Skip to Content.
Sympa Menu

sm-commit - [[SM-Commit] ] GIT changes to master grimoire by Treeve Jelbert (b81652f9101745c494a5696f39b680e416ecf7b9)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Treeve Jelbert <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 Treeve Jelbert (b81652f9101745c494a5696f39b680e416ecf7b9)
  • Date: Tue, 26 Aug 2025 14:36:33 +0000

GIT changes to master grimoire by Treeve Jelbert <treeve AT sourcemage.org>:

libs/boost/DETAILS | 4 ++--
libs/boost/HISTORY | 3 +++
libs/ixion/HISTORY | 3 +++
libs/ixion/PRE_BUILD | 4 ++++
libs/ixion/patches/filesys.diff | 33 +++++++++++++++++++++++++++++++++
libs/ixion/patches/m4.diff | 23 +++++++++++++++++++++++
libs/libwps/BUILD | 3 ---
libs/libwps/DEPENDS | 2 +-
libs/libwps/HISTORY | 4 ++++
libs/orcus/DETAILS | 4 ++--
libs/orcus/HISTORY | 3 +++
11 files changed, 78 insertions(+), 8 deletions(-)

New commits:
commit b81652f9101745c494a5696f39b680e416ecf7b9
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

libwps - fixes

commit 9de886a68ed46899185cc7f0431185995363a19c
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

orcus: => 0.20.2

commit 1ae31c90500a823691a19d2e8b2848794103b340
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

ixion - fix for boost-1.89

commit 60e2a33e00a2a48571a19d048d7df4249b541b5d
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

boost: => 1.89.0

diff --git a/libs/boost/DETAILS b/libs/boost/DETAILS
index eaa4565..7f30cfd 100755
--- a/libs/boost/DETAILS
+++ b/libs/boost/DETAILS
@@ -1,6 +1,6 @@
SPELL=boost
- VERSION=1.88.0
-
SOURCE_HASH="sha256:46d9d2c06637b219270877c9e16155cbd015b6dc84349af064c088e9b5b12f7b:UPSTREAM_HASH"
+ VERSION=1.89.0
+
SOURCE_HASH="sha256:85a33fa22621b4f314f8e85e1a5e2a9363d22e4f4992925d4bb3bc631b5a0c7a:UPSTREAM_HASH"
SECURITY_PATCH=1
SOURCE=${SPELL}_${VERSION//./_}.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/${SPELL}_${VERSION//./_}
diff --git a/libs/boost/HISTORY b/libs/boost/HISTORY
index 103aee0..be7f693 100644
--- a/libs/boost/HISTORY
+++ b/libs/boost/HISTORY
@@ -1,3 +1,6 @@
+2025-08-26 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.89.0
+
2025-04-11 Pavel Vinogradov <public AT sourcemage.org>
* DETAILS: version 1.88.0, updated SOURCE_URL

diff --git a/libs/ixion/HISTORY b/libs/ixion/HISTORY
index 058db31..47cb851 100644
--- a/libs/ixion/HISTORY
+++ b/libs/ixion/HISTORY
@@ -1,3 +1,6 @@
+2025-08-26 Treeve Jelbert <treeve AT sourcemage.org>
+ * PRE_BUILD patthes/*: added, fix for boost-1.89
+
2025-02-24 Ismael Luceno <ismael AT sourcemage.org>
* DEPENDS: depends on mdds >= 3.0

diff --git a/libs/ixion/PRE_BUILD b/libs/ixion/PRE_BUILD
new file mode 100755
index 0000000..8502e22
--- /dev/null
+++ b/libs/ixion/PRE_BUILD
@@ -0,0 +1,4 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+apply_patch_dir patches &&
+autoreconf -sf
diff --git a/libs/ixion/patches/filesys.diff b/libs/ixion/patches/filesys.diff
new file mode 100644
index 0000000..ebe3c9a
--- /dev/null
+++ b/libs/ixion/patches/filesys.diff
@@ -0,0 +1,33 @@
+diff --git a/configure.ac b/configure.ac
+index
7dff9a01a8ef28c88bc76b81568262646ff80995..ef9f5ecdcf68fef4093978cf042ee3734df7d45e
100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -113,7 +113,6 @@ AC_CHECK_SIZEOF([void *])
+ CXXFLAGS="$CXXFLAGS -DSIZEOF_VOID_P=$ac_cv_sizeof_void_p"
+
+ BOOST_REQUIRE([1.36])
+-BOOST_FILESYSTEM
+
+ # =====
+ # Debug
+diff --git a/src/libixion/module.cpp b/src/libixion/module.cpp
+index
b6a4dfff3df7c24283c6b49e55fce7ac6dfb1c6b..7bdf32cbde2979328ec58b3eebf449996d3479d5
100644
+--- a/src/libixion/module.cpp
++++ b/src/libixion/module.cpp
+@@ -10,7 +10,6 @@
+ #include "ixion/compute_engine.hpp"
+ #include <sstream>
+ #include <vector>
+-#include <boost/filesystem.hpp>
+
+ #ifdef _WIN32
+ #include <windows.h>
+@@ -18,8 +17,6 @@
+ #include <dlfcn.h>
+ #endif
+
+-namespace fs = boost::filesystem;
+-
+ namespace ixion { namespace draft {
+
+ namespace {
diff --git a/libs/ixion/patches/m4.diff b/libs/ixion/patches/m4.diff
new file mode 100644
index 0000000..c8efbe8
--- /dev/null
+++ b/libs/ixion/patches/m4.diff
@@ -0,0 +1,23 @@
+diff --git a/m4/boost.m4 b/m4/boost.m4
+index
706035d31c9aefcba52ceacb839ab2f3ee0168d5..342516e445312787f87a88742c23c603c2d22a12
100644
+--- a/m4/boost.m4
++++ b/m4/boost.m4
+@@ -1332,11 +1332,16 @@ BOOST_DEFUN([String_Algo],
+ # --------------------------------
+ # Look for Boost.System. For the documentation of PREFERRED-RT-OPT, see the
+ # documentation of BOOST_FIND_LIB above. This library was introduced in
Boost
+-# 1.35.0.
++# 1.35.0 and is header only since 1.70.
+ BOOST_DEFUN([System],
+-[BOOST_FIND_LIB([system], [$1],
++[
++if test $boost_major_version -ge 170; then
++ BOOST_FIND_HEADER([boost/system/error_code.hpp])
++else
++ BOOST_FIND_LIB([system], [$1],
+ [boost/system/error_code.hpp],
+ [boost::system::error_code e; e.clear();], [], [], [$2])
++fi
+ ])# BOOST_SYSTEM
+
+
diff --git a/libs/libwps/BUILD b/libs/libwps/BUILD
deleted file mode 100755
index ba514da..0000000
--- a/libs/libwps/BUILD
+++ /dev/null
@@ -1,3 +0,0 @@
-LDFLAGS+=' -lboost_system' &&
-OPTS+=' --disable-werror' &&
-default_build
diff --git a/libs/libwps/DEPENDS b/libs/libwps/DEPENDS
index 58235e0..aaa03de 100755
--- a/libs/libwps/DEPENDS
+++ b/libs/libwps/DEPENDS
@@ -1,4 +1,4 @@
-depends -sub CXX gcc '--with-sharedptr=c++11' &&
+depends -sub CXX gcc &&
depends librevenge &&
depends boost &&
optional_depends doxygen '' '--without-docs' 'build documentation'
diff --git a/libs/libwps/HISTORY b/libs/libwps/HISTORY
index d1915aa..850e844 100644
--- a/libs/libwps/HISTORY
+++ b/libs/libwps/HISTORY
@@ -1,3 +1,7 @@
+2025-08-26 Treeve Jelbert <treeve AT sourcemage.org>
+ * DEPENDS: drop bad gcc flags
+ * BUILD: deleted
+
2025-06-06 Treeve Jelbert <treeve AT sourcemage.org>
* DEPENDS: add boost

diff --git a/libs/orcus/DETAILS b/libs/orcus/DETAILS
index 1a0401c..bc259db 100755
--- a/libs/orcus/DETAILS
+++ b/libs/orcus/DETAILS
@@ -1,7 +1,7 @@
. "$GRIMOIRE/FUNCTIONS"
SPELL=orcus
- VERSION=0.20.1
-
SOURCE_HASH=sha512:e39ab43d89c9ec9c22f5a5d14087d05a30edeeed524dd2f0d301e4e30f4f720a244cbfebd0f920db1ca8c8a4844723a53e915e734ce3b5b001f764b3f9064a9f
+ VERSION=0.20.2
+
SOURCE_HASH=sha512:3f6d06b7bb75a1ac64503f8bae0d90b415dd647292ad4773199c220ab83aefc8168b8d8432f075e929fe3720c261f51b7c0488ddb3acf5662c2a5977ebc9ecd0
SOURCE=lib$SPELL-$VERSION.tar.xz

SOURCE_URL[0]=https://gitlab.com/api/v4/projects/orcus%2Forcus/packages/generic/source/$VERSION/$SOURCE
SOURCE_DIRECTORY=$BUILD_DIRECTORY/lib$SPELL-$VERSION
diff --git a/libs/orcus/HISTORY b/libs/orcus/HISTORY
index e1c18d9..e214566 100644
--- a/libs/orcus/HISTORY
+++ b/libs/orcus/HISTORY
@@ -1,3 +1,6 @@
+2025-08-26 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 0.20.2
+
2025-08-15 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 0.20.1



  • [[SM-Commit] ] GIT changes to master grimoire by Treeve Jelbert (b81652f9101745c494a5696f39b680e416ecf7b9), Treeve Jelbert, 08/26/2025

Archive powered by MHonArc 2.6.24.

Top of Page