* [gentoo-commits] repo/gentoo:master commit in: app-arch/advancecomp/, app-arch/advancecomp/files/
@ 2016-05-07 22:22 Michael Weber
0 siblings, 0 replies; 4+ messages in thread
From: Michael Weber @ 2016-05-07 22:22 UTC (permalink / raw
To: gentoo-commits
commit: 153c54d8983ab65d365448dd7b3cf3a599c701f7
Author: Michael Weber <xmw <AT> gentoo <DOT> org>
AuthorDate: Sat May 7 22:11:26 2016 +0000
Commit: Michael Weber <xmw <AT> gentoo <DOT> org>
CommitDate: Sat May 7 22:11:26 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=153c54d8
app-arch/advancecomp: Drop old.
Package-Manager: portage-2.2.28
app-arch/advancecomp/Manifest | 2 -
app-arch/advancecomp/advancecomp-1.16.ebuild | 43 ------------------
app-arch/advancecomp/advancecomp-1.17.ebuild | 52 ----------------------
.../files/advancecomp-1.17-bzip2-compile.patch | 16 -------
4 files changed, 113 deletions(-)
diff --git a/app-arch/advancecomp/Manifest b/app-arch/advancecomp/Manifest
index 0354d47..f70b99b 100644
--- a/app-arch/advancecomp/Manifest
+++ b/app-arch/advancecomp/Manifest
@@ -1,4 +1,2 @@
DIST advancecomp-1.15.tar.gz 259340 SHA256 0d235c78224d450666bdd852a301159d53b9570e9cd28f015e222797ba4d5fe1 SHA512 18d6abb4c739c16e340bad2e87f89b545d0ecb660897a109a038b2a236bab6ce3d3b3ad572839fb4ce7981c5f150d8ed2447654291a8d808bbb85e70152e47ba WHIRLPOOL 34b44dd464092f442d5b9945e97abb4cd6fee1363c61df7573792d6a315cdab64197653b63c545b55587f37da7353e68d4cc3e26cbad961e700729b0a3f76aa2
-DIST advancecomp-1.16.tar.gz 280510 SHA256 de5617d561935f41522f04e332d9db01f910c2acb3eb231d2fb0774a86539bc0 SHA512 51e80758bb290a59b1d2faaccd7b0ead18ce6abfd85e47a57d3123e80334fe0676d4e6ec82496c228db4aef46a18050409811c7f74c833b7aa52bc57ff4aaae5 WHIRLPOOL 90e1c5c2c48dde3d9646691a92188ff28f58fd11a1e632492882e190a7090364d8bc9018e219d55eb5cf67e69e4bd54edbd4c5ac012afa556fdeb03acd8721ec
-DIST advancecomp-1.17.tar.gz 1189646 SHA256 856d064e064c6105986b7cc29d6e2cba477e9ffca4a8830631161f5e7cd18e82 SHA512 8a75204ae98e3b0a55eea2ba82f23a31203d052b568031529b08bcd3028a241c64e30537db6d360d1a7717a7d0f8ea087340121c0224e288abd62267abe7287d WHIRLPOOL fc2ef6b9b767f8a9cffbe4f8493ca279aec1883b105845a284f8c7c88168c36552e14d50fbc5953fa2fc4b60b6b5af9ae8dbafde4c04217693993b44fbfdc185
DIST advancecomp-1.19.tar.gz 1193228 SHA256 d594c50c3da356aa961f75b00e958a4ed1e142c6530b42926092e46419af3047 SHA512 9bce761f315e94ea9ebe59273cc810297e6227d914b498501f159f05c3a002236570c2d4248b397c5cdd3cf9a60565bb8d7f1470b079d5f50249031d3c78348d WHIRLPOOL cbf67f173d4cac1ef90266c5dfc9f8b65903828de26bdbafa467aada602d5858eb5eeeddaba08d665dad8a829d394e60d67bb6100322fa501c7d80144e74e91f
diff --git a/app-arch/advancecomp/advancecomp-1.16.ebuild b/app-arch/advancecomp/advancecomp-1.16.ebuild
deleted file mode 100644
index 2061e94..0000000
--- a/app-arch/advancecomp/advancecomp-1.16.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-DESCRIPTION="Recompress ZIP, PNG and MNG using deflate 7-Zip, considerably improving compression"
-HOMEPAGE="http://advancemame.sourceforge.net/comp-readme.html"
-SRC_URI="mirror://sourceforge/advancemame/${P}.tar.gz"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd"
-IUSE="png mng"
-
-DEPEND="
- app-arch/bzip2
- sys-libs/zlib
-"
-RDEPEND="${DEPEND}"
-
-RESTRICT="test" #282441
-
-src_configure() {
- econf --enable-bzip2
-}
-
-src_install() {
- dobin advdef advzip
-
- if use png; then
- dobin advpng
- doman doc/advpng.1
- fi
-
- if use mng; then
- dobin advmng
- doman doc/advmng.1
- fi
-
- dodoc HISTORY AUTHORS README
- doman doc/advdef.1 doc/advzip.1
-}
diff --git a/app-arch/advancecomp/advancecomp-1.17.ebuild b/app-arch/advancecomp/advancecomp-1.17.ebuild
deleted file mode 100644
index 25f0ab6..0000000
--- a/app-arch/advancecomp/advancecomp-1.17.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils
-
-DESCRIPTION="Recompress ZIP, PNG and MNG using deflate 7-Zip, considerably improving compression"
-HOMEPAGE="http://advancemame.sourceforge.net/comp-readme.html"
-SRC_URI="mirror://sourceforge/project/advancemame/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-3 LGPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd"
-IUSE="mng png test"
-
-RDEPEND="app-arch/bzip2
- sys-libs/zlib"
-DEPEND="${RDEPEND}
- test? (
- app-text/tofrodos
- dev-util/valgrind
- )"
-
-#RESTRICT="test" #282441
-
-src_prepare() {
- epatch "${FILESDIR}"/${P}-bzip2-compile.patch
-}
-
-src_configure() {
- econf --enable-bzip2 \
- $(use_enable test valgrind)
-}
-
-src_install() {
- dobin advdef advzip
-
- if use png; then
- dobin advpng
- doman doc/advpng.1
- fi
-
- if use mng; then
- dobin advmng
- doman doc/advmng.1
- fi
-
- dodoc HISTORY AUTHORS README
- doman doc/advdef.1 doc/advzip.1
-}
diff --git a/app-arch/advancecomp/files/advancecomp-1.17-bzip2-compile.patch b/app-arch/advancecomp/files/advancecomp-1.17-bzip2-compile.patch
deleted file mode 100644
index 726c63c..0000000
--- a/app-arch/advancecomp/files/advancecomp-1.17-bzip2-compile.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- advancecomp-1.17/zipsh.cc
-+++ advancecomp-1.17/zipsh.cc
-@@ -215,11 +215,11 @@
- }
-
- #if USE_BZIP2
-- if (level != shrink_fast && !standard) {
-+ if (level.level != shrink_fast && !standard) {
- unsigned bzip2_level;
- unsigned bzip2_workfactor;
-
-- switch (level) {
-+ switch (level.level) {
- case shrink_normal :
- bzip2_level = 6;
- bzip2_workfactor = 30;
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-arch/advancecomp/, app-arch/advancecomp/files/
@ 2018-05-26 11:30 Johannes Huber
0 siblings, 0 replies; 4+ messages in thread
From: Johannes Huber @ 2018-05-26 11:30 UTC (permalink / raw
To: gentoo-commits
commit: 1c88070676070531d518c90d4410182043bcb1e3
Author: Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Sat May 26 11:29:16 2018 +0000
Commit: Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Sat May 26 11:30:09 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1c880706
app-arch/advancecomp: Remove 1.15
Uses deprecated EAPI 4 and overshadowed by 2.0.
Package-Manager: Portage-2.3.40, Repoman-2.3.9
app-arch/advancecomp/Manifest | 1 -
app-arch/advancecomp/advancecomp-1.15.ebuild | 46 ----------------
.../advancecomp-1.13-bzip2-compile-plz-k-thx.diff | 61 ----------------------
3 files changed, 108 deletions(-)
diff --git a/app-arch/advancecomp/Manifest b/app-arch/advancecomp/Manifest
index 3454e85b39f..1675d81b481 100644
--- a/app-arch/advancecomp/Manifest
+++ b/app-arch/advancecomp/Manifest
@@ -1,3 +1,2 @@
-DIST advancecomp-1.15.tar.gz 259340 BLAKE2B 64be369b56962b8612d46190a1ee2ccd3d3cae32867891a2dcec6fc24c1ea76c41fb3eb3980d1e43d642011d43250ad49a75f98ba4cb86f8e511c130ab2678a4 SHA512 18d6abb4c739c16e340bad2e87f89b545d0ecb660897a109a038b2a236bab6ce3d3b3ad572839fb4ce7981c5f150d8ed2447654291a8d808bbb85e70152e47ba
DIST advancecomp-1.23.tar.gz 1288937 BLAKE2B 48044f8e896e29ec41518f50daee50bd10e43d474a966f3a9d5ff1c567fb21366f09b1b7ead51323ec5a959fceafd4df247e469c4ba015ad3cfdb9b2f187bfdd SHA512 2218d8677787d3f72434e2d5dd3f6b21f69de7042c7533ad29625522adedd56d765e70e4749bbfac14973b9b2bb6958db2900e62b26e5242106caf760cbc2236
DIST advancecomp-2.0.tar.gz 1292164 BLAKE2B 16f24820ac8f6de517edc91237b743935673894fd784271ab7ef7c1b5e7ff11fb4087dffa4e99b0b5b5ef550514f7267962cfcc7dde2976db69a28c68398c8ac SHA512 e324cdf1687d3a92d3416d07269b3d03087ccece9cf636cd4cd0075fbededcd27da5c84a2d77cc1265800f252fcd75a841459fcc55dd9d5eee3ea3fa48d9f906
diff --git a/app-arch/advancecomp/advancecomp-1.15.ebuild b/app-arch/advancecomp/advancecomp-1.15.ebuild
deleted file mode 100644
index ec508977331..00000000000
--- a/app-arch/advancecomp/advancecomp-1.15.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-inherit eutils
-
-DESCRIPTION="Recompress ZIP, PNG and MNG, considerably improving compression"
-HOMEPAGE="http://advancemame.sourceforge.net/comp-readme.html"
-SRC_URI="mirror://sourceforge/advancemame/${P}.tar.gz"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ~ppc ~ppc64 x86 ~x86-fbsd"
-IUSE="png mng"
-
-DEPEND="sys-libs/zlib
- app-arch/bzip2"
-RDEPEND="${DEPEND}"
-
-RESTRICT="test" #282441
-
-src_prepare() {
- # bzip2 support wont compile, here's a quick patch.
- epatch "${FILESDIR}"/${PN}-1.13-bzip2-compile-plz-k-thx.diff
-}
-
-src_configure() {
- econf --enable-bzip2
-}
-
-src_install() {
- dobin advdef advzip
-
- if use png; then
- dobin advpng
- doman doc/advpng.1
- fi
-
- if use mng; then
- dobin advmng
- doman doc/advmng.1
- fi
-
- dodoc HISTORY AUTHORS README
- doman doc/advdef.1 doc/advzip.1
-}
diff --git a/app-arch/advancecomp/files/advancecomp-1.13-bzip2-compile-plz-k-thx.diff b/app-arch/advancecomp/files/advancecomp-1.13-bzip2-compile-plz-k-thx.diff
deleted file mode 100644
index f20bba3373a..00000000000
--- a/app-arch/advancecomp/files/advancecomp-1.13-bzip2-compile-plz-k-thx.diff
+++ /dev/null
@@ -1,61 +0,0 @@
---- advancecomp-1.13.orig/compress.cc 2004-12-16 23:19:17.779774920 -0200
-+++ advancecomp-1.13/compress.cc 2004-12-16 23:36:05.356599960 -0200
-@@ -181,16 +181,17 @@
- }
-
- #if USE_BZIP2
--bool compress_bzip2(const unsigned char* in_data, unsigned in_size, unsigned char* out_data, unsigned& out_size, int blocksize, int workfactor)
-+
-+bool compress_bzip2(const char* in_data, unsigned in_size, char* out_data, unsigned& out_size, int blocksize, int workfactor)
- {
-- return BZ2_bzBuffToBuffCompress(out_data, &out_size, const_cast<unsigned char*>(in_data), in_size, blocksize, 0, workfactor) == BZ_OK;
-+ return BZ2_bzBuffToBuffCompress(out_data,&out_size,const_cast<char*>(in_data),in_size,blocksize,0,workfactor) == BZ_OK;
- }
-
--bool decompress_bzip2(const unsigned char* in_data, unsigned in_size, unsigned char* out_data, unsigned out_size)
-+bool decompress_bzip2(const char* in_data, unsigned in_size, char* out_data, unsigned out_size)
- {
- unsigned size = out_size;
-
-- if (BZ2_bzBuffToBuffDecompress(out_data, &size, const_cast<unsigned char*>(in_data), in_size, 0, 0)!=BZ_OK)
-+ if (BZ2_bzBuffToBuffDecompress(out_data,&size,const_cast< char*>(in_data),in_size,0,0)!=BZ_OK)
- return false;
-
- if (size != out_size)
---- advancecomp-1.13.orig/compress.h 2004-12-16 23:19:17.778775072 -0200
-+++ advancecomp-1.13/compress.h 2004-12-16 23:37:00.178265800 -0200
-@@ -37,8 +37,8 @@
- bool decompress_deflate_zlib(const unsigned char* in_data, unsigned in_size, unsigned char* out_data, unsigned out_size);
- bool compress_deflate_zlib(const unsigned char* in_data, unsigned in_size, unsigned char* out_data, unsigned& out_size, int compression_level, int strategy, int mem_level);
-
--bool decompress_bzip2(const unsigned char* in_data, unsigned in_size, unsigned char* out_data, unsigned out_size);
--bool compress_bzip2(const unsigned char* in_data, unsigned in_size, unsigned char* out_data, unsigned& out_size, int blocksize, int workfactor);
-+bool decompress_bzip2(const char* in_data, unsigned in_size, char* out_data, unsigned out_size);
-+bool compress_bzip2(const char* in_data, unsigned in_size, char* out_data, unsigned& out_size, int blocksize, int workfactor);
-
- bool decompress_rfc1950_zlib(const unsigned char* in_data, unsigned in_size, unsigned char* out_data, unsigned out_size);
- bool compress_rfc1950_zlib(const unsigned char* in_data, unsigned in_size, unsigned char* out_data, unsigned& out_size, int compression_level, int strategy, int mem_level);
---- advancecomp-1.13.orig/stamp-h1 1969-12-31 21:00:00.000000000 -0300
-+++ advancecomp-1.13/stamp-h1 2004-12-16 23:37:46.906162080 -0200
-@@ -0,0 +1 @@
-+timestamp for config.h
---- advancecomp-1.13.orig/zipsh.cc 2004-12-16 23:19:17.779774920 -0200
-+++ advancecomp-1.13/zipsh.cc 2004-12-16 23:39:30.099474312 -0200
-@@ -39,7 +39,7 @@
- }
- #ifdef USE_BZIP2
- } else if (info.compression_method == ZIP_METHOD_BZIP2) {
-- if (!decompress_bzip2(data, compressed_size_get(), uncompressed_data, uncompressed_size_get())) {
-+ if (!decompress_bzip2((char *)data,compressed_size_get(),(char *)uncompressed_data,uncompressed_size_get())) {
- throw error_invalid() << "Invalid compressed data on file " << name_get();
- }
- #endif
-@@ -247,7 +247,7 @@
- c1_met = ZIP_METHOD_BZIP2;
- c1_fla = 0;
-
-- if (!compress_bzip2(uncompressed_data, uncompressed_size_get(), c1_data, c1_size, bzip2_level, bzip2_workfactor)) {
-+ if (!compress_bzip2((char *)uncompressed_data,uncompressed_size_get(),(char *)c1_data,c1_size,bzip2_level,bzip2_workfactor)) {
- data_free(c1_data);
- c1_data = 0;
- }
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-arch/advancecomp/, app-arch/advancecomp/files/
@ 2021-04-29 19:56 Michał Górny
0 siblings, 0 replies; 4+ messages in thread
From: Michał Górny @ 2021-04-29 19:56 UTC (permalink / raw
To: gentoo-commits
commit: 30eb83dd80937406bc984e5834b82e73f8738be3
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 29 18:41:13 2021 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Apr 29 19:55:43 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=30eb83dd
app-arch/advancecomp: Backport C++17 (GCC 11) fix
Closes: https://bugs.gentoo.org/786534
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
.../advancecomp/advancecomp-2.2_pre20190301.ebuild | 7 +-
.../files/advancecomp-2.2_pre20190301-gcc-11.patch | 184 +++++++++++++++++++++
2 files changed, 189 insertions(+), 2 deletions(-)
diff --git a/app-arch/advancecomp/advancecomp-2.2_pre20190301.ebuild b/app-arch/advancecomp/advancecomp-2.2_pre20190301.ebuild
index e103631dcc4..edb31f6a8c4 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 00000000000..b72a6824a30
--- /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?= <mgorny@gentoo.org>
+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 ();
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-arch/advancecomp/, app-arch/advancecomp/files/
@ 2022-06-06 12:57 Michał Górny
0 siblings, 0 replies; 4+ messages in thread
From: Michał Górny @ 2022-06-06 12:57 UTC (permalink / raw
To: gentoo-commits
commit: fd134e4dfe3e084c1e969fc7712038352780e5ad
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 6 12:55:38 2022 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Mon Jun 6 12:55:38 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fd134e4d
app-arch/advancecomp: Remove old
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
app-arch/advancecomp/Manifest | 1 -
.../advancecomp/advancecomp-2.2_pre20190301.ebuild | 50 ------
.../files/advancecomp-2.2_pre20190301-gcc-11.patch | 184 ---------------------
3 files changed, 235 deletions(-)
diff --git a/app-arch/advancecomp/Manifest b/app-arch/advancecomp/Manifest
index 98d02d75ff6d..82234b11ddf2 100644
--- a/app-arch/advancecomp/Manifest
+++ b/app-arch/advancecomp/Manifest
@@ -1,2 +1 @@
DIST advancecomp-2.3.tar.gz 1292157 BLAKE2B 7fdbbc4c53c58a4988339189d5e2e2412e782a69081b6ba39f86f4c2b101b03d8400f8104091eb8b22d2d4969515c8126011e79e346787bddba77d67387a6efe SHA512 87dc6a25139708b975ff138f73555fb2053c0fb8310412823624de7786a2034657fc3b4ddb6eeda332788073bbe21ea955b7368707186ee3bb61d1fe59e672e3
-DIST advancecomp-fcf71a89265c78fc26243574dda3a872574a5c02.tar.gz 1195310 BLAKE2B 9dcab7e266023f996504cfcfc9ba8237f216f2bf1af56d645e3fe7fb79a5e3d0dae2abdd47cc9c38c6ade385d1eb44b1e0ae6afa6fd2485afd1423be37276d06 SHA512 2c3e01146441aa940f6de464e0c19613f22d6a5fd671e4e0b1b83e68cad322ff0dc6be0fa328524332e6a782198edfeac0443b72a30d9c51c86e7c5ad141f6b7
diff --git a/app-arch/advancecomp/advancecomp-2.2_pre20190301.ebuild b/app-arch/advancecomp/advancecomp-2.2_pre20190301.ebuild
deleted file mode 100644
index b13f318de57e..000000000000
--- a/app-arch/advancecomp/advancecomp-2.2_pre20190301.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-EGIT_COMMIT="fcf71a89265c78fc26243574dda3a872574a5c02"
-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"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ppc ppc64 ~riscv x86"
-IUSE=""
-
-RDEPEND="app-arch/bzip2:=
- sys-libs/zlib:="
-DEPEND="${RDEPEND}"
-
-# Tests seem to rely on exact output:
-# https://sourceforge.net/p/advancemame/bugs/270/
-RESTRICT="test"
-
-PATCHES=(
- "${FILESDIR}"/${P}-gcc-11.patch
-)
-
-src_prepare() {
- default
- eautoreconf
-}
-
-src_configure() {
- local myconf=(
- --enable-bzip2
- # (--disable-* arguments are mishandled)
- # --disable-debug
- # --disable-valgrind
- )
- econf "${myconf[@]}"
-}
-
-src_install() {
- default
- dodoc HISTORY
-}
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
deleted file mode 100644
index b72a6824a305..000000000000
--- a/app-arch/advancecomp/files/advancecomp-2.2_pre20190301-gcc-11.patch
+++ /dev/null
@@ -1,184 +0,0 @@
-From 7b08f7a2af3f66ab95437e4490499cebb20e5e41 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-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 ();
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2022-06-06 12:58 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-06-06 12:57 [gentoo-commits] repo/gentoo:master commit in: app-arch/advancecomp/, app-arch/advancecomp/files/ Michał Górny
-- strict thread matches above, loose matches on Subject: below --
2021-04-29 19:56 Michał Górny
2018-05-26 11:30 Johannes Huber
2016-05-07 22:22 Michael Weber
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox