diff options
author | nia <nia@pkgsrc.org> | 2019-09-05 13:39:10 +0000 |
---|---|---|
committer | nia <nia@pkgsrc.org> | 2019-09-05 13:39:10 +0000 |
commit | f7c57d1162e7a5c02f42a210e3db8a01a48fbc0a (patch) | |
tree | b09b435c7829da211af00d07aefad75f4676b947 | |
parent | 2ad931d451137052fe91b471536f0b6b642ba476 (diff) | |
download | pkgsrc-f7c57d1162e7a5c02f42a210e3db8a01a48fbc0a.tar.gz |
qcad: Switch from qt5 to qt5
Bump PKGREVISION
-rw-r--r-- | cad/qcad/Makefile | 15 | ||||
-rw-r--r-- | cad/qcad/PLIST | 87 | ||||
-rw-r--r-- | cad/qcad/distinfo | 30 | ||||
-rw-r--r-- | cad/qcad/patches/patch-scripts_Help_About_About.js | 8 | ||||
-rw-r--r-- | cad/qcad/patches/patch-scripts_Widgets_LibraryBrowser_LibraryBrowser.js | 9 | ||||
-rw-r--r-- | cad/qcad/patches/patch-shared.pri | 10 | ||||
-rw-r--r-- | cad/qcad/patches/patch-src_3rdparty_dxflib_dxflib.pro | 7 | ||||
-rw-r--r-- | cad/qcad/patches/patch-src_3rdparty_dxflib_src_dl__writer.h | 7 | ||||
-rw-r--r-- | cad/qcad/patches/patch-src_3rdparty_spatialindexnavel_spatialindexnavel.pro | 6 | ||||
-rw-r--r-- | cad/qcad/patches/patch-src_3rdparty_stemmer_stemmer.pro | 6 | ||||
-rw-r--r-- | cad/qcad/patches/patch-src_core_RS.cpp | 10 | ||||
-rw-r--r-- | cad/qcad/patches/patch-src_core_RSPlatform.cpp | 6 | ||||
-rw-r--r-- | cad/qcad/patches/patch-src_core_RSettings.cpp | 7 | ||||
-rw-r--r-- | cad/qcad/patches/patch-src_customwidgets_customwidgets.pro | 7 | ||||
-rw-r--r-- | cad/qcad/patches/patch-src_operations_operations.pro | 7 | ||||
-rw-r--r-- | cad/qcad/patches/patch-src_scripting_ecmaapi_ecmaapi.pro | 15 | ||||
-rw-r--r-- | cad/qcad/patches/patch-src_snap_snap.pro | 7 |
17 files changed, 141 insertions, 103 deletions
diff --git a/cad/qcad/Makefile b/cad/qcad/Makefile index bd1c104e19a..68482067d42 100644 --- a/cad/qcad/Makefile +++ b/cad/qcad/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.74 2019/07/31 19:30:20 plunky Exp $ +# $NetBSD: Makefile,v 1.75 2019/09/05 13:39:10 nia Exp $ # DISTNAME= qcad-3.23.0.0 +PKGREVISION= 1 CATEGORIES= cad MASTER_SITES= ${MASTER_SITE_GITHUB:=qcad/} EXTRACT_USING= bsdtar @@ -14,8 +15,6 @@ LICENSE= gnu-gpl-v3 GITHUB_TAG= v${PKGVERSION_NOREV} DEPENDS+= bash-[0-9]*:../../shells/bash -DEPENDS+= qt4-tiff-[0-9]*:../../x11/qt4-tiff -DEPENDS+= qt4-sqlite3-[0-9]*:../../x11/qt4-sqlite3 USE_TOOLS+= chmod find make pax USE_LANGUAGES= c c++ @@ -62,9 +61,9 @@ do-install: .include "../../sysutils/desktop-file-utils/desktopdb.mk" .include "../../devel/libexecinfo/buildlink3.mk" .include "../../devel/zlib/buildlink3.mk" -.include "../../x11/qt4-libs/buildlink3.mk" -BUILDLINK_API_DEPENDS.qt4-libs+= qt4-libs>=4.7 -.include "../../x11/qt4-tools/buildlink3.mk" -BUILDLINK_API_DEPENDS.qt4-tools+= qt4-tools>=4.7 -BUILDLINK_DEPMETHOD.qt4-tools= full +.include "../../x11/qt5-qtbase/buildlink3.mk" +.include "../../x11/qt5-qtscript/buildlink3.mk" +.include "../../x11/qt5-qtsvg/buildlink3.mk" +.include "../../x11/qt5-qttools/buildlink3.mk" +.include "../../x11/qt5-qtxmlpatterns/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/cad/qcad/PLIST b/cad/qcad/PLIST index 76001440f0c..0a4bda8f45b 100644 --- a/cad/qcad/PLIST +++ b/cad/qcad/PLIST @@ -1,18 +1,18 @@ -@comment $NetBSD: PLIST,v 1.12 2019/07/31 19:30:20 plunky Exp $ +@comment $NetBSD: PLIST,v 1.13 2019/09/05 13:39:10 nia Exp $ bin/qcad -lib/libdxflib.la -lib/libopennurbs.la -lib/libqcadcore.la -lib/libqcadecmaapi.la -lib/libqcadentity.la -lib/libqcadgrid.la -lib/libqcadgui.la -lib/libqcadoperations.la -lib/libqcadsnap.la -lib/libqcadspatialindex.la -lib/libqcadstemmer.la -lib/libspatialindexnavel.la -lib/libstemmer.la +lib/libdxflib.so +lib/libopennurbs.so +lib/libqcadcore.so +lib/libqcadecmaapi.so +lib/libqcadentity.so +lib/libqcadgrid.so +lib/libqcadgui.so +lib/libqcadoperations.so +lib/libqcadsnap.so +lib/libqcadspatialindex.so +lib/libqcadstemmer.so +lib/libspatialindexnavel.so +lib/libstemmer.so lib/qcad/fonts/CourierCad.cxf lib/qcad/fonts/Cursive.cxf lib/qcad/fonts/Cyrillic_II.cxf @@ -288,12 +288,8 @@ lib/qcad/patterns/metric/swamp.pat lib/qcad/patterns/metric/trans.pat lib/qcad/patterns/metric/triang.pat lib/qcad/patterns/metric/zigzag.pat -lib/qcad/plugins/codecs/libqcncodecs.so -lib/qcad/plugins/codecs/libqjpcodecs.so -lib/qcad/plugins/codecs/libqkrcodecs.so -lib/qcad/plugins/codecs/libqtwcodecs.so lib/qcad/plugins/codecs/readme.txt -lib/qcad/plugins/designer/libqcadcustomwidgets.la +lib/qcad/plugins/designer/libqcadcustomwidgets.so lib/qcad/plugins/designer/readme.txt lib/qcad/plugins/imageformats/libqgif.so lib/qcad/plugins/imageformats/libqico.so @@ -302,18 +298,49 @@ lib/qcad/plugins/imageformats/libqsvg.so lib/qcad/plugins/imageformats/libqtga.so lib/qcad/plugins/imageformats/libqtiff.so lib/qcad/plugins/imageformats/readme.txt -lib/qcad/plugins/libqcaddxf.la +lib/qcad/plugins/libqcaddxf.so +lib/qcad/plugins/printsupport/libcupsprintersupport.so lib/qcad/plugins/printsupport/readme.txt -lib/qcad/plugins/script/libqtscript_core.la -lib/qcad/plugins/script/libqtscript_gui.la -lib/qcad/plugins/script/libqtscript_network.la -lib/qcad/plugins/script/libqtscript_opengl.la -lib/qcad/plugins/script/libqtscript_sql.la -lib/qcad/plugins/script/libqtscript_svg.la -lib/qcad/plugins/script/libqtscript_uitools.la -lib/qcad/plugins/script/libqtscript_webkit.la -lib/qcad/plugins/script/libqtscript_xml.la -lib/qcad/plugins/script/libqtscript_xmlpatterns.la +lib/qcad/plugins/script/libqtscript_core.so +lib/qcad/plugins/script/libqtscript_core.so.1 +lib/qcad/plugins/script/libqtscript_core.so.1.0 +lib/qcad/plugins/script/libqtscript_core.so.1.0.0 +lib/qcad/plugins/script/libqtscript_gui.so +lib/qcad/plugins/script/libqtscript_gui.so.1 +lib/qcad/plugins/script/libqtscript_gui.so.1.0 +lib/qcad/plugins/script/libqtscript_gui.so.1.0.0 +lib/qcad/plugins/script/libqtscript_network.so +lib/qcad/plugins/script/libqtscript_network.so.1 +lib/qcad/plugins/script/libqtscript_network.so.1.0 +lib/qcad/plugins/script/libqtscript_network.so.1.0.0 +lib/qcad/plugins/script/libqtscript_opengl.so +lib/qcad/plugins/script/libqtscript_opengl.so.1 +lib/qcad/plugins/script/libqtscript_opengl.so.1.0 +lib/qcad/plugins/script/libqtscript_opengl.so.1.0.0 +lib/qcad/plugins/script/libqtscript_printsupport.so +lib/qcad/plugins/script/libqtscript_printsupport.so.1 +lib/qcad/plugins/script/libqtscript_printsupport.so.1.0 +lib/qcad/plugins/script/libqtscript_printsupport.so.1.0.0 +lib/qcad/plugins/script/libqtscript_sql.so +lib/qcad/plugins/script/libqtscript_sql.so.1 +lib/qcad/plugins/script/libqtscript_sql.so.1.0 +lib/qcad/plugins/script/libqtscript_sql.so.1.0.0 +lib/qcad/plugins/script/libqtscript_uitools.so +lib/qcad/plugins/script/libqtscript_uitools.so.1 +lib/qcad/plugins/script/libqtscript_uitools.so.1.0 +lib/qcad/plugins/script/libqtscript_uitools.so.1.0.0 +lib/qcad/plugins/script/libqtscript_widgets.so +lib/qcad/plugins/script/libqtscript_widgets.so.1 +lib/qcad/plugins/script/libqtscript_widgets.so.1.0 +lib/qcad/plugins/script/libqtscript_widgets.so.1.0.0 +lib/qcad/plugins/script/libqtscript_xml.so +lib/qcad/plugins/script/libqtscript_xml.so.1 +lib/qcad/plugins/script/libqtscript_xml.so.1.0 +lib/qcad/plugins/script/libqtscript_xml.so.1.0.0 +lib/qcad/plugins/script/libqtscript_xmlpatterns.so +lib/qcad/plugins/script/libqtscript_xmlpatterns.so.1 +lib/qcad/plugins/script/libqtscript_xmlpatterns.so.1.0 +lib/qcad/plugins/script/libqtscript_xmlpatterns.so.1.0.0 lib/qcad/plugins/sqldrivers/libqsqlite.so lib/qcad/plugins/sqldrivers/readme.txt lib/qcad/scripts/.gitignore diff --git a/cad/qcad/distinfo b/cad/qcad/distinfo index 431bd8e6459..39df12eaa75 100644 --- a/cad/qcad/distinfo +++ b/cad/qcad/distinfo @@ -1,38 +1,38 @@ -$NetBSD: distinfo,v 1.31 2019/07/31 19:30:20 plunky Exp $ +$NetBSD: distinfo,v 1.32 2019/09/05 13:39:10 nia Exp $ SHA1 (qcad-3.23.0.0.tar.gz) = 4d54082ae447f8bd388708ffaa845fb4b0b5b572 RMD160 (qcad-3.23.0.0.tar.gz) = 277073e7ceaf713aa8c8e7a99dab95dd278da7ad SHA512 (qcad-3.23.0.0.tar.gz) = defec8cedfe2f7ef9963b4802a441172cef53d54cb9e30109b999c787f93b86f1ca4901a3960711ba54f05eee4c7a60d7a0a7807413826d1be621355c5956dd1 Size (qcad-3.23.0.0.tar.gz) = 33296984 bytes SHA1 (patch-qcad.pro) = b8dafdf3105ff3580815bb82a6a84b71f4d0b172 -SHA1 (patch-scripts_Help_About_About.js) = 011bf46171a3363cca3cd84b5a3f2479414023ba +SHA1 (patch-scripts_Help_About_About.js) = c1d12d2dc6cdf5a4452d9872a11bc887c6729ce5 SHA1 (patch-scripts_Help_ShowReadme_ShowReadme.js) = 96412237a7c4422f02dc5d2ab3634457b376a2d2 SHA1 (patch-scripts_Widgets_CommandLine_CommandLine.js) = 3e8313d04f43a0115949d8a20b01a7cbbe097ef3 -SHA1 (patch-scripts_Widgets_LibraryBrowser_LibraryBrowser.js) = 43842ba0e7c3cfadfe433be3f6b93f13867355eb -SHA1 (patch-shared.pri) = fa940892d1deab185a752cab8e5346a04ba1bf03 +SHA1 (patch-scripts_Widgets_LibraryBrowser_LibraryBrowser.js) = 65f988e553259eb93217ea12e9cb429fe52f05be +SHA1 (patch-shared.pri) = f0b3ca615636c7fc2edc1af3b25b7aef2d9393ac SHA1 (patch-shared__app.pri) = a3957987228dcadb6eb8a8bb282d6d8baee643c2 -SHA1 (patch-src_3rdparty_dxflib_dxflib.pro) = 4bfe1a47b2e1c8c574512732e07936b7d75c65ee -SHA1 (patch-src_3rdparty_dxflib_src_dl__writer.h) = 28d515063c5d410083a2ab582e9dfa75adf4e3ac +SHA1 (patch-src_3rdparty_dxflib_dxflib.pro) = 7229800bfa5f04a475111f68cf26581e6ea41e83 +SHA1 (patch-src_3rdparty_dxflib_src_dl__writer.h) = 7009daf3a87ca82f3299f5b22b936e149c0ed036 SHA1 (patch-src_3rdparty_opennurbs_opennurbs.pro) = d96e1ce129d32703fc474aea71afdae1d4b537ed SHA1 (patch-src_3rdparty_opennurbs_opennurbs__zlib.cpp) = 26385c45b2132909470aba79181c242c785614a7 SHA1 (patch-src_3rdparty_opennurbs_opennurbs__zlib.h) = 333fe1510cc5ea2457eefd7d07ccaf034ee5d22f SHA1 (patch-src_3rdparty_opennurbs_opennurbs_opennurbs.pro) = 7120c49027d4a50c23b1e9e60c44a1e0a239d6ac SHA1 (patch-src_3rdparty_qtscript.pro) = c4ea2ca8884a24e0abc4e7231b4a474d21035280 -SHA1 (patch-src_3rdparty_spatialindexnavel_spatialindexnavel.pro) = 64bf1fb27be358e707fe5476d7deaa9bf2d09230 -SHA1 (patch-src_3rdparty_stemmer_stemmer.pro) = aae5dbeba3f0d3abf2f9bb536817138ce9089f58 +SHA1 (patch-src_3rdparty_spatialindexnavel_spatialindexnavel.pro) = d3af7c7c8da0d3bc297fb8cd19d0c91125bfcdfe +SHA1 (patch-src_3rdparty_stemmer_stemmer.pro) = 22e2e937f6a19277608bad11676b156e87cf1826 SHA1 (patch-src_core_RMetaTypes.h) = 8e3a2c7c7fc08a8608dcb64c9521c5449dd13fe8 -SHA1 (patch-src_core_RS.cpp) = 6cb504d409737058c9eb7ab8058ce0ec889a71c4 -SHA1 (patch-src_core_RSPlatform.cpp) = e61695b3f364b0c5d28d070a075f9d7cd0081757 -SHA1 (patch-src_core_RSettings.cpp) = 1f5073db53feba80bf8312ce41436627e80f500b +SHA1 (patch-src_core_RS.cpp) = 7864f7a99904401ad9eae01dfd1304f062a52d6a +SHA1 (patch-src_core_RSPlatform.cpp) = 6df8bce2057748955873cd564512a1a3f88421f5 +SHA1 (patch-src_core_RSettings.cpp) = 3fc5cea42fae1b9ace651f68f38dad62dfe0e88a SHA1 (patch-src_core_core.pro) = 3b2c68139457f08205896b94e44ebf6c09eb6bfe -SHA1 (patch-src_customwidgets_customwidgets.pro) = 2fc0b1f4b0110e8031f2d0b06ad22c823b2e26a6 +SHA1 (patch-src_customwidgets_customwidgets.pro) = 8bac25b8f02092464591019be961470a45c810cc SHA1 (patch-src_entity_entity.pro) = 5452a432726c598036be0a816ee040c68313519e SHA1 (patch-src_grid_grid.pro) = 65f5f47cce612b31181a0ac3e153214d29f08767 SHA1 (patch-src_gui_gui.pro) = 938fdcb8715ec78550ebff80400ab66be551584d SHA1 (patch-src_io_dxf_dxf.pro) = d386b09c217fcebd7fae68807950aa7b80c3a6c8 -SHA1 (patch-src_operations_operations.pro) = b7c549e45dfa84141dbf8bedceac992b4b1ca7ca +SHA1 (patch-src_operations_operations.pro) = d10b38594f29ae07febdb52339049646926c2252 SHA1 (patch-src_run_run.pri) = 856f798e7dcefbe53a46b5a6b524b10bf0782d6c -SHA1 (patch-src_scripting_ecmaapi_ecmaapi.pro) = 0ebf6ef7b91ee2686f59acdb410d470c198956fe -SHA1 (patch-src_snap_snap.pro) = fc538a3fcd7f4782016d8221d8758cb8de1594dd +SHA1 (patch-src_scripting_ecmaapi_ecmaapi.pro) = 8105fd89a8b52962f9e0c1ff80cf154ceb09145e +SHA1 (patch-src_snap_snap.pro) = 9464576805a1d2baa81c91f759e59a8cc3989b6a SHA1 (patch-src_spatialindex_spatialindex.pro) = 3afcdcd036b0ee183220cc5406accbf0756841e7 SHA1 (patch-src_stemmer_stemmer.pro) = d17c2e33682684c97bb52eb4563d50c208bc6d1c diff --git a/cad/qcad/patches/patch-scripts_Help_About_About.js b/cad/qcad/patches/patch-scripts_Help_About_About.js index e9e43b34329..8d1d825b633 100644 --- a/cad/qcad/patches/patch-scripts_Help_About_About.js +++ b/cad/qcad/patches/patch-scripts_Help_About_About.js @@ -1,10 +1,10 @@ -$NetBSD: patch-scripts_Help_About_About.js,v 1.1 2016/08/30 10:56:04 plunky Exp $ +$NetBSD: patch-scripts_Help_About_About.js,v 1.2 2019/09/05 13:39:10 nia Exp $ add some system information to About window ---- scripts/Help/About/About.js.orig 2016-08-04 12:53:50.087339591 +0000 +--- scripts/Help/About/About.js.orig 2019-07-18 15:47:56.000000000 +0000 +++ scripts/Help/About/About.js -@@ -425,6 +425,16 @@ About.prototype.initAboutSystem = functi +@@ -451,6 +451,16 @@ About.prototype.initAboutSystem = functi if (RS.getSystemId()==="linux") { text += "Linux"; } @@ -19,5 +19,5 @@ add some system information to About window + } + text += " [via pkgsrc]"; text += "\nOS version: " + RSettings.getOSVersion(); - + text += "\n"; diff --git a/cad/qcad/patches/patch-scripts_Widgets_LibraryBrowser_LibraryBrowser.js b/cad/qcad/patches/patch-scripts_Widgets_LibraryBrowser_LibraryBrowser.js index f316615502c..77856c2870b 100644 --- a/cad/qcad/patches/patch-scripts_Widgets_LibraryBrowser_LibraryBrowser.js +++ b/cad/qcad/patches/patch-scripts_Widgets_LibraryBrowser_LibraryBrowser.js @@ -1,12 +1,12 @@ -$NetBSD: patch-scripts_Widgets_LibraryBrowser_LibraryBrowser.js,v 1.1 2016/08/30 10:56:04 plunky Exp $ +$NetBSD: patch-scripts_Widgets_LibraryBrowser_LibraryBrowser.js,v 1.2 2019/09/05 13:39:10 nia Exp $ fix path to libraries ---- scripts/Widgets/LibraryBrowser/LibraryBrowser.js.orig 2016-07-01 07:13:14.000000000 +0000 +--- scripts/Widgets/LibraryBrowser/LibraryBrowser.js.orig 2019-07-18 15:47:56.000000000 +0000 +++ scripts/Widgets/LibraryBrowser/LibraryBrowser.js -@@ -173,12 +173,12 @@ LibraryBrowser.getSourceList = function( +@@ -174,12 +174,12 @@ LibraryBrowser.getSourceList = function( var libs; - + // no configuration: add all libraries available in libraries subdir: - librariesDir = new QDir("libraries"); + librariesDir = new QDir("@PREFIX@/share/qcad/libraries"); @@ -18,3 +18,4 @@ fix path to libraries + sourceList.push(QDir.fromNativeSeparators(new QDir("%1/%2".arg(librariesDir.absolutePath()).arg(libs[i])).absolutePath())); } } + diff --git a/cad/qcad/patches/patch-shared.pri b/cad/qcad/patches/patch-shared.pri index a5ec260161e..c2669f359cc 100644 --- a/cad/qcad/patches/patch-shared.pri +++ b/cad/qcad/patches/patch-shared.pri @@ -1,17 +1,17 @@ -$NetBSD: patch-shared.pri,v 1.1 2016/08/30 10:56:04 plunky Exp $ +$NetBSD: patch-shared.pri,v 1.2 2019/09/05 13:39:10 nia Exp $ fix build for pkgsrc, by allowing qmake to link binaries in situ and create an install target ---- shared.pri.orig 2016-07-01 07:13:14.000000000 +0000 +--- shared.pri.orig 2019-07-18 15:47:56.000000000 +0000 +++ shared.pri -@@ -158,7 +158,8 @@ QMAKE_TARGET_PRODUCT = QCAD Application +@@ -178,7 +178,8 @@ QMAKE_TARGET_PRODUCT = QCAD Application DESTDIR = $$PWD/$$ROUTDIR UI_DIR = .ui - + -LIBS += -L$$PWD/$$ROUTDIR +PREFIX= @PREFIX@ +target.path = $${PREFIX}/lib - + CONFIG(debug, debug|release) { !win32 { diff --git a/cad/qcad/patches/patch-src_3rdparty_dxflib_dxflib.pro b/cad/qcad/patches/patch-src_3rdparty_dxflib_dxflib.pro index a75a4760371..b11104df69e 100644 --- a/cad/qcad/patches/patch-src_3rdparty_dxflib_dxflib.pro +++ b/cad/qcad/patches/patch-src_3rdparty_dxflib_dxflib.pro @@ -1,11 +1,11 @@ -$NetBSD: patch-src_3rdparty_dxflib_dxflib.pro,v 1.2 2017/12/18 21:21:44 plunky Exp $ +$NetBSD: patch-src_3rdparty_dxflib_dxflib.pro,v 1.3 2019/09/05 13:39:10 nia Exp $ fix build for pkgsrc, by allowing qmake to link binaries in situ and create an install target ---- src/3rdparty/dxflib/dxflib.pro.orig 2017-07-21 17:57:53.000000000 +0000 +--- src/3rdparty/dxflib/dxflib.pro.orig 2019-07-18 15:47:56.000000000 +0000 +++ src/3rdparty/dxflib/dxflib.pro -@@ -25,6 +25,7 @@ SOURCES = \ +@@ -25,7 +25,8 @@ SOURCES = \ TARGET = dxflib TEMPLATE = lib @@ -14,3 +14,4 @@ and create an install target +INSTALLS += target CONFIG -= qt DEFINES += DXFLIB_LIBRARY + RC_FILE = dxflib.rc diff --git a/cad/qcad/patches/patch-src_3rdparty_dxflib_src_dl__writer.h b/cad/qcad/patches/patch-src_3rdparty_dxflib_src_dl__writer.h index 8951da3144d..d0c49e5d3f5 100644 --- a/cad/qcad/patches/patch-src_3rdparty_dxflib_src_dl__writer.h +++ b/cad/qcad/patches/patch-src_3rdparty_dxflib_src_dl__writer.h @@ -1,13 +1,14 @@ -$NetBSD: patch-src_3rdparty_dxflib_src_dl__writer.h,v 1.1 2016/08/30 10:56:04 plunky Exp $ +$NetBSD: patch-src_3rdparty_dxflib_src_dl__writer.h,v 1.2 2019/09/05 13:39:10 nia Exp $ apply fix for PR 45392 ---- src/3rdparty/dxflib/src/dl_writer.h.orig 2016-07-01 07:13:14.000000000 +0000 +--- src/3rdparty/dxflib/src/dl_writer.h.orig 2019-07-18 15:47:56.000000000 +0000 +++ src/3rdparty/dxflib/src/dl_writer.h @@ -36,6 +36,7 @@ #pragma once #endif // _MSC_VER > 1000 - + +#include <cstring> #include <iostream> #include <algorithm> + diff --git a/cad/qcad/patches/patch-src_3rdparty_spatialindexnavel_spatialindexnavel.pro b/cad/qcad/patches/patch-src_3rdparty_spatialindexnavel_spatialindexnavel.pro index 664561d552e..aca937920fd 100644 --- a/cad/qcad/patches/patch-src_3rdparty_spatialindexnavel_spatialindexnavel.pro +++ b/cad/qcad/patches/patch-src_3rdparty_spatialindexnavel_spatialindexnavel.pro @@ -1,15 +1,15 @@ -$NetBSD: patch-src_3rdparty_spatialindexnavel_spatialindexnavel.pro,v 1.1 2016/08/30 10:56:04 plunky Exp $ +$NetBSD: patch-src_3rdparty_spatialindexnavel_spatialindexnavel.pro,v 1.2 2019/09/05 13:39:10 nia Exp $ fix build for pkgsrc, by allowing qmake to link binaries in situ and create an install target ---- src/3rdparty/spatialindexnavel/spatialindexnavel.pro.orig 2016-07-01 07:13:14.000000000 +0000 +--- src/3rdparty/spatialindexnavel/spatialindexnavel.pro.orig 2019-07-18 15:47:56.000000000 +0000 +++ src/3rdparty/spatialindexnavel/spatialindexnavel.pro @@ -8,6 +8,7 @@ r_static_libs { else { CONFIG += plugin } +INSTALLS += target - + # this is required to compile the spatial index library from navel ltd: #DEFINES += PACKAGE_BUGREPORT=\\\"mhadji@gmail.com\\\" diff --git a/cad/qcad/patches/patch-src_3rdparty_stemmer_stemmer.pro b/cad/qcad/patches/patch-src_3rdparty_stemmer_stemmer.pro index e434e1b59fc..1084eff8652 100644 --- a/cad/qcad/patches/patch-src_3rdparty_stemmer_stemmer.pro +++ b/cad/qcad/patches/patch-src_3rdparty_stemmer_stemmer.pro @@ -1,12 +1,12 @@ -$NetBSD: patch-src_3rdparty_stemmer_stemmer.pro,v 1.1 2016/08/30 10:56:04 plunky Exp $ +$NetBSD: patch-src_3rdparty_stemmer_stemmer.pro,v 1.2 2019/09/05 13:39:10 nia Exp $ fix build for pkgsrc, by allowing qmake to link binaries in situ and create an install target ---- src/3rdparty/stemmer/stemmer.pro.orig 2016-07-01 07:13:14.000000000 +0000 +--- src/3rdparty/stemmer/stemmer.pro.orig 2019-07-18 15:47:56.000000000 +0000 +++ src/3rdparty/stemmer/stemmer.pro @@ -44,5 +44,5 @@ HEADERS += \ - + TARGET = stemmer TEMPLATE = lib -CONFIG += staticlib diff --git a/cad/qcad/patches/patch-src_core_RS.cpp b/cad/qcad/patches/patch-src_core_RS.cpp index 8db0fb7d696..a9a354a76f4 100644 --- a/cad/qcad/patches/patch-src_core_RS.cpp +++ b/cad/qcad/patches/patch-src_core_RS.cpp @@ -1,13 +1,13 @@ -$NetBSD: patch-src_core_RS.cpp,v 1.1 2016/08/30 10:56:04 plunky Exp $ +$NetBSD: patch-src_core_RS.cpp,v 1.2 2019/09/05 13:39:10 nia Exp $ fix hardcoded paths ---- src/core/RS.cpp.orig 2016-07-01 07:13:14.000000000 +0000 +--- src/core/RS.cpp.orig 2019-07-18 15:47:56.000000000 +0000 +++ src/core/RS.cpp -@@ -79,48 +79,9 @@ bool RS::compare(const QPair<QVariant, R +@@ -139,48 +139,9 @@ bool RS::compare(const QPair<QVariant, R QStringList RS::getDirectoryList(const QString& subDirectory) { QStringList dirList; - + - QString appDir = QCoreApplication::applicationDirPath(); - QFileInfo fi(appDir); - if (fi.fileName() == "debug" || fi.fileName() == "release") { @@ -53,6 +53,6 @@ fix hardcoded paths + dirList.append("@PREFIX@/lib/qcad/" + subDirectory); + dirList.append("@PREFIX@/share/qcad/" + subDirectory); + dirList.append(QDir::homePath() + "/.qcad/" + subDirectory); - + QStringList ret; for (int i=0; i<dirList.size(); i++) { diff --git a/cad/qcad/patches/patch-src_core_RSPlatform.cpp b/cad/qcad/patches/patch-src_core_RSPlatform.cpp index e1ec9d488ea..dbadbdb925a 100644 --- a/cad/qcad/patches/patch-src_core_RSPlatform.cpp +++ b/cad/qcad/patches/patch-src_core_RSPlatform.cpp @@ -1,8 +1,8 @@ -$NetBSD: patch-src_core_RSPlatform.cpp,v 1.1 2016/08/30 10:56:04 plunky Exp $ +$NetBSD: patch-src_core_RSPlatform.cpp,v 1.2 2019/09/05 13:39:10 nia Exp $ enhance getSystemId for some common platforms ---- src/core/RSPlatform.cpp.orig 2016-07-01 07:13:14.000000000 +0000 +--- src/core/RSPlatform.cpp.orig 2019-07-18 15:47:56.000000000 +0000 +++ src/core/RSPlatform.cpp @@ -43,7 +43,7 @@ QString RS::getHostId() { @@ -15,7 +15,7 @@ enhance getSystemId for some common platforms // environment variable HOSTNAME not exported on OS X by default: @@ -56,7 +56,7 @@ QString RS::getHostId() { } - + /** - * \return Unique system ID ("linux", "osx", "win"). + * \return Unique system ID ("linux", "osx", "win", "netbsd", "freebsd", "solaris"). diff --git a/cad/qcad/patches/patch-src_core_RSettings.cpp b/cad/qcad/patches/patch-src_core_RSettings.cpp index 80a81211132..b8e12430423 100644 --- a/cad/qcad/patches/patch-src_core_RSettings.cpp +++ b/cad/qcad/patches/patch-src_core_RSettings.cpp @@ -1,10 +1,10 @@ -$NetBSD: patch-src_core_RSettings.cpp,v 1.1 2016/08/30 10:56:04 plunky Exp $ +$NetBSD: patch-src_core_RSettings.cpp,v 1.2 2019/09/05 13:39:10 nia Exp $ fix hardcoded paths ---- src/core/RSettings.cpp.orig 2016-08-29 06:49:22.000000000 +0000 +--- src/core/RSettings.cpp.orig 2019-07-18 15:47:56.000000000 +0000 +++ src/core/RSettings.cpp -@@ -148,27 +148,7 @@ bool RSettings::isDeployed() { +@@ -345,27 +345,7 @@ bool RSettings::isDeployed() { * \return Path where all application resources are stored ('scripts', 'patterns', 'ts', 'doc', 'linetypes', ...) */ QString RSettings::getApplicationPath() { @@ -32,3 +32,4 @@ fix hardcoded paths + QDir ret("@PREFIX@/lib/qcad"); return ret.path(); } + diff --git a/cad/qcad/patches/patch-src_customwidgets_customwidgets.pro b/cad/qcad/patches/patch-src_customwidgets_customwidgets.pro index 230c8480b22..4fd6bf5a11c 100644 --- a/cad/qcad/patches/patch-src_customwidgets_customwidgets.pro +++ b/cad/qcad/patches/patch-src_customwidgets_customwidgets.pro @@ -1,11 +1,11 @@ -$NetBSD: patch-src_customwidgets_customwidgets.pro,v 1.1 2016/08/30 10:56:04 plunky Exp $ +$NetBSD: patch-src_customwidgets_customwidgets.pro,v 1.2 2019/09/05 13:39:10 nia Exp $ fix build for pkgsrc, by allowing qmake to link binaries in situ and create an install target ---- src/customwidgets/customwidgets.pro.orig 2016-07-01 07:13:14.000000000 +0000 +--- src/customwidgets/customwidgets.pro.orig 2019-07-18 15:47:56.000000000 +0000 +++ src/customwidgets/customwidgets.pro -@@ -36,6 +36,9 @@ HEADERS = RShortcutLineEditPlugin.h \ +@@ -38,7 +38,10 @@ HEADERS = RShortcutLineEditPlugin.h \ # HEADERS += RWebViewPlugin.h #} TEMPLATE = lib @@ -16,3 +16,4 @@ and create an install target +target.path = $${PREFIX}/lib/$${RLIBNAME}/plugins/designer DESTDIR = ../../plugins/designer OTHER_FILES += customwidgets.dox + RC_FILE = customwidgets.rc diff --git a/cad/qcad/patches/patch-src_operations_operations.pro b/cad/qcad/patches/patch-src_operations_operations.pro index 89b463a0485..6e5cbabbd4c 100644 --- a/cad/qcad/patches/patch-src_operations_operations.pro +++ b/cad/qcad/patches/patch-src_operations_operations.pro @@ -1,11 +1,11 @@ -$NetBSD: patch-src_operations_operations.pro,v 1.1 2016/08/30 10:56:04 plunky Exp $ +$NetBSD: patch-src_operations_operations.pro,v 1.2 2019/09/05 13:39:10 nia Exp $ fix build for pkgsrc, by allowing qmake to link binaries in situ and create an install target ---- src/operations/operations.pro.orig 2016-07-01 07:13:14.000000000 +0000 +--- src/operations/operations.pro.orig 2019-07-18 15:47:56.000000000 +0000 +++ src/operations/operations.pro -@@ -41,6 +41,8 @@ else { +@@ -45,7 +45,9 @@ else { CONFIG += plugin } TARGET = $${RLIBNAME}operations @@ -15,3 +15,4 @@ and create an install target +INSTALLS += target OTHER_FILES += operations.dox DEFINES += QCADOPERATIONS_LIBRARY + RC_FILE = operations.rc diff --git a/cad/qcad/patches/patch-src_scripting_ecmaapi_ecmaapi.pro b/cad/qcad/patches/patch-src_scripting_ecmaapi_ecmaapi.pro index 8de31d0f0db..703aa9236b2 100644 --- a/cad/qcad/patches/patch-src_scripting_ecmaapi_ecmaapi.pro +++ b/cad/qcad/patches/patch-src_scripting_ecmaapi_ecmaapi.pro @@ -1,19 +1,24 @@ -$NetBSD: patch-src_scripting_ecmaapi_ecmaapi.pro,v 1.2 2019/07/31 19:30:21 plunky Exp $ +$NetBSD: patch-src_scripting_ecmaapi_ecmaapi.pro,v 1.3 2019/09/05 13:39:10 nia Exp $ fix build for pkgsrc, by allowing qmake to link binaries in situ and create an install target ---- src/scripting/ecmaapi/ecmaapi.pro.orig 2019-02-27 15:06:55.000000000 +0000 +"error: one or more PCH files were found, but they were invalid" + +--- src/scripting/ecmaapi/ecmaapi.pro.orig 2019-07-18 15:47:56.000000000 +0000 +++ src/scripting/ecmaapi/ecmaapi.pro -@@ -2,6 +2,7 @@ include( ../../../shared.pri ) +@@ -2,9 +2,9 @@ include( ../../../shared.pri ) TEMPLATE = lib CONFIG += plugin TARGET = $${RLIBNAME}ecmaapi +INSTALLS += target CONFIG -= warn_on CONFIG += warn_off - CONFIG += precompile_header -@@ -20,11 +21,11 @@ SOURCES += \ +-CONFIG += precompile_header + PRECOMPILED_HEADER = stable.h + OTHER_FILES += ecmaapi.dox + DEFINES += QCADECMAAPI_LIBRARY +@@ -20,11 +20,11 @@ SOURCES += \ include(adapters/adapters.pri) include(generated/generated.pri) LIBS += \ diff --git a/cad/qcad/patches/patch-src_snap_snap.pro b/cad/qcad/patches/patch-src_snap_snap.pro index db0a6ad256f..27593f4c721 100644 --- a/cad/qcad/patches/patch-src_snap_snap.pro +++ b/cad/qcad/patches/patch-src_snap_snap.pro @@ -1,11 +1,11 @@ -$NetBSD: patch-src_snap_snap.pro,v 1.1 2016/08/30 10:56:04 plunky Exp $ +$NetBSD: patch-src_snap_snap.pro,v 1.2 2019/09/05 13:39:10 nia Exp $ fix build for pkgsrc, by allowing qmake to link binaries in situ and create an install target ---- src/snap/snap.pro.orig 2016-07-01 07:13:14.000000000 +0000 +--- src/snap/snap.pro.orig 2019-07-18 15:47:56.000000000 +0000 +++ src/snap/snap.pro -@@ -45,6 +45,9 @@ else { +@@ -45,7 +45,10 @@ else { CONFIG += plugin } TARGET = $${RLIBNAME}snap @@ -16,3 +16,4 @@ and create an install target +INSTALLS += target OTHER_FILES += snap.dox DEFINES += QCADSNAP_LIBRARY + RC_FILE = snap.rc |