pool/librecad
SHA256
12
0
Fork 2
Code Issues Pull Requests Activity

Accepting request 402902 from home:jirislaby:branches:graphics

Browse Source 
- add librecad-gcc6.patch

OBS-URL: https://build.opensuse.org/request/show/402902
OBS-URL: https://build.opensuse.org/package/show/graphics/librecad?expand=0&rev=37
This commit is contained in:
Jan Engelhardt
2016-06-17 13:08:31 +00:00
committed by Git OBS Bridge
parent fd4fd7ba78
commit 84542a298b
3 changed files with 38 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
librecad-gcc6.patch Normal file
View File

@@ -0,0 +1,31 @@
Subject: Fix gcc6 build failure
Taken from fedora.
---
diff -up LibreCAD-dbf1cc7c9597740d34a068f6f09c36841054e903/librecad/src/boost.pri.gcc6 LibreCAD-dbf1cc7c9597740d34a068f6f09c36841054e903/librecad/src/boost.pri
--- LibreCAD-dbf1cc7c9597740d34a068f6f09c36841054e903/librecad/src/boost.pri.gcc6 2016-06-06 11:47:24.087659733 -0400
+++ LibreCAD-dbf1cc7c9597740d34a068f6f09c36841054e903/librecad/src/boost.pri 2016-06-06 11:47:27.439636022 -0400
@@ -113,7 +113,7 @@ unix {
}
- INCLUDEPATH += $${BOOST_INCDIR}
+ # INCLUDEPATH += $${BOOST_INCDIR}
HEADERS += $${BOOST_INCDIR}
!isEmpty( BOOST_LIBS ) {
diff -up LibreCAD-dbf1cc7c9597740d34a068f6f09c36841054e903/librecad/src/muparser.pri.gcc6 LibreCAD-dbf1cc7c9597740d34a068f6f09c36841054e903/librecad/src/muparser.pri
--- LibreCAD-dbf1cc7c9597740d34a068f6f09c36841054e903/librecad/src/muparser.pri.gcc6 2016-06-05 02:27:45.000000000 -0400
+++ LibreCAD-dbf1cc7c9597740d34a068f6f09c36841054e903/librecad/src/muparser.pri 2016-06-06 11:46:11.508173138 -0400
@@ -2,9 +2,7 @@
macx|win32|equals(build_muparser, "true")|!packagesExist(muparser){
message("Using bundled muparser")
MUPARSER_DIR = ../../libraries/muparser
- DEPENDPATH += $$MUPARSER_DIR/include \
- $$MUPARSER_DIR/src
- INCLUDEPATH += $$MUPARSER_DIR/include
+ DEPENDPATH += $$MUPARSER_DIR/src
GEN_LIB_DIR = ../../generated/lib
LIBS += -L$$GEN_LIB_DIR -lmuparser
PRE_TARGETDEPS += $$GEN_LIB_DIR/libmuparser.a

5
librecad.changes
View File

@@ -1,3 +1,8 @@
-------------------------------------------------------------------
Fri Jun 17 10:21:20 UTC 2016 - jslaby@suse.com
- add librecad-gcc6.patch
-------------------------------------------------------------------
Tue Jun 7 07:51:47 UTC 2016 - jslaby@suse.com

2
librecad.spec
View File

@@ -34,6 +34,7 @@ Source3: http://wiki.librecad.org/images/7/70/Electronics3-LCAD.zip
Source4: http://wiki.librecad.org/images/9/9d/Electrical1-LCAD.zip
Source10: ttf2lff.1
Source20: %name-rpmlintrc
Patch0: librecad-gcc6.patch
Patch1: librecad-no-date.diff
Patch2: librecad-use-system-libdxfrw.patch
Patch3: librecad-install.diff
@@ -87,6 +88,7 @@ CAD drawings.
%prep
%setup -qn LibreCAD-%version -a 2 -a 3 -a 4
%patch0 -p1
%patch1 -p1
%patch2 -p1
%patch3 -p1