[packages/ixion] - added upstream fix for boost 1.89+, allow mdds up to 3.2.x
qboosh
qboosh at pld-linux.org
Tue Oct 13 19:35:02 CEST 2026
commit 9d732f3b2f335d7a59fa7b6936d63a61cecafae1
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Tue Oct 13 19:35:39 2026 +0200
- added upstream fix for boost 1.89+, allow mdds up to 3.2.x
ixion-boost-update.patch | 35 +++++++++++++++++++++++++++++++++++
ixion.spec | 11 +++++++----
2 files changed, 42 insertions(+), 4 deletions(-)
---
diff --git a/ixion.spec b/ixion.spec
index a57c3ea..c58f480 100644
--- a/ixion.spec
+++ b/ixion.spec
@@ -16,6 +16,7 @@ Group: Libraries
Source0: https://gitlab.com/api/v4/projects/ixion%2Fixion/packages/generic/source/%{version}/libixion-%{version}.tar.xz
# Source0-md5: 75b38bb8db5fce0a1e3108647f27b050
Patch0: %{name}-flags.patch
+Patch1: %{name}-boost-update.patch
URL: https://gitlab.com/ixion/ixion
%{?with_vulkan:BuildRequires: Vulkan-Loader-devel >= 1.2.0}
BuildRequires: autoconf >= 2.63
@@ -23,8 +24,9 @@ BuildRequires: automake >= 1:1.11
BuildRequires: boost-devel >= 1.36
BuildRequires: libstdc++-devel >= 6:7
BuildRequires: libtool >= 2:2
+# mdds-3.0 API
BuildRequires: mdds-devel >= 2.1.99
-BuildRequires: mdds-devel < 3.1
+BuildRequires: mdds-devel < 3.3
BuildRequires: pkgconfig
BuildRequires: python3 >= 1:3.4
BuildRequires: python3-devel >= 1:3.4
@@ -124,7 +126,8 @@ Interfejs Pythona 3 do biblioteki ixion.
%prep
%setup -q -n libixion-%{version}
-%patch -P 0 -p1
+%patch -P0 -p1
+%patch -P1 -p1
%build
%{__libtoolize}
@@ -170,7 +173,7 @@ rm -rf $RPM_BUILD_ROOT
%attr(755,root,root) %{_bindir}/ixion-formula-tokenizer
%attr(755,root,root) %{_bindir}/ixion-parser
%attr(755,root,root) %{_bindir}/ixion-sorter
-%attr(755,root,root) %{_libdir}/libixion-0.20.so.*.*.*
+%{_libdir}/libixion-0.20.so.*.*.*
%ghost %{_libdir}/libixion-0.20.so.0
%files devel
@@ -193,4 +196,4 @@ rm -rf $RPM_BUILD_ROOT
%files -n python3-ixion
%defattr(644,root,root,755)
-%attr(755,root,root) %{py3_sitedir}/ixion.so
+%{py3_sitedir}/ixion.so
diff --git a/ixion-boost-update.patch b/ixion-boost-update.patch
new file mode 100644
index 0000000..f1c5cc4
--- /dev/null
+++ b/ixion-boost-update.patch
@@ -0,0 +1,35 @@
+From bfe5ab6adadda265d575fec9c192e6f53f2ef9f5 Mon Sep 17 00:00:00 2001
+From: Kohei Yoshida <kohei.yoshida at gmail.com>
+Date: Fri, 4 Apr 2025 21:08:55 -0400
+Subject: [PATCH] Update boost.m4 from the latest upstream
+
+---
+ m4/boost.m4 | 9 +++++++--
+ 1 file changed, 7 insertions(+), 2 deletions(-)
+
+diff --git a/m4/boost.m4 b/m4/boost.m4
+index 706035d3..342516e4 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
+
+
+--
+GitLab
+
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/ixion.git/commitdiff/9d732f3b2f335d7a59fa7b6936d63a61cecafae1
More information about the pld-cvs-commit
mailing list