From a978c074e4272bb901fbe4a10de0a7b2af574f17 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 4 May 2021 22:28:33 +0100 Subject: gentoo resync : 04.05.2021 --- app-arch/advancecomp/Manifest | 3 +- .../advancecomp/advancecomp-2.2_pre20190301.ebuild | 7 +- .../files/advancecomp-2.2_pre20190301-gcc-11.patch | 184 +++++++++++++++++++++ 3 files changed, 191 insertions(+), 3 deletions(-) create mode 100644 app-arch/advancecomp/files/advancecomp-2.2_pre20190301-gcc-11.patch (limited to 'app-arch/advancecomp') diff --git a/app-arch/advancecomp/Manifest b/app-arch/advancecomp/Manifest index b23c10102163..241dc5608aea 100644 --- a/app-arch/advancecomp/Manifest +++ b/app-arch/advancecomp/Manifest @@ -1,3 +1,4 @@ +AUX advancecomp-2.2_pre20190301-gcc-11.patch 7012 BLAKE2B ba239903860dbebec89d102f7417bc1db83129a762dfa59ed81ea46ef0ca58720556f0e697a05a995d095f1f33540538dcebeff98bc228b870ff84e267a51fa1 SHA512 a122abb506667203d202da35796f4f59bf050aa25edeec644bbf9c6ccd2fb841c1b3e8df9b782af0d84dd6362d2722044cc54d53c5923da5a47fc6296322d16e DIST advancecomp-fcf71a89265c78fc26243574dda3a872574a5c02.tar.gz 1195310 BLAKE2B 9dcab7e266023f996504cfcfc9ba8237f216f2bf1af56d645e3fe7fb79a5e3d0dae2abdd47cc9c38c6ade385d1eb44b1e0ae6afa6fd2485afd1423be37276d06 SHA512 2c3e01146441aa940f6de464e0c19613f22d6a5fd671e4e0b1b83e68cad322ff0dc6be0fa328524332e6a782198edfeac0443b72a30d9c51c86e7c5ad141f6b7 -EBUILD advancecomp-2.2_pre20190301.ebuild 1002 BLAKE2B a43008f31eda3336f4b529db071b61e02b362f5f6b3da59fe77b064a31134626e2bc4643b6eebc6c5702fb229ff0fdb8057414c57d5f406db6de39272b2714eb SHA512 522bf7d3aada96ed7507a3b48244b6dbb50cb83b12b1e4a3d0f2ecff4a849fc2b192642a3678fc05aeb61ed4a9b4a2e9fba5178581ce7640b9d516ab19e3fd1b +EBUILD advancecomp-2.2_pre20190301.ebuild 1047 BLAKE2B 38f4a51875c94066ca1145cef0c9da2dadcb99126b81cbe7752b82fcc61db2f7381ffd94adf6d60d5a23c93b6da6e2f04c608dbb2a348bf61d46d97e3b9f7474 SHA512 cf1fbb54db472e22fd28385e789a2e79030b6edf7d3f109ab74a4a5a5f4c608b5ca0f103112384d5c5e82910987aff680c18c31dd8ad64cc35a0ce281b1f23fd MISC metadata.xml 389 BLAKE2B ed897e83e347f7fc4b6e6fa63d80411e17976e1a31643ca586f3a842745673f690ceeff904b0fffcf39633002525d603fb01cac62caff5e8bc4639e14ecea3aa SHA512 d8b6d613b1fc382dc8add3ace9f08eec9d479e0460db597e241edfcc5b398f8916eeb8958eaca6588a00ce8fd8a9c2833a12b422256d4629eac573f59780dd0a diff --git a/app-arch/advancecomp/advancecomp-2.2_pre20190301.ebuild b/app-arch/advancecomp/advancecomp-2.2_pre20190301.ebuild index e103631dcc47..edb31f6a8c44 100644 --- a/app-arch/advancecomp/advancecomp-2.2_pre20190301.ebuild +++ b/app-arch/advancecomp/advancecomp-2.2_pre20190301.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -10,6 +10,7 @@ DESCRIPTION="Recompress ZIP, PNG and MNG, considerably improving compression" HOMEPAGE="https://www.advancemame.it/comp-readme.html" SRC_URI="https://github.com/amadvance/advancecomp/archive/${EGIT_COMMIT}.tar.gz -> ${PN}-${EGIT_COMMIT}.tar.gz" +S=${WORKDIR}/${PN}-${EGIT_COMMIT} LICENSE="GPL-2+ Apache-2.0 LGPL-2.1+ MIT" SLOT="0" @@ -24,7 +25,9 @@ DEPEND="${RDEPEND}" # https://sourceforge.net/p/advancemame/bugs/270/ RESTRICT="test" -S=${WORKDIR}/${PN}-${EGIT_COMMIT} +PATCHES=( + "${FILESDIR}"/${P}-gcc-11.patch +) src_prepare() { default 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 new file mode 100644 index 000000000000..b72a6824a305 --- /dev/null +++ b/app-arch/advancecomp/files/advancecomp-2.2_pre20190301-gcc-11.patch @@ -0,0 +1,184 @@ +From 7b08f7a2af3f66ab95437e4490499cebb20e5e41 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= +Date: Wed, 28 Apr 2021 22:11:42 +0200 +Subject: [PATCH] Remove dynamic exception specification to fix C++17 + compatibility + +The dynamic exception specifications have been deprecated in C++11 +and eventually removed in C++17 [1]. GCC-11 uses gnu++17 by default, +causing advancecomp to fail to compile: + + In file included from rezip.cc:24: + file.h:70:43: error: ISO C++17 does not allow dynamic exception specifications + 70 | bool file_exists(const std::string& file) throw (error); + | ^~~~~ + file.h:71:75: error: ISO C++17 does not allow dynamic exception specifications + 71 | e(const std::string& path, const char* data, unsigned size) throw (error); + | ^~~~~ + ... + +Since there is really no gain from having these specifications anymore, +just remove them to fix the build. + +[1] https://en.cppreference.com/w/cpp/language/except_spec +--- + file.cc | 26 +++++++++++++------------- + file.h | 24 ++++++++++++------------ + 2 files changed, 25 insertions(+), 25 deletions(-) + +diff --git a/file.cc b/file.cc +index 1e90348..d676d25 100644 +--- a/file.cc ++++ b/file.cc +@@ -98,7 +98,7 @@ void infopath::readonly_set(bool Areadonly) + /** + * Check if a file exists. + */ +-bool file_exists(const string& path) throw (error) ++bool file_exists(const string& path) + { + struct stat s; + if (stat(path.c_str(), &s) != 0) { +@@ -114,7 +114,7 @@ bool file_exists(const string& path) throw (error) + /** + * Write a whole file. + */ +-void file_write(const string& path, const char* data, unsigned size) throw (error) ++void file_write(const string& path, const char* data, unsigned size) + { + FILE* f = fopen(path.c_str(), "wb"); + if (!f) +@@ -134,7 +134,7 @@ void file_write(const string& path, const char* data, unsigned size) throw (erro + /** + * Read a whole file. + */ +-void file_read(const string& path, char* data, unsigned size) throw (error) ++void file_read(const string& path, char* data, unsigned size) + { + file_read(path, data, 0, size); + } +@@ -142,7 +142,7 @@ void file_read(const string& path, char* data, unsigned size) throw (error) + /** + * Read a whole file. + */ +-void file_read(const string& path, char* data, unsigned offset, unsigned size) throw (error) ++void file_read(const string& path, char* data, unsigned offset, unsigned size) + { + FILE* f = fopen(path.c_str(), "rb"); + if (!f) +@@ -166,7 +166,7 @@ void file_read(const string& path, char* data, unsigned offset, unsigned size) t + /** + * Get the time of a file. + */ +-time_t file_time(const string& path) throw (error) ++time_t file_time(const string& path) + { + struct stat s; + if (stat(path.c_str(), &s)!=0) +@@ -178,7 +178,7 @@ time_t file_time(const string& path) throw (error) + /** + * Set the time of a file. + */ +-void file_utime(const string& path, time_t tod) throw (error) ++void file_utime(const string& path, time_t tod) + { + struct utimbuf u; + +@@ -192,7 +192,7 @@ void file_utime(const string& path, time_t tod) throw (error) + /** + * Get the size of a file. + */ +-unsigned file_size(const string& path) throw (error) ++unsigned file_size(const string& path) + { + struct stat s; + if (stat(path.c_str(), &s)!=0) +@@ -204,7 +204,7 @@ unsigned file_size(const string& path) throw (error) + /** + * Get the crc of a file. + */ +-crc_t file_crc(const string& path) throw (error) ++crc_t file_crc(const string& path) + { + unsigned size = file_size(path); + +@@ -227,7 +227,7 @@ crc_t file_crc(const string& path) throw (error) + /** + * Copy a file. + */ +-void file_copy(const string& path1, const string& path2) throw (error) ++void file_copy(const string& path1, const string& path2) + { + unsigned size; + +@@ -249,7 +249,7 @@ void file_copy(const string& path1, const string& path2) throw (error) + /** + * Move a file. + */ +-void file_move(const string& path1, const string& path2) throw (error) ++void file_move(const string& path1, const string& path2) + { + if (rename(path1.c_str(), path2.c_str())!=0 + && errno==EXDEV) { +@@ -271,7 +271,7 @@ void file_move(const string& path1, const string& path2) throw (error) + /** + * Remove a file. + */ +-void file_remove(const string& path1) throw (error) ++void file_remove(const string& path1) + { + if (remove(path1.c_str())!=0) { + throw error() << "Failed remove of " << path1; +@@ -281,7 +281,7 @@ void file_remove(const string& path1) throw (error) + /** + * Rename a file. + */ +-void file_rename(const string& path1, const string& path2) throw (error) ++void file_rename(const string& path1, const string& path2) + { + if (rename(path1.c_str(), path2.c_str())!=0) { + throw error() << "Failed rename of " << path1 << " to " << path2; +@@ -409,7 +409,7 @@ string file_adjust(const string& path) throw () + /** + * Make a drectory tree. + */ +-void file_mktree(const std::string& path) throw (error) ++void file_mktree(const std::string& path) + { + string dir = file_dir(path); + string name = file_name(path); +diff --git a/file.h b/file.h +index 1b0cf85..49429b5 100644 +--- a/file.h ++++ b/file.h +@@ -67,18 +67,18 @@ typedef unsigned crc_t; + crc_t crc_compute(const char* data, unsigned len); + crc_t crc_compute(crc_t pred, const char* data, unsigned len); + +-bool file_exists(const std::string& file) throw (error); +-void file_write(const std::string& path, const char* data, unsigned size) throw (error); +-void file_read(const std::string& path, char* data, unsigned size) throw (error); +-void file_read(const std::string& path, char* data, unsigned offset, unsigned size) throw (error); +-time_t file_time(const std::string& path) throw (error); +-void file_utime(const std::string& path, time_t tod) throw (error); +-unsigned file_size(const std::string& path) throw (error); +-crc_t file_crc(const std::string& path) throw (error); +-void file_copy(const std::string& path1, const std::string& path2) throw (error); +-void file_move(const std::string& path1, const std::string& path2) throw (error); +-void file_remove(const std::string& path1) throw (error); +-void file_mktree(const std::string& path1) throw (error); ++bool file_exists(const std::string& file); ++void file_write(const std::string& path, const char* data, unsigned size); ++void file_read(const std::string& path, char* data, unsigned size); ++void file_read(const std::string& path, char* data, unsigned offset, unsigned size); ++time_t file_time(const std::string& path); ++void file_utime(const std::string& path, time_t tod); ++unsigned file_size(const std::string& path); ++crc_t file_crc(const std::string& path); ++void file_copy(const std::string& path1, const std::string& path2); ++void file_move(const std::string& path1, const std::string& path2); ++void file_remove(const std::string& path1); ++void file_mktree(const std::string& path1); + + std::string file_temp(const std::string& path) throw (); + std::string file_randomize(const std::string& path, int n) throw (); -- cgit v1.2.3