git: 42871a5f620e - main - cad/openscad-devel: Update to 2025.04.07

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Michael Reifenberger <mr_at_FreeBSD.org>
Date: Sun, 13 Apr 2025 10:50:15 UTC
The branch main has been updated by mr:

URL: https://cgit.FreeBSD.org/ports/commit/?id=42871a5f620eacdcf1b52aeeb11dcc4e938d8d2b

commit 42871a5f620eacdcf1b52aeeb11dcc4e938d8d2b
Author:     Michael Reifenberger <mr@FreeBSD.org>
AuthorDate: 2025-04-13 10:45:33 +0000
Commit:     Michael Reifenberger <mr@FreeBSD.org>
CommitDate: 2025-04-13 10:49:55 +0000

    cad/openscad-devel: Update to 2025.04.07
    
    Update to 2025.04.07 switch to qt6 and disable mimalloc.
    Hopefully fixes segfaults as described in PR
    
    PR:             286074
---
 cad/openscad-devel/Makefile                            | 12 ++++++++----
 cad/openscad-devel/Makefile.git_rev                    | 10 +++++-----
 cad/openscad-devel/distinfo                            | 18 +++++++++---------
 .../files/patch-cmake_Modules_FindQt6QScintilla.cmake  | 10 ++++++++++
 cad/openscad-devel/pkg-plist                           |  6 +++++-
 5 files changed, 37 insertions(+), 19 deletions(-)

diff --git a/cad/openscad-devel/Makefile b/cad/openscad-devel/Makefile
index 212c5b3863c5..ce24f14bc99b 100644
--- a/cad/openscad-devel/Makefile
+++ b/cad/openscad-devel/Makefile
@@ -19,10 +19,12 @@ BUILD_DEPENDS=	cgal>0:math/cgal \
 		evdev-proto>0:devel/evdev-proto \
 		${LOCALBASE}/include/glm/glm.hpp:math/glm \
 		${PYTHON_PKGNAMEPREFIX}numpy>0:math/py-numpy@${PY_FLAVOR}
+#libqscintilla2_qt5.so:devel/qscintilla2@qt5 \
+
 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 \
@@ -34,12 +36,13 @@ LIB_DEPENDS=	libzip.so:archivers/libzip \
 
 CONFLICTS=	openscad
 
-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=		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 AngusJohnson:clipper2
@@ -57,6 +60,7 @@ CFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-Wl,--as-needed -L${LOCALBASE}/lib
 #CMAKE_OFF=	USE_GLAD:BOOL=OFF
 #CMAKE_ON=	USE_GLEW:BOOL=ON
+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"
 
diff --git a/cad/openscad-devel/Makefile.git_rev b/cad/openscad-devel/Makefile.git_rev
index a17dfa77f135..ab76943863fa 100644
--- a/cad/openscad-devel/Makefile.git_rev
+++ b/cad/openscad-devel/Makefile.git_rev
@@ -1,8 +1,8 @@
-GIT_SRC_HASH=  1308a7d476facb466bf9fae1e77666c35c8e3c8f
-GIT_SRC_DATE=  2025.02.08
+GIT_SRC_HASH=  bff822d19ca86e6d39ebd947be6f639e0a680f0f
+GIT_SRC_DATE=  2025.04.07
 GIT_MCAD_HASH= 1ea402208c3127ffb443931e9bb1681c191dacca
 GIT_CLIPPER2_HASH= 6901921c4be75126d1de60bfd24bd86a61319fd0
-GIT_OPENCSG_HASH= 60528589443b5543e72ba0056a3f2a91190b5e8d
-GIT_MANIFOLD_HASH= 98b8142519d35c13e0e25cfa9fd6e3a271403be6
-GIT_MIMALLOC_HASH= fe61be80bf8942e764e18d469e96f8dacab44728
+GIT_OPENCSG_HASH= 313018fbf997f484f66cb4a320bbd2abf79a4fc1
+GIT_MANIFOLD_HASH= 7c8fbe186aa1ac5eb73f12c28bdef093ee4d11c9
+GIT_MIMALLOC_HASH= 4cebb48062196625b91c79311f3ff4b22f493d47
 GIT_SANITIZERSCMAKE_HASH= c3dc841af4dbf44669e65b82cb68a575864326bd
diff --git a/cad/openscad-devel/distinfo b/cad/openscad-devel/distinfo
index 3819415726be..a8880facc71c 100644
--- a/cad/openscad-devel/distinfo
+++ b/cad/openscad-devel/distinfo
@@ -1,14 +1,14 @@
-TIMESTAMP = 1739032512
-SHA256 (openscad-openscad-2025.02.08-1308a7d476facb466bf9fae1e77666c35c8e3c8f_GH0.tar.gz) = 7cef8f72ec648affa962e4bc8a1e2e5a96db0a040abc6386bbe4d4d4a781f013
-SIZE (openscad-openscad-2025.02.08-1308a7d476facb466bf9fae1e77666c35c8e3c8f_GH0.tar.gz) = 25552843
-SHA256 (microsoft-mimalloc-fe61be80bf8942e764e18d469e96f8dacab44728_GH0.tar.gz) = 414f9abb64d692a59c91132695e9cf01c2ded2d05f57aca4a597cf3e746fb191
-SIZE (microsoft-mimalloc-fe61be80bf8942e764e18d469e96f8dacab44728_GH0.tar.gz) = 1128112
-SHA256 (elalish-manifold-98b8142519d35c13e0e25cfa9fd6e3a271403be6_GH0.tar.gz) = 3555c55d5e4596396cb72d112ae81b796c19ce777da1874f315ac859dd5b91bd
-SIZE (elalish-manifold-98b8142519d35c13e0e25cfa9fd6e3a271403be6_GH0.tar.gz) = 29248651
+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-60528589443b5543e72ba0056a3f2a91190b5e8d_GH0.tar.gz) = 9d3951a20552b4cfc7c6406ede487c81e95a21149d0531cfb80dd1bcc42463dc
-SIZE (openscad-OpenCSG-60528589443b5543e72ba0056a3f2a91190b5e8d_GH0.tar.gz) = 303319
+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
diff --git a/cad/openscad-devel/files/patch-cmake_Modules_FindQt6QScintilla.cmake b/cad/openscad-devel/files/patch-cmake_Modules_FindQt6QScintilla.cmake
new file mode 100644
index 000000000000..9a8b48e60ebd
--- /dev/null
+++ b/cad/openscad-devel/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-devel/pkg-plist b/cad/openscad-devel/pkg-plist
index 750347b96f7c..5c654739604f 100644
--- a/cad/openscad-devel/pkg-plist
+++ b/cad/openscad-devel/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,6 +183,7 @@ share/mime/packages/openscad.xml
 %%DATADIR%%/locale/zh_TW/LC_MESSAGES/openscad.mo
 %%DATADIR%%/shaders/MouseSelector.frag
 %%DATADIR%%/shaders/MouseSelector.vert
+%%DATADIR%%/shaders/OpenCSG.vert
 %%DATADIR%%/shaders/ViewEdges.frag
 %%DATADIR%%/shaders/ViewEdges.vert
 %%DATADIR%%/templates/CC0.json