commit cfee45ba059967e5abf8b7e5707fd4e6797dcf63
Author: Jan Palus <[email protected]>
Date: Sun Aug 18 17:40:53 2024 +0200
up to 4.13
highlight-Makefile.patch | 8 ++++----
highlight.spec | 8 ++++----
2 files changed, 8 insertions(+), 8 deletions(-)
---
diff --git a/highlight.spec b/highlight.spec
index acf10bf..35e314b 100644
--- a/highlight.spec
+++ b/highlight.spec
@@ -6,17 +6,17 @@
Summary: A source code converter to HTML, XHTML, RTF, TeX, LaTeX,
XSL-FO, and XML
Summary(pl.UTF-8): Konwerter kodu źródłowego do formatów HTML, XHTML, RTF,
TeX, LaTeX, XSL-FO oraz XML
Name: highlight
-Version: 4.10
+Version: 4.13
Release: 1
License: GPL v3
Group: Applications/Publishing
Source0: http://www.andre-simon.de/zip/%{name}-%{version}.tar.bz2
-# Source0-md5: 187a16136f7aa4310e57eecb994b7ac4
+# Source0-md5: 25e6aef8901eb5cf555f36be63ce502e
Patch0: %{name}-Makefile.patch
URL: http://www.andre-simon.de/
BuildRequires: boost-devel
%{?with_apidocs:BuildRequires: doxygen}
-BuildRequires: libstdc++-devel
+BuildRequires: libstdc++-devel >= 6:8
BuildRequires: lua-devel >= 5.3
BuildRequires: pkgconfig
BuildRequires: rpm-build >= 4.6
@@ -113,7 +113,7 @@ ZSH completion for highlight.
%build
%{__make} \
CXX="%{__cxx}" \
- CXXFLAGS="%{rpmcxxflags} -std=c++11" \
+ CXXFLAGS="%{rpmcxxflags} -std=c++17" \
LUA_PKG_NAME="lua"
%if %{with gui}
%{__make} gui \
diff --git a/highlight-Makefile.patch b/highlight-Makefile.patch
index 87a4966..33933c1 100644
--- a/highlight-Makefile.patch
+++ b/highlight-Makefile.patch
@@ -14,14 +14,14 @@ diff -urN highlight-3.34.orig/src/makefile
highlight-3.34/src/makefile
QMAKE ?= qmake
--CFLAGS:=-Wall -O2 ${CFLAGS} -DNDEBUG -std=c++11 -D_FILE_OFFSET_BITS=64
-+CXXFLAGS:=-Wall -O2 ${CFLAGS} -DNDEBUG -std=c++11 -D_FILE_OFFSET_BITS=64
+-CFLAGS:=-Wall -O2 ${CFLAGS} -DNDEBUG -std=c++17 -D_FILE_OFFSET_BITS=64
++CXXFLAGS:=-Wall -O2 ${CFLAGS} -DNDEBUG -std=c++17 -D_FILE_OFFSET_BITS=64
-#CFLAGS:= -fPIC -O2 -g -pipe -Wall -Werror=format-security
-Wp,-D_FORTIFY_SOURCE=2 -Wp,-D_GLIBCXX_ASSERTIONS -fexceptions
-fstack-protector-strong -grecord-gcc-switches -fasynchronous-unwind-tables
-fstack-clash-protection
+#CXXFLAGS:= -fPIC -O2 -g -pipe -Wall -Werror=format-security
-Wp,-D_FORTIFY_SOURCE=2 -Wp,-D_GLIBCXX_ASSERTIONS -fexceptions
-fstack-protector-strong -grecord-gcc-switches -fasynchronous-unwind-tables
-fstack-clash-protection
--#CFLAGS:=-ggdb -O0 ${CFLAGS} -std=c++11
-+#CXXFLAGS:=-ggdb -O0 ${CFLAGS} -std=c++11
+-#CFLAGS:=-ggdb -O0 ${CFLAGS} -std=c++17
++#CXXFLAGS:=-ggdb -O0 ${CFLAGS} -std=c++17
-CFLAGS_DILU=-fno-strict-aliasing
+CXXFLAGS_DILU=-fno-strict-aliasing
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/highlight.git/commitdiff/cfee45ba059967e5abf8b7e5707fd4e6797dcf63
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
