CVS commit: pkgsrc/textproc/source-highlight

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Sun Jun 16 18:47:42 UTC 2024

Modified Files:
        pkgsrc/textproc/source-highlight: distinfo
Added Files:
        pkgsrc/textproc/source-highlight/patches:
            patch-lib_srchilite_fileutil.cc patch-lib_srchilite_fileutil.h

Log Message:
source-highlight: fix build with gcc 12

using upstream commit


To generate a diff of this commit:
cvs rdiff -u -r1.30 -r1.31 pkgsrc/textproc/source-highlight/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/textproc/source-highlight/patches/patch-lib_srchilite_fileutil.cc \
    pkgsrc/textproc/source-highlight/patches/patch-lib_srchilite_fileutil.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/textproc/source-highlight/distinfo
diff -u pkgsrc/textproc/source-highlight/distinfo:1.30 pkgsrc/textproc/source-highlight/distinfo:1.31
--- pkgsrc/textproc/source-highlight/distinfo:1.30      Tue Oct 26 11:23:32 2021
+++ pkgsrc/textproc/source-highlight/distinfo   Sun Jun 16 18:47:42 2024
@@ -1,8 +1,10 @@
-$NetBSD: distinfo,v 1.30 2021/10/26 11:23:32 nia Exp $
+$NetBSD: distinfo,v 1.31 2024/06/16 18:47:42 wiz Exp $
 
 BLAKE2s (source-highlight-3.1.9.tar.gz) = 0cd88f93a781e7ff22ff13c4fced0b933c99ca77416d67b06e79e85953e3ad11
 SHA512 (source-highlight-3.1.9.tar.gz) = d8e154e9a5d62c77807e4e5d36c0faed5ce2964291be5f8b83e2968a6de52229503689a4ca2109a717ae2632a14b63ec937ca0430c91684c72063f6bc0294195
 Size (source-highlight-3.1.9.tar.gz) = 1717234 bytes
+SHA1 (patch-lib_srchilite_fileutil.cc) = 0e2fab101bf1bd4431f3b04193c1fe5e04aacb11
+SHA1 (patch-lib_srchilite_fileutil.h) = 245a9ffbe889e6420e124038de8cbad174c7e7a8
 SHA1 (patch-lib_tests_stdboosterror.h) = 3948726a1e358bfcf83a8529c4a9b452c2907e62
 SHA1 (patch-lib_tests_test__wordtokenizer__main.cpp) = 8ccf9b0a2b4dae17c99e933a2c20e2cb6c512928
 SHA1 (patch-tests_valgrind__suppressions.sh.in) = f3bd3b94b74d198ce0ac2cf81a688835fa940323

Added files:

Index: pkgsrc/textproc/source-highlight/patches/patch-lib_srchilite_fileutil.cc
diff -u /dev/null pkgsrc/textproc/source-highlight/patches/patch-lib_srchilite_fileutil.cc:1.1
--- /dev/null   Sun Jun 16 18:47:42 2024
+++ pkgsrc/textproc/source-highlight/patches/patch-lib_srchilite_fileutil.cc    Sun Jun 16 18:47:42 2024
@@ -0,0 +1,22 @@
+$NetBSD: patch-lib_srchilite_fileutil.cc,v 1.1 2024/06/16 18:47:42 wiz Exp $
+
+commit 904949c9026cb772dc93fbe0947a252ef47127f4
+Author: Tom Tromey <tom%tromey.com@localhost>
+Date:   Wed Jun 10 20:38:27 2020 -0600
+
+    Remove "throw" specifications
+
+    C++ throw specifications were deprecated in C++11.
+    This patch removes them from the library.
+
+--- lib/srchilite/fileutil.cc.orig     2024-06-16 18:45:32.449771762 +0000
++++ 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()) {
Index: pkgsrc/textproc/source-highlight/patches/patch-lib_srchilite_fileutil.h
diff -u /dev/null pkgsrc/textproc/source-highlight/patches/patch-lib_srchilite_fileutil.h:1.1
--- /dev/null   Sun Jun 16 18:47:42 2024
+++ pkgsrc/textproc/source-highlight/patches/patch-lib_srchilite_fileutil.h     Sun Jun 16 18:47:42 2024
@@ -0,0 +1,22 @@
+$NetBSD: patch-lib_srchilite_fileutil.h,v 1.1 2024/06/16 18:47:42 wiz Exp $
+
+commit 904949c9026cb772dc93fbe0947a252ef47127f4
+Author: Tom Tromey <tom%tromey.com@localhost>
+Date:   Wed Jun 10 20:38:27 2020 -0600
+
+    Remove "throw" specifications
+
+    C++ throw specifications were deprecated in C++11.
+    This patch removes them from the library.
+
+--- lib/srchilite/fileutil.h.orig      2024-06-16 18:45:39.263792391 +0000
++++ 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);
+