CVS commit: pkgsrc/cad/qcad

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Sat Mar 25 13:16:11 UTC 2023

Modified Files:
        pkgsrc/cad/qcad: Makefile PLIST distinfo
        pkgsrc/cad/qcad/patches: patch-shared__app.pri
            patch-src_3rdparty_3rdparty.pro patch-src_stemmer_stemmer.pro
Removed Files:
        pkgsrc/cad/qcad/patches: patch-src_3rdparty_stemmer_stemmer.pro

Log Message:
qcad: use libstemmer package instead of building and installing own copy

Avoids conflicts with e.g. gimp-devel.

Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.109 -r1.110 pkgsrc/cad/qcad/Makefile
cvs rdiff -u -r1.22 -r1.23 pkgsrc/cad/qcad/PLIST
cvs rdiff -u -r1.42 -r1.43 pkgsrc/cad/qcad/distinfo
cvs rdiff -u -r1.4 -r1.5 pkgsrc/cad/qcad/patches/patch-shared__app.pri
cvs rdiff -u -r1.2 -r1.3 \
    pkgsrc/cad/qcad/patches/patch-src_3rdparty_3rdparty.pro
cvs rdiff -u -r1.2 -r0 \
    pkgsrc/cad/qcad/patches/patch-src_3rdparty_stemmer_stemmer.pro
cvs rdiff -u -r1.3 -r1.4 \
    pkgsrc/cad/qcad/patches/patch-src_stemmer_stemmer.pro

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.109 pkgsrc/cad/qcad/Makefile:1.110
--- pkgsrc/cad/qcad/Makefile:1.109      Sun Jan 29 21:15:36 2023
+++ pkgsrc/cad/qcad/Makefile    Sat Mar 25 13:16:11 2023
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.109 2023/01/29 21:15:36 ryoon Exp $
-#
+# $NetBSD: Makefile,v 1.110 2023/03/25 13:16:11 wiz Exp $
 
 DISTNAME=              qcad-3.27.6.0
-PKGREVISION=           4
+PKGREVISION=           5
 CATEGORIES=            cad
 MASTER_SITES=          ${MASTER_SITE_GITHUB:=qcad/}
 EXTRACT_USING=         bsdtar
@@ -78,6 +77,7 @@ do-install:
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../devel/libexecinfo/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
+.include "../../textproc/libstemmer/buildlink3.mk"
 .include "../../x11/qt5-qtbase/buildlink3.mk"
 .include "../../x11/qt5-qtscript/buildlink3.mk"
 .include "../../x11/qt5-qtsvg/buildlink3.mk"

Index: pkgsrc/cad/qcad/PLIST
diff -u pkgsrc/cad/qcad/PLIST:1.22 pkgsrc/cad/qcad/PLIST:1.23
--- pkgsrc/cad/qcad/PLIST:1.22  Tue May 24 05:17:12 2022
+++ pkgsrc/cad/qcad/PLIST       Sat Mar 25 13:16:11 2023
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.22 2022/05/24 05:17:12 plunky Exp $
+@comment $NetBSD: PLIST,v 1.23 2023/03/25 13:16:11 wiz Exp $
 bin/qcad
 lib/libdxflib.so
 lib/libopennurbs.so
@@ -13,7 +13,6 @@ 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

Index: pkgsrc/cad/qcad/distinfo
diff -u pkgsrc/cad/qcad/distinfo:1.42 pkgsrc/cad/qcad/distinfo:1.43
--- pkgsrc/cad/qcad/distinfo:1.42       Tue May 24 05:17:12 2022
+++ pkgsrc/cad/qcad/distinfo    Sat Mar 25 13:16:11 2023
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.42 2022/05/24 05:17:12 plunky Exp $
+$NetBSD: distinfo,v 1.43 2023/03/25 13:16:11 wiz Exp $
 
 BLAKE2s (qcad-3.27.6.0.tar.gz) = 785b6fa299fb7486f66b61e1fa0566e3f7b64c71296d81f9dd29a52ae414b13b
 SHA512 (qcad-3.27.6.0.tar.gz) = cc793bcb4934cf234c3e6fd8b9072147df9906e54bcab454d6a08ba148ffd08fbbbdfdfbe52232af5ac55921c7cba6a126b30cfb86d5f650b427ea9608bfadcb
@@ -7,15 +7,14 @@ SHA1 (patch-qcad.pro) = b8dafdf3105ff358
 SHA1 (patch-scripts_Help_ShowReadme_ShowReadme.js) = 96412237a7c4422f02dc5d2ab3634457b376a2d2
 SHA1 (patch-scripts_Widgets_LibraryBrowser_LibraryBrowser.js) = 65f988e553259eb93217ea12e9cb429fe52f05be
 SHA1 (patch-shared.pri) = f0b3ca615636c7fc2edc1af3b25b7aef2d9393ac
-SHA1 (patch-shared__app.pri) = ecb78919758acaa9d48ba5e60f17cb2e410cb4a5
-SHA1 (patch-src_3rdparty_3rdparty.pro) = 4fe0e0f63b24551bd62b2cfd0ffd862d4fca7221
+SHA1 (patch-shared__app.pri) = 8ba5162b67b1ae769f2f3c8fc2362bc9f2efc421
+SHA1 (patch-src_3rdparty_3rdparty.pro) = 3cee1dc339dbd9cfce6022ab0f304561bbc33bfb
 SHA1 (patch-src_3rdparty_dxflib_dxflib.pro) = 7229800bfa5f04a475111f68cf26581e6ea41e83
 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_spatialindexnavel_spatialindexnavel.pro) = d3af7c7c8da0d3bc297fb8cd19d0c91125bfcdfe
-SHA1 (patch-src_3rdparty_stemmer_stemmer.pro) = 22e2e937f6a19277608bad11676b156e87cf1826
 SHA1 (patch-src_core_RS.cpp) = a8814a6f475bde9c7ff03c3066e13daff2313ac5
 SHA1 (patch-src_core_RSettings.cpp) = 3fc5cea42fae1b9ace651f68f38dad62dfe0e88a
 SHA1 (patch-src_core_core.pro) = 3b2c68139457f08205896b94e44ebf6c09eb6bfe
@@ -31,4 +30,4 @@ SHA1 (patch-src_scripting_ecmaapi_ecmaap
 SHA1 (patch-src_scripts_scripts.pro) = 7019dd69451b2594890c14f9ebf688a15cf81ee4
 SHA1 (patch-src_snap_snap.pro) = 9464576805a1d2baa81c91f759e59a8cc3989b6a
 SHA1 (patch-src_spatialindex_spatialindex.pro) = 3afcdcd036b0ee183220cc5406accbf0756841e7
-SHA1 (patch-src_stemmer_stemmer.pro) = d76d1d92378f516a278432fb0d6a23f8fdd355eb
+SHA1 (patch-src_stemmer_stemmer.pro) = 645ca8fbfa75d818998927c6c2fbdaaab12a7b7c

Index: pkgsrc/cad/qcad/patches/patch-shared__app.pri
diff -u pkgsrc/cad/qcad/patches/patch-shared__app.pri:1.4 pkgsrc/cad/qcad/patches/patch-shared__app.pri:1.5
--- pkgsrc/cad/qcad/patches/patch-shared__app.pri:1.4   Tue May 24 05:17:12 2022
+++ pkgsrc/cad/qcad/patches/patch-shared__app.pri       Sat Mar 25 13:16:11 2023
@@ -1,4 +1,4 @@
-$NetBSD: patch-shared__app.pri,v 1.4 2022/05/24 05:17:12 plunky Exp $
+$NetBSD: patch-shared__app.pri,v 1.5 2023/03/25 13:16:11 wiz Exp $
 
 fix build for pkgsrc, by allowing qmake to link binaries in situ
 and create an install target
@@ -23,7 +23,6 @@ and create an install target
 -    -l$${RLIBNAME}snap \
 -    -l$${RLIBNAME}core \
 -    -l$${RLIBNAME}stemmer \
--    -lstemmer
 +    -L$$PWD/src/gui -l$${RLIBNAME}gui \
 +    -L$$PWD/src/entity -l$${RLIBNAME}entity \
 +    -L$$PWD/src/operations -l$${RLIBNAME}operations \
@@ -33,7 +32,7 @@ and create an install target
 +    -L$$PWD/src/snap -l$${RLIBNAME}snap \
 +    -L$$PWD/src/core -l$${RLIBNAME}core \
 +    -L$$PWD/src/stemmer -l$${RLIBNAME}stemmer \
-+    -L$$PWD/src/3rdparty/stemmer -lstemmer
+     -lstemmer
  
  !r_no_opennurbs {
      LIBS += \

Index: pkgsrc/cad/qcad/patches/patch-src_3rdparty_3rdparty.pro
diff -u pkgsrc/cad/qcad/patches/patch-src_3rdparty_3rdparty.pro:1.2 pkgsrc/cad/qcad/patches/patch-src_3rdparty_3rdparty.pro:1.3
--- pkgsrc/cad/qcad/patches/patch-src_3rdparty_3rdparty.pro:1.2 Tue May 24 05:17:12 2022
+++ pkgsrc/cad/qcad/patches/patch-src_3rdparty_3rdparty.pro     Sat Mar 25 13:16:11 2023
@@ -1,12 +1,20 @@
-$NetBSD: patch-src_3rdparty_3rdparty.pro,v 1.2 2022/05/24 05:17:12 plunky Exp $
+$NetBSD: patch-src_3rdparty_3rdparty.pro,v 1.3 2023/03/25 13:16:11 wiz Exp $
 
 Support building with "unsupported" Qt versions. Sometimes the Qt version
 in pkgsrc is later than the versions listed in QCAD source. Just use
 v5.5.0 for all unknown Qt5 versions. Qt6 includes qtscriptgenerator
 
---- src/3rdparty/3rdparty.pro.orig     2022-05-15 09:24:30.635775811 +0100
-+++ src/3rdparty/3rdparty.pro  2022-05-15 09:24:24.541676113 +0100
-@@ -17,7 +17,7 @@
+--- src/3rdparty/3rdparty.pro.orig     2022-05-17 09:39:30.000000000 +0000
++++ src/3rdparty/3rdparty.pro
+@@ -2,7 +2,6 @@ include (../../shared.pri)
+ TEMPLATE = subdirs
+ SUBDIRS = \
+     spatialindexnavel \
+-    stemmer
+ 
+ !r_no_opennurbs {
+     SUBDIRS += opennurbs
+@@ -17,7 +16,7 @@ SUBDIRS = \
      }
      else {
          lessThan(QT_MAJOR_VERSION, 6) {

Index: pkgsrc/cad/qcad/patches/patch-src_stemmer_stemmer.pro
diff -u pkgsrc/cad/qcad/patches/patch-src_stemmer_stemmer.pro:1.3 pkgsrc/cad/qcad/patches/patch-src_stemmer_stemmer.pro:1.4
--- pkgsrc/cad/qcad/patches/patch-src_stemmer_stemmer.pro:1.3   Fri Apr  2 20:27:12 2021
+++ pkgsrc/cad/qcad/patches/patch-src_stemmer_stemmer.pro       Sat Mar 25 13:16:11 2023
@@ -1,4 +1,4 @@
-$NetBSD: patch-src_stemmer_stemmer.pro,v 1.3 2021/04/02 20:27:12 plunky Exp $
+$NetBSD: patch-src_stemmer_stemmer.pro,v 1.4 2023/03/25 13:16:11 wiz Exp $
 
 fix build for pkgsrc, by allowing qmake to link binaries in situ
 and create an install target
@@ -9,8 +9,7 @@ and create an install target
  TEMPLATE = lib
  CONFIG += plugin
  TARGET = $${RLIBNAME}stemmer
--LIBS += -lstemmer
-+LIBS += -L../3rdparty/stemmer -lstemmer
+ LIBS += -lstemmer
 +INSTALLS += target
  OTHER_FILES += stemmer.dox
  DEFINES += QCADSTEMMER_LIBRARY