pool/librecad
SHA256
4
0
Fork 2
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 402953 from graphics

Browse Source 
- add librecad-gcc6.patch (forwarded request 402902 from jirislaby)

OBS-URL: https://build.opensuse.org/request/show/402953
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/librecad?expand=0&rev=15
This commit is contained in:
Dominique Leuenberger 2016-06-19 08:50:28 +00:00 committed by Git OBS Bridge
commit 0997483e29
9 changed files with 92 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
2.0.11.tar.gz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:05be8268614771e0c2a65e5ec767b26f516aab1d38e0c79d8137feabf110aa49
size 22128460

3
2.1.0.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:dd1855f25d7d083f84a21381024d0e4f05ff3d0f1b6225809b409f30b6b885cf
size 22414093

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

29
librecad-install.diff
View File

@ -1,24 +1,13 @@
---
librecad/src/src.pro | 1 -
scripts/postprocess-unix.sh | 2 +-
2 files changed, 1 insertion(+), 2 deletions(-)
Subject: postprocess-unix.sh: use correct path
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
@@ -64,7 +64,6 @@ unix {
DEFINES += QC_APPDIR="\"librecad\""
DEFINES += QINITIMAGES_LIBRECAD="qInitImages_librecad"
RC_FILE = ../res/main/librecad.icns
- QMAKE_POST_LINK = cd $$_PRO_FILE_PWD_/../.. && scripts/postprocess-unix.sh
}
}
win32 {
Index: LibreCAD-2.0.8/scripts/postprocess-unix.sh
===================================================================
--- LibreCAD-2.0.8.orig/scripts/postprocess-unix.sh
+++ LibreCAD-2.0.8/scripts/postprocess-unix.sh
[js] rebase on the top of 2.1.0
---
scripts/postprocess-unix.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- a/scripts/postprocess-unix.sh
+++ b/scripts/postprocess-unix.sh
@@ -3,7 +3,7 @@
THISDIR="`pwd`"
LCDIR="${THISDIR}/librecad"

26
librecad-no-date.diff
View File

@ -1,18 +1,18 @@
Remove build time references so build-compare can do its work
Remove build time references so build-compare can do its work.
[js] rebase on top of 2.1.0
---
librecad/src/main/qc_applicationwindow.cpp | 1 -
1 file changed, 1 deletion(-)
Index: LibreCAD-2.0.8/librecad/src/main/qc_applicationwindow.cpp
===================================================================
--- LibreCAD-2.0.8.orig/librecad/src/main/qc_applicationwindow.cpp
+++ LibreCAD-2.0.8/librecad/src/main/qc_applicationwindow.cpp
@@ -3358,7 +3358,6 @@ void QC_ApplicationWindow::slotHelpAbout
tr("Compiler: Microsoft Visual C++<br>") +
#endif
tr("Qt Version: %1").arg(qVersion()) + "<br>" +
- tr("Compiled on: %1").arg(__DATE__) + "<br>" +
"Portions (c) 2011 by R. van Twisk" + "<br>" +
tr("Program Icons Supplied by") +"<br>&nbsp;&nbsp;&nbsp;Pablo: LibreCAD Argentine<br/>" +
tr("Splash and Logo supplied by") + "<br>&nbsp;&nbsp;&nbsp;Diego " + "<a href=\"http://daltom.2082studio.com/\">Daltom Designer</a>" + "<br/>" +
--- a/librecad/src/main/qc_applicationwindow.cpp
+++ b/librecad/src/main/qc_applicationwindow.cpp
@@ -2380,7 +2380,6 @@ void QC_ApplicationWindow::showAboutWind
#elif defined(Q_CC_MSVC)
tr("Compiler: Microsoft Visual C++") + "\n" +
#endif
- tr("Compiled on: %1").arg(__DATE__) + "\n" +
tr("Qt Version: %1").arg(qVersion()) + "\n" +
tr("Boost Version: %1.%2.%3").arg(BOOST_VERSION / 100000).arg(BOOST_VERSION / 100 % 1000).arg(BOOST_VERSION % 100)
);

2
librecad-rpmlintrc
View File

@ -1,2 +1,2 @@
# We are not a library, dammit
addFilter("shlib-policy-missing-lib")
addFilter("libre.* shlib-policy-")

19
librecad-use-system-libdxfrw.patch
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 \

15
librecad.changes
View File

@ -1,3 +1,18 @@
-------------------------------------------------------------------
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
- Update to new upstream release 2.1.0
* new features
* lot of bug fixes
* other changes
* see full changelog at:
https://github.com/LibreCAD/ChangeLogs/blob/master/developers/r-a-v-a-s/2-1/2-1-0/2-1-0.md
-------------------------------------------------------------------
Tue May 24 10:32:20 UTC 2016 - jengelh@inai.de

15
librecad.spec
View File

@ -17,7 +17,7 @@
Name: librecad
Version: 2.0.11
Version: 2.1.0
Release: 0
Summary: Computer-aided design (CAD) software package for 2D design and drafting
License: GPL-2.0 and (Apache-2.0 or SUSE-GPL-3.0+-with-font-exception)
@ -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,9 +88,13 @@ CAD drawings.
%prep
%setup -qn LibreCAD-%version -a 2 -a 3 -a 4
%patch -P 1 -P 2 -P 3 -P 4 -p1
%patch0 -p1
%patch1 -p1
%patch2 -p1
%patch3 -p1
%patch4 -p1
%if 0%{?suse_version} >= 1321
%patch -P 5 -p1
%patch5 -p1
%endif
dxfrw_includedir=$(pkg-config --cflags-only-I libdxfrw0 | sed 's|-I||g')
@ -97,6 +102,9 @@ dxfrw_includedir=$(pkg-config --cflags-only-I libdxfrw0 | sed 's|-I||g')
# Fix paths
sed -i 's|##LIBDIR##|%_libdir|g' librecad/src/lib/engine/rs_system.cpp
sed -i 's|$${DXFRW_INCLUDEDIR}|'"$dxfrw_includedir"'|g' librecad/src/src.pro
%if 0%{?suse_version} >= 1321
sed -i 's@LRELEASE="lrelease"@LRELEASE="lrelease-qt5"@' scripts/postprocess-unix.sh
%endif
# Make sure bundled libraries are not used
rm -rf libraries/libdxfrw
@ -108,6 +116,7 @@ rm -rf plugins/importshp/shapelib
sed -i 's/\r$//' LICENSE-MIT.txt LICENSE_KST32B_v2.txt license-lc_opengost-fonts.txt
%build
echo 'DISABLE_POSTSCRIPT = true' > librecad/src/custom.pri
%if 0%{?suse_version} >= 1321
qmake-qt5 \
%else