CVS commit: pkgsrc/cad/qcad

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/cad/qcad
From: "Iain Hibbert" <plunky%netbsd.org@localhost>
Date: Sun, 29 Dec 2019 14:18:20 +0000

Module Name:    pkgsrc
Committed By:   plunky
Date:           Sun Dec 29 14:18:20 UTC 2019

Modified Files:
        pkgsrc/cad/qcad: Makefile PLIST distinfo
        pkgsrc/cad/qcad/patches: patch-src_run_run.pri
Added Files:
        pkgsrc/cad/qcad/patches: patch-src_run_main.cpp

Log Message:
do not copy or reinstall Qt plugins, allow QCAD to find them directly


To generate a diff of this commit:
cvs rdiff -u -r1.83 -r1.84 pkgsrc/cad/qcad/Makefile
cvs rdiff -u -r1.17 -r1.18 pkgsrc/cad/qcad/PLIST
cvs rdiff -u -r1.34 -r1.35 pkgsrc/cad/qcad/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/cad/qcad/patches/patch-src_run_main.cpp
cvs rdiff -u -r1.3 -r1.4 pkgsrc/cad/qcad/patches/patch-src_run_run.pri

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/cad/qcad/Makefile
diff -u pkgsrc/cad/qcad/Makefile:1.83 pkgsrc/cad/qcad/Makefile:1.84
--- pkgsrc/cad/qcad/Makefile:1.83       Sun Dec 29 14:16:05 2019
+++ pkgsrc/cad/qcad/Makefile    Sun Dec 29 14:18:20 2019
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.83 2019/12/29 14:16:05 plunky Exp $
+# $NetBSD: Makefile,v 1.84 2019/12/29 14:18:20 plunky Exp $
 #
 
 DISTNAME=              qcad-3.24.0.1
-PKGREVISION=           1
+PKGREVISION=           2
 CATEGORIES=            cad
 MASTER_SITES=          ${MASTER_SITE_GITHUB:=qcad/}
 EXTRACT_USING=         bsdtar
@@ -55,7 +55,6 @@ BUILD_TARGET= release
 # allow pkgsrc to use DESTDIR
 #
 do-configure:
-       cd ${WRKSRC} && ${MKDIR} release
        cd ${WRKSRC} && ${QTDIR}/bin/qmake -r -after DESTDIR=
 
 do-install:
@@ -79,8 +78,7 @@ do-install:
        ${FIND} ${WRKSRC}/scripts -name \*.orig -delete
        ${FIND} ${WRKSRC} -name \*.gitignore -delete
        cd ${WRKSRC} && ${PAX} -rwpm \
-           fonts linetypes patterns plugins platforminputcontexts platforms \
-           xcbglintegrations scripts themes ts \
+           fonts linetypes patterns scripts themes ts \
            ${DESTDIR}${PREFIX}/lib/${PKGBASE}
        cd ${WRKSRC} && ${PAX} -rwpm \
            readme.txt examples libraries \

Index: pkgsrc/cad/qcad/PLIST
diff -u pkgsrc/cad/qcad/PLIST:1.17 pkgsrc/cad/qcad/PLIST:1.18
--- pkgsrc/cad/qcad/PLIST:1.17  Sun Dec 29 14:15:32 2019
+++ pkgsrc/cad/qcad/PLIST       Sun Dec 29 14:18:20 2019
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.17 2019/12/29 14:15:32 plunky Exp $
+@comment $NetBSD: PLIST,v 1.18 2019/12/29 14:18:20 plunky Exp $
 bin/qcad
 lib/libdxflib.so
 lib/libopennurbs.so
@@ -342,26 +342,8 @@ lib/qcad/patterns/metric/trans.pat
 lib/qcad/patterns/metric/tri-overlap.pat
 lib/qcad/patterns/metric/triang.pat
 lib/qcad/patterns/metric/zigzag.pat
-lib/qcad/platforminputcontexts/libcomposeplatforminputcontextplugin.so
-lib/qcad/platforminputcontexts/libibusplatforminputcontextplugin.so
-lib/qcad/platforminputcontexts/readme.txt
-lib/qcad/platforms/libqminimal.so
-lib/qcad/platforms/libqoffscreen.so
-lib/qcad/platforms/libqxcb.so
-lib/qcad/platforms/readme.txt
-lib/qcad/plugins/codecs/readme.txt
 lib/qcad/plugins/designer/libqcadcustomwidgets.so
-lib/qcad/plugins/designer/readme.txt
-lib/qcad/plugins/imageformats/libqgif.so
-lib/qcad/plugins/imageformats/libqico.so
-lib/qcad/plugins/imageformats/libqjpeg.so
-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.so
-lib/qcad/plugins/printsupport/libcupsprintersupport.so
-lib/qcad/plugins/printsupport/readme.txt
 lib/qcad/plugins/script/libqtscript_core.so
 lib/qcad/plugins/script/libqtscript_core.so.1
 lib/qcad/plugins/script/libqtscript_core.so.1.0
@@ -402,8 +384,6 @@ lib/qcad/plugins/script/libqtscript_xmlp
 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/AddOn.js
 lib/qcad/scripts/Apollonius.js
 lib/qcad/scripts/Block/AddBlock/AddBlock-inverse.svg
@@ -10542,9 +10522,6 @@ lib/qcad/ts/scripts_zh_CN.qm
 lib/qcad/ts/scripts_zh_CN.ts
 lib/qcad/ts/scripts_zh_TW.qm
 lib/qcad/ts/scripts_zh_TW.ts
-${PLIST.egl}lib/qcad/xcbglintegrations/libqxcb-egl-integration.so
-${PLIST.glx}lib/qcad/xcbglintegrations/libqxcb-glx-integration.so
-lib/qcad/xcbglintegrations/readme.txt
 man/man1/qcad.1
 share/applications/qcad.desktop
 share/icons/hicolor/256x256/apps/qcad.png

Index: pkgsrc/cad/qcad/distinfo
diff -u pkgsrc/cad/qcad/distinfo:1.34 pkgsrc/cad/qcad/distinfo:1.35
--- pkgsrc/cad/qcad/distinfo:1.34       Sun Dec 29 12:44:15 2019
+++ pkgsrc/cad/qcad/distinfo    Sun Dec 29 14:18:20 2019
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.34 2019/12/29 12:44:15 plunky Exp $
+$NetBSD: distinfo,v 1.35 2019/12/29 14:18:20 plunky Exp $
 
 SHA1 (qcad-3.24.0.1.tar.gz) = 39cf137348dfa28ddfa565b6d894da539a17fd44
 RMD160 (qcad-3.24.0.1.tar.gz) = e5a6c008443546f1f35939ba0c439df2b619e8fa
@@ -26,7 +26,8 @@ SHA1 (patch-src_grid_grid.pro) = 65f5f47
 SHA1 (patch-src_gui_gui.pro) = 938fdcb8715ec78550ebff80400ab66be551584d
 SHA1 (patch-src_io_dxf_dxf.pro) = d386b09c217fcebd7fae68807950aa7b80c3a6c8
 SHA1 (patch-src_operations_operations.pro) = d10b38594f29ae07febdb52339049646926c2252
-SHA1 (patch-src_run_run.pri) = c5d8b641649ba1689558b82c5ac25a617c9d62b7
+SHA1 (patch-src_run_main.cpp) = 4f3cae015852ab4b4550c897d82e9f30ac14d3d1
+SHA1 (patch-src_run_run.pri) = fca4570872f9fc7b25beac8dfd0c4802b81d3972
 SHA1 (patch-src_scripting_ecmaapi_ecmaapi.pro) = 8105fd89a8b52962f9e0c1ff80cf154ceb09145e
 SHA1 (patch-src_snap_snap.pro) = 9464576805a1d2baa81c91f759e59a8cc3989b6a
 SHA1 (patch-src_spatialindex_spatialindex.pro) = 3afcdcd036b0ee183220cc5406accbf0756841e7

Index: pkgsrc/cad/qcad/patches/patch-src_run_run.pri
diff -u pkgsrc/cad/qcad/patches/patch-src_run_run.pri:1.3 pkgsrc/cad/qcad/patches/patch-src_run_run.pri:1.4
--- pkgsrc/cad/qcad/patches/patch-src_run_run.pri:1.3   Thu Sep 19 21:59:36 2019
+++ pkgsrc/cad/qcad/patches/patch-src_run_run.pri       Sun Dec 29 14:18:20 2019
@@ -1,13 +1,11 @@
-$NetBSD: patch-src_run_run.pri,v 1.3 2019/09/19 21:59:36 nia Exp $
+$NetBSD: patch-src_run_run.pri,v 1.4 2019/12/29 14:18:20 plunky Exp $
 
 fix build for pkgsrc, by allowing qmake to link binaries in situ
-and create an install target
-
-only link to the Qt plugins, no need to copy them over
+and create an install target. Do not copy Qt plugins
 
 --- src/run/run.pri.orig       2019-07-18 15:47:56.000000000 +0000
 +++ src/run/run.pri
-@@ -45,6 +45,9 @@ else {
+@@ -45,9 +45,12 @@ else {
          TARGET = $${RLIBNAME}-bin
      }
  }
@@ -15,22 +13,10 @@ only link to the Qt plugins, no need to 
 +INSTALLS += target
 +target.path = $${PREFIX}/bin
  
- # copy Qt plugins to QCAD plugin folder:
- !build_pass {
-@@ -109,7 +112,7 @@ else {
- 
-         for(FILE,FILES) {
-             !exists("$${DESTDIR}/../plugins/$${FILE}") {
--                system(cp "$$[QT_INSTALL_PLUGINS]/$${FILE}" "$${DESTDIR}/../plugins/$${FILE}")
-+                system(ln -sf "$$[QT_INSTALL_PLUGINS]/$${FILE}" "../../plugins/$${FILE}")
-             }
-         }
- 
-@@ -117,7 +120,6 @@ else {
-             system(cp "$$[QT_INSTALL_PLUGINS]/platforms/libqxcb.so" "$${DESTDIR}/../platforms")
-             system(cp "$$[QT_INSTALL_PLUGINS]/platforms/libqoffscreen.so" "$${DESTDIR}/../platforms")
-             system(cp "$$[QT_INSTALL_PLUGINS]/platforms/libqminimal.so" "$${DESTDIR}/../platforms")
--            system(cp "$$[QT_INSTALL_PLUGINS]/platforms/libqlinuxfb.so" "$${DESTDIR}/../platforms")
-             system(cp "$$[QT_INSTALL_PLUGINS]/platforminputcontexts/*.so" "$${DESTDIR}/../platforminputcontexts")
-             system(cp "$$[QT_INSTALL_PLUGINS]/xcbglintegrations/*.so" "$${DESTDIR}/../xcbglintegrations")
-         }
+-# copy Qt plugins to QCAD plugin folder:
+-!build_pass {
++# do not copy Qt plugins to QCAD plugin folder:
++do_not {
+     macx {
+         FILES = \
+             imageformats/libqgif.dylib \

Added files:

Index: pkgsrc/cad/qcad/patches/patch-src_run_main.cpp
diff -u /dev/null pkgsrc/cad/qcad/patches/patch-src_run_main.cpp:1.1
--- /dev/null   Sun Dec 29 14:18:20 2019
+++ pkgsrc/cad/qcad/patches/patch-src_run_main.cpp      Sun Dec 29 14:18:20 2019
@@ -0,0 +1,19 @@
+$NetBSD: patch-src_run_main.cpp,v 1.1 2019/12/29 14:18:20 plunky Exp $
+
+don't overwrite the plugins directory: remove the applicationDir and add the pluginPaths
+
+--- src/run/main.cpp.orig      2019-12-22 19:09:21.954519285 +0000
++++ src/run/main.cpp
+@@ -237,7 +237,11 @@ int main(int argc, char *argv[]) {
+         qWarning() << "No plugin paths found";
+         return -1;
+     }
+-    app->setLibraryPaths(pluginPaths);
++
++    // for pkgsrc, skip the applicationDir and add the Plugin paths
++    app->removeLibraryPath(app->applicationDirPath());
++    foreach (const QString &path, pluginPaths)
++      app->addLibraryPath(path);
+ 
+     RMath::init();
+     RFontList::init();

Prev by Date: CVS commit: pkgsrc/cad/qcad
Next by Date: CVS commit: pkgsrc/cad/qcad
Previous by Thread: CVS commit: pkgsrc/cad/qcad
Next by Thread: CVS commit: pkgsrc/cad/qcad
Indexes:

Home | Main Index | Thread Index | Old Index