Accepting request 244624 from home:adra:branches:graphics

Update to new upstream release 2.0.4, Rebased librecad-use-system-libdxfrw.patch to apply cleanly

OBS-URL: https://build.opensuse.org/request/show/244624
OBS-URL: https://build.opensuse.org/package/show/graphics/librecad?expand=0&rev=17
This commit is contained in:
2014-08-14 01:50:06 +00:00
committed by Git OBS Bridge
parent 084b400594
commit 6f532499cd
5 changed files with 28 additions and 12 deletions

View File

@@ -6,10 +6,10 @@ build: avoid using bundled libdxfrw
librecad/src/src.pro | 3 +--
2 files changed, 1 insertion(+), 3 deletions(-)
Index: LibreCAD-2.0.2/libraries/libraries.pro
Index: LibreCAD-2.0.4/libraries/libraries.pro
===================================================================
--- LibreCAD-2.0.2.orig/libraries/libraries.pro
+++ LibreCAD-2.0.2/libraries/libraries.pro
--- LibreCAD-2.0.4.orig/libraries/libraries.pro
+++ LibreCAD-2.0.4/libraries/libraries.pro
@@ -9,7 +9,6 @@ TEMPLATE = subdirs
TARGET = libraries
@@ -17,11 +17,11 @@ Index: LibreCAD-2.0.2/libraries/libraries.pro
- libdxfrw \
jwwlib
Index: LibreCAD-2.0.2/librecad/src/src.pro
macx|win32|equals(build_muparser, "true"){
Index: LibreCAD-2.0.4/librecad/src/src.pro
===================================================================
--- LibreCAD-2.0.2.orig/librecad/src/src.pro
+++ LibreCAD-2.0.2/librecad/src/src.pro
--- LibreCAD-2.0.4.orig/librecad/src/src.pro
+++ LibreCAD-2.0.4/librecad/src/src.pro
@@ -37,7 +37,6 @@ greaterThan( QT_MAJOR_VERSION, 4 ) {
CONFIG += help
}
@@ -30,7 +30,7 @@ Index: LibreCAD-2.0.2/librecad/src/src.pro
PRE_TARGETDEPS += ../../generated/lib/libjwwlib.a
DESTDIR = $${INSTALLDIR}
@@ -77,7 +76,7 @@ LIBS += -L../../generated/lib \
@@ -86,7 +85,7 @@ LIBS += -L../../generated/lib \
-ljwwlib
DEPENDPATH += \