diff --git a/.gear/qcad-qt5-unbundle_libraries.patch b/.gear/qcad-qt5-unbundle_libraries.patch new file mode 100644 index 000000000..6300a2c5b --- /dev/null +++ b/.gear/qcad-qt5-unbundle_libraries.patch @@ -0,0 +1,72 @@ +diff -rupN shared.pri qcad-3.15.6.1-new/shared.pri +--- shared.pri 2016-12-01 10:40:01.000000000 +0100 ++++ shared.pri 2016-12-18 21:03:22.059514509 +0100 +@@ -164,10 +164,10 @@ QMAKE_TARGET_DESCRIPTION = QCAD Applicat + QMAKE_TARGET_COPYRIGHT = + QMAKE_TARGET_PRODUCT = QCAD Application Framework + +-DESTDIR = $$PWD/$$ROUTDIR ++DESTDIR = $$shadowed($$PWD)/$$ROUTDIR + UI_DIR = .ui + +-LIBS += -L$$PWD/$$ROUTDIR ++LIBS += -L$$shadowed($$PWD)/$$ROUTDIR + + CONFIG(debug, debug|release) { + !win32 { +diff -rupN src/3rdparty/3rdparty.pro qcad-3.15.6.1-new/src/3rdparty/3rdparty.pro +--- src/3rdparty/3rdparty.pro 2016-12-01 10:40:01.000000000 +0100 ++++ src/3rdparty/3rdparty.pro 2016-12-18 21:08:23.664591423 +0100 +@@ -1,9 +1,6 @@ + include (../../shared.pri) + TEMPLATE = subdirs +-SUBDIRS = \ +- spatialindexnavel \ +- stemmer \ +- quazip ++SUBDIRS = stemmer spatialindexnavel + + !r_no_opennurbs { + SUBDIRS += opennurbs +diff -rupN src/spatialindex/RSpatialIndexNavel.h qcad-3.15.6.1-new/src/spatialindex/RSpatialIndexNavel.h +--- src/spatialindex/RSpatialIndexNavel.h 2016-12-01 10:40:01.000000000 +0100 ++++ src/spatialindex/RSpatialIndexNavel.h 2016-12-18 21:04:31.387312658 +0100 +@@ -28,7 +28,7 @@ + + #include "RSpatialIndex.h" + +-#include "spatialindexnavel/include/spatialindex/SpatialIndex.h" ++#include "spatialindex/SpatialIndex.h" + + class RSiDataStream : public SpatialIndex::IDataStream + { +--- src/scripting/ecmaapi/ecmaapi.orig.pro 2016-12-01 10:40:01.000000000 +0100 ++++ src/scripting/ecmaapi/ecmaapi.pro 2016-12-19 19:03:52.081431285 +0100 +@@ -28,4 +28,4 @@ + -l$${RLIBNAME}spatialindex \ + -l$${RLIBNAME}stemmer \ + -l$${RLIBNAME}zip \ +- -lquazip ++ -lquazip5 +--- src/zip/zip.orig.pro 2016-12-01 10:40:01.000000000 +0100 ++++ src/zip/zip.pro 2016-12-19 19:05:42.959796504 +0100 +@@ -23,7 +23,7 @@ + CONFIG += plugin + } + TARGET = $${RLIBNAME}zip +-LIBS += -l$${RLIBNAME}core -lquazip ++LIBS += -l$${RLIBNAME}core -lquazip5 + OTHER_FILES += zip.dox + DEFINES += QCADZIP_LIBRARY + RC_FILE = zip.rc +--- shared_app.orig.pri 2016-12-01 10:40:01.000000000 +0100 ++++ shared_app.pri 2016-12-19 19:07:16.984258212 +0100 +@@ -13,7 +13,7 @@ + -l$${RLIBNAME}stemmer \ + -lstemmer \ + -l$${RLIBNAME}zip \ +- -lquazip ++ -lquazip5 + + !r_no_opennurbs { + LIBS += \ diff --git a/.gear/rules b/.gear/rules index d6977a906..052898881 100644 --- a/.gear/rules +++ b/.gear/rules @@ -1,4 +1,5 @@ copy: qcad copy: *.desktop +copy: .gear/*.patch tar: v@version@:. diff: v@version@:. . diff --git a/qcad.spec b/qcad.spec index 2b8568b9d..533027809 100644 --- a/qcad.spec +++ b/qcad.spec @@ -2,7 +2,7 @@ Name: qcad Version: 3.21.3.2 -Release: alt1 +Release: alt2 Summary: A professional CAD system Summary(ru_RU.UTF-8): Профессиональная система CAD @@ -17,6 +17,7 @@ Source0: qcad-%version.tar Source1: qcad.desktop Source2: qcad Patch: %name-%version-%release.patch +Patch1: qcad-qt5-unbundle_libraries.patch BuildRequires: gcc-c++ qt5-base-devel python BuildRequires: desktop-file-utils @@ -34,6 +35,8 @@ BuildRequires: qt5-webengine-devel BuildRequires: qt5-webkit-devel BuildRequires: qt5-xmlpatterns-devel BuildRequires: zlib-devel +BuildRequires: libquazip-qt5-devel +BuildRequires: spatialindex-devel Requires: qt5-translations qt5-imageformats @@ -52,6 +55,7 @@ QCad это профессиональная CAD система. С QCad вы м %prep %setup -q %patch -p1 +%patch1 -p0 %if_with debug echo 'DEFINES -= QT_NO_DEBUG_OUTPUT' >> shared.pri %endif