Skip to Content.
Sympa Menu

sm-commit - [[SM-Commit] ] GIT changes to master grimoire by Ismael Luceno (fbeee939802d078dd8a164f40e1f2f9df1790c3a)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Ismael Luceno <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org, sm-commit AT lists.sourcemage.org
  • Subject: [[SM-Commit] ] GIT changes to master grimoire by Ismael Luceno (fbeee939802d078dd8a164f40e1f2f9df1790c3a)
  • Date: Thu, 2 Jan 2025 22:35:36 +0000

GIT changes to master grimoire by Ismael Luceno <ismael AT sourcemage.org>:

science/cgal/DETAILS | 4 +-
science/cgal/HISTORY | 3 +
science/openscad/DEPENDS | 49
++++++++++++++----------------
science/openscad/HISTORY | 4 ++
science/openscad/patches/boost-1.87.patch | 28 +++++++++++++++++
5 files changed, 60 insertions(+), 28 deletions(-)

New commits:
commit fbeee939802d078dd8a164f40e1f2f9df1790c3a
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

openscad: Fixed build against Boost 1.87

commit 1b7d29a4fed1aa80a3794b3353622b4d72ac6711
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

cgal 5.5.5

diff --git a/science/cgal/DETAILS b/science/cgal/DETAILS
index 990aeff..e955753 100755
--- a/science/cgal/DETAILS
+++ b/science/cgal/DETAILS
@@ -1,10 +1,10 @@
source $GRIMOIRE/CMAKE_FUNCTIONS
SPELL=cgal
SPELLX=CGAL
- VERSION=5.5.1
+ VERSION=5.5.5
SOURCE="${SPELLX}-${VERSION}.tar.xz"

SOURCE_URL[0]=https://github.com/$SPELLX/cgal/releases/download/v${VERSION}/${SOURCE}
-
SOURCE_HASH=sha512:952ba892d5819b19c310b36ebb32d4f690eb8130bd3f1026b0114159191fc6ff0b88b96338e89319759bfddd4d9d711712a10ab81d4e29892889688fc7374f5e
+
SOURCE_HASH=sha512:3127c162cf8897bbfc27a7d2a8e874deefb4f557b918a004df842ba5f72a8826f53565531cf09a038e56dadef53914c41b299f8275a85da79d4339016bb09a08
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELLX}-${VERSION}"
WEB_SITE="https://www.cgal.org";
LICENSE[0]=GPL
diff --git a/science/cgal/HISTORY b/science/cgal/HISTORY
index 1703a8e..a598a37 100644
--- a/science/cgal/HISTORY
+++ b/science/cgal/HISTORY
@@ -1,3 +1,6 @@
+2025-01-02 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: updated spell to 5.5.5
+
2023-01-14 Florian Franzmann <bwlf AT bandrate.org>
* DETAILS: version 5.5.1

diff --git a/science/openscad/DEPENDS b/science/openscad/DEPENDS
index e9d9303..78fc2d5 100755
--- a/science/openscad/DEPENDS
+++ b/science/openscad/DEPENDS
@@ -1,30 +1,27 @@
-depends gcc &&
-depends qtbase &&
-depends qtmultimedia &&
-depends qscintilla &&
-depends cgal &&
-depends gmp &&
-depends mpfr &&
-depends boost &&
-# "-DBoost_USE_STATIC_LIBS=OFF
-DBOOST_INCLUDEDIR=${INSTALL_ROOT}/usr/include
-DBOOST_LIBRARYDIR=${INSTALL_ROOT}/usr/lib" &&
-sub_depends boost FILESYSTEM &&
-sub_depends boost SYSTEM &&
-sub_depends boost THREAD &&
-sub_depends boost REGEX &&
-sub_depends boost PROGRAM_OPTIONS &&
+. "$GRIMOIRE"/VDEPENDS &&
+vdepends << ! &&
+ PKG-CONFIG
+ bison
+ boost[FILESYSTEM,PROGRAM_OPTIONS,REGEX,SYSTEM,THREAD]
+ cgal >= 5.5.5
+ double-conversion
+ eigen3
+ flex
+ fontconfig
+ freetype2
+ gcc
+ glew
+ glib2
+ gmp
+ harfbuzz
+ libzip
+ mpfr
+ opencsg
+ qscintilla
+ qtbase
+ qtmultimedia
+!

-depends opencsg &&
-depends glew &&
-depends eigen3 &&
-depends glib2 &&
-depends fontconfig &&
-depends freetype2 &&
-depends harfbuzz &&
-depends libzip &&
-depends bison &&
-depends flex &&
-depends PKG-CONFIG &&
-depends double-conversion &&
optional_depends lib3mf \
'' \
-DCMAKE_DISABLE_FIND_PACKAGE_LIB3MF=TRUE \
diff --git a/science/openscad/HISTORY b/science/openscad/HISTORY
index e287aa5..bb90e15 100644
--- a/science/openscad/HISTORY
+++ b/science/openscad/HISTORY
@@ -1,3 +1,7 @@
+2025-01-02 Ismael Luceno <ismael AT sourcemage.org>
+ * patches/boost-1.87.patch: fixed build against boost 1.87.
+ * DEPENDS: made use of vdepends; cgal >= 5.5.5
+
2023-01-14 Florian Franzmann <bwlf AT bandrate.org>
* PRE_BUILD, patches/{
0000-CVE-2022-0497.patch,
diff --git a/science/openscad/patches/boost-1.87.patch
b/science/openscad/patches/boost-1.87.patch
new file mode 100644
index 0000000..da28ec5
--- /dev/null
+++ b/science/openscad/patches/boost-1.87.patch
@@ -0,0 +1,28 @@
+From cc51ea0a0dd14075df0f9af09ed4e20cce7fcb4c Mon Sep 17 00:00:00 2001
+From: Guenther Sohler <guenther.sohler AT photeon.com>
+Date: Thu, 22 Dec 2022 08:21:41 +0100
+Subject: [PATCH] fixed small compiler warning
+
+[ismael AT sorcemage.org: this became a build error with boost 1.87]
+Upstream-Status: Backport
+Signed-off-by: Ismael Luceno <ismael AT sourcemage.org>
+---
+ src/FileModule.cc | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/usr/src/openscad-2021.01/src/FileModule.cc b/FileModule.cc
+index ce57b1fac024..71e343cd7abb 100644
+--- a/src/FileModule.cc
++++ b/src/FileModule.cc
+@@ -65,7 +65,7 @@ void FileModule::registerUse(const std::string path, const
Location &loc)
+ auto ext = fs::path(path).extension().generic_string();
+
+ if (boost::iequals(ext, ".otf") || boost::iequals(ext, ".ttf")) {
+- if (fs::is_regular(path)) {
++ if (fs::is_regular_file(path)) {
+ FontCache::instance()->register_font_file(path);
+ } else {
+ LOG(message_group::Error,Location::NONE,"","Can't
read font with path '%1$s'",path);
+--
+2.47.1
+


  • [[SM-Commit] ] GIT changes to master grimoire by Ismael Luceno (fbeee939802d078dd8a164f40e1f2f9df1790c3a), Ismael Luceno, 01/02/2025

Archive powered by MHonArc 2.6.24.

Top of Page