1 |
commit: fd134e4dfe3e084c1e969fc7712038352780e5ad |
2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Jun 6 12:55:38 2022 +0000 |
4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Jun 6 12:55:38 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fd134e4d |
7 |
|
8 |
app-arch/advancecomp: Remove old |
9 |
|
10 |
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> |
11 |
|
12 |
app-arch/advancecomp/Manifest | 1 - |
13 |
.../advancecomp/advancecomp-2.2_pre20190301.ebuild | 50 ------ |
14 |
.../files/advancecomp-2.2_pre20190301-gcc-11.patch | 184 --------------------- |
15 |
3 files changed, 235 deletions(-) |
16 |
|
17 |
diff --git a/app-arch/advancecomp/Manifest b/app-arch/advancecomp/Manifest |
18 |
index 98d02d75ff6d..82234b11ddf2 100644 |
19 |
--- a/app-arch/advancecomp/Manifest |
20 |
+++ b/app-arch/advancecomp/Manifest |
21 |
@@ -1,2 +1 @@ |
22 |
DIST advancecomp-2.3.tar.gz 1292157 BLAKE2B 7fdbbc4c53c58a4988339189d5e2e2412e782a69081b6ba39f86f4c2b101b03d8400f8104091eb8b22d2d4969515c8126011e79e346787bddba77d67387a6efe SHA512 87dc6a25139708b975ff138f73555fb2053c0fb8310412823624de7786a2034657fc3b4ddb6eeda332788073bbe21ea955b7368707186ee3bb61d1fe59e672e3 |
23 |
-DIST advancecomp-fcf71a89265c78fc26243574dda3a872574a5c02.tar.gz 1195310 BLAKE2B 9dcab7e266023f996504cfcfc9ba8237f216f2bf1af56d645e3fe7fb79a5e3d0dae2abdd47cc9c38c6ade385d1eb44b1e0ae6afa6fd2485afd1423be37276d06 SHA512 2c3e01146441aa940f6de464e0c19613f22d6a5fd671e4e0b1b83e68cad322ff0dc6be0fa328524332e6a782198edfeac0443b72a30d9c51c86e7c5ad141f6b7 |
24 |
|
25 |
diff --git a/app-arch/advancecomp/advancecomp-2.2_pre20190301.ebuild b/app-arch/advancecomp/advancecomp-2.2_pre20190301.ebuild |
26 |
deleted file mode 100644 |
27 |
index b13f318de57e..000000000000 |
28 |
--- a/app-arch/advancecomp/advancecomp-2.2_pre20190301.ebuild |
29 |
+++ /dev/null |
30 |
@@ -1,50 +0,0 @@ |
31 |
-# Copyright 1999-2021 Gentoo Authors |
32 |
-# Distributed under the terms of the GNU General Public License v2 |
33 |
- |
34 |
-EAPI=7 |
35 |
- |
36 |
-inherit autotools |
37 |
- |
38 |
-EGIT_COMMIT="fcf71a89265c78fc26243574dda3a872574a5c02" |
39 |
-DESCRIPTION="Recompress ZIP, PNG and MNG, considerably improving compression" |
40 |
-HOMEPAGE="https://www.advancemame.it/comp-readme.html" |
41 |
-SRC_URI="https://github.com/amadvance/advancecomp/archive/${EGIT_COMMIT}.tar.gz |
42 |
- -> ${PN}-${EGIT_COMMIT}.tar.gz" |
43 |
-S=${WORKDIR}/${PN}-${EGIT_COMMIT} |
44 |
- |
45 |
-LICENSE="GPL-2+ Apache-2.0 LGPL-2.1+ MIT" |
46 |
-SLOT="0" |
47 |
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ppc ppc64 ~riscv x86" |
48 |
-IUSE="" |
49 |
- |
50 |
-RDEPEND="app-arch/bzip2:= |
51 |
- sys-libs/zlib:=" |
52 |
-DEPEND="${RDEPEND}" |
53 |
- |
54 |
-# Tests seem to rely on exact output: |
55 |
-# https://sourceforge.net/p/advancemame/bugs/270/ |
56 |
-RESTRICT="test" |
57 |
- |
58 |
-PATCHES=( |
59 |
- "${FILESDIR}"/${P}-gcc-11.patch |
60 |
-) |
61 |
- |
62 |
-src_prepare() { |
63 |
- default |
64 |
- eautoreconf |
65 |
-} |
66 |
- |
67 |
-src_configure() { |
68 |
- local myconf=( |
69 |
- --enable-bzip2 |
70 |
- # (--disable-* arguments are mishandled) |
71 |
- # --disable-debug |
72 |
- # --disable-valgrind |
73 |
- ) |
74 |
- econf "${myconf[@]}" |
75 |
-} |
76 |
- |
77 |
-src_install() { |
78 |
- default |
79 |
- dodoc HISTORY |
80 |
-} |
81 |
|
82 |
diff --git a/app-arch/advancecomp/files/advancecomp-2.2_pre20190301-gcc-11.patch b/app-arch/advancecomp/files/advancecomp-2.2_pre20190301-gcc-11.patch |
83 |
deleted file mode 100644 |
84 |
index b72a6824a305..000000000000 |
85 |
--- a/app-arch/advancecomp/files/advancecomp-2.2_pre20190301-gcc-11.patch |
86 |
+++ /dev/null |
87 |
@@ -1,184 +0,0 @@ |
88 |
-From 7b08f7a2af3f66ab95437e4490499cebb20e5e41 Mon Sep 17 00:00:00 2001 |
89 |
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@g.o> |
90 |
-Date: Wed, 28 Apr 2021 22:11:42 +0200 |
91 |
-Subject: [PATCH] Remove dynamic exception specification to fix C++17 |
92 |
- compatibility |
93 |
- |
94 |
-The dynamic exception specifications have been deprecated in C++11 |
95 |
-and eventually removed in C++17 [1]. GCC-11 uses gnu++17 by default, |
96 |
-causing advancecomp to fail to compile: |
97 |
- |
98 |
- In file included from rezip.cc:24: |
99 |
- file.h:70:43: error: ISO C++17 does not allow dynamic exception specifications |
100 |
- 70 | bool file_exists(const std::string& file) throw (error); |
101 |
- | ^~~~~ |
102 |
- file.h:71:75: error: ISO C++17 does not allow dynamic exception specifications |
103 |
- 71 | e(const std::string& path, const char* data, unsigned size) throw (error); |
104 |
- | ^~~~~ |
105 |
- ... |
106 |
- |
107 |
-Since there is really no gain from having these specifications anymore, |
108 |
-just remove them to fix the build. |
109 |
- |
110 |
-[1] https://en.cppreference.com/w/cpp/language/except_spec |
111 |
---- |
112 |
- file.cc | 26 +++++++++++++------------- |
113 |
- file.h | 24 ++++++++++++------------ |
114 |
- 2 files changed, 25 insertions(+), 25 deletions(-) |
115 |
- |
116 |
-diff --git a/file.cc b/file.cc |
117 |
-index 1e90348..d676d25 100644 |
118 |
---- a/file.cc |
119 |
-+++ b/file.cc |
120 |
-@@ -98,7 +98,7 @@ void infopath::readonly_set(bool Areadonly) |
121 |
- /** |
122 |
- * Check if a file exists. |
123 |
- */ |
124 |
--bool file_exists(const string& path) throw (error) |
125 |
-+bool file_exists(const string& path) |
126 |
- { |
127 |
- struct stat s; |
128 |
- if (stat(path.c_str(), &s) != 0) { |
129 |
-@@ -114,7 +114,7 @@ bool file_exists(const string& path) throw (error) |
130 |
- /** |
131 |
- * Write a whole file. |
132 |
- */ |
133 |
--void file_write(const string& path, const char* data, unsigned size) throw (error) |
134 |
-+void file_write(const string& path, const char* data, unsigned size) |
135 |
- { |
136 |
- FILE* f = fopen(path.c_str(), "wb"); |
137 |
- if (!f) |
138 |
-@@ -134,7 +134,7 @@ void file_write(const string& path, const char* data, unsigned size) throw (erro |
139 |
- /** |
140 |
- * Read a whole file. |
141 |
- */ |
142 |
--void file_read(const string& path, char* data, unsigned size) throw (error) |
143 |
-+void file_read(const string& path, char* data, unsigned size) |
144 |
- { |
145 |
- file_read(path, data, 0, size); |
146 |
- } |
147 |
-@@ -142,7 +142,7 @@ void file_read(const string& path, char* data, unsigned size) throw (error) |
148 |
- /** |
149 |
- * Read a whole file. |
150 |
- */ |
151 |
--void file_read(const string& path, char* data, unsigned offset, unsigned size) throw (error) |
152 |
-+void file_read(const string& path, char* data, unsigned offset, unsigned size) |
153 |
- { |
154 |
- FILE* f = fopen(path.c_str(), "rb"); |
155 |
- if (!f) |
156 |
-@@ -166,7 +166,7 @@ void file_read(const string& path, char* data, unsigned offset, unsigned size) t |
157 |
- /** |
158 |
- * Get the time of a file. |
159 |
- */ |
160 |
--time_t file_time(const string& path) throw (error) |
161 |
-+time_t file_time(const string& path) |
162 |
- { |
163 |
- struct stat s; |
164 |
- if (stat(path.c_str(), &s)!=0) |
165 |
-@@ -178,7 +178,7 @@ time_t file_time(const string& path) throw (error) |
166 |
- /** |
167 |
- * Set the time of a file. |
168 |
- */ |
169 |
--void file_utime(const string& path, time_t tod) throw (error) |
170 |
-+void file_utime(const string& path, time_t tod) |
171 |
- { |
172 |
- struct utimbuf u; |
173 |
- |
174 |
-@@ -192,7 +192,7 @@ void file_utime(const string& path, time_t tod) throw (error) |
175 |
- /** |
176 |
- * Get the size of a file. |
177 |
- */ |
178 |
--unsigned file_size(const string& path) throw (error) |
179 |
-+unsigned file_size(const string& path) |
180 |
- { |
181 |
- struct stat s; |
182 |
- if (stat(path.c_str(), &s)!=0) |
183 |
-@@ -204,7 +204,7 @@ unsigned file_size(const string& path) throw (error) |
184 |
- /** |
185 |
- * Get the crc of a file. |
186 |
- */ |
187 |
--crc_t file_crc(const string& path) throw (error) |
188 |
-+crc_t file_crc(const string& path) |
189 |
- { |
190 |
- unsigned size = file_size(path); |
191 |
- |
192 |
-@@ -227,7 +227,7 @@ crc_t file_crc(const string& path) throw (error) |
193 |
- /** |
194 |
- * Copy a file. |
195 |
- */ |
196 |
--void file_copy(const string& path1, const string& path2) throw (error) |
197 |
-+void file_copy(const string& path1, const string& path2) |
198 |
- { |
199 |
- unsigned size; |
200 |
- |
201 |
-@@ -249,7 +249,7 @@ void file_copy(const string& path1, const string& path2) throw (error) |
202 |
- /** |
203 |
- * Move a file. |
204 |
- */ |
205 |
--void file_move(const string& path1, const string& path2) throw (error) |
206 |
-+void file_move(const string& path1, const string& path2) |
207 |
- { |
208 |
- if (rename(path1.c_str(), path2.c_str())!=0 |
209 |
- && errno==EXDEV) { |
210 |
-@@ -271,7 +271,7 @@ void file_move(const string& path1, const string& path2) throw (error) |
211 |
- /** |
212 |
- * Remove a file. |
213 |
- */ |
214 |
--void file_remove(const string& path1) throw (error) |
215 |
-+void file_remove(const string& path1) |
216 |
- { |
217 |
- if (remove(path1.c_str())!=0) { |
218 |
- throw error() << "Failed remove of " << path1; |
219 |
-@@ -281,7 +281,7 @@ void file_remove(const string& path1) throw (error) |
220 |
- /** |
221 |
- * Rename a file. |
222 |
- */ |
223 |
--void file_rename(const string& path1, const string& path2) throw (error) |
224 |
-+void file_rename(const string& path1, const string& path2) |
225 |
- { |
226 |
- if (rename(path1.c_str(), path2.c_str())!=0) { |
227 |
- throw error() << "Failed rename of " << path1 << " to " << path2; |
228 |
-@@ -409,7 +409,7 @@ string file_adjust(const string& path) throw () |
229 |
- /** |
230 |
- * Make a drectory tree. |
231 |
- */ |
232 |
--void file_mktree(const std::string& path) throw (error) |
233 |
-+void file_mktree(const std::string& path) |
234 |
- { |
235 |
- string dir = file_dir(path); |
236 |
- string name = file_name(path); |
237 |
-diff --git a/file.h b/file.h |
238 |
-index 1b0cf85..49429b5 100644 |
239 |
---- a/file.h |
240 |
-+++ b/file.h |
241 |
-@@ -67,18 +67,18 @@ typedef unsigned crc_t; |
242 |
- crc_t crc_compute(const char* data, unsigned len); |
243 |
- crc_t crc_compute(crc_t pred, const char* data, unsigned len); |
244 |
- |
245 |
--bool file_exists(const std::string& file) throw (error); |
246 |
--void file_write(const std::string& path, const char* data, unsigned size) throw (error); |
247 |
--void file_read(const std::string& path, char* data, unsigned size) throw (error); |
248 |
--void file_read(const std::string& path, char* data, unsigned offset, unsigned size) throw (error); |
249 |
--time_t file_time(const std::string& path) throw (error); |
250 |
--void file_utime(const std::string& path, time_t tod) throw (error); |
251 |
--unsigned file_size(const std::string& path) throw (error); |
252 |
--crc_t file_crc(const std::string& path) throw (error); |
253 |
--void file_copy(const std::string& path1, const std::string& path2) throw (error); |
254 |
--void file_move(const std::string& path1, const std::string& path2) throw (error); |
255 |
--void file_remove(const std::string& path1) throw (error); |
256 |
--void file_mktree(const std::string& path1) throw (error); |
257 |
-+bool file_exists(const std::string& file); |
258 |
-+void file_write(const std::string& path, const char* data, unsigned size); |
259 |
-+void file_read(const std::string& path, char* data, unsigned size); |
260 |
-+void file_read(const std::string& path, char* data, unsigned offset, unsigned size); |
261 |
-+time_t file_time(const std::string& path); |
262 |
-+void file_utime(const std::string& path, time_t tod); |
263 |
-+unsigned file_size(const std::string& path); |
264 |
-+crc_t file_crc(const std::string& path); |
265 |
-+void file_copy(const std::string& path1, const std::string& path2); |
266 |
-+void file_move(const std::string& path1, const std::string& path2); |
267 |
-+void file_remove(const std::string& path1); |
268 |
-+void file_mktree(const std::string& path1); |
269 |
- |
270 |
- std::string file_temp(const std::string& path) throw (); |
271 |
- std::string file_randomize(const std::string& path, int n) throw (); |