commit 748f295719675e4ed00365fdb62a2f23aa0f82a9
Author: Jan Rękorajski <[email protected]>
Date: Thu Dec 26 00:39:51 2024 +0100
- build fix for boost 1.85, rel 7
boost-1.85.patch | 24 ++++++++++++++++++++++++
innoextract.spec | 4 +++-
2 files changed, 27 insertions(+), 1 deletion(-)
---
diff --git a/innoextract.spec b/innoextract.spec
index 4b9f1a6..792cdc2 100644
--- a/innoextract.spec
+++ b/innoextract.spec
@@ -2,11 +2,12 @@ Summary: Tool to unpack installers created by Inno Setup
Summary(pl.UTF-8): Narzędzie do rozpakowywania instalatorów tworzonych
przez Inno Setup
Name: innoextract
Version: 1.9
-Release: 6
+Release: 7
License: Zlib (BSD-like)
Group: Applications/Files
Source0:
https://constexpr.org/innoextract/files/innoextract-%{version}/%{name}-%{version}.tar.gz
# Source0-md5: 964f39bb3f8fd2313629e69ffd3dab9f
+Patch0: boost-1.85.patch
URL: https://constexpr.org/innoextract/
BuildRequires: boost-devel
BuildRequires: bzip2-devel
@@ -32,6 +33,7 @@ instalatory utworzone przez Inno Setup w wersjach od 1.2.10
do 6.0.5.
%prep
%setup -q
+%patch -P 0 -p1
%build
install -d build
diff --git a/boost-1.85.patch b/boost-1.85.patch
new file mode 100644
index 0000000..ed3dc09
--- /dev/null
+++ b/boost-1.85.patch
@@ -0,0 +1,24 @@
+From 264c2fe6b84f90f6290c670e5f676660ec7b2387 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Bernhard=20Rosenkr=C3=A4nzer?= <[email protected]>
+Date: Thu, 28 Mar 2024 15:11:40 +0100
+Subject: [PATCH] Fix build with boost 1.85
+
+As of boost 1.85-beta1, boost/filesystem/directory.hpp is no longer
+implicitly included by boost/filesystem/operations.hpp. Include it
+explicitly.
+---
+ src/stream/slice.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/stream/slice.cpp b/src/stream/slice.cpp
+index 12468a38..f7ebe0e5 100644
+--- a/src/stream/slice.cpp
++++ b/src/stream/slice.cpp
+@@ -27,6 +27,7 @@
+ #include <boost/cstdint.hpp>
+ #include <boost/algorithm/string/predicate.hpp>
+ #include <boost/filesystem/operations.hpp>
++#include <boost/filesystem/directory.hpp>
+ #include <boost/range/size.hpp>
+
+ #include "util/console.hpp"
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/innoextract.git/commitdiff/748f295719675e4ed00365fdb62a2f23aa0f82a9
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
