Control: tags 983961 + pending Dear maintainer,
I've prepared an NMU for advancecomp (versioned as 2.1-2.2) and uploaded it to DELAYED/2. Please feel free to tell me if I should delay it longer. Regards. diff -Nru advancecomp-2.1/debian/changelog advancecomp-2.1/debian/changelog --- advancecomp-2.1/debian/changelog 2019-05-18 17:50:20.000000000 -0300 +++ advancecomp-2.1/debian/changelog 2022-04-14 14:04:51.000000000 -0300 @@ -1,3 +1,11 @@ +advancecomp (2.1-2.2) unstable; urgency=medium + + * Non-maintainer upload. + * debian/patches/Fix-build-gcc11.patch: New. Fix FTBFS with GCC-11. + Thanks to MichaŠGórny <mgo...@gentoo.org>. (Closes: #983961) + + -- Marcos Talau <mar...@talau.info> Thu, 14 Apr 2022 14:04:51 -0300 + advancecomp (2.1-2.1) unstable; urgency=medium * Non-maintainer upload. diff -Nru advancecomp-2.1/debian/patches/Fix-build-gcc11.patch advancecomp-2.1/debian/patches/Fix-build-gcc11.patch --- advancecomp-2.1/debian/patches/Fix-build-gcc11.patch 1969-12-31 21:00:00.000000000 -0300 +++ advancecomp-2.1/debian/patches/Fix-build-gcc11.patch 2022-04-14 14:04:51.000000000 -0300 @@ -0,0 +1,161 @@ +Description: Remove dynamic exception specification to fix C++17 compatibility +Bug-Debian: https://bugs.debian.org/983961 +Origin: upstream, https://github.com/amadvance/advancecomp/commit/7b08f7a2af3f66ab95437e4490499cebb20e5e41 +Author: MichaŠGórny <mgo...@gentoo.org> +Last-Update: 2021-04-28 +Index: advancecomp-2.1/file.cc +=================================================================== +--- advancecomp-2.1.orig/file.cc ++++ advancecomp-2.1/file.cc +@@ -98,7 +98,7 @@ void infopath::readonly_set(bool Areadon + /** + * 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) thr + /** + * 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, cons + /** + * 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* + /** + * 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* + /** + * 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) thr + /** + * 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 + /** + * 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) t + /** + * 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 + /** + * 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, cons + /** + * 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, cons + /** + * 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) th + /** + * 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) t + /** + * 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); +Index: advancecomp-2.1/file.h +=================================================================== +--- advancecomp-2.1.orig/file.h ++++ advancecomp-2.1/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 (); diff -Nru advancecomp-2.1/debian/patches/series advancecomp-2.1/debian/patches/series --- advancecomp-2.1/debian/patches/series 2019-05-18 17:50:20.000000000 -0300 +++ advancecomp-2.1/debian/patches/series 2022-04-14 14:04:39.000000000 -0300 @@ -1,3 +1,4 @@ Fix-a-buffer-overflow-with-image-of-invalid-size.patch Fix-a-buffer-overflow-caused-by-invalid-images.patch Fix-a-buffer-overflow-caused-by-invalid-chunks.patch +Fix-build-gcc11.patch
