From d888cae283d82b408a7165160785a5c1201b17c0 Mon Sep 17 00:00:00 2001 From: Michael Reifenberger Date: Mon, 14 Apr 2025 11:42:55 +0200 Subject: [PATCH] cad/openscad: Update to 2025.04.07 Update to a newer snapshot to fix a segfault during runtime. PR: 286074 Reported by: Torfinn Ingolfsen --- cad/openscad/Makefile | 34 +++++++++++-------- cad/openscad/Makefile.git_rev | 8 +++++ cad/openscad/distinfo | 28 ++++++++------- ...atch-cmake_Modules_FindQt6QScintilla.cmake | 10 ++++++ cad/openscad/pkg-plist | 10 ++++-- 5 files changed, 60 insertions(+), 30 deletions(-) create mode 100644 cad/openscad/Makefile.git_rev create mode 100644 cad/openscad/files/patch-cmake_Modules_FindQt6QScintilla.cmake diff --git a/cad/openscad/Makefile b/cad/openscad/Makefile index e4622024957f..4aed6283c2f8 100644 --- a/cad/openscad/Makefile +++ b/cad/openscad/Makefile @@ -1,6 +1,6 @@ PORTNAME= openscad -PORTVERSION= 2024.10.11 -PORTREVISION= 6 +PORTVERSION= ${GIT_SRC_DATE} +#PORTREVISION= 1 CATEGORIES= cad #PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ @@ -16,12 +16,12 @@ WWW= https://www.openscad.org/ BUILD_DEPENDS= cgal>0:math/cgal \ evdev-proto>0:devel/evdev-proto \ ${LOCALBASE}/include/glm/glm.hpp:math/glm \ - ${LOCALBASE}/include/clipper2/clipper.h:cad/Clipper2 \ ${PYTHON_PKGNAMEPREFIX}numpy>0:math/py-numpy@${PY_FLAVOR} + LIB_DEPENDS= libzip.so:archivers/libzip \ libhidapi.so:comms/hidapi \ libboost_regex.so:devel/boost-libs \ - libqscintilla2_qt5.so:devel/qscintilla2@qt5 \ + libqscintilla2_qt6.so:devel/qscintilla2@qt6 \ libopencsg.so:graphics/opencsg \ libgmp.so:math/gmp \ libmpfr.so:math/mpfr \ @@ -33,24 +33,30 @@ LIB_DEPENDS= libzip.so:archivers/libzip \ CONFLICTS= openscad-devel -USES= bison cmake compiler:c++14-lang cpe desktop-file-utils eigen:3 gettext \ - gl gnome pkgconfig python qt:5 shared-mime-info xorg +USES= bison cmake compiler:c++17-lang cpe desktop-file-utils eigen:3 gettext \ + gl gnome pkgconfig python qt:6 shared-mime-info xorg USE_GITHUB= yes USE_GL= gl glu glew USE_GNOME= cairo glib20 libxml2 -USE_QT= buildtools:build core concurrent:build dbus gui multimedia qmake svg widgets +USE_QT= base 5compat multimedia svg tools USE_XORG= x11 -GH_ACCOUNT= microsoft:mimalloc elalish:manifold arsenm:sanitizerscmake openscad:opencsg -GH_PROJECT= MCAD:mcad mimalloc:mimalloc manifold:manifold sanitizers-cmake:sanitizerscmake OpenCSG:opencsg -GH_TAGNAME= 19a4d67 bd0a7ba3f042bfbced5ca1894b236cea08904e26:mcad \ - fe61be8:mimalloc 22c6605:manifold c3dc841:sanitizerscmake 059a173:opencsg +GH_ACCOUNT= microsoft:mimalloc elalish:manifold arsenm:sanitizerscmake \ + openscad:opencsg AngusJohnson:clipper2 +GH_PROJECT= MCAD:mcad mimalloc:mimalloc manifold:manifold sanitizers-cmake:sanitizerscmake \ + OpenCSG:opencsg Clipper2:clipper2 +GH_TAGNAME= ${GIT_SRC_HASH} ${GIT_MCAD_HASH}:mcad \ + ${GIT_CLIPPER2_HASH}:clipper2 ${GIT_OPENCSG_HASH}:opencsg \ + ${GIT_MANIFOLD_HASH}:manifold ${GIT_MIMALLOC_HASH}:mimalloc \ + ${GIT_SANITIZERSCMAKE_HASH}:sanitizerscmake GH_SUBDIR= libraries/MCAD:mcad submodules/mimalloc:mimalloc submodules/manifold:manifold \ - submodules/sanitizers-cmake:sanitizerscmake submodules/OpenCSG:opencsg + submodules/sanitizers-cmake:sanitizerscmake submodules/OpenCSG:opencsg \ + submodules/Clipper2:clipper2 # Avoid overlinking: kvm, procstat, boost(thread, system), Qt5(concurrent, network, printsupport) CFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -Wl,--as-needed -L${LOCALBASE}/lib -#CMAKE_ON= USE_GLAD -#CMAKE_OFF= USE_GLEW +CMAKE_ARGS+= -DUSE_QT6="ON" -DUSE_MIMALLOC="OFF" -DENABLE_CGAL="ON" -DUSE_BUILTIN_OPENCSG="ON" -DENABLE_GLX="ON" -DCMAKE_BUILD_TYPE=Debug + +.include "Makefile.git_rev" .include diff --git a/cad/openscad/Makefile.git_rev b/cad/openscad/Makefile.git_rev new file mode 100644 index 000000000000..ab76943863fa --- /dev/null +++ b/cad/openscad/Makefile.git_rev @@ -0,0 +1,8 @@ +GIT_SRC_HASH= bff822d19ca86e6d39ebd947be6f639e0a680f0f +GIT_SRC_DATE= 2025.04.07 +GIT_MCAD_HASH= 1ea402208c3127ffb443931e9bb1681c191dacca +GIT_CLIPPER2_HASH= 6901921c4be75126d1de60bfd24bd86a61319fd0 +GIT_OPENCSG_HASH= 313018fbf997f484f66cb4a320bbd2abf79a4fc1 +GIT_MANIFOLD_HASH= 7c8fbe186aa1ac5eb73f12c28bdef093ee4d11c9 +GIT_MIMALLOC_HASH= 4cebb48062196625b91c79311f3ff4b22f493d47 +GIT_SANITIZERSCMAKE_HASH= c3dc841af4dbf44669e65b82cb68a575864326bd diff --git a/cad/openscad/distinfo b/cad/openscad/distinfo index 39bc26ab97c4..a8880facc71c 100644 --- a/cad/openscad/distinfo +++ b/cad/openscad/distinfo @@ -1,13 +1,15 @@ -TIMESTAMP = 1728663723 -SHA256 (openscad-openscad-2024.10.11-19a4d67_GH0.tar.gz) = ad9389d3657c9283ef27d03bea25b324bde2b3c87686a65939a6876b39ce58b6 -SIZE (openscad-openscad-2024.10.11-19a4d67_GH0.tar.gz) = 25286240 -SHA256 (microsoft-mimalloc-fe61be8_GH0.tar.gz) = 3669f0f83e3d904cbef5625be2105cb8438428de2e152740220a7acead1b8800 -SIZE (microsoft-mimalloc-fe61be8_GH0.tar.gz) = 1127821 -SHA256 (elalish-manifold-22c6605_GH0.tar.gz) = 896655257392ba1e4976e5e5aca5b75f5755b2822ce636a454b11ef04c358b8a -SIZE (elalish-manifold-22c6605_GH0.tar.gz) = 28752916 -SHA256 (arsenm-sanitizers-cmake-c3dc841_GH0.tar.gz) = bc5cddf6451c3edecc75bf605e7976cb47208d31021db6f5bf99c579efc01f5a -SIZE (arsenm-sanitizers-cmake-c3dc841_GH0.tar.gz) = 7436 -SHA256 (openscad-OpenCSG-059a173_GH0.tar.gz) = d84ec6f6b4857a5563701018673378d630b95702f2706b2a5eb2ab0c64e32da5 -SIZE (openscad-OpenCSG-059a173_GH0.tar.gz) = 299886 -SHA256 (openscad-MCAD-bd0a7ba3f042bfbced5ca1894b236cea08904e26_GH0.tar.gz) = 1f7003bf1bdfe9c7e5898eb5e82c54834b156569e79da97d906f3bbcf7c5549c -SIZE (openscad-MCAD-bd0a7ba3f042bfbced5ca1894b236cea08904e26_GH0.tar.gz) = 58895 +TIMESTAMP = 1744129336 +SHA256 (openscad-openscad-2025.04.07-bff822d19ca86e6d39ebd947be6f639e0a680f0f_GH0.tar.gz) = fd9910c352d233996994ac91658be5dc5ffb74b475f63677926efe7d90f9ecb2 +SIZE (openscad-openscad-2025.04.07-bff822d19ca86e6d39ebd947be6f639e0a680f0f_GH0.tar.gz) = 26331130 +SHA256 (microsoft-mimalloc-4cebb48062196625b91c79311f3ff4b22f493d47_GH0.tar.gz) = 1811a777b83ffa9cb5c2f3c1b2f41b48bd72b6f044812d7ba2c2bacf5e1b8e2c +SIZE (microsoft-mimalloc-4cebb48062196625b91c79311f3ff4b22f493d47_GH0.tar.gz) = 1133506 +SHA256 (elalish-manifold-7c8fbe186aa1ac5eb73f12c28bdef093ee4d11c9_GH0.tar.gz) = 5418524300e37c2edb0de81a2393cd768f631a5de02f68936bc5c42988271813 +SIZE (elalish-manifold-7c8fbe186aa1ac5eb73f12c28bdef093ee4d11c9_GH0.tar.gz) = 29614163 +SHA256 (arsenm-sanitizers-cmake-c3dc841af4dbf44669e65b82cb68a575864326bd_GH0.tar.gz) = 19d511a3a4ddc872c89ab62c070dd8d1fcc733e6ea4655f5876a60237cd556ba +SIZE (arsenm-sanitizers-cmake-c3dc841af4dbf44669e65b82cb68a575864326bd_GH0.tar.gz) = 7433 +SHA256 (openscad-OpenCSG-313018fbf997f484f66cb4a320bbd2abf79a4fc1_GH0.tar.gz) = e6da517ab86422ed822e09c71e1ca6a673149fbbac50e7f3cb94f2daa3f7999d +SIZE (openscad-OpenCSG-313018fbf997f484f66cb4a320bbd2abf79a4fc1_GH0.tar.gz) = 302671 +SHA256 (AngusJohnson-Clipper2-6901921c4be75126d1de60bfd24bd86a61319fd0_GH0.tar.gz) = d4ba8b5a927caab6e2b3d07d9becd5bf3775489494fd84251e7d288e3b43ae4b +SIZE (AngusJohnson-Clipper2-6901921c4be75126d1de60bfd24bd86a61319fd0_GH0.tar.gz) = 621021 +SHA256 (openscad-MCAD-1ea402208c3127ffb443931e9bb1681c191dacca_GH0.tar.gz) = 3d04077d369814638c3f018fecc39439011a47f545026f43c1a465bce1773f57 +SIZE (openscad-MCAD-1ea402208c3127ffb443931e9bb1681c191dacca_GH0.tar.gz) = 56943 diff --git a/cad/openscad/files/patch-cmake_Modules_FindQt6QScintilla.cmake b/cad/openscad/files/patch-cmake_Modules_FindQt6QScintilla.cmake new file mode 100644 index 000000000000..9a8b48e60ebd --- /dev/null +++ b/cad/openscad/files/patch-cmake_Modules_FindQt6QScintilla.cmake @@ -0,0 +1,10 @@ +--- cmake/Modules/FindQt6QScintilla.cmake.orig 2025-04-09 09:33:16 UTC ++++ cmake/Modules/FindQt6QScintilla.cmake +@@ -50,6 +50,7 @@ set ( QT6QSCINTILLA_INCLUDE_DIRS ${QT6QSCINTILLA_INCLU + ) + + set ( QT6QSCINTILLA_INCLUDE_DIRS ${QT6QSCINTILLA_INCLUDE_DIR} ) ++set (Qt6Widgets_LIBRARIES /usr/local/lib/qt6 /usr/local/lib /usr/lib ) + + # version + set ( _VERSION_FILE ${QT6QSCINTILLA_INCLUDE_DIR}/qsciglobal.h ) diff --git a/cad/openscad/pkg-plist b/cad/openscad/pkg-plist index ffee6166f86d..5c654739604f 100644 --- a/cad/openscad/pkg-plist +++ b/cad/openscad/pkg-plist @@ -38,6 +38,7 @@ share/mime/packages/openscad.xml %%DATADIR%%/examples/Advanced/assert.scad %%DATADIR%%/examples/Advanced/children.scad %%DATADIR%%/examples/Advanced/children_indexed.scad +%%DATADIR%%/examples/Advanced/example-dir.json %%DATADIR%%/examples/Advanced/module_recursion.scad %%DATADIR%%/examples/Advanced/offset.scad %%DATADIR%%/examples/Advanced/surface_image.png @@ -45,6 +46,7 @@ share/mime/packages/openscad.xml %%DATADIR%%/examples/Basics/CSG-modules.scad %%DATADIR%%/examples/Basics/CSG.scad %%DATADIR%%/examples/Basics/LetterBlock.scad +%%DATADIR%%/examples/Basics/example-dir.json %%DATADIR%%/examples/Basics/hull.scad %%DATADIR%%/examples/Basics/linear_extrude.scad %%DATADIR%%/examples/Basics/logo.scad @@ -56,6 +58,7 @@ share/mime/packages/openscad.xml %%DATADIR%%/examples/Basics/text_on_cube.scad %%DATADIR%%/examples/COPYING-CC0.txt %%DATADIR%%/examples/Functions/echo.scad +%%DATADIR%%/examples/Functions/example-dir.json %%DATADIR%%/examples/Functions/functions.scad %%DATADIR%%/examples/Functions/list_comprehensions.scad %%DATADIR%%/examples/Functions/polygon_areas.scad @@ -93,9 +96,9 @@ share/mime/packages/openscad.xml %%DATADIR%%/examples/Old/example024.scad %%DATADIR%%/examples/Parametric/candleStand.json %%DATADIR%%/examples/Parametric/candleStand.scad +%%DATADIR%%/examples/Parametric/example-dir.json %%DATADIR%%/examples/Parametric/sign.json %%DATADIR%%/examples/Parametric/sign.scad -%%DATADIR%%/examples/examples.json %%DATADIR%%/fonts/05-osx-fonts.conf %%DATADIR%%/fonts/10-liberation.conf %%DATADIR%%/fonts/Liberation-2.00.1/AUTHORS @@ -180,8 +183,9 @@ share/mime/packages/openscad.xml %%DATADIR%%/locale/zh_TW/LC_MESSAGES/openscad.mo %%DATADIR%%/shaders/MouseSelector.frag %%DATADIR%%/shaders/MouseSelector.vert -%%DATADIR%%/shaders/Preview.frag -%%DATADIR%%/shaders/Preview.vert +%%DATADIR%%/shaders/OpenCSG.vert +%%DATADIR%%/shaders/ViewEdges.frag +%%DATADIR%%/shaders/ViewEdges.vert %%DATADIR%%/templates/CC0.json %%DATADIR%%/templates/difference.json %%DATADIR%%/templates/for.json