Control: tags 984342 + patch Control: tags 984342 + pending Dear maintainer,
I've prepared an NMU for source-highlight (versioned as 3.1.9-4.1) and uploaded it to DELAYED/5. Please feel free to tell me if I should delay it longer. Regards. diff -Nru source-highlight-3.1.9/debian/changelog source-highlight- 3.1.9/debian/changelog --- source-highlight-3.1.9/debian/changelog 2020-08-02 16:01:04.000000000 -0400 +++ source-highlight-3.1.9/debian/changelog 2021-10-22 16:25:06.000000000 -0400 @@ -1,3 +1,14 @@ +source-highlight (3.1.9-4.1) unstable; urgency=high + + * Non-maintainer upload. + * Apply patch from Ubuntu: + + [ Graham Inggs ] + * Remove "throw" specifications to fix build with GCC 11 + (Closes: #984342) + + -- Boyuan Yang <by...@debian.org> Fri, 22 Oct 2021 16:25:06 -0400 + source-highlight (3.1.9-3) unstable; urgency=medium * Added VCS and will be maintained at salsa diff -Nru source-highlight-3.1.9/debian/gitlab-ci.yml source-highlight- 3.1.9/debian/gitlab-ci.yml --- source-highlight-3.1.9/debian/gitlab-ci.yml 1969-12-31 19:00:00.000000000 -0500 +++ source-highlight-3.1.9/debian/gitlab-ci.yml 2021-10-22 16:23:56.000000000 -0400 @@ -0,0 +1,10 @@ +image: registry.salsa.debian.org/salsa-ci-team/ci-image-git- buildpackage:latest + +build: + artifacts: + paths: + - "*.deb" + expire_in: 1 day + script: + - gitlab-ci-git-buildpackage-all + diff -Nru source-highlight-3.1.9/debian/patches/gcc11.patch source-highlight- 3.1.9/debian/patches/gcc11.patch --- source-highlight-3.1.9/debian/patches/gcc11.patch 1969-12-31 19:00:00.000000000 -0500 +++ source-highlight-3.1.9/debian/patches/gcc11.patch 2021-10-22 16:24:26.000000000 -0400 @@ -0,0 +1,30 @@ +Description: Remove "throw" specifications + C++ throw specifications were deprecated in C++11. + This patch removes them from the library. +Bug-Debian: https://bugs.debian.org/984342 +Origin: upstream, https://git.savannah.gnu.org/cgit/src-highlite.git/commit/?id=904949c9026cb772dc93fbe0947a252ef47127f4 +Author: Tom Tromey <t...@tromey.com> +Last-Update: 2020-06-10 + +--- a/lib/srchilite/fileutil.cc ++++ b/lib/srchilite/fileutil.cc +@@ -48,7 +48,7 @@ + // FIXME avoid using a global variable + std::string start_path; + +-string readFile(const string &fileName) throw (IOException) { ++string readFile(const string &fileName) { + ifstream file(fileName.c_str()); + + if (!file.is_open()) { +--- a/lib/srchilite/fileutil.h ++++ b/lib/srchilite/fileutil.h +@@ -27,7 +27,7 @@ + * @return the contents of the file + * @throw IOException + */ +-string readFile(const string &fileName) throw (IOException); ++string readFile(const string &fileName); + + //char *read_file(const string &fileName); + diff -Nru source-highlight-3.1.9/debian/patches/series source-highlight- 3.1.9/debian/patches/series --- source-highlight-3.1.9/debian/patches/series 2020-08-02 16:01:04.000000000 -0400 +++ source-highlight-3.1.9/debian/patches/series 2021-10-22 16:24:26.000000000 -0400 @@ -1 +1,2 @@ fix-national-encoding.patch +gcc11.patch
signature.asc
Description: This is a digitally signed message part
