diff --git a/169.patch b/169.patch new file mode 100644 index 0000000..77bd5dd --- /dev/null +++ b/169.patch @@ -0,0 +1,24 @@ +From 264c2fe6b84f90f6290c670e5f676660ec7b2387 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Bernhard=20Rosenkr=C3=A4nzer?= +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 + #include + #include ++#include + #include + + #include "util/console.hpp" diff --git a/innoextract.changes b/innoextract.changes index 17c3782..31c2176 100644 --- a/innoextract.changes +++ b/innoextract.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Sun Apr 28 13:13:44 UTC 2024 - Martin Hauke + +- Add patch: + * https://github.com/dscharrer/innoextract/pull/169 + Fix build when using boost >= 1.85 + ------------------------------------------------------------------- Mon Aug 10 12:39:21 UTC 2020 - Martin Hauke diff --git a/innoextract.spec b/innoextract.spec index 35ef86e..6349a9e 100644 --- a/innoextract.spec +++ b/innoextract.spec @@ -1,7 +1,7 @@ # # spec file for package innoextract # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2024 SUSE LLC # Copyright (c) 2012 Pascal Bleser # # All modifications and additions to the file contributed by third parties @@ -27,6 +27,7 @@ URL: http://constexpr.org/innoextract/ Source: http://constexpr.org/innoextract/files/%{name}-%{version}.tar.gz Source1: http://constexpr.org/innoextract/files/%{name}-%{version}.tar.gz.sig Source2: %{name}.keyring +Patch0: https://github.com/dscharrer/innoextract/pull/169.patch BuildRequires: cmake >= 2.8.0 BuildRequires: gcc-c++ BuildRequires: libboost_date_time-devel @@ -48,7 +49,7 @@ Extract currently supports installers created by Inno Setup 1.2.10 to 5.4.3. %prep -%setup -q +%autosetup -p1 %build %cmake