Added upstream patch to fix #2131454
Signed-off-by: Adrian Reber <adrian@lisas.de>
This commit is contained in:
parent
a7cb5c448d
commit
cdc578d87f
42
904949c9026cb772dc93fbe0947a252ef47127f4.patch
Normal file
42
904949c9026cb772dc93fbe0947a252ef47127f4.patch
Normal file
@ -0,0 +1,42 @@
|
||||
From 904949c9026cb772dc93fbe0947a252ef47127f4 Mon Sep 17 00:00:00 2001
|
||||
From: Tom Tromey <tom@tromey.com>
|
||||
Date: Wed, 10 Jun 2020 20:38:27 -0600
|
||||
Subject: Remove "throw" specifications
|
||||
|
||||
C++ throw specifications were deprecated in C++11.
|
||||
This patch removes them from the library.
|
||||
---
|
||||
ChangeLog | 5 +++++
|
||||
lib/srchilite/fileutil.cc | 2 +-
|
||||
lib/srchilite/fileutil.h | 2 +-
|
||||
3 files changed, 7 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);
|
||||
|
||||
--
|
||||
cgit v1.1
|
||||
|
@ -1,11 +1,14 @@
|
||||
Summary: Produces a document with syntax highlighting
|
||||
Name: source-highlight
|
||||
Version: 3.1.9
|
||||
Release: 14%{?dist}.1
|
||||
Release: 15%{?dist}
|
||||
License: GPLv3+
|
||||
Source0: ftp://ftp.gnu.org/gnu/src-highlite/%{name}-%{version}.tar.gz
|
||||
Source1: ftp://ftp.gnu.org/gnu/src-highlite/%{name}-%{version}.tar.gz.sig
|
||||
URL: http://www.gnu.org/software/src-highlite/
|
||||
# Taken from https://git.savannah.gnu.org/cgit/src-highlite.git/patch/?id=904949c9026cb772dc93fbe0947a252ef47127f4
|
||||
# and slightly adapted
|
||||
Patch0: 904949c9026cb772dc93fbe0947a252ef47127f4.patch
|
||||
BuildRequires: make
|
||||
BuildRequires: bison, flex, boost-devel
|
||||
BuildRequires: help2man, chrpath, pkgconfig(bash-completion)
|
||||
@ -87,6 +90,9 @@ rmdir $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d
|
||||
%{_includedir}/srchilite/*.h
|
||||
|
||||
%changelog
|
||||
* Thu Oct 06 2022 Adrian Reber <adrian@lisas.de> - 3.1.9-15
|
||||
- Added upstream patch to fix #2131454
|
||||
|
||||
* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 3.1.9-14.1
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user