Accepting request 1310456 from Archiving

OBS-URL: https://build.opensuse.org/request/show/1310456
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/innoextract?expand=0&rev=14

199.patch

@@ -0,0 +1,33 @@
+From 882796e0e9b134b02deeaae4bbfe92920adb6fe2 Mon Sep 17 00:00:00 2001
+From: Michael Cho <michael@michaelcho.dev>
+Date: Mon, 11 Aug 2025 12:06:17 -0400
+Subject: [PATCH] CMake: Fix build with Boost 1.89.0
+
+---
+ CMakeLists.txt | 8 ++++++--
+ 1 file changed, 6 insertions(+), 2 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 69956105..dbbe0d34 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -173,13 +173,17 @@ else()
+ 	set(INNOEXTRACT_HAVE_LZMA 0)
+ endif()
+ 
+-find_package(Boost REQUIRED COMPONENTS
++set(BOOST_REQUIRED_COMPONENTS
+ 	iostreams
+ 	filesystem
+ 	date_time
+-	system
+ 	program_options
+ )
++find_package(Boost REQUIRED COMPONENTS ${BOOST_REQUIRED_COMPONENTS})
++if(Boost_MAJOR_VERSION EQUAL 1 AND Boost_MINOR_VERSION LESS 69)
++	list(APPEND BOOST_REQUIRED_COMPONENTS system)
++	find_package(Boost REQUIRED COMPONENTS ${BOOST_REQUIRED_COMPONENTS})
++endif()
+ list(APPEND LIBRARIES ${Boost_LIBRARIES})
+ link_directories(${Boost_LIBRARY_DIRS})
+ include_directories(SYSTEM ${Boost_INCLUDE_DIR})

cmake-version-range.patch

@@ -0,0 +1,25 @@
+From 83d0bf4365b09ddd17dddb400ba5d262ddf16fb8 Mon Sep 17 00:00:00 2001
+From: Daniel Scharrer <daniel@constexpr.org>
+Date: Wed, 20 Jan 2021 08:39:19 +0100
+Subject: [PATCH] cmake: Fix warning with newer cmake versions
+
+---
+ cmake/VersionScript.cmake | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/cmake/VersionScript.cmake b/cmake/VersionScript.cmake
+index be04b36..47c8542 100644
+--- a/cmake/VersionScript.cmake
++++ b/cmake/VersionScript.cmake
+@@ -17,7 +17,7 @@
+ #    misrepresented as being the original software.
+ # 3. This notice may not be removed or altered from any source distribution.
+ 
+-cmake_minimum_required(VERSION 2.8)
++cmake_minimum_required(VERSION 2.8...3.19)
+ 
+ # CMake script that reads a VERSION file and the current git history and the calls configure_file().
+ # This is used by version_file() in VersionString.cmake
+-- 
+2.50.1
+

innoextract.changes

@@ -1,3 +1,17 @@
+-------------------------------------------------------------------
+Sun Oct  5 12:31:24 UTC 2025 - Martin Hauke <mardnh@gmx.de>
+
+- Add patch:
+  * https://github.com/dscharrer/innoextract/pull/199/files
+    CMake: Fix build with Boost 1.89.0
+  * 199.patch
+
+-------------------------------------------------------------------
+Sun Jul 27 15:43:57 UTC 2025 - Christoph G <foss@grueninger.de>
+
+- Add upstream cmake-version-range.patch for compatibility with
+  CMake 4.0 and newer.
+
 -------------------------------------------------------------------
 Sun Apr 28 13:13:44 UTC 2024 - Martin Hauke <mardnh@gmx.de>
 

innoextract.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package innoextract
 #
-# Copyright (c) 2024 SUSE LLC
+# Copyright (c) 2025 SUSE LLC and contributors
 # Copyright (c) 2012 Pascal Bleser <pascal.bleser@opensuse.org>
 #
 # All modifications and additions to the file contributed by third parties
@@ -28,13 +28,15 @@ 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
+# patch from upstream
+Patch1:         cmake-version-range.patch
+Patch2:         https://github.com/dscharrer/innoextract/pull/199.patch
+BuildRequires:  cmake >= 3.5
 BuildRequires:  gcc-c++
 BuildRequires:  libboost_date_time-devel
 BuildRequires:  libboost_filesystem-devel
 BuildRequires:  libboost_iostreams-devel
 BuildRequires:  libboost_program_options-devel
-BuildRequires:  libboost_system-devel
 BuildRequires:  pkgconfig
 BuildRequires:  python3-base
 BuildRequires:  pkgconfig(bzip2)