File librecad-use-system-libdxfrw.patch of Package librecad

Overview Repositories Revisions Requests Users Attributes Meta

File librecad-use-system-libdxfrw.patch of Package librecad (Revision fc35d8335aa36429f7a7d6e2a9ae257a)

Currently displaying revision fc35d8335aa36429f7a7d6e2a9ae257a , Show latest

build: avoid using bundled libdxfrw
[asterios.dramis@gmail.com: imported the patch from Fedora into openSUSE's librecad]
[jslaby@suse.com: rebase/rework on top of 2.1.0]

---
 libraries/libraries.pro |    1 -
 librecad/src/src.pro    |    5 ++---
 2 files changed, 2 insertions(+), 4 deletions(-)

Index: LibreCAD-2.2.0.2/libraries/libraries.pro
===================================================================
--- LibreCAD-2.2.0.2.orig/libraries/libraries.pro
+++ LibreCAD-2.2.0.2/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.2.0.2/librecad/src/src.pro
===================================================================
--- LibreCAD-2.2.0.2.orig/librecad/src/src.pro
+++ LibreCAD-2.2.0.2/librecad/src/src.pro
@@ -33,8 +33,7 @@ CONFIG += c++11
 }
 
 GEN_LIB_DIR = ../../generated/lib
-PRE_TARGETDEPS += $$GEN_LIB_DIR/libdxfrw.a \
-		$$GEN_LIB_DIR/libjwwlib.a
+PRE_TARGETDEPS += $$GEN_LIB_DIR/libjwwlib.a
 
 DESTDIR = $${INSTALLDIR}
 
@@ -85,7 +84,7 @@ LIBS += -L../../generated/lib  \
     -ljwwlib
 
 INCLUDEPATH += \
-    ../../libraries/libdxfrw/src \
+    $${DXFRW_INCLUDEDIR} \
     ../../libraries/jwwlib/src \
     cmd \
     lib/actions \

Places

File librecad-use-system-libdxfrw.patch of Package librecad (Revision fc35d8335aa36429f7a7d6e2a9ae257a)

Places