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: Tue, 19 Aug 2025 12:52:18 +0000

Module Name:    pkgsrc
Committed By:   plunky
Date:           Tue Aug 19 12:52:17 UTC 2025

Modified Files:
        pkgsrc/cad/qcad: Makefile PLIST distinfo
        pkgsrc/cad/qcad/patches: patch-scripts_Help_ShowReadme_ShowReadme.js
            patch-src_CMakeLists.txt patch-src_core_RS.cpp
            patch-src_core_RSettings.cpp
Added Files:
        pkgsrc/cad/qcad/patches:
            patch-src_3rdparty_opennurbs_opennurbs__defines.cpp
            patch-src_3rdparty_opennurbs_opennurbs__system__runtime.h
            patch-src_3rdparty_opennurbs_zlib_zconf.h
            patch-src_entity_CMakeLists.txt patch-src_qcadjsapi_CMakeLists.txt
            patch-src_qtjsapi_RJSTools.cpp patch-src_run_CMakeInclude.txt
Removed Files:
        pkgsrc/cad/qcad/patches: patch-src_3rdparty_opennurbs_CMakeLists.txt
            patch-src_3rdparty_opennurbs_opennurbs__zlib.cpp
            patch-src_3rdparty_opennurbs_opennurbs__zlib.h

Log Message:
Update QCAD to 3.32.3.4

Changelog at https://www.qcad.org/en/documentation/changelog

this [incidentally] fixes a recent build failure after the update to Qt6.9.1, raised by wiz@


To generate a diff of this commit:
cvs rdiff -u -r1.129 -r1.130 pkgsrc/cad/qcad/Makefile
cvs rdiff -u -r1.26 -r1.27 pkgsrc/cad/qcad/PLIST
cvs rdiff -u -r1.46 -r1.47 pkgsrc/cad/qcad/distinfo
cvs rdiff -u -r1.2 -r1.3 \
    pkgsrc/cad/qcad/patches/patch-scripts_Help_ShowReadme_ShowReadme.js
cvs rdiff -u -r1.1 -r0 \
    pkgsrc/cad/qcad/patches/patch-src_3rdparty_opennurbs_CMakeLists.txt
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/cad/qcad/patches/patch-src_3rdparty_opennurbs_opennurbs__defines.cpp \
    pkgsrc/cad/qcad/patches/patch-src_3rdparty_opennurbs_opennurbs__system__runtime.h \
    pkgsrc/cad/qcad/patches/patch-src_3rdparty_opennurbs_zlib_zconf.h \
    pkgsrc/cad/qcad/patches/patch-src_entity_CMakeLists.txt \
    pkgsrc/cad/qcad/patches/patch-src_qcadjsapi_CMakeLists.txt \
    pkgsrc/cad/qcad/patches/patch-src_qtjsapi_RJSTools.cpp \
    pkgsrc/cad/qcad/patches/patch-src_run_CMakeInclude.txt
cvs rdiff -u -r1.2 -r0 \
    pkgsrc/cad/qcad/patches/patch-src_3rdparty_opennurbs_opennurbs__zlib.cpp \
    pkgsrc/cad/qcad/patches/patch-src_3rdparty_opennurbs_opennurbs__zlib.h
cvs rdiff -u -r1.1 -r1.2 pkgsrc/cad/qcad/patches/patch-src_CMakeLists.txt
cvs rdiff -u -r1.4 -r1.5 pkgsrc/cad/qcad/patches/patch-src_core_RS.cpp
cvs rdiff -u -r1.3 -r1.4 pkgsrc/cad/qcad/patches/patch-src_core_RSettings.cpp

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.129 pkgsrc/cad/qcad/Makefile:1.130
--- pkgsrc/cad/qcad/Makefile:1.129      Thu Apr 24 14:13:20 2025
+++ pkgsrc/cad/qcad/Makefile    Tue Aug 19 12:52:17 2025
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.129 2025/04/24 14:13:20 wiz Exp $
+# $NetBSD: Makefile,v 1.130 2025/08/19 12:52:17 plunky Exp $
 
-DISTNAME=              qcad-3.32.2.0
-PKGREVISION=           2
+DISTNAME=              qcad-3.32.3.4
 CATEGORIES=            cad
 MASTER_SITES=          ${MASTER_SITE_GITHUB:=qcad/}
 EXTRACT_USING=         bsdtar
@@ -25,18 +24,9 @@ SUBST_FILES.paths+=  scripts/Help/ShowRea
 SUBST_FILES.paths+=    src/core/RS.cpp src/core/RSettings.cpp
 SUBST_VARS.paths=      PREFIX
 
-SUBST_CLASSES+=                icon
-SUBST_STAGE.icon=      pre-configure
-SUBST_MESSAGE.icon=    Fix icon name.
-SUBST_FILES.icon=      qcad.desktop
-SUBST_SED.icon=                -e s,qcad_icon,qcad,g
-
-# qcad source includes libzlib, transform this to libz to use builtin
-BUILDLINK_TRANSFORM+=  l:zlib:z
-
 CMAKE_CONFIGURE_ARGS+= -DCMAKE_BUILD_TYPE="Release"
 
-INSTALLATION_DIRS=     bin ${PKGMANDIR}/man1 share/applications        \
+INSTALLATION_DIRS=     bin ${PKGMANDIR}/man1 share/applications \
                        share/icons/hicolor/scalable/apps \
                        share/icons/hicolor/512x512/apps \
                        share/icons/hicolor/256x256/apps \
@@ -81,7 +71,6 @@ do-install:
 
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../devel/libexecinfo/buildlink3.mk"
-.include "../../devel/zlib/buildlink3.mk"
 .include "../../devel/qt6-qt5compat/buildlink3.mk"
 .include "../../devel/qt6-qttools/buildlink3.mk"
 .include "../../graphics/qt6-qtsvg/buildlink3.mk"

Index: pkgsrc/cad/qcad/PLIST
diff -u pkgsrc/cad/qcad/PLIST:1.26 pkgsrc/cad/qcad/PLIST:1.27
--- pkgsrc/cad/qcad/PLIST:1.26  Sun Mar 16 14:56:11 2025
+++ pkgsrc/cad/qcad/PLIST       Tue Aug 19 12:52:17 2025
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.26 2025/03/16 14:56:11 plunky Exp $
+@comment $NetBSD: PLIST,v 1.27 2025/08/19 12:52:17 plunky Exp $
 bin/qcad
 lib/libopennurbs.so
 lib/libqcadcore.so
@@ -1492,18 +1492,32 @@ lib/qcad/scripts/Draw/Arc/ArcTangential/
 lib/qcad/scripts/Draw/Arc/ArcTangential/doc/ArcTangential_nl.html
 lib/qcad/scripts/Draw/Arc/ArcTangential/doc/ArcTangential_pl.html
 lib/qcad/scripts/Draw/Arc/ArcTangential/doc/ArcTangential_proc_bg.html
+lib/qcad/scripts/Draw/Arc/ArcTangential/doc/ArcTangential_proc_cs.html
 lib/qcad/scripts/Draw/Arc/ArcTangential/doc/ArcTangential_proc_da.html
 lib/qcad/scripts/Draw/Arc/ArcTangential/doc/ArcTangential_proc_de.html
 lib/qcad/scripts/Draw/Arc/ArcTangential/doc/ArcTangential_proc_en.html
 lib/qcad/scripts/Draw/Arc/ArcTangential/doc/ArcTangential_proc_es.html
+lib/qcad/scripts/Draw/Arc/ArcTangential/doc/ArcTangential_proc_et.html
+lib/qcad/scripts/Draw/Arc/ArcTangential/doc/ArcTangential_proc_fi.html
 lib/qcad/scripts/Draw/Arc/ArcTangential/doc/ArcTangential_proc_fr.html
+lib/qcad/scripts/Draw/Arc/ArcTangential/doc/ArcTangential_proc_hu.html
+lib/qcad/scripts/Draw/Arc/ArcTangential/doc/ArcTangential_proc_id.html
 lib/qcad/scripts/Draw/Arc/ArcTangential/doc/ArcTangential_proc_it.html
 lib/qcad/scripts/Draw/Arc/ArcTangential/doc/ArcTangential_proc_ja.html
+lib/qcad/scripts/Draw/Arc/ArcTangential/doc/ArcTangential_proc_lt.html
+lib/qcad/scripts/Draw/Arc/ArcTangential/doc/ArcTangential_proc_lv.html
 lib/qcad/scripts/Draw/Arc/ArcTangential/doc/ArcTangential_proc_nl.html
 lib/qcad/scripts/Draw/Arc/ArcTangential/doc/ArcTangential_proc_pl.html
 lib/qcad/scripts/Draw/Arc/ArcTangential/doc/ArcTangential_proc_pt.html
+lib/qcad/scripts/Draw/Arc/ArcTangential/doc/ArcTangential_proc_ro.html
 lib/qcad/scripts/Draw/Arc/ArcTangential/doc/ArcTangential_proc_ru.html
+lib/qcad/scripts/Draw/Arc/ArcTangential/doc/ArcTangential_proc_sk.html
+lib/qcad/scripts/Draw/Arc/ArcTangential/doc/ArcTangential_proc_sl.html
 lib/qcad/scripts/Draw/Arc/ArcTangential/doc/ArcTangential_proc_sv.html
+lib/qcad/scripts/Draw/Arc/ArcTangential/doc/ArcTangential_proc_tr.html
+lib/qcad/scripts/Draw/Arc/ArcTangential/doc/ArcTangential_proc_uk.html
+lib/qcad/scripts/Draw/Arc/ArcTangential/doc/ArcTangential_proc_zh_CN.html
+lib/qcad/scripts/Draw/Arc/ArcTangential/doc/ArcTangential_proc_zh_TW.html
 lib/qcad/scripts/Draw/Arc/ArcTangential/doc/ArcTangential_pt.html
 lib/qcad/scripts/Draw/Arc/ArcTangential/doc/ArcTangential_ru.html
 lib/qcad/scripts/Draw/Arc/ArcTangential/doc/ArcTangential_sl.html
@@ -4045,8 +4059,12 @@ lib/qcad/scripts/Draw/Polyline/DrawPolyl
 lib/qcad/scripts/Draw/Polyline/DrawPolyline/Redo.svg
 lib/qcad/scripts/Draw/Polyline/DrawPolyline/Tests/DrawPolylineTest00.js
 lib/qcad/scripts/Draw/Polyline/DrawPolyline/Tests/DrawPolylineTest01.js
+lib/qcad/scripts/Draw/Polyline/DrawPolyline/Tests/DrawPolylineTest02.js
+lib/qcad/scripts/Draw/Polyline/DrawPolyline/Tests/DrawPolylineTest03.js
 lib/qcad/scripts/Draw/Polyline/DrawPolyline/Tests/required/DrawPolylineTest00_000.dxf
 lib/qcad/scripts/Draw/Polyline/DrawPolyline/Tests/required/DrawPolylineTest01_000.dxf
+lib/qcad/scripts/Draw/Polyline/DrawPolyline/Tests/required/DrawPolylineTest02_000.dxf
+lib/qcad/scripts/Draw/Polyline/DrawPolyline/Tests/required/DrawPolylineTest03_000.dxf
 lib/qcad/scripts/Draw/Polyline/DrawPolyline/Undo-inverse.svg
 lib/qcad/scripts/Draw/Polyline/DrawPolyline/Undo.svg
 lib/qcad/scripts/Draw/Polyline/DrawPolyline/doc/Close.png
@@ -12845,4 +12863,3 @@ share/qcad/readme.txt
 @pkgdir lib/qcad/scripts/Block/EditBlock/Tests/actual
 @pkgdir lib/qcad/scripts/Block/CreateBlock/Tests/actual
 @pkgdir lib/qcad/scripts/Block/AddBlock/Tests/actual
-@pkgdir lib/plugins

Index: pkgsrc/cad/qcad/distinfo
diff -u pkgsrc/cad/qcad/distinfo:1.46 pkgsrc/cad/qcad/distinfo:1.47
--- pkgsrc/cad/qcad/distinfo:1.46       Sun Mar 16 14:56:12 2025
+++ pkgsrc/cad/qcad/distinfo    Tue Aug 19 12:52:17 2025
@@ -1,20 +1,24 @@
-$NetBSD: distinfo,v 1.46 2025/03/16 14:56:12 plunky Exp $
+$NetBSD: distinfo,v 1.47 2025/08/19 12:52:17 plunky Exp $
 
-BLAKE2s (qcad-3.32.2.0.tar.gz) = 3e150349b061c13c5d6f27bcc2db515f53a52bd6314066bb95660465b76e5121
-SHA512 (qcad-3.32.2.0.tar.gz) = b13bfad1f2aa714949f82baa4ba80f264f1353e768264cb74225e24eab876fe763e0b4551ece6497ca251946e0aee1349d28478738c855a6b00a7178308a041d
-Size (qcad-3.32.2.0.tar.gz) = 43092869 bytes
-BLAKE2s (qcad-qcadjsapi-v3.32.2.0.tar.gz) = b74a6ba6c3bd9cad94af6dd7ee46968a44adeec430f808a7e5c0f2338da3cace
-SHA512 (qcad-qcadjsapi-v3.32.2.0.tar.gz) = 0a4e496938d56cef6c22869bd0b792dd04d5a9ed15c99f4c6307f688202a31b3762518063fda3bc79b1079322dd7a4c5b5c7c74bd6a3d4eb0f5c6ed06dff446c
-Size (qcad-qcadjsapi-v3.32.2.0.tar.gz) = 3471956 bytes
-BLAKE2s (qcad-qtjsapi-v3.32.2.0.tar.gz) = 9ed9cc79e86e069fb89936daca01fff50678247a04f5f08cc9298a90c1b7060b
-SHA512 (qcad-qtjsapi-v3.32.2.0.tar.gz) = d78fb2b03378e04a973af5ec77b41ee60091e25e0fadf8ec98b018326af337803f75902c60a561cdf91813beb8453b04c58191e308f807228623ecf018aefe10
-Size (qcad-qtjsapi-v3.32.2.0.tar.gz) = 3167711 bytes
-SHA1 (patch-scripts_Help_ShowReadme_ShowReadme.js) = 96412237a7c4422f02dc5d2ab3634457b376a2d2
+BLAKE2s (qcad-3.32.3.4.tar.gz) = 5dd55492b7e49e23182137e481fdcc6a6a0edc6c3da3452b7e25202138233502
+SHA512 (qcad-3.32.3.4.tar.gz) = 39135251f342224cf633c88257e9ebdcc7fad3607c0d32c09fc37b577173e5064f20c20a027402fdb44290ed8b0869698293c5154138ab1320458341a5519be9
+Size (qcad-3.32.3.4.tar.gz) = 47995615 bytes
+BLAKE2s (qcad-qcadjsapi-v3.32.3.4.tar.gz) = ac59bb11d096f2445e3c4601c8bf0222346c45d90331b23717c1598f9bee4788
+SHA512 (qcad-qcadjsapi-v3.32.3.4.tar.gz) = 50bf01b20aff724de84280a12c298fd52d0cfe9d170d0cf05fa3ebb97823527cafb48624a1ea8a8fe391e69edbd11fe8537501734b35662296e6f5fa7ecc5239
+Size (qcad-qcadjsapi-v3.32.3.4.tar.gz) = 3447940 bytes
+BLAKE2s (qcad-qtjsapi-v3.32.3.4.tar.gz) = 1a159c1256a53df8b81faeeeb55eda42833870c7915b8f84aaaa94eeacf870ce
+SHA512 (qcad-qtjsapi-v3.32.3.4.tar.gz) = 3108e9c730c3611bb25a7e3c5a697d734bec91a3a594fe5558ca182693dc47719e8cb7424d3cd2d8fe2848e9d926cb04ac74a811cefde1d5250fc282c8464d69
+Size (qcad-qtjsapi-v3.32.3.4.tar.gz) = 3209211 bytes
+SHA1 (patch-scripts_Help_ShowReadme_ShowReadme.js) = 5b843d1c11c70b2be533fdc4c3ec46442cd4ac19
 SHA1 (patch-src_3rdparty_CMakeLists.txt) = 789a1d14b9c74374a7333bddc931ea6ffa2fac56
-SHA1 (patch-src_3rdparty_opennurbs_CMakeLists.txt) = 0e5a5b4547840c38a3b18fdfbf2c716c1e30be50
-SHA1 (patch-src_3rdparty_opennurbs_opennurbs__zlib.cpp) = 5691a80688cfe135a1d47ce340768c6db6c60c66
-SHA1 (patch-src_3rdparty_opennurbs_opennurbs__zlib.h) = e83185090c36a7d502d11852b0469e26be523d51
-SHA1 (patch-src_CMakeLists.txt) = 37e003e48e51d43abfa4509ecbe2003a703aadc2
-SHA1 (patch-src_core_RS.cpp) = a8814a6f475bde9c7ff03c3066e13daff2313ac5
-SHA1 (patch-src_core_RSettings.cpp) = d59135a840520f88abb5ed37ae6bd511f0578c92
+SHA1 (patch-src_3rdparty_opennurbs_opennurbs__defines.cpp) = 18295a7a94579de8ef76f2e0a12a2adc07556658
+SHA1 (patch-src_3rdparty_opennurbs_opennurbs__system__runtime.h) = ebcfdfb5d54e1516216b8ee4130a0ded05db19f3
+SHA1 (patch-src_3rdparty_opennurbs_zlib_zconf.h) = 17850165130eb3ee50aa31aaa62a173c3733b7e8
+SHA1 (patch-src_CMakeLists.txt) = 4243a56124dbf049644477da22e8cf9aea6d16b0
+SHA1 (patch-src_core_RS.cpp) = f8b7d6be3a2e822c04342b3490f2f99d47b57484
+SHA1 (patch-src_core_RSettings.cpp) = 8c5cba0026f727829c539195a0632224e3e51638
+SHA1 (patch-src_entity_CMakeLists.txt) = 6bf41871ea1df9b8534d2d9078ce441c2f57f68b
+SHA1 (patch-src_qcadjsapi_CMakeLists.txt) = a73eeb21ac7da58b27b7ea17153776060c632069
+SHA1 (patch-src_qtjsapi_RJSTools.cpp) = 11bd60ffbb3d3c32ac9219844b912fcf02786ea2
+SHA1 (patch-src_run_CMakeInclude.txt) = f484ba9ff244196f2f80401b964f45cb7acc3963
 SHA1 (patch-src_run_main.cpp) = 2414fdbd6434c5a7d12647f9f964775b01fcee6a

Index: pkgsrc/cad/qcad/patches/patch-scripts_Help_ShowReadme_ShowReadme.js
diff -u pkgsrc/cad/qcad/patches/patch-scripts_Help_ShowReadme_ShowReadme.js:1.2 pkgsrc/cad/qcad/patches/patch-scripts_Help_ShowReadme_ShowReadme.js:1.3
--- pkgsrc/cad/qcad/patches/patch-scripts_Help_ShowReadme_ShowReadme.js:1.2     Fri Jul 27 14:12:41 2018
+++ pkgsrc/cad/qcad/patches/patch-scripts_Help_ShowReadme_ShowReadme.js Tue Aug 19 12:52:17 2025
@@ -1,8 +1,8 @@
-$NetBSD: patch-scripts_Help_ShowReadme_ShowReadme.js,v 1.2 2018/07/27 14:12:41 plunky Exp $
+$NetBSD: patch-scripts_Help_ShowReadme_ShowReadme.js,v 1.3 2025/08/19 12:52:17 plunky Exp $
 
 fix path to file
 
---- scripts/Help/ShowReadme/ShowReadme.js.orig 2018-07-10 13:17:39.000000000 +0000
+--- scripts/Help/ShowReadme/ShowReadme.js.orig 2025-06-10 07:10:41.000000000 +0000
 +++ scripts/Help/ShowReadme/ShowReadme.js
 @@ -19,7 +19,7 @@
  

Index: pkgsrc/cad/qcad/patches/patch-src_CMakeLists.txt
diff -u pkgsrc/cad/qcad/patches/patch-src_CMakeLists.txt:1.1 pkgsrc/cad/qcad/patches/patch-src_CMakeLists.txt:1.2
--- pkgsrc/cad/qcad/patches/patch-src_CMakeLists.txt:1.1        Sun Mar 16 14:56:12 2025
+++ pkgsrc/cad/qcad/patches/patch-src_CMakeLists.txt    Tue Aug 19 12:52:17 2025
@@ -1,4 +1,4 @@
-$NetBSD: patch-src_CMakeLists.txt,v 1.1 2025/03/16 14:56:12 plunky Exp $
+$NetBSD: patch-src_CMakeLists.txt,v 1.2 2025/08/19 12:52:17 plunky Exp $
 
 turn off debug output
 
@@ -10,7 +10,7 @@ include qtjsapi (library) and qcadjsapi 
  
  include(../CMakeInclude.txt)
  
-+add_compile_definitions(QT_DEBUG_NO_OUTPUT)
++add_compile_definitions(QT_NO_DEBUG_OUTPUT)
 +
  add_subdirectory(3rdparty)
  add_subdirectory(core)

Index: pkgsrc/cad/qcad/patches/patch-src_core_RS.cpp
diff -u pkgsrc/cad/qcad/patches/patch-src_core_RS.cpp:1.4 pkgsrc/cad/qcad/patches/patch-src_core_RS.cpp:1.5
--- pkgsrc/cad/qcad/patches/patch-src_core_RS.cpp:1.4   Tue May 24 05:17:12 2022
+++ pkgsrc/cad/qcad/patches/patch-src_core_RS.cpp       Tue Aug 19 12:52:17 2025
@@ -1,10 +1,10 @@
-$NetBSD: patch-src_core_RS.cpp,v 1.4 2022/05/24 05:17:12 plunky Exp $
+$NetBSD: patch-src_core_RS.cpp,v 1.5 2025/08/19 12:52:17 plunky Exp $
 
 fix hardcoded paths
 
---- src/core/RS.cpp.orig       2020-03-17 10:40:38.000000000 +0000
+--- src/core/RS.cpp.orig       2025-06-10 07:10:41.000000000 +0000
 +++ src/core/RS.cpp
-@@ -149,6 +149,7 @@
+@@ -168,6 +168,7 @@ bool RS::compare(const QPair<QVariant, R
  QStringList RS::getDirectoryList(const QString& subDirectory) {
      QStringList dirList;
  
@@ -12,7 +12,7 @@ fix hardcoded paths
      QString appDir = QCoreApplication::applicationDirPath();
      QFileInfo fi(appDir);
      if (fi.fileName() == "debug" || fi.fileName() == "release") {
-@@ -187,6 +188,11 @@
+@@ -206,6 +207,11 @@ QStringList RS::getDirectoryList(const Q
      }
  #endif
      */

Index: pkgsrc/cad/qcad/patches/patch-src_core_RSettings.cpp
diff -u pkgsrc/cad/qcad/patches/patch-src_core_RSettings.cpp:1.3 pkgsrc/cad/qcad/patches/patch-src_core_RSettings.cpp:1.4
--- pkgsrc/cad/qcad/patches/patch-src_core_RSettings.cpp:1.3    Sun Mar 16 14:56:12 2025
+++ pkgsrc/cad/qcad/patches/patch-src_core_RSettings.cpp        Tue Aug 19 12:52:17 2025
@@ -1,8 +1,8 @@
-$NetBSD: patch-src_core_RSettings.cpp,v 1.3 2025/03/16 14:56:12 plunky Exp $
+$NetBSD: patch-src_core_RSettings.cpp,v 1.4 2025/08/19 12:52:17 plunky Exp $
 
 fix hardcoded paths
 
---- src/core/RSettings.cpp.orig        2025-02-20 12:25:22.000000000 +0000
+--- src/core/RSettings.cpp.orig        2025-06-10 07:10:41.000000000 +0000
 +++ src/core/RSettings.cpp
 @@ -376,6 +376,7 @@ bool RSettings::isDeployed() {
   * \return Path where all application resources are stored ('scripts', 'patterns', 'ts', 'doc', 'linetypes', ...)

Added files:

Index: pkgsrc/cad/qcad/patches/patch-src_3rdparty_opennurbs_opennurbs__defines.cpp
diff -u /dev/null pkgsrc/cad/qcad/patches/patch-src_3rdparty_opennurbs_opennurbs__defines.cpp:1.1
--- /dev/null   Tue Aug 19 12:52:18 2025
+++ pkgsrc/cad/qcad/patches/patch-src_3rdparty_opennurbs_opennurbs__defines.cpp Tue Aug 19 12:52:17 2025
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_3rdparty_opennurbs_opennurbs__defines.cpp,v 1.1 2025/08/19 12:52:17 plunky Exp $
+
+fcloseall() may not be available (CloseAllFiles is not used by QCAD anyway)
+
+--- src/3rdparty/opennurbs/opennurbs_defines.cpp.orig  2025-06-29 15:24:08.450418459 +0000
++++ src/3rdparty/opennurbs/opennurbs_defines.cpp
+@@ -499,7 +499,7 @@ int ON::CloseAllFiles()
+   //fcloseall is not supported on mac/ios or android
+   return EOF;
+ #else
+-  return fcloseall();
++  return EOF;
+ #endif
+ }
+ 
Index: pkgsrc/cad/qcad/patches/patch-src_3rdparty_opennurbs_opennurbs__system__runtime.h
diff -u /dev/null pkgsrc/cad/qcad/patches/patch-src_3rdparty_opennurbs_opennurbs__system__runtime.h:1.1
--- /dev/null   Tue Aug 19 12:52:18 2025
+++ pkgsrc/cad/qcad/patches/patch-src_3rdparty_opennurbs_opennurbs__system__runtime.h   Tue Aug 19 12:52:17 2025
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_3rdparty_opennurbs_opennurbs__system__runtime.h,v 1.1 2025/08/19 12:52:17 plunky Exp $
+
+they say ON_RUNTIME_LINUX but really it is POSIX
+
+--- src/3rdparty/opennurbs/opennurbs_system_runtime.h.orig     2025-06-29 16:05:12.382568700 +0000
++++ src/3rdparty/opennurbs/opennurbs_system_runtime.h
+@@ -51,7 +51,7 @@
+ #define ON_RUNTIME_ANDROID
+ #endif
+ 
+-#elif defined(__linux__)
++#elif defined(__linux__) || defined(__NetBSD__)
+ #if !defined(ON_RUNTIME_LINUX)
+ #define ON_RUNTIME_LINUX
+ #endif
Index: pkgsrc/cad/qcad/patches/patch-src_3rdparty_opennurbs_zlib_zconf.h
diff -u /dev/null pkgsrc/cad/qcad/patches/patch-src_3rdparty_opennurbs_zlib_zconf.h:1.1
--- /dev/null   Tue Aug 19 12:52:18 2025
+++ pkgsrc/cad/qcad/patches/patch-src_3rdparty_opennurbs_zlib_zconf.h   Tue Aug 19 12:52:17 2025
@@ -0,0 +1,26 @@
+$NetBSD: patch-src_3rdparty_opennurbs_zlib_zconf.h,v 1.1 2025/08/19 12:52:17 plunky Exp $
+
+as we are using private zlib, also apply prefix to other symbols to prevent
+cross contamination with other users
+
+--- src/3rdparty/opennurbs/zlib/zconf.h.orig   2025-08-17 10:19:40.640835518 +0000
++++ src/3rdparty/opennurbs/zlib/zconf.h
+@@ -83,6 +83,18 @@ warning C4127: conditional expression is
+ #  define get_crc_table         z_get_crc_table
+ #  define zError                z_zError
+ 
++#  define adler32_combine       z_adler32_combine
++#  define crc32_combine         z_crc32_combine
++#  define deflateSetHeader      z_deflateSetHeader
++#  define deflateTune           z_deflateTune
++#  define inflateBackInit_      z_inflateBackInit_
++#  define inflate_fast          z_inflate_fast
++#  define inflateGetHeader      z_inflateGetHeader
++#  define inflatePrime          z_inflatePrime
++#  define inflate_table         z_inflate_table
++#  define zlibCompileFlags      z_zlibCompileFlags
++#  define zlibVersion           z_zlibVersion
++
+ #  define alloc_func            z_alloc_func
+ #  define free_func             z_free_func
+ #  define in_func               z_in_func
Index: pkgsrc/cad/qcad/patches/patch-src_entity_CMakeLists.txt
diff -u /dev/null pkgsrc/cad/qcad/patches/patch-src_entity_CMakeLists.txt:1.1
--- /dev/null   Tue Aug 19 12:52:18 2025
+++ pkgsrc/cad/qcad/patches/patch-src_entity_CMakeLists.txt     Tue Aug 19 12:52:17 2025
@@ -0,0 +1,14 @@
+$NetBSD: patch-src_entity_CMakeLists.txt,v 1.1 2025/08/19 12:52:17 plunky Exp $
+
+don't link to opennurbs in that way
+
+--- src/entity/CMakeLists.txt.orig     2025-06-29 18:03:28.748685869 +0000
++++ src/entity/CMakeLists.txt
+@@ -120,7 +120,6 @@ target_link_libraries(qcadentity PUBLIC
+     Qt::Svg
+     Qt::Xml
+     qcadcore
+-    opennurbs
+ )
+ 
+ if(win32-msvc2010)
Index: pkgsrc/cad/qcad/patches/patch-src_qcadjsapi_CMakeLists.txt
diff -u /dev/null pkgsrc/cad/qcad/patches/patch-src_qcadjsapi_CMakeLists.txt:1.1
--- /dev/null   Tue Aug 19 12:52:18 2025
+++ pkgsrc/cad/qcad/patches/patch-src_qcadjsapi_CMakeLists.txt  Tue Aug 19 12:52:17 2025
@@ -0,0 +1,12 @@
+$NetBSD: patch-src_qcadjsapi_CMakeLists.txt,v 1.1 2025/08/19 12:52:17 plunky Exp $
+
+don't link to opennurbs in that way
+
+--- src/qcadjsapi/CMakeLists.txt.orig  2025-06-30 17:43:41.724951923 +0000
++++ src/qcadjsapi/CMakeLists.txt
+@@ -139,5 +139,4 @@ target_link_libraries(qcadjsapi PRIVATE
+     qcadspatialindex
+     qcadstemmer
+     qtjsapi
+-    opennurbs
+ )
Index: pkgsrc/cad/qcad/patches/patch-src_qtjsapi_RJSTools.cpp
diff -u /dev/null pkgsrc/cad/qcad/patches/patch-src_qtjsapi_RJSTools.cpp:1.1
--- /dev/null   Tue Aug 19 12:52:18 2025
+++ pkgsrc/cad/qcad/patches/patch-src_qtjsapi_RJSTools.cpp      Tue Aug 19 12:52:17 2025
@@ -0,0 +1,19 @@
+$NetBSD: patch-src_qtjsapi_RJSTools.cpp,v 1.1 2025/08/19 12:52:17 plunky Exp $
+
+turn off debug output
+
+--- src/qtjsapi/RJSTools.cpp.orig      2025-05-28 12:02:41.395712228 +0000
++++ src/qtjsapi/RJSTools.cpp
+@@ -321,10 +321,12 @@ void RJSTools::print(const QJSValue& arg
+ }
+ 
+ void RJSTools::debug(const QJSValue& args) {
++#ifndef QT_NO_DEBUG_OUTPUT
+     QDebug deb = qDebug().noquote();
+     for (int i=0; i<args.property("length").toInt(); i++) {
+         deb << args.property(i).toString();
+     }
++#endif
+ }
+ 
+ void RJSTools::warning(const QJSValue& args) {
Index: pkgsrc/cad/qcad/patches/patch-src_run_CMakeInclude.txt
diff -u /dev/null pkgsrc/cad/qcad/patches/patch-src_run_CMakeInclude.txt:1.1
--- /dev/null   Tue Aug 19 12:52:18 2025
+++ pkgsrc/cad/qcad/patches/patch-src_run_CMakeInclude.txt      Tue Aug 19 12:52:17 2025
@@ -0,0 +1,14 @@
+$NetBSD: patch-src_run_CMakeInclude.txt,v 1.1 2025/08/19 12:52:17 plunky Exp $
+
+don't link opennurbs in that way
+
+--- src/run/CMakeInclude.txt.orig      2025-06-29 19:50:30.599468737 +0000
++++ src/run/CMakeInclude.txt
+@@ -118,7 +118,6 @@ endif()
+ if(NOT r_no_opennurbs)
+     target_link_libraries(${PROJECT_NAME} PRIVATE
+         zlib
+-        opennurbs
+     )
+ endif()
+

Prev by Date: CVS commit: pkgsrc/geography/opencpn-plugin-debugger
Next by Date: CVS commit: pkgsrc/doc
Previous by Thread: CVS commit: pkgsrc/geography/opencpn-plugin-debugger
Next by Thread: CVS commit: pkgsrc/doc
Indexes:

Home | Main Index | Thread Index | Old Index