diff --git a/cad/qcad/Makefile b/cad/qcad/Makefile index 5856de7fa633..d67d0923e2e5 100644 --- a/cad/qcad/Makefile +++ b/cad/qcad/Makefile @@ -1,104 +1,89 @@ PORTNAME= qcad -PORTVERSION= 3.32.2.0 +PORTVERSION= 3.32.9.0 DISTVERSIONPREFIX= v -PORTREVISION= 2 CATEGORIES= cad DIST_SUBDIR= ${PORTNAME} -#PATCH_SITES= https://github.com/qcad/qcad/commit/ -#PATCHFILES= bbcd195f199e75190e758f46475b4f723643a820.patch:-p1 -#GH_TAGNAME= 98f92a5a275102dfab915b920e2ebf52f43bf091 - MAINTAINER= mr@FreeBSD.org COMMENT= Professional CAD system WWW= https://www.ribbonsoft.com/qcad.html LICENSE= GPLv3 -BROKEN_i386= doesn't buld on pkg builder +BROKEN_i386= doesn't build on pkg builder + +BUILD_DEPENDS= bash:shells/bash +LIB_DEPENDS= libOpenNURBS.so:graphics/opennurbs \ + libqtjsapi.so:cad/qtjsapi \ + libcups.so:print/cups -BUILD_DEPENDS= bash:shells/bash \ - ${LOCALBASE}/lib/libopenNURBS.a:graphics/opennurbs +USES= cmake compiler:c++17-lang gl localbase:ldflags qt:6 +USE_CXXSTD= c++17 -USES= compiler:c++11-lang gl gmake qmake qt:${FLAVOR:S/qt//} -#USES= compiler:c++11-lang gl gmake qmake qt:5 -USE_CXXSTD= c++14 -FLAVORS= qt5 #qt6 -FLAVOR= qt5 -qt5_PKGNAMESUFFIX= -qt5 -qt6_PKGNAMESUFFIX= -qt6 USE_GITHUB= yes + +CMAKE_ON= BUILD_QT6 +USE_QT= 5compat base declarative svg tools +USE_GL= opengl USE_LDCONFIG= yes -_USE_QT5= buildtools qmake:build \ - concurrent designer gui help imageformats network opengl script \ - scripttools sql svg uitools xml xmlpatterns -_USE_QT6= base -USE_QT= ${_USE_QT${FLAVOR:S/qt//}} -#USE_QT= ${_USE_QT5} -USE_GL= glu DESKTOP_ENTRIES="QCad" \ "" \ "${DATADIR}/scripts/qcad_icon.png" \ "${PREFIX}/bin/qcad-bin" \ "" \ true .if defined(WITH_DEBUG) RESDIR= ${WRKSRC}/debug .else RESDIR= ${WRKSRC}/release .endif -SHRLIBS= qcadcore qcadecmaapi qcadentity qcadgrid qcadgui qcadoperations \ +SHRLIBS= qcadcore qcadentity qcadgrid qcadgui qcadoperations \ qcadsnap qcadspatialindex qcadstemmer spatialindexnavel STALIBS= dxflib stemmer -SHRDIR= fonts libraries linetypes patterns plugins scripts themes ts -#QSCRIPTS should not be installed to avoid conflicts with texlive-base -QSCRIPTS= bbox dwg2bmp dwg2pdf dwg2svg +SHRDIR= fonts libraries linetypes patterns plugins scripts support themes ts OPTIONS_DEFINE= EXAMPLES -CFLAGS_i386= -fPIC -CXXFLAGS_i386= -fPIC +CFLAGS+= -DON_SIZEOF_WCHAR_T=4 -fPIC +LDFLAGS+= -lexecinfo LDFLAGS_i386= -Wl,-z,notext -.include +.include -.if defined(WITH_DEBUG) -ALL_TARGET= debug -PLIST_SUB+= DEBUG_LIB_SUFFIX="_debug" -RESDIR= ${WRKSRC}/debug +.if ${ARCH} != "sparc64" && ${ARCH} != "powerpc" && ${ARCH} != powerpc64 +CFLAGS+= -DON_LITTLE_ENDIAN .else -ALL_TARGET= release -PLIST_SUB+= DEBUG_LIB_SUFFIX="" -RESDIR= ${WRKSRC}/release +CFLAGS+= -DON_BIG_ENDIAN .endif pre-configure: ${MKDIR} ${WRKSRC}/src/3rdparty/qt-labs-qtscriptgenerator-${_QT_VERSION} ${CP} ${WRKSRC}/src/3rdparty/qt-labs-qtscriptgenerator-5.13.2/qt-labs-qtscriptgenerator-5.13.2.pro \ ${WRKSRC}/src/3rdparty/qt-labs-qtscriptgenerator-${_QT_VERSION}/qt-labs-qtscriptgenerator-${_QT_VERSION}.pro ${REINPLACE_CMD} -e "s|%%DATADIR%%|${DATADIR}|" \ ${WRKSRC}/src/core/RS.cpp ${REINPLACE_CMD} -e "s|%%DATADIR%%|${DATADIR}|" \ ${WRKSRC}/src/core/RSettings.cpp do-install: - ${INSTALL_PROGRAM} ${RESDIR}/qcad-bin ${STAGEDIR}${PREFIX}/bin/ - ${LN} -sf qcad-bin ${STAGEDIR}${PREFIX}/bin/qcad + ${INSTALL_PROGRAM} ${RESDIR}/qcad ${STAGEDIR}${PREFIX}/bin/ .for lib in ${SHRLIBS:C|^|lib|:C|$|.so|} ${INSTALL_LIB} ${RESDIR}/${lib} ${STAGEDIR}${PREFIX}/lib/${lib}.0 ${LN} -sf ${lib}.0 ${STAGEDIR}${PREFIX}/lib/${lib} .endfor .for lib in ${STALIBS:C|^|lib|:C|$|.a|} ${INSTALL_DATA} ${RESDIR}/${lib} ${STAGEDIR}${PREFIX}/lib/ .endfor ${MKDIR} ${STAGEDIR}${DATADIR} .for dir in ${SHRDIR} cd ${WRKSRC} && ${COPYTREE_SHARE} ${dir} ${STAGEDIR}${DATADIR} .endfor + +do-install-EXAMPLES-on: ${MKDIR} ${STAGEDIR}${EXAMPLESDIR} cd ${WRKSRC}/examples && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR} -.include +.include diff --git a/cad/qcad/distinfo b/cad/qcad/distinfo index d5f683ae99ec..a4f78f9cb022 100644 --- a/cad/qcad/distinfo +++ b/cad/qcad/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1741683907 -SHA256 (qcad/qcad-qcad-v3.32.2.0_GH0.tar.gz) = ac2bbbc89f21d004683e95e91ac8777f4e1385e9f1efaf574eff42adb2fb1972 -SIZE (qcad/qcad-qcad-v3.32.2.0_GH0.tar.gz) = 43092869 +TIMESTAMP = 1779904495 +SHA256 (qcad/qcad-qcad-v3.32.9.0_GH0.tar.gz) = 78585ab01143525745257531c0210592ee14811aef52274ddab8bb30138e3bf4 +SIZE (qcad/qcad-qcad-v3.32.9.0_GH0.tar.gz) = 44821097 diff --git a/cad/qcad/files/patch-CMakeInclude.txt b/cad/qcad/files/patch-CMakeInclude.txt new file mode 100644 index 000000000000..0f709237a7f2 --- /dev/null +++ b/cad/qcad/files/patch-CMakeInclude.txt @@ -0,0 +1,11 @@ +--- CMakeInclude.txt.orig 2026-05-06 14:27:07 UTC ++++ CMakeInclude.txt +@@ -35,7 +35,7 @@ endif() + set(RWIN32 TRUE) + endif() + +-if(CMAKE_SYSTEM_NAME STREQUAL "Linux") ++if(UNIX) + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC") + endif() + diff --git a/cad/qcad/files/patch-shared_app.pri b/cad/qcad/files/patch-shared_app.pri index ade00a50ffdf..e4489ad34303 100644 --- a/cad/qcad/files/patch-shared_app.pri +++ b/cad/qcad/files/patch-shared_app.pri @@ -1,13 +1,13 @@ --- shared_app.pri.orig 2025-02-10 09:29:49 UTC +++ shared_app.pri @@ -18,8 +18,8 @@ LIBS += \ !r_no_opennurbs { LIBS += \ - -lopennurbs \ - -lzlib -+ -lopenNURBS \ ++ -lOpenNURBS \ + -lz } win32 { diff --git a/cad/qcad/files/patch-src_3rdparty_3rdparty.pro b/cad/qcad/files/patch-src_3rdparty_3rdparty.pro index 6b2322abbb96..88a30cdeb3fe 100644 --- a/cad/qcad/files/patch-src_3rdparty_3rdparty.pro +++ b/cad/qcad/files/patch-src_3rdparty_3rdparty.pro @@ -1,17 +1,14 @@ Second hunk: fix a version of the shipped qtscriptgenerator, as when updating Qt, the new one might not yet be bundled in the tarball. ---- src/3rdparty/3rdparty.pro.orig 2025-02-10 09:29:49 UTC +--- src/3rdparty/3rdparty.pro.orig 2026-05-06 14:27:07 UTC +++ src/3rdparty/3rdparty.pro -@@ -11,9 +11,8 @@ else { - SUBDIRS += legacy +@@ -19,7 +19,7 @@ else { + } + else { + # Qt 6: use newer opennurbs library +- SUBDIRS += opennurbs ++ # FreeBSD: prefer opennurbs from dependent ports + } } - --!r_no_opennurbs { -- SUBDIRS += opennurbs --} -+# FreeBSD: prefer opennurbs from dependent ports -+ !rs_no_dxf { - SUBDIRS += dxflib - } diff --git a/cad/qcad/files/patch-src_3rdparty_CMakeLists.txt b/cad/qcad/files/patch-src_3rdparty_CMakeLists.txt new file mode 100644 index 000000000000..5dd049b78813 --- /dev/null +++ b/cad/qcad/files/patch-src_3rdparty_CMakeLists.txt @@ -0,0 +1,10 @@ +--- src/3rdparty/CMakeLists.txt.orig 2026-05-06 14:27:07 UTC ++++ src/3rdparty/CMakeLists.txt +@@ -5,7 +5,6 @@ add_subdirectory(dxflib) + project(3rdparty VERSION 1.0 LANGUAGES CXX C) + + add_subdirectory(dxflib) +-add_subdirectory(opennurbs) + add_subdirectory(spatialindexnavel) + add_subdirectory(stemmer) + diff --git a/cad/qcad/files/patch-src_3rdparty_legacy_spatialindexnavel_include_spatialindex_MovingRegion.h b/cad/qcad/files/patch-src_3rdparty_legacy_spatialindexnavel_include_spatialindex_MovingRegion.h new file mode 100644 index 000000000000..c0fd946670e6 --- /dev/null +++ b/cad/qcad/files/patch-src_3rdparty_legacy_spatialindexnavel_include_spatialindex_MovingRegion.h @@ -0,0 +1,13 @@ +--- src/3rdparty/legacy/spatialindexnavel/include/spatialindex/MovingRegion.h.orig 2026-05-06 14:27:07 UTC ++++ src/3rdparty/legacy/spatialindexnavel/include/spatialindex/MovingRegion.h +@@ -152,10 +152,6 @@ namespace SpatialIndex + uint32_t m_boundary; + const MovingRegion* m_to; + +- struct ascending: public std::binary_function +- { +- bool operator()(const CrossPoint& __x, const CrossPoint& __y) const { return __x.m_t > __y.m_t; } +- }; + }; // CrossPoint + + public: diff --git a/cad/qcad/files/patch-src_3rdparty_legacy_spatialindexnavel_src_mvrtree_MVRTree.h b/cad/qcad/files/patch-src_3rdparty_legacy_spatialindexnavel_src_mvrtree_MVRTree.h new file mode 100644 index 000000000000..21d9cb9ecefe --- /dev/null +++ b/cad/qcad/files/patch-src_3rdparty_legacy_spatialindexnavel_src_mvrtree_MVRTree.h @@ -0,0 +1,13 @@ +--- src/3rdparty/legacy/spatialindexnavel/src/mvrtree/MVRTree.h.orig 2026-05-06 14:27:07 UTC ++++ src/3rdparty/legacy/spatialindexnavel/src/mvrtree/MVRTree.h +@@ -179,10 +179,6 @@ namespace SpatialIndex + NNEntry(id_type id, IEntry* e, double f) : m_id(id), m_pEntry(e), m_minDist(f) {} + ~NNEntry() {} + +- struct greater : public std::binary_function +- { +- bool operator()(const NNEntry* __x, const NNEntry* __y) const { return __x->m_minDist > __y->m_minDist; } +- }; + }; // NNEntry + + class NNComparator : public INearestNeighborComparator diff --git a/cad/qcad/files/patch-src_3rdparty_legacy_spatialindexnavel_src_rtree_BulkLoader.h b/cad/qcad/files/patch-src_3rdparty_legacy_spatialindexnavel_src_rtree_BulkLoader.h new file mode 100644 index 000000000000..19e43c86fea5 --- /dev/null +++ b/cad/qcad/files/patch-src_3rdparty_legacy_spatialindexnavel_src_rtree_BulkLoader.h @@ -0,0 +1,27 @@ +--- src/3rdparty/legacy/spatialindexnavel/src/rtree/BulkLoader.h.orig 2026-05-06 14:27:07 UTC ++++ src/3rdparty/legacy/spatialindexnavel/src/rtree/BulkLoader.h +@@ -40,13 +40,13 @@ namespace SpatialIndex + Record(); + Record(const Region& r, id_type id, uint32_t len, byte* pData, uint32_t s); + ~Record(); +- ++ + bool operator<(const Record& r) const; + + void storeToFile(Tools::TemporaryFile& f); + void loadFromFile(Tools::TemporaryFile& f); + +- struct SortAscending : public std::binary_function ++ struct SortAscending + { + bool operator()(Record* const r1, Record* const r2) + { +@@ -78,7 +78,7 @@ namespace SpatialIndex + public: + PQEntry(Record* r, uint32_t u32Index) : m_r(r), m_u32Index(u32Index) {} + +- struct SortAscending : public std::binary_function ++ struct SortAscending + { + bool operator()(const PQEntry& e1, const PQEntry& e2) + { diff --git a/cad/qcad/files/patch-src_3rdparty_legacy_spatialindexnavel_src_rtree_RTree.cc b/cad/qcad/files/patch-src_3rdparty_legacy_spatialindexnavel_src_rtree_RTree.cc new file mode 100644 index 000000000000..985fda24e8d3 --- /dev/null +++ b/cad/qcad/files/patch-src_3rdparty_legacy_spatialindexnavel_src_rtree_RTree.cc @@ -0,0 +1,12 @@ +--- src/3rdparty/legacy/spatialindexnavel/src/rtree/RTree.cc.orig 2026-05-06 14:27:07 UTC ++++ src/3rdparty/legacy/spatialindexnavel/src/rtree/RTree.cc +@@ -525,7 +525,8 @@ void SpatialIndex::RTree::RTree::nearestNeighborQuery( + Tools::LockGuard lock(&m_lock); + #endif + +- std::priority_queue, NNEntry::ascending> queue; ++ auto ascending = [](const NNEntry* lhs, const NNEntry* rhs) { return rhs->m_minDist > lhs->m_minDist; }; ++ std::priority_queue, decltype(ascending)> queue(ascending); + + queue.push(new NNEntry(m_rootID, 0, 0.0)); + diff --git a/cad/qcad/files/patch-src_3rdparty_legacy_spatialindexnavel_src_rtree_RTree.h b/cad/qcad/files/patch-src_3rdparty_legacy_spatialindexnavel_src_rtree_RTree.h new file mode 100644 index 000000000000..9d9b760c840d --- /dev/null +++ b/cad/qcad/files/patch-src_3rdparty_legacy_spatialindexnavel_src_rtree_RTree.h @@ -0,0 +1,13 @@ +--- src/3rdparty/legacy/spatialindexnavel/src/rtree/RTree.h.orig 2026-05-06 14:27:07 UTC ++++ src/3rdparty/legacy/spatialindexnavel/src/rtree/RTree.h +@@ -157,10 +157,6 @@ namespace SpatialIndex + NNEntry(id_type id, IEntry* e, double f) : m_id(id), m_pEntry(e), m_minDist(f) {} + ~NNEntry() {} + +- struct ascending : public std::binary_function +- { +- bool operator()(const NNEntry* __x, const NNEntry* __y) const { return __x->m_minDist > __y->m_minDist; } +- }; + }; // NNEntry + + class NNComparator : public INearestNeighborComparator diff --git a/cad/qcad/files/patch-src_3rdparty_legacy_spatialindexnavel_src_spatialindex_MovingRegion.cc b/cad/qcad/files/patch-src_3rdparty_legacy_spatialindexnavel_src_spatialindex_MovingRegion.cc new file mode 100644 index 000000000000..49d02fe1168f --- /dev/null +++ b/cad/qcad/files/patch-src_3rdparty_legacy_spatialindexnavel_src_spatialindex_MovingRegion.cc @@ -0,0 +1,12 @@ +--- src/3rdparty/legacy/spatialindexnavel/src/spatialindex/MovingRegion.cc.orig 2026-05-06 14:27:07 UTC ++++ src/3rdparty/legacy/spatialindexnavel/src/spatialindex/MovingRegion.cc +@@ -910,7 +910,8 @@ double MovingRegion::getIntersectingAreaInTime(const I + + MovingRegion x = *this; + CrossPoint c; +- std::priority_queue, CrossPoint::ascending> pq; ++ auto ascending = [](CrossPoint& lhs, CrossPoint& rhs) { return lhs.m_t > rhs.m_t; }; ++ std::priority_queue < CrossPoint, std::vector, decltype(ascending)> pq(ascending); + + // find points of intersection in all dimensions. + for (uint32_t i = 0; i < m_dimension; ++i) diff --git a/cad/qcad/files/patch-src_3rdparty_legacy_spatialindexnavel_src_tprtree_TPRTree.h b/cad/qcad/files/patch-src_3rdparty_legacy_spatialindexnavel_src_tprtree_TPRTree.h new file mode 100644 index 000000000000..41a60b869a64 --- /dev/null +++ b/cad/qcad/files/patch-src_3rdparty_legacy_spatialindexnavel_src_tprtree_TPRTree.h @@ -0,0 +1,13 @@ +--- src/3rdparty/legacy/spatialindexnavel/src/tprtree/TPRTree.h.orig 2026-05-06 14:27:07 UTC ++++ src/3rdparty/legacy/spatialindexnavel/src/tprtree/TPRTree.h +@@ -158,10 +158,6 @@ namespace SpatialIndex + NNEntry(id_type id, IEntry* e, double f) : m_id(id), m_pEntry(e), m_minDist(f) {} + ~NNEntry() {} + +- struct ascending : public std::binary_function +- { +- bool operator()(const NNEntry* __x, const NNEntry* __y) const { return __x->m_minDist > __y->m_minDist; } +- }; + }; // NNEntry + + class NNComparator : public INearestNeighborComparator diff --git a/cad/qcad/files/patch-src_core_CMakeLists.txt b/cad/qcad/files/patch-src_core_CMakeLists.txt new file mode 100644 index 000000000000..13afbf4f3d2e --- /dev/null +++ b/cad/qcad/files/patch-src_core_CMakeLists.txt @@ -0,0 +1,11 @@ +--- src/core/CMakeLists.txt.orig 2026-05-06 14:27:07 UTC ++++ src/core/CMakeLists.txt +@@ -248,7 +248,7 @@ target_link_libraries(qcadcore PUBLIC + Qt::Svg + Qt::Xml + Qt::Qml +- zlib ++ z + OpenNURBS + ) + diff --git a/cad/qcad/files/patch-src_core_RS.cpp b/cad/qcad/files/patch-src_core_RS.cpp index 7974660b1457..8d28dbc5dc89 100644 --- a/cad/qcad/files/patch-src_core_RS.cpp +++ b/cad/qcad/files/patch-src_core_RS.cpp @@ -1,13 +1,13 @@ --- src/core/RS.cpp.orig 2025-02-10 09:29:49 UTC +++ src/core/RS.cpp @@ -174,6 +174,10 @@ QStringList RS::getDirectoryList(const QString& subDir appDir = fi.absolutePath(); } +#ifdef Q_OS_FREEBSD -+ dirList.append("/usr/local/share/qcad/" + subDirectory); ++ dirList.append("%%DATADIR%%" + subDirectory); +#endif + #ifdef Q_OS_MAC // macOS app bundle: dirList.append(appDir + "/../Resources/" + subDirectory); diff --git a/cad/qcad/files/patch-src_core_RScriptHandler.h b/cad/qcad/files/patch-src_core_RScriptHandler.h deleted file mode 100644 index 036b00f3ee09..000000000000 --- a/cad/qcad/files/patch-src_core_RScriptHandler.h +++ /dev/null @@ -1,10 +0,0 @@ ---- src/core/RScriptHandler.h.orig 2025-03-11 20:09:48 UTC -+++ src/core/RScriptHandler.h -@@ -25,6 +25,7 @@ - #include - #include - #include -+#include - - #include "RDocumentInterface.h" - #include "RScriptAction.h" diff --git a/cad/qcad/files/patch-src_core_RSettings.cpp b/cad/qcad/files/patch-src_core_RSettings.cpp index 046153f04c1a..21e6dbb7782b 100644 --- a/cad/qcad/files/patch-src_core_RSettings.cpp +++ b/cad/qcad/files/patch-src_core_RSettings.cpp @@ -1,16 +1,16 @@ ---- src/core/RSettings.cpp.orig 2025-02-10 09:29:49 UTC +--- src/core/RSettings.cpp.orig 2026-05-06 14:27:07 UTC +++ src/core/RSettings.cpp -@@ -393,9 +393,13 @@ QString RSettings::getApplicationPath() { +@@ -397,9 +397,13 @@ QString RSettings::getApplicationPath() { } #endif +#ifdef Q_OS_FREEBSD -+ ret.cd("/usr/local/share/qcad"); ++ ret.cd("%%DATADIR%%"); +#else if (ret.dirName() == "debug" || ret.dirName() == "release") { ret.cdUp(); } +#endif return ret.path(); } diff --git a/cad/qcad/files/patch-src_core_bridges_CMakeLists.txt b/cad/qcad/files/patch-src_core_bridges_CMakeLists.txt new file mode 100644 index 000000000000..0a39abde5b5a --- /dev/null +++ b/cad/qcad/files/patch-src_core_bridges_CMakeLists.txt @@ -0,0 +1,11 @@ +--- src/core/bridges/CMakeLists.txt.orig 2026-05-06 14:27:07 UTC ++++ src/core/bridges/CMakeLists.txt +@@ -247,7 +247,7 @@ target_link_libraries(qcadcore PUBLIC + Qt::Svg + Qt::Xml + Qt::Qml +- zlib ++ z + OpenNURBS + ) + diff --git a/cad/qcad/files/patch-src_core_core.pro b/cad/qcad/files/patch-src_core_core.pro index 2d8042d0fe1b..fffdf503b90f 100644 --- a/cad/qcad/files/patch-src_core_core.pro +++ b/cad/qcad/files/patch-src_core_core.pro @@ -1,11 +1,11 @@ ---- src/core/core.pro.orig 2025-02-10 09:29:49 UTC +--- src/core/core.pro.orig 2026-05-06 14:27:07 UTC +++ src/core/core.pro -@@ -318,7 +318,7 @@ DEFINES += QCADCORE_LIBRARY +@@ -324,7 +324,7 @@ DEFINES += QCADCORE_LIBRARY OTHER_FILES += core.dox math/math.dox DEFINES += QCADCORE_LIBRARY -LIBS += -lopennurbs -lzlib +LIBS += -lopenNURBS -lz win32 { LIBS += -lRpcrt4 -lAdvapi32 diff --git a/cad/qcad/files/patch-src_core_math_RSpline.h b/cad/qcad/files/patch-src_core_math_RSpline.h index b454910b2ca8..4a9305ffee12 100644 --- a/cad/qcad/files/patch-src_core_math_RSpline.h +++ b/cad/qcad/files/patch-src_core_math_RSpline.h @@ -1,11 +1,11 @@ ---- src/core/math/RSpline.h.orig 2025-02-10 09:29:49 UTC +--- src/core/math/RSpline.h.orig 2026-05-06 14:27:07 UTC +++ src/core/math/RSpline.h -@@ -33,7 +33,7 @@ class RSplineProxy; - class RSplineProxy; +@@ -34,7 +34,7 @@ class RSplineProxy; #ifndef R_NO_OPENNURBS + #if QT_VERSION >= 0x060000 -#include "opennurbs/opennurbs.h" -+#include ++#include + #else + #include "legacy/opennurbs/opennurbs.h" #endif - - #ifndef RDEFAULT_MIN1 diff --git a/cad/qcad/files/patch-src_entity_CMakeLists.txt b/cad/qcad/files/patch-src_entity_CMakeLists.txt new file mode 100644 index 000000000000..1f4ca4127b20 --- /dev/null +++ b/cad/qcad/files/patch-src_entity_CMakeLists.txt @@ -0,0 +1,11 @@ +--- src/entity/CMakeLists.txt.orig 2026-05-06 14:27:07 UTC ++++ src/entity/CMakeLists.txt +@@ -121,7 +121,7 @@ target_link_libraries(qcadentity PUBLIC + Qt::Svg + Qt::Xml + qcadcore +- opennurbs ++ OpenNURBS + ) + + if(win32-msvc2010) diff --git a/cad/qcad/files/patch-src_run_CMakeInclude.txt b/cad/qcad/files/patch-src_run_CMakeInclude.txt new file mode 100644 index 000000000000..340400baf4e5 --- /dev/null +++ b/cad/qcad/files/patch-src_run_CMakeInclude.txt @@ -0,0 +1,13 @@ +--- src/run/CMakeInclude.txt.orig 2026-05-06 14:27:07 UTC ++++ src/run/CMakeInclude.txt +@@ -110,8 +110,8 @@ if(NOT r_no_opennurbs) + + if(NOT r_no_opennurbs) + target_link_libraries(${PROJECT_NAME} PRIVATE +- zlib +- opennurbs ++ z ++ OpenNURBS + ) + endif() + diff --git a/cad/qcad/pkg-message b/cad/qcad/pkg-message new file mode 100644 index 000000000000..f287ab13d1cb --- /dev/null +++ b/cad/qcad/pkg-message @@ -0,0 +1,9 @@ +[ +{ type: install + message: <