From nobody Sun Oct 13 11:28:40 2024 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XRJ5j0NQbz5YpDD; Sun, 13 Oct 2024 11:28:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XRJ5h6zhGz4q65; Sun, 13 Oct 2024 11:28:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728818921; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vfMWVg4pBKLXj6JtW0frGRINkof9z97amlZIytLzDpQ=; b=yIo5k9m6eDJqoCPE0KBIo1Tix/GqsXnhKzhI9ybmPp/JOTHPDDE8brRF66xOqsFt2cgpCe mIfnbBeHLhAUS9iadpMQnlo1YW7rsLxPSF1UMeGzW5JX4UrRd6xn47LyQ1muocdB4CMVU8 EQ3JUSPny0fzZahU9nFNU/CGPUtfUJn6cZKW7bxT2ipSFv4yQ7hxhdjTbtnRCgNX61tIX1 aSPJsV4criLWWHpJrC2Uh/Dxrwj6ooiTt4mKg9zXwBbwRmU2LkOE2q5HvQk8wk9URnFk+M 8IUsJqXEPzpUG5Ur1bl1X/V7V4aF/Ye39Z35R1s2VYl+NhMmSzh4ZBQNwav3sQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728818921; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vfMWVg4pBKLXj6JtW0frGRINkof9z97amlZIytLzDpQ=; b=Whi37Czgq9ZHjQF65+Dhzq7M0ZYeIWIaAOi3wTCCdYtCf+5OUkJ/4N21Mzq3B9aGDMuc6G EqKPGvYdiAOC4jtzY4eYftXJ/JPgJmAbi1hb2/OlGds8wVkflc7eT2lcxVkkOHlT0wwzED hLFzXQ+BqHTEfkQENqkY+5ekv3dJCOKkPf7PXrnlRyNeTBjRTf1PH8y55KOe1MU+fUIdGW LV1fjuqNWP5jWJR8Bq4NTeEpji21a142OwLOCslS3mBz7J4vlAZyDITzHuMb1rIEPI8xSk dRjHuir8JcOrh5NtbrnheSettL8CkwUI2eG+/SXY/p1vwTQtKmQNMo7BI+dt2g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728818921; a=rsa-sha256; cv=none; b=dhh4FWBhI67nmifSMDr5OnYTHXWVShRiUMXMVtz1ayojUaXdMEaCXxbNOgu2zvUetHjR3r fwAf4aoCS2e0WFkDC4HchjHYKd5yPH6ttluwFJ6iLS/VfOasaFUYxZ3WCZa3Q28N4Qkky7 MJE2vm3dToWeYQ248lo9Fgb/BmMS9Vnsse7GkxIMbcv1BuOz6yE0sbedZFoD0myv54bQaE St15ZNN85gZ8Xxm82PZPjqh2FYc+ALoXkxJnMKAVAknV9U1sekHtaD9YlKhfuGCFZgTi0i WBJky28Z3YKCKoB7Qhayky7ASuFTVwHrOlLqNLJPXZ3GoyWbt7kbYKlOanF9pg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XRJ5h6JwGzrxk; Sun, 13 Oct 2024 11:28:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49DBSeM7010454; Sun, 13 Oct 2024 11:28:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49DBSe7H010451; Sun, 13 Oct 2024 11:28:40 GMT (envelope-from git) Date: Sun, 13 Oct 2024 11:28:40 GMT Message-Id: <202410131128.49DBSe7H010451@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Michael Reifenberger Subject: git: 18017953fde7 - main - cad/openscad: Update List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mr X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 18017953fde7a222042654d5f8b0b1a4dc54cecb Auto-Submitted: auto-generated The branch main has been updated by mr: URL: https://cgit.FreeBSD.org/ports/commit/?id=18017953fde7a222042654d5f8b0b1a4dc54cecb commit 18017953fde7a222042654d5f8b0b1a4dc54cecb Author: Michael Reifenberger AuthorDate: 2024-10-13 11:25:06 +0000 Commit: Michael Reifenberger CommitDate: 2024-10-13 11:28:21 +0000 cad/openscad: Update Unbreak and update to a more recent snapshot 2024.10.11 --- cad/openscad/Makefile | 49 +++++++++++++--------- cad/openscad/distinfo | 16 ++++--- .../patch-cmake_Modules_FindQt5QScintilla.cmake | 10 +++++ cad/openscad/files/patch-src_handle__dep.cc | 13 ------ cad/openscad/pkg-plist | 4 +- 5 files changed, 54 insertions(+), 38 deletions(-) diff --git a/cad/openscad/Makefile b/cad/openscad/Makefile index bf5476cd03ff..b3ed4fe0af64 100644 --- a/cad/openscad/Makefile +++ b/cad/openscad/Makefile @@ -1,19 +1,23 @@ PORTNAME= openscad -DISTVERSION= 2021.01.01-20221206 -PORTREVISION= 5 +PORTVERSION= 2024.10.11 +#PORTREVISION= 1 CATEGORIES= cad +#PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ +#PATCHFILES+= cc49ad8dac24.patch:-p1 + MAINTAINER= mr@FreeBSD.org COMMENT= Programmer's solid 3D CAD modeller #' -WWW= https://openscad.org/ +WWW= https://www.openscad.org/ LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/COPYING -BROKEN= fails to build with boost-1.85+ - BUILD_DEPENDS= cgal>0:math/cgal \ - ${LOCALBASE}/include/linux/input.h:devel/evdev-proto + 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 \ @@ -24,25 +28,32 @@ LIB_DEPENDS= libzip.so:archivers/libzip \ libfreetype.so:print/freetype2 \ libharfbuzz.so:print/harfbuzz \ libfontconfig.so:x11-fonts/fontconfig \ - libdouble-conversion.so:devel/double-conversion + libdouble-conversion.so:devel/double-conversion \ + libasound_module_pcm_oss.so:audio/alsa-plugins \ + libtbb.so:devel/onetbb + +CONFLICTS= openscad-devel USES= bison cmake compiler:c++14-lang cpe desktop-file-utils eigen:3 gettext \ - gl gnome localbase:ldflags pkgconfig qt:5 shared-mime-info xorg + gl gnome pkgconfig python qt:5 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 network svg widgets qmake:build +USE_QT= buildtools:build core concurrent:build dbus gui multimedia qmake svg widgets USE_XORG= x11 -QMAKE_ARGS= CONFIG+="experimental" VERSION=${PORTVERSION} +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_SUBDIR= libraries/MCAD:mcad submodules/mimalloc:mimalloc submodules/manifold:manifold \ + submodules/sanitizers-cmake:sanitizerscmake submodules/OpenCSG:opencsg # Avoid overlinking: kvm, procstat, boost(thread, system), Qt5(concurrent, network, printsupport) -LDFLAGS+= -Wl,--as-needed - -USE_GITHUB= yes -GH_TAGNAME= 972d184 -GH_TUPLE= openscad:MCAD:1ea4022:MCAD/libraries/MCAD \ - microsoft:mimalloc:fe61be8:mimalloc/submodules/mimalloc +CFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -Wl,--as-needed -L${LOCALBASE}/lib -CMAKE_ARGS= -DQT5QSCINTILLA_LIBRARY=/usr/local/lib/qt5/libqscintilla2_qt5.so +.include -CONFLICTS_INSTALL= openscad-devel # bin/openscad +do-install: + ${CMAKE_BIN} --install ${BUILD_WRKSRC} --prefix ${STAGEDIR}${PREFIX} -.include +.include diff --git a/cad/openscad/distinfo b/cad/openscad/distinfo index ba528d6c84ba..39bc26ab97c4 100644 --- a/cad/openscad/distinfo +++ b/cad/openscad/distinfo @@ -1,7 +1,13 @@ -TIMESTAMP = 1671494678 -SHA256 (openscad-openscad-2021.01.01-20221206-972d184_GH0.tar.gz) = fc6a33395cdebbe457489d0593548c19abfc53ad15aef771c31e3f84f1615b35 -SIZE (openscad-openscad-2021.01.01-20221206-972d184_GH0.tar.gz) = 23120895 -SHA256 (openscad-MCAD-1ea4022_GH0.tar.gz) = c32e9ebb29b7fff12de408d76258f109b37001740a6f76a2f65b0792e32890d1 -SIZE (openscad-MCAD-1ea4022_GH0.tar.gz) = 56897 +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 diff --git a/cad/openscad/files/patch-cmake_Modules_FindQt5QScintilla.cmake b/cad/openscad/files/patch-cmake_Modules_FindQt5QScintilla.cmake new file mode 100644 index 000000000000..e9b1a9fac601 --- /dev/null +++ b/cad/openscad/files/patch-cmake_Modules_FindQt5QScintilla.cmake @@ -0,0 +1,10 @@ +--- cmake/Modules/FindQt5QScintilla.cmake.orig 2021-10-23 02:33:13 UTC ++++ cmake/Modules/FindQt5QScintilla.cmake +@@ -50,6 +50,7 @@ find_path ( QT5QSCINTILLA_INCLUDE_DIR + ) + + set ( QT5QSCINTILLA_INCLUDE_DIRS ${QT5QSCINTILLA_INCLUDE_DIR} ) ++set (Qt5Widgets_LIBRARIES /usr/local/lib/qt5 /usr/local/lib /usr/lib ) + + # version + set ( _VERSION_FILE ${QT5QSCINTILLA_INCLUDE_DIR}/qsciglobal.h ) diff --git a/cad/openscad/files/patch-src_handle__dep.cc b/cad/openscad/files/patch-src_handle__dep.cc deleted file mode 100644 index 8fabaa4e3524..000000000000 --- a/cad/openscad/files/patch-src_handle__dep.cc +++ /dev/null @@ -1,13 +0,0 @@ -- https://github.com/openscad/openscad/issues/4453 - ---- src/handle_dep.cc.orig 2022-12-20 00:11:57 UTC -+++ src/handle_dep.cc -@@ -9,6 +9,8 @@ - #include - namespace fs = boost::filesystem; - -+#include -+ - std::unordered_set dependencies; - const char *make_command = nullptr; - diff --git a/cad/openscad/pkg-plist b/cad/openscad/pkg-plist index 288770b9a318..ffee6166f86d 100644 --- a/cad/openscad/pkg-plist +++ b/cad/openscad/pkg-plist @@ -22,10 +22,12 @@ share/mime/packages/openscad.xml %%DATADIR%%/color-schemes/readme.txt %%DATADIR%%/color-schemes/render/beforedawn.json %%DATADIR%%/color-schemes/render/clearsky.json +%%DATADIR%%/color-schemes/render/daylight-gem.json %%DATADIR%%/color-schemes/render/deepocean.json %%DATADIR%%/color-schemes/render/metallic.json %%DATADIR%%/color-schemes/render/monotone.json %%DATADIR%%/color-schemes/render/nature.json +%%DATADIR%%/color-schemes/render/nocturnal-gem.json %%DATADIR%%/color-schemes/render/solarized.json %%DATADIR%%/color-schemes/render/starnight.json %%DATADIR%%/color-schemes/render/sunset.json @@ -169,6 +171,7 @@ share/mime/packages/openscad.xml %%DATADIR%%/locale/es/LC_MESSAGES/openscad.mo %%DATADIR%%/locale/fr/LC_MESSAGES/openscad.mo %%DATADIR%%/locale/hy/LC_MESSAGES/openscad.mo +%%DATADIR%%/locale/ka/LC_MESSAGES/openscad.mo %%DATADIR%%/locale/pl/LC_MESSAGES/openscad.mo %%DATADIR%%/locale/ru/LC_MESSAGES/openscad.mo %%DATADIR%%/locale/tr/LC_MESSAGES/openscad.mo @@ -186,4 +189,3 @@ share/mime/packages/openscad.xml %%DATADIR%%/templates/module.json %%DATADIR%%/templates/rotate.json %%DATADIR%%/templates/translate.json -@dir %%DATADIR%%/libraries/MCAD