Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package source-highlight for
openSUSE:Factory checked in at 2021-06-07 22:44:54
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/source-highlight (Old)
and /work/SRC/openSUSE:Factory/.source-highlight.new.32437 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "source-highlight"
Mon Jun 7 22:44:54 2021 rev:18 rq:898161 version:3.1.9
Changes:
--------
--- /work/SRC/openSUSE:Factory/source-highlight/source-highlight.changes
2020-12-28 10:31:48.025589949 +0100
+++
/work/SRC/openSUSE:Factory/.source-highlight.new.32437/source-highlight.changes
2021-06-07 22:45:26.080681105 +0200
@@ -1,0 +2,8 @@
+Tue Jun 1 09:33:31 UTC 2021 - Christophe Giboudeaux <[email protected]>
+
+- Add GCC 11 compatibility fix:
+ * 0001-Remove-throw-specifications.patch
+- Update source-highlight-doxygen_disable_timestamp_in_footer.patch
+ to allow using %autosetup
+
+-------------------------------------------------------------------
New:
----
0001-Remove-throw-specifications.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ source-highlight.spec ++++++
--- /var/tmp/diff_new_pack.wZUn3h/_old 2021-06-07 22:45:26.616682010 +0200
+++ /var/tmp/diff_new_pack.wZUn3h/_new 2021-06-07 22:45:26.616682010 +0200
@@ -29,9 +29,11 @@
#Source2: %{name}.keyring
Source3: baselibs.conf
Source4: source-highlight-apache2.conf
-Patch2: source-highlight-doxygen_disable_timestamp_in_footer.patch
+Patch0: source-highlight-doxygen_disable_timestamp_in_footer.patch
# PATCH-FIX-OPENSUSE use-lessopen.patch boo#1016309 [email protected] -- use
lessopen, not lesspipe
-Patch3: use-lessopen.patch
+Patch1: use-lessopen.patch
+# PATCH-FIX-UPSTREAM
+Patch2: 0001-Remove-throw-specifications.patch
BuildRequires: bison
BuildRequires: ctags
BuildRequires: doxygen
@@ -108,9 +110,8 @@
your webserver using source-highlight.
%prep
-%setup -q
-%patch2
-%patch3 -p1
+%autosetup -p1
+
sed -i 's/\r//g' doc/*.css
%build
++++++ 0001-Remove-throw-specifications.patch ++++++
>From 52ac9fe79c41f300b86a8f51df5b02d0d562b966 Mon Sep 17 00:00:00 2001
From: Tom Tromey <[email protected]>
Date: Wed, 10 Jun 2020 20:38:27 -0600
Subject: [PATCH] Remove "throw" specifications
C++ throw specifications were deprecated in C++11.
This patch removes them from the library.
---
lib/srchilite/fileutil.cc | 2 +-
lib/srchilite/fileutil.h | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
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);
--
2.31.1
++++++ source-highlight-doxygen_disable_timestamp_in_footer.patch ++++++
--- /var/tmp/diff_new_pack.wZUn3h/_old 2021-06-07 22:45:26.672682105 +0200
+++ /var/tmp/diff_new_pack.wZUn3h/_new 2021-06-07 22:45:26.672682105 +0200
@@ -1,7 +1,7 @@
-Index: lib/srchilite/srchilite.doxyfile.in
-===================================================================
---- lib/srchilite/srchilite.doxyfile.in.orig
-+++ lib/srchilite/srchilite.doxyfile.in
+diff --git a/lib/srchilite/srchilite.doxyfile.in
b/lib/srchilite/srchilite.doxyfile.in
+index e98a536..45ef2d9 100644
+--- a/lib/srchilite/srchilite.doxyfile.in
++++ b/lib/srchilite/srchilite.doxyfile.in
@@ -727,6 +727,7 @@ HTML_HEADER =
# standard footer.
