[arch-commits] Commit in source-highlight/trunk (2 files)

[Antonio Rojas]

    Date: Tuesday, June 8, 2021 @ 16:49:12
  Author: arojas
Revision: 417473

Fix build with GCC 11

Added:
  source-highlight/trunk/source-highlight-gcc11.patch
Modified:
  source-highlight/trunk/PKGBUILD

------------------------------+
 PKGBUILD                     |   10 ++++++++--
 source-highlight-gcc11.patch |   34 ++++++++++++++++++++++++++++++++++
 2 files changed, 42 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-06-08 16:43:09 UTC (rev 417472)
+++ PKGBUILD	2021-06-08 16:49:12 UTC (rev 417473)
@@ -10,11 +10,17 @@
 license=('GPL')
 depends=('bash' 'boost-libs')
 makedepends=('ctags' 'boost')
-source=(https://ftp.gnu.org/gnu/src-highlite/${pkgname}-${pkgver}.tar.gz{,.sig})
+source=(https://ftp.gnu.org/gnu/src-highlite/${pkgname}-${pkgver}.tar.gz{,.sig}
+        source-highlight-gcc11.patch)
 validpgpkeys=('E9FE8AE950CB07F5BEB2E805036A75309D33E5B5')
 sha512sums=('d8e154e9a5d62c77807e4e5d36c0faed5ce2964291be5f8b83e2968a6de52229503689a4ca2109a717ae2632a14b63ec937ca0430c91684c72063f6bc0294195'
-            'SKIP')
+            'SKIP'
+            '55f22121a2e7501c437f305790b34d330b9ad475a87ed4482527386c23424ed2eb8c1a563da41995573f0598e4a5c9096abbf414938f7e1305354bcc720944ec')
 
+prepare() {
+  patch -d $pkgname-$pkgver -p1 < source-highlight-gcc11.patch # Fix build with GCC 11
+}
+
 build() {
   cd ${pkgname}-${pkgver}
 

Added: source-highlight-gcc11.patch
===================================================================
--- source-highlight-gcc11.patch	                        (rev 0)
+++ source-highlight-gcc11.patch	2021-06-08 16:49:12 UTC (rev 417473)
@@ -0,0 +1,34 @@
+From 904949c9026cb772dc93fbe0947a252ef47127f4 Mon Sep 17 00:00:00 2001
+From: Tom Tromey <tom at tromey.com>
+Date: Wed, 10 Jun 2020 20:38:27 -0600
+Subject: Remove "throw" specifications
+
+diff --git a/lib/srchilite/fileutil.cc b/lib/srchilite/fileutil.cc
+index 59a6d64..963178c 100644
+--- a/lib/srchilite/fileutil.cc
++++ b/lib/srchilite/fileutil.cc
+@@ -48,7 +48,7 @@ void set_file_util_verbose(bool b) {
+ // 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()) {
+diff --git a/lib/srchilite/fileutil.h b/lib/srchilite/fileutil.h
+index 7335a9b..042eb56 100644
+--- a/lib/srchilite/fileutil.h
++++ b/lib/srchilite/fileutil.h
+@@ -27,7 +27,7 @@ extern std::string start_path;
+  * @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);
+ 
+-- 
+cgit v1.2.1
+