Accepting request 1170623 from home:mnhauke

- Add patch:
  * https://github.com/dscharrer/innoextract/pull/169
    Fix build when using boost >= 1.85

OBS-URL: https://build.opensuse.org/request/show/1170623
OBS-URL: https://build.opensuse.org/package/show/Archiving/innoextract?expand=0&rev=30
This commit is contained in:
Martin Pluskal 2024-04-29 06:16:29 +00:00 committed by Git OBS Bridge
parent 637d6d04f9
commit a9b1e16349
3 changed files with 34 additions and 2 deletions

24
169.patch Normal file
View File

@ -0,0 +1,24 @@
From 264c2fe6b84f90f6290c670e5f676660ec7b2387 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bernhard=20Rosenkr=C3=A4nzer?= <bero@lindev.ch>
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"

View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Sun Apr 28 13:13:44 UTC 2024 - Martin Hauke <mardnh@gmx.de>
- 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 <mardnh@gmx.de> Mon Aug 10 12:39:21 UTC 2020 - Martin Hauke <mardnh@gmx.de>

View File

@ -1,7 +1,7 @@
# #
# spec file for package innoextract # spec file for package innoextract
# #
# Copyright (c) 2020 SUSE LLC # Copyright (c) 2024 SUSE LLC
# Copyright (c) 2012 Pascal Bleser <pascal.bleser@opensuse.org> # Copyright (c) 2012 Pascal Bleser <pascal.bleser@opensuse.org>
# #
# All modifications and additions to the file contributed by third parties # 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 Source: http://constexpr.org/innoextract/files/%{name}-%{version}.tar.gz
Source1: http://constexpr.org/innoextract/files/%{name}-%{version}.tar.gz.sig Source1: http://constexpr.org/innoextract/files/%{name}-%{version}.tar.gz.sig
Source2: %{name}.keyring Source2: %{name}.keyring
Patch0: https://github.com/dscharrer/innoextract/pull/169.patch
BuildRequires: cmake >= 2.8.0 BuildRequires: cmake >= 2.8.0
BuildRequires: gcc-c++ BuildRequires: gcc-c++
BuildRequires: libboost_date_time-devel BuildRequires: libboost_date_time-devel
@ -48,7 +49,7 @@ Extract currently supports installers created by Inno Setup 1.2.10 to
5.4.3. 5.4.3.
%prep %prep
%setup -q %autosetup -p1
%build %build
%cmake %cmake