1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
|
From 902434f50398ebcda0786ade4b28a0496084810e Mon Sep 17 00:00:00 2001
From: fhorse <punes.development@gmail.com>
Date: Wed, 29 Dec 2021 19:12:29 +0100
Subject: [PATCH] Fixed 'make install'.
---
.../lib7zip-3.0.1wip-53abfeb-puNES.patch | 26 ++++++++++---------
src/extra/lib7zip-53abfeb/CMakeLists.txt | 4 ++-
src/extra/lib7zip-53abfeb/configure | 2 +-
3 files changed, 18 insertions(+), 14 deletions(-)
diff --git a/src/extra/lib7zip-3.0.1wip-53abfeb-puNES.patch b/src/extra/lib7zip-3.0.1wip-53abfeb-puNES.patch
index acd4c14b..6125f77f 100644
--- a/src/extra/lib7zip-3.0.1wip-53abfeb-puNES.patch
+++ b/src/extra/lib7zip-3.0.1wip-53abfeb-puNES.patch
@@ -1,9 +1,9 @@
diff -upNr lib7zip-53abfeb.org/CMakeLists.txt lib7zip-53abfeb/CMakeLists.txt
--- lib7zip-53abfeb.org/CMakeLists.txt 2021-05-26 22:04:41.000000000 +0200
-+++ lib7zip-53abfeb/CMakeLists.txt 2021-09-19 15:12:38.078043955 +0200
++++ lib7zip-53abfeb/CMakeLists.txt 2021-12-29 18:32:06.823795378 +0100
@@ -1,4 +1,4 @@
-CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
-+CMAKE_MINIMUM_REQUIRED(VERSION 2.8.12)
++CMAKE_MINIMUM_REQUIRED(VERSION 3.13)
CMAKE_POLICY(
SET CMP0048 NEW
@@ -34,7 +34,7 @@ diff -upNr lib7zip-53abfeb.org/CMakeLists.txt lib7zip-53abfeb/CMakeLists.txt
set(cxx_warnings "")
set(no_undefined -Wl,-undefined,error)
elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC")
-@@ -56,9 +59,12 @@ SET(CXX_STANDARD_REQUIRED OFF)
+@@ -56,9 +59,14 @@ SET(CXX_STANDARD_REQUIRED OFF)
SET(CXX_EXTENSION NO)
if (NOT CONFIGURED_ONCE)
@@ -48,9 +48,11 @@ diff -upNr lib7zip-53abfeb.org/CMakeLists.txt lib7zip-53abfeb/CMakeLists.txt
ADD_SUBDIRECTORY(src)
-ADD_SUBDIRECTORY(test)
+#ADD_SUBDIRECTORY(test)
++
++install(FILES dummy DESTINATION bin OPTIONAL)
diff -upNr lib7zip-53abfeb.org/configure lib7zip-53abfeb/configure
--- lib7zip-53abfeb.org/configure 1970-01-01 01:00:00.000000000 +0100
-+++ lib7zip-53abfeb/configure 2021-09-19 15:06:57.196285060 +0200
++++ lib7zip-53abfeb/configure 2021-12-29 18:31:54.871731271 +0100
@@ -0,0 +1,355 @@
+#!/bin/sh
+
@@ -406,7 +408,7 @@ diff -upNr lib7zip-53abfeb.org/configure lib7zip-53abfeb/configure
+
+#eval "${CMAKE_CMD}" "${TOP_SRCDIR}" -DCMAKE_BUILD_TYPE="${BUILD_TYPE}" -DCMAKE_INSTALL_PREFIX="${PREFIX}" -DCMAKE_INSTALL_LIBDIR="${LIBDIR}" ${CMAKE_ARGS}
+#eval "${CMAKE_CMD}" "${TOP_SRCDIR}" -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON -DBUILD_SHARED_LIB="OFF" -DP7ZIP_SOURCE_DIR="${P7ZIP_SOURCE_DIR}" ${CMAKE_ARGS}
-+eval "${CMAKE_CMD}" "${TOP_SRCDIR}" -DBUILD_SHARED_LIB="OFF" -DP7ZIP_SOURCE_DIR="${P7ZIP_SOURCE_DIR}" ${CMAKE_ARGS}
++eval "${CMAKE_CMD}" "${TOP_SRCDIR}" -DCMAKE_INSTALL_PREFIX="${PREFIX}" -DBUILD_SHARED_LIB="OFF" -DP7ZIP_SOURCE_DIR="${P7ZIP_SOURCE_DIR}" ${CMAKE_ARGS}
diff -upNr lib7zip-53abfeb.org/.gitignore lib7zip-53abfeb/.gitignore
--- lib7zip-53abfeb.org/.gitignore 2021-05-26 22:04:41.000000000 +0200
+++ lib7zip-53abfeb/.gitignore 1970-01-01 01:00:00.000000000 +0100
@@ -501,7 +503,7 @@ diff -upNr lib7zip-53abfeb.org/.hgignore lib7zip-53abfeb/.hgignore
\ Manca newline alla fine del file
diff -upNr lib7zip-53abfeb.org/src/7ZipFormatInfo.cpp lib7zip-53abfeb/src/7ZipFormatInfo.cpp
--- lib7zip-53abfeb.org/src/7ZipFormatInfo.cpp 2021-05-26 22:04:41.000000000 +0200
-+++ lib7zip-53abfeb/src/7ZipFormatInfo.cpp 2021-09-19 14:20:56.671905670 +0200
++++ lib7zip-53abfeb/src/7ZipFormatInfo.cpp 2021-12-29 18:31:45.681682054 +0100
@@ -4,6 +4,7 @@
#endif
@@ -512,7 +514,7 @@ diff -upNr lib7zip-53abfeb.org/src/7ZipFormatInfo.cpp lib7zip-53abfeb/src/7ZipFo
#include "CPP/Common/MyCom.h"
diff -upNr lib7zip-53abfeb.org/src/7ZipObjectPtrArray.cpp lib7zip-53abfeb/src/7ZipObjectPtrArray.cpp
--- lib7zip-53abfeb.org/src/7ZipObjectPtrArray.cpp 2021-05-26 22:04:41.000000000 +0200
-+++ lib7zip-53abfeb/src/7ZipObjectPtrArray.cpp 2021-09-19 14:21:44.925154586 +0200
++++ lib7zip-53abfeb/src/7ZipObjectPtrArray.cpp 2021-12-29 18:31:45.681682054 +0100
@@ -18,9 +18,9 @@ void C7ZipObjectPtrArray::clear()
{
if (m_bAutoRelease)
@@ -527,7 +529,7 @@ diff -upNr lib7zip-53abfeb.org/src/7ZipObjectPtrArray.cpp lib7zip-53abfeb/src/7Z
diff -upNr lib7zip-53abfeb.org/src/CMakeLists.txt lib7zip-53abfeb/src/CMakeLists.txt
--- lib7zip-53abfeb.org/src/CMakeLists.txt 2021-05-26 22:04:41.000000000 +0200
-+++ lib7zip-53abfeb/src/CMakeLists.txt 2021-09-19 14:22:53.391507308 +0200
++++ lib7zip-53abfeb/src/CMakeLists.txt 2021-12-29 18:31:45.681682054 +0100
@@ -7,6 +7,10 @@ SET(lib7zip_src
7ZipCodecInfo.h 7ZipFormatInfo.h 7zipLibrary.cpp OSFunctions_OS2.h
)
@@ -541,13 +543,13 @@ diff -upNr lib7zip-53abfeb.org/src/CMakeLists.txt lib7zip-53abfeb/src/CMakeLists
)
diff -upNr lib7zip-53abfeb.org/src/GUIDs.cpp lib7zip-53abfeb/src/GUIDs.cpp
--- lib7zip-53abfeb.org/src/GUIDs.cpp 1970-01-01 01:00:00.000000000 +0100
-+++ lib7zip-53abfeb/src/GUIDs.cpp 2021-09-19 14:27:46.632076949 +0200
++++ lib7zip-53abfeb/src/GUIDs.cpp 2021-12-29 18:31:45.681682054 +0100
@@ -0,0 +1,2 @@
+#include <initguid.h>
+#include "GUIDs.h"
diff -upNr lib7zip-53abfeb.org/src/GUIDs.h lib7zip-53abfeb/src/GUIDs.h
--- lib7zip-53abfeb.org/src/GUIDs.h 1970-01-01 01:00:00.000000000 +0100
-+++ lib7zip-53abfeb/src/GUIDs.h 2021-09-19 14:27:46.632076949 +0200
++++ lib7zip-53abfeb/src/GUIDs.h 2021-12-29 18:31:45.681682054 +0100
@@ -0,0 +1,139 @@
+// This file is based on the following file from the LZMA SDK (http://www.7-zip.org/sdk.html):
+// ./CPP/7zip/Guid.txt
@@ -690,7 +692,7 @@ diff -upNr lib7zip-53abfeb.org/src/GUIDs.h lib7zip-53abfeb/src/GUIDs.h
+}
diff -upNr lib7zip-53abfeb.org/src/HelperFuncs.cpp lib7zip-53abfeb/src/HelperFuncs.cpp
--- lib7zip-53abfeb.org/src/HelperFuncs.cpp 2021-05-26 22:04:41.000000000 +0200
-+++ lib7zip-53abfeb/src/HelperFuncs.cpp 2021-09-19 14:25:05.620215573 +0200
++++ lib7zip-53abfeb/src/HelperFuncs.cpp 2021-12-29 18:31:45.681682054 +0100
@@ -2,10 +2,12 @@
#include "config.h"
#endif
@@ -706,7 +708,7 @@ diff -upNr lib7zip-53abfeb.org/src/HelperFuncs.cpp lib7zip-53abfeb/src/HelperFun
#include "CPP/myWindows/StdAfx.h"
diff -upNr lib7zip-53abfeb.org/src/OSFunctions_UnixLike.cpp lib7zip-53abfeb/src/OSFunctions_UnixLike.cpp
--- lib7zip-53abfeb.org/src/OSFunctions_UnixLike.cpp 2021-05-26 22:04:41.000000000 +0200
-+++ lib7zip-53abfeb/src/OSFunctions_UnixLike.cpp 2021-09-19 14:26:54.366798374 +0200
++++ lib7zip-53abfeb/src/OSFunctions_UnixLike.cpp 2021-12-29 18:31:45.681682054 +0100
@@ -122,13 +122,13 @@ int myselect(const struct dirent * pDir
{
closedir( pTmpDir );
diff --git a/src/extra/lib7zip-53abfeb/CMakeLists.txt b/src/extra/lib7zip-53abfeb/CMakeLists.txt
index ad6422dd..ae546159 100644
--- a/src/extra/lib7zip-53abfeb/CMakeLists.txt
+++ b/src/extra/lib7zip-53abfeb/CMakeLists.txt
@@ -1,4 +1,4 @@
-CMAKE_MINIMUM_REQUIRED(VERSION 2.8.12)
+CMAKE_MINIMUM_REQUIRED(VERSION 3.13)
CMAKE_POLICY(
SET CMP0048 NEW
@@ -68,3 +68,5 @@ endif()
ADD_SUBDIRECTORY(src)
#ADD_SUBDIRECTORY(test)
+
+install(FILES dummy DESTINATION bin OPTIONAL)
diff --git a/src/extra/lib7zip-53abfeb/configure b/src/extra/lib7zip-53abfeb/configure
index 7499ffab..ca28ab14 100755
--- a/src/extra/lib7zip-53abfeb/configure
+++ b/src/extra/lib7zip-53abfeb/configure
@@ -352,4 +352,4 @@ fi
#eval "${CMAKE_CMD}" "${TOP_SRCDIR}" -DCMAKE_BUILD_TYPE="${BUILD_TYPE}" -DCMAKE_INSTALL_PREFIX="${PREFIX}" -DCMAKE_INSTALL_LIBDIR="${LIBDIR}" ${CMAKE_ARGS}
#eval "${CMAKE_CMD}" "${TOP_SRCDIR}" -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON -DBUILD_SHARED_LIB="OFF" -DP7ZIP_SOURCE_DIR="${P7ZIP_SOURCE_DIR}" ${CMAKE_ARGS}
-eval "${CMAKE_CMD}" "${TOP_SRCDIR}" -DBUILD_SHARED_LIB="OFF" -DP7ZIP_SOURCE_DIR="${P7ZIP_SOURCE_DIR}" ${CMAKE_ARGS}
+eval "${CMAKE_CMD}" "${TOP_SRCDIR}" -DCMAKE_INSTALL_PREFIX="${PREFIX}" -DBUILD_SHARED_LIB="OFF" -DP7ZIP_SOURCE_DIR="${P7ZIP_SOURCE_DIR}" ${CMAKE_ARGS}
--
2.34.0
|