librecad/librecad-use-system-libdxfrw.patch
Jan Engelhardt c08040b02b Accepting request 283705 from home:adra:branches:graphics
Update to new upstream release 2.0.7, Added new Part Libraries Architect8-LCAD.zip and Electronics8-LCAD.zip, Added new build requirement unzip, Rebased patches

OBS-URL: https://build.opensuse.org/request/show/283705
OBS-URL: https://build.opensuse.org/package/show/graphics/librecad?expand=0&rev=19
2015-02-01 23:16:34 +00:00

42 lines
1.2 KiB
Diff

build: avoid using bundled libdxfrw
[asterios.dramis@gmail.com: patch imported from Fedora]
---
libraries/libraries.pro | 1 -
librecad/src/src.pro | 3 +--
2 files changed, 1 insertion(+), 3 deletions(-)
Index: LibreCAD-2.0.7/libraries/libraries.pro
===================================================================
--- LibreCAD-2.0.7.orig/libraries/libraries.pro
+++ LibreCAD-2.0.7/libraries/libraries.pro
@@ -9,7 +9,6 @@ TEMPLATE = subdirs
TARGET = libraries
SUBDIRS = \
- libdxfrw \
jwwlib
macx|win32|equals(build_muparser, "true")|!packagesExist(muparser){
Index: LibreCAD-2.0.7/librecad/src/src.pro
===================================================================
--- LibreCAD-2.0.7.orig/librecad/src/src.pro
+++ LibreCAD-2.0.7/librecad/src/src.pro
@@ -39,7 +39,6 @@ greaterThan( QT_MAJOR_VERSION, 4 ) {
CONFIG += help
}
-PRE_TARGETDEPS += ../../generated/lib/libdxfrw.a
PRE_TARGETDEPS += ../../generated/lib/libjwwlib.a
DESTDIR = $${INSTALLDIR}
@@ -88,7 +87,7 @@ LIBS += -L../../generated/lib \
-ljwwlib
DEPENDPATH += \
- ../../libraries/libdxfrw/src \
+ $${DXFRW_INCLUDEDIR} \
../../libraries/jwwlib/src \
cmd \
lib/actions \