Jan Engelhardt
44893268d4
- update to 2.2.0-rc3 * major release * DWG imports are more reliable now * and a lot more of bugfixes and improvements - remove (they are in upstream now) * 0001-fix-build-with-gcc-9.patch * add-boost-tuple-include-to-fix-build.patch * ensured-all-objects-are-shown-when-a-layer-is-toggle.patch * fix-build-with-Qt-5.11.patch * fix-build-with-Qt-5.15.patch - remove qcad provides/obsoletes -- it's an ancient history OBS-URL: https://build.opensuse.org/request/show/941610 OBS-URL: https://build.opensuse.org/package/show/graphics/librecad?expand=0&rev=61
32 lines
811 B
Diff
32 lines
811 B
Diff
build: avoid using bundled shapelib
|
|
[asterios.dramis@gmail.com: imported the patch from Fedora into openSUSE's librecad]
|
|
|
|
---
|
|
plugins/importshp/importshp.pro | 11 +++--------
|
|
1 file changed, 3 insertions(+), 8 deletions(-)
|
|
|
|
--- a/plugins/importshp/importshp.pro
|
|
+++ b/plugins/importshp/importshp.pro
|
|
@@ -17,12 +17,9 @@ include(../../common.pri)
|
|
# For plugins
|
|
INCLUDEPATH += ../../librecad/src/plugins
|
|
|
|
-SOURCES += importshp.cpp \
|
|
- shapelib/shpopen.c \
|
|
- shapelib/safileio.c \
|
|
- shapelib/dbfopen.c
|
|
-HEADERS += importshp.h \
|
|
- shapelib/shapefil.h
|
|
+SOURCES += importshp.cpp
|
|
+HEADERS += importshp.h
|
|
+LIBS += -lshp
|
|
|
|
# Installation Directory
|
|
win32 {
|
|
@@ -36,5 +33,3 @@ unix {
|
|
DESTDIR = ../../unix/resources/plugins
|
|
}
|
|
}
|
|
-
|
|
-INCLUDEPATH += shapelib
|