CVS commit: pkgsrc/archivers/innoextract

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Wed Jan 22 12:47:49 UTC 2025

Modified Files:
        pkgsrc/archivers/innoextract: Makefile distinfo
        pkgsrc/archivers/innoextract/patches: patch-src_stream_slice.cpp
Added Files:
        pkgsrc/archivers/innoextract/patches: patch-CMakeLists.txt

Log Message:
innoextract: fix build


To generate a diff of this commit:
cvs rdiff -u -r1.32 -r1.33 pkgsrc/archivers/innoextract/Makefile
cvs rdiff -u -r1.10 -r1.11 pkgsrc/archivers/innoextract/distinfo
cvs rdiff -u -r0 -r1.3 \
    pkgsrc/archivers/innoextract/patches/patch-CMakeLists.txt
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/archivers/innoextract/patches/patch-src_stream_slice.cpp

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/archivers/innoextract/Makefile
diff -u pkgsrc/archivers/innoextract/Makefile:1.32 pkgsrc/archivers/innoextract/Makefile:1.33
--- pkgsrc/archivers/innoextract/Makefile:1.32  Sun Dec 29 15:09:38 2024
+++ pkgsrc/archivers/innoextract/Makefile       Wed Jan 22 12:47:49 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2024/12/29 15:09:38 adam Exp $
+# $NetBSD: Makefile,v 1.33 2025/01/22 12:47:49 wiz Exp $
 
 DISTNAME=      innoextract-1.9
 PKGREVISION=   12
@@ -13,11 +13,10 @@ LICENSE=    zlib
 USE_CXX_FEATURES=      filesystem
 USE_LANGUAGES=         c c++
 
-.include "../../devel/cmake/build.mk"
-
 CMAKE_CONFIGURE_ARGS+= -DCMAKE_INSTALL_MANDIR=${PREFIX}/${PKGMANDIR}
 CMAKE_CONFIGURE_ARGS+= -DSET_OPTIMIZATION_FLAGS=OFF
 
+.include "../../devel/cmake/build.mk"
 .include "../../archivers/xz/buildlink3.mk"
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../devel/boost-libs/buildlink3.mk"

Index: pkgsrc/archivers/innoextract/distinfo
diff -u pkgsrc/archivers/innoextract/distinfo:1.10 pkgsrc/archivers/innoextract/distinfo:1.11
--- pkgsrc/archivers/innoextract/distinfo:1.10  Sun Apr 21 16:08:29 2024
+++ pkgsrc/archivers/innoextract/distinfo       Wed Jan 22 12:47:49 2025
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.10 2024/04/21 16:08:29 adam Exp $
+$NetBSD: distinfo,v 1.11 2025/01/22 12:47:49 wiz Exp $
 
 BLAKE2s (innoextract-1.9.tar.gz) = 1dca12efdfc57920e81b3a5d8a4ad776e9a7fb86d4ecd4177c03e26b928b3106
 SHA512 (innoextract-1.9.tar.gz) = 2b18f7bb7f50744bcb1bdcd25e57e0760193b179c77b55e0f63c537e55afc98de3b0380da3cae470ce97660ed41a7ffbb48c8c25329c9ce9b3811d9aec74bcde
 Size (innoextract-1.9.tar.gz) = 206931 bytes
-SHA1 (patch-src_stream_slice.cpp) = 38df0b08941f4a72c2aa29d18a4829cb2b6c27f8
+SHA1 (patch-CMakeLists.txt) = 69493f330d32e0c63737443b1e9647633146e0eb
+SHA1 (patch-src_stream_slice.cpp) = d98f14b988d17d3e85199fa9480e5b308497bafd

Index: pkgsrc/archivers/innoextract/patches/patch-src_stream_slice.cpp
diff -u pkgsrc/archivers/innoextract/patches/patch-src_stream_slice.cpp:1.1 pkgsrc/archivers/innoextract/patches/patch-src_stream_slice.cpp:1.2
--- pkgsrc/archivers/innoextract/patches/patch-src_stream_slice.cpp:1.1 Sun Apr 21 16:08:30 2024
+++ pkgsrc/archivers/innoextract/patches/patch-src_stream_slice.cpp     Wed Jan 22 12:47:49 2025
@@ -1,6 +1,7 @@
-$NetBSD: patch-src_stream_slice.cpp,v 1.1 2024/04/21 16:08:30 adam Exp $
+$NetBSD: patch-src_stream_slice.cpp,v 1.2 2025/01/22 12:47:49 wiz Exp $
 
 Fix build with newer boost.
+https://github.com/dscharrer/innoextract/commit/264c2fe6b84f90f6290c670e5f676660ec7b2387
 
 --- src/stream/slice.cpp.orig  2024-04-21 16:03:13.394516482 +0000
 +++ src/stream/slice.cpp

Added files:

Index: pkgsrc/archivers/innoextract/patches/patch-CMakeLists.txt
diff -u /dev/null pkgsrc/archivers/innoextract/patches/patch-CMakeLists.txt:1.3
--- /dev/null   Wed Jan 22 12:47:49 2025
+++ pkgsrc/archivers/innoextract/patches/patch-CMakeLists.txt   Wed Jan 22 12:47:49 2025
@@ -0,0 +1,26 @@
+$NetBSD: patch-CMakeLists.txt,v 1.3 2025/01/22 12:47:49 wiz Exp $
+
+First part: use proper variable for boost include directories
+
+Rest:
+https://github.com/dscharrer/innoextract/commit/045f72a73d692bb3a918650e33106df5233f90c9
+
+--- CMakeLists.txt.orig        2020-08-09 18:48:04.000000000 +0000
++++ CMakeLists.txt
+@@ -160,11 +160,15 @@ find_package(Boost REQUIRED COMPONENTS
+ )
+ list(APPEND LIBRARIES ${Boost_LIBRARIES})
+ link_directories(${Boost_LIBRARY_DIRS})
+-include_directories(SYSTEM ${Boost_INCLUDE_DIR})
++include_directories(SYSTEM ${Boost_INCLUDE_DIRS})
+ if(NOT Boost_VERSION_MACRO)
+       # CMP0093 changed Boost_VERSION to x.y.z format and provide the old format in Boost_VERSION_MACRO
+       set(Boost_VERSION_MACRO ${Boost_VERSION})
+ endif()
++add_definitions(-DBOOST_SYSTEM_DISABLE_THREADS)
++if(win32)
++      add_definitions(-DBOOST_SYSTEM_USE_UTF8)
++endif()
+ 
+ has_static_libs(Boost Boost_LIBRARIES)
+ if(Boost_HAS_STATIC_LIBS)