[packages/highlight] up to 3.34
atler
atler at pld-linux.org
Tue Jan 24 23:08:45 CET 2017
commit 9d86d0ce105a3f1e100d7d156860d39432fa738b
Author: Jan Palus <atler at pld-linux.org>
Date: Tue Jan 24 23:07:59 2017 +0100
up to 3.34
highlight-Makefile.patch | 158 ++++++++++++++++++++++++-----------------------
highlight.spec | 4 +-
2 files changed, 82 insertions(+), 80 deletions(-)
---
diff --git a/highlight.spec b/highlight.spec
index 823725e..1633ef6 100644
--- a/highlight.spec
+++ b/highlight.spec
@@ -5,12 +5,12 @@
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: 3.30
+Version: 3.34
Release: 1
License: GPL v3
Group: Applications/Publishing
Source0: http://www.andre-simon.de/zip/%{name}-%{version}.tar.bz2
-# Source0-md5: 3636b0db7ba0285bac4f27b34a38bf16
+# Source0-md5: 6c886515231f5c16eca991a736eefe6e
Patch0: %{name}-Makefile.patch
URL: http://www.andre-simon.de/
BuildRequires: QtCore-devel
diff --git a/highlight-Makefile.patch b/highlight-Makefile.patch
index 67d9b36..4a54c1e 100644
--- a/highlight-Makefile.patch
+++ b/highlight-Makefile.patch
@@ -1,79 +1,81 @@
---- highlight-3.30/src/makefile.orig 2016-07-24 23:17:13.177486879 +0200
-+++ highlight-3.30/src/makefile 2016-07-24 23:18:05.876942844 +0200
+diff -urN highlight-3.34.orig/src/makefile highlight-3.34/src/makefile
+--- highlight-3.34.orig/src/makefile 2017-01-24 22:56:25.702768453 +0100
++++ highlight-3.34/src/makefile 2017-01-24 22:57:44.332773964 +0100
@@ -2,7 +2,7 @@
- # This file will compile the highlight library and binaries.
- # See INSTALL for instructions.
-
--# Add -DHL_DATA_DIR=\"/your/path/\" to CFLAGS if you want to define a
-+# Add -DHL_DATA_DIR=\"/your/path/\" to CXXFLAGS if you want to define a
- # custom installation directory not listed in INSTALL.
- # Copy *.conf, ./langDefs, ./themes amd ./indentSchemes to /your/path/.
- # See ../makefile for the definition of ${data_dir}
-@@ -18,10 +18,10 @@
- QMAKE=qmake
-
- # Added -std=c++11 because of auto_ptr to unique_ptr transition
--CFLAGS:=-Wall -O2 ${CFLAGS} -DNDEBUG -std=c++11
--#CFLAGS:=-ggdb ${CFLAGS}
-+CXXFLAGS:=-Wall -O2 ${CXXFLAGS} -DNDEBUG -std=c++11
-+#CXXFLAGS:=-ggdb ${CXXFLAGS}
-
--CFLAGS_DILU=-fno-strict-aliasing
-+CXXFLAGS_DILU=-fno-strict-aliasing
-
- SO_VERSION=3.30
-
-@@ -38,10 +38,10 @@
- # If Lua 5.2 is not default on your system yet you have to
- # use lua5.1 in the pkg-config calls
-
--LUA_CFLAGS=$(shell pkg-config --cflags lua)
-+LUA_CFLAGS=$(shell pkg-config --cflags lua5.2)
-
- # default lua lib
--LUA_LIBS=$(shell pkg-config --libs lua)
-+LUA_LIBS=$(shell pkg-config --libs lua5.2)
-
- # luajit lib
- # LUA_LIBS=$(shell pkg-config --libs luajit)
-@@ -62,7 +62,7 @@
- endif
-
- ifdef PIC
-- CFLAGS+=-fPIC
-+ CXXFLAGS+=-fPIC
- endif
-
- LDFLAGS = -ldl
-@@ -72,7 +72,7 @@
- #LDFLAGS = ${LDFLAGS} -s
- #LDFLAGS= -Wl,--as-needed
-
--CXX_COMPILE=${CXX} ${CFLAGS} -c -I ${INCLUDE_DIR} ${LUA_CFLAGS}
-+CXX_COMPILE=${CXX} ${CXXFLAGS} -c -I ${INCLUDE_DIR} ${LUA_CFLAGS}
-
- # Data directories (data dir, configuration file dir)
- CXX_DIR=-DHL_DATA_DIR=\"${HL_DATA_DIR}\" -DHL_CONFIG_DIR=\"${HL_CONFIG_DIR}\"
-@@ -234,7 +234,7 @@
- LuaUtils.o: ${DILU_DIR}LuaUtils.cpp
- ${CXX_COMPILE} ${DILU_DIR}LuaUtils.cpp
- LuaValue.o: ${DILU_DIR}LuaValue.cpp
-- ${CXX_COMPILE} ${CFLAGS_DILU} ${DILU_DIR}LuaValue.cpp
-+ ${CXX_COMPILE} ${CXXFLAGS_DILU} ${DILU_DIR}LuaValue.cpp
- LuaVariable.o: ${DILU_DIR}LuaVariable.cpp
- ${CXX_COMPILE} ${DILU_DIR}LuaVariable.cpp
- LuaWrappers.o: ${DILU_DIR}LuaWrappers.cpp
---- highlight-3.30/src/gui-qt/highlight.pro.orig 2016-07-24 23:21:32.954798546 +0200
-+++ highlight-3.30/src/gui-qt/highlight.pro 2016-07-24 23:21:49.861289760 +0200
-@@ -35,9 +35,9 @@
- unix {
- DESTDIR = ../
- LIBS += -L.. -lhighlight
-- LIBS += -llua
-+ LIBS += -llua5.2
- CONFIG += link_pkgconfig
-- PKGCONFIG += lua
-+ PKGCONFIG += lua5.2
-
- # to make it run within Qt Creator
- !contains(DEFINES, DATA_DIR) {
+ # This file will compile the highlight library and binaries.
+ # See INSTALL for instructions.
+
+-# Add -DHL_DATA_DIR=\"/your/path/\" to CFLAGS if you want to define a
++# Add -DHL_DATA_DIR=\"/your/path/\" to CXXFLAGS if you want to define a
+ # custom installation directory not listed in INSTALL.
+ # Copy *.conf, ./langDefs, ./themes amd ./indentSchemes to /your/path/.
+ # See ../makefile for the definition of ${data_dir}
+@@ -19,10 +19,10 @@
+ QMAKE=qmake
+
+ # Added -std=c++11 because of auto_ptr to unique_ptr transition
+-CFLAGS:=-Wall -O2 ${CFLAGS} -DNDEBUG -std=c++11
+-#CFLAGS:=-ggdb ${CFLAGS}
++CXXFLAGS:=-Wall -O2 ${CXXFLAGS} -DNDEBUG -std=c++11
++#CXXFLAGS:=-ggdb ${CXXFLAGS}
+
+-CFLAGS_DILU=-fno-strict-aliasing
++CXXFLAGS_DILU=-fno-strict-aliasing
+
+ SO_VERSION=3.30
+
+@@ -39,10 +39,10 @@
+ # If Lua 5.2 is not default on your system yet you have to
+ # use lua5.1 in the pkg-config calls
+
+-LUA_CFLAGS=$(shell pkg-config --cflags lua)
++LUA_CFLAGS=$(shell pkg-config --cflags lua5.2)
+
+ # default lua lib
+-LUA_LIBS=$(shell pkg-config --libs lua)
++LUA_LIBS=$(shell pkg-config --libs lua5.2)
+
+ # luajit lib
+ # LUA_LIBS=$(shell pkg-config --libs luajit)
+@@ -63,7 +63,7 @@
+ endif
+
+ ifdef PIC
+- CFLAGS+=-fPIC
++ CXXFLAGS+=-fPIC
+ endif
+
+ LDFLAGS = -ldl
+@@ -73,7 +73,7 @@
+ #LDFLAGS = ${LDFLAGS} -s
+ #LDFLAGS= -Wl,--as-needed
+
+-CXX_COMPILE=${CXX} ${CFLAGS} -c -I ${INCLUDE_DIR} ${LUA_CFLAGS}
++CXX_COMPILE=${CXX} ${CXXFLAGS} -c -I ${INCLUDE_DIR} ${LUA_CFLAGS}
+
+ # Data directories (data dir, configuration file dir)
+ CXX_DIR=-DHL_DATA_DIR=\"${HL_DATA_DIR}\" -DHL_CONFIG_DIR=\"${HL_CONFIG_DIR}\"
+@@ -235,7 +235,7 @@
+ LuaUtils.o: ${DILU_DIR}LuaUtils.cpp
+ ${CXX_COMPILE} ${DILU_DIR}LuaUtils.cpp
+ LuaValue.o: ${DILU_DIR}LuaValue.cpp
+- ${CXX_COMPILE} ${CFLAGS_DILU} ${DILU_DIR}LuaValue.cpp
++ ${CXX_COMPILE} ${CXXFLAGS_DILU} ${DILU_DIR}LuaValue.cpp
+ LuaVariable.o: ${DILU_DIR}LuaVariable.cpp
+ ${CXX_COMPILE} ${DILU_DIR}LuaVariable.cpp
+ LuaWrappers.o: ${DILU_DIR}LuaWrappers.cpp
+diff -urN highlight-3.34.orig/src/gui-qt/highlight.pro highlight-3.34/src/gui-qt/highlight.pro
+--- highlight-3.34.orig/src/gui-qt/highlight.pro 2017-01-24 22:56:25.702768453 +0100
++++ highlight-3.34/src/gui-qt/highlight.pro 2017-01-24 22:58:08.419208074 +0100
+@@ -38,9 +38,9 @@
+ unix {
+ DESTDIR = ../
+ LIBS += -L.. -lhighlight
+- LIBS += -llua
++ LIBS += -llua5.2
+ CONFIG += link_pkgconfig
+- PKGCONFIG += lua
++ PKGCONFIG += lua5.2
+
+ # to make it run within Qt Creator
+ !contains(DEFINES, DATA_DIR) {
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/highlight.git/commitdiff/9d86d0ce105a3f1e100d7d156860d39432fa738b
More information about the pld-cvs-commit
mailing list