[packages/Collage] - build fix for boost 1.87, does not build due to C++ standard problem
baggins
baggins at pld-linux.org
Sun Dec 22 19:49:30 CET 2024
commit 615816930337ead2b3c917c51d79e3c755f2dc2b
Author: Jan Rękorajski <baggins at pld-linux.org>
Date: Sun Dec 22 20:30:46 2024 +0100
- build fix for boost 1.87, does not build due to C++ standard problem
Collage.spec | 13 +++++++++----
boost-1.87.patch | 11 +++++++++++
2 files changed, 20 insertions(+), 4 deletions(-)
---
diff --git a/Collage.spec b/Collage.spec
index 002df40..86f0524 100644
--- a/Collage.spec
+++ b/Collage.spec
@@ -15,9 +15,10 @@ Source0: https://github.com/Eyescale/Collage/archive/%{version}/%{name}-%{versio
Patch0: boost-1.61.patch
Patch1: %{name}-boost.patch
Patch2: includes.patch
+Patch3: boost-1.87.patch
URL: http://libcollage.net/
-BuildRequires: Lunchbox-devel >= 1.16.0
BuildRequires: Eyescale-CMake >= 2017.05
+BuildRequires: Lunchbox-devel >= 1.16.0
BuildRequires: Pression-devel >= 2.0.0
BuildRequires: Servus-devel >= 1.5.1
BuildRequires: boost-devel >= 1.41.0
@@ -85,9 +86,10 @@ Dokumentacja API biblioteki Collage.
%prep
%setup -q
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
+%patch -P 0 -p1
+%patch -P 1 -p1
+%patch -P 2 -p1
+%patch -P 3 -p1
rmdir CMake/common
ln -s %{_datadir}/Eyescale-CMake CMake/common
@@ -95,6 +97,9 @@ ln -s %{_datadir}/Eyescale-CMake CMake/common
%build
install -d build
cd build
+
+# boost 1.87 requires at least c++14, but something inside
+# this PoS forces -stdc=gnu++11
%cmake .. \
-DBUILDYARD_DISABLED=ON \
-DCOMMON_DISABLE_WERROR=ON
diff --git a/boost-1.87.patch b/boost-1.87.patch
new file mode 100644
index 0000000..536d292
--- /dev/null
+++ b/boost-1.87.patch
@@ -0,0 +1,11 @@
+--- Collage-1.7.0/co/rspConnection.h~ 2017-05-29 15:17:51.000000000 +0200
++++ Collage-1.7.0/co/rspConnection.h 2024-12-22 15:59:24.030000032 +0100
+@@ -196,7 +196,7 @@
+ typedef lunchbox::RefPtr<EventConnection> EventConnectionPtr;
+ EventConnectionPtr _event;
+
+- boost::asio::io_service _ioService;
++ boost::asio::io_context _ioService;
+ boost::asio::ip::udp::socket* _read;
+ boost::asio::ip::udp::socket* _write;
+ boost::asio::ip::udp::endpoint _readAddr;
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/Collage.git/commitdiff/615816930337ead2b3c917c51d79e3c755f2dc2b
More information about the pld-cvs-commit
mailing list