Accepting request 400404 from home:jirislaby:branches:graphics

Update to new upstream release 2.1.0

OBS-URL: https://build.opensuse.org/request/show/400404
OBS-URL: https://build.opensuse.org/package/show/graphics/librecad?expand=0&rev=36
This commit is contained in:
2016-06-07 09:21:04 +00:00
committed by Git OBS Bridge
parent b7b4b1c313
commit fd4fd7ba78
8 changed files with 54 additions and 51 deletions

View File

@@ -1,15 +1,14 @@
build: avoid using bundled libdxfrw
[asterios.dramis@gmail.com: patch imported from Fedora]
[js] rebase 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.0.8/libraries/libraries.pro
===================================================================
--- LibreCAD-2.0.8.orig/libraries/libraries.pro
+++ LibreCAD-2.0.8/libraries/libraries.pro
--- a/libraries/libraries.pro
+++ b/libraries/libraries.pro
@@ -9,7 +9,6 @@ TEMPLATE = subdirs
TARGET = libraries
@@ -18,11 +17,9 @@ Index: LibreCAD-2.0.8/libraries/libraries.pro
jwwlib
macx|win32|equals(build_muparser, "true")|!packagesExist(muparser){
Index: LibreCAD-2.0.8/librecad/src/src.pro
===================================================================
--- LibreCAD-2.0.8.orig/librecad/src/src.pro
+++ LibreCAD-2.0.8/librecad/src/src.pro
@@ -42,8 +42,7 @@ greaterThan( QT_MAJOR_VERSION, 4 ) {
--- a/librecad/src/src.pro
+++ b/librecad/src/src.pro
@@ -35,8 +35,7 @@ greaterThan( QT_MAJOR_VERSION, 4 ) {
}
GEN_LIB_DIR = ../../generated/lib
@@ -32,10 +29,10 @@ Index: LibreCAD-2.0.8/librecad/src/src.pro
DESTDIR = $${INSTALLDIR}
@@ -91,7 +90,7 @@ LIBS += -L../../generated/lib \
@@ -84,7 +83,7 @@ LIBS += -L../../generated/lib \
-ljwwlib
DEPENDPATH += \
INCLUDEPATH += \
- ../../libraries/libdxfrw/src \
+ $${DXFRW_INCLUDEDIR} \
../../libraries/jwwlib/src \