[packages/highlight] up to 3.30

atler atler at pld-linux.org
Sun Jul 24 23:37:54 CEST 2016 

commit 7a8012a758c41bd8fb54241ac15d21973f081a31
Author: Jan Palus <atler at pld-linux.org>
Date:   Sun Jul 24 23:35:47 2016 +0200

    up to 3.30
    
    - BR: boost-devel, lua52-devel
    - requires std=c++11 to compile
    - packaged lua plugins and new l10n langs
    - apidocs bcond toggled due to missing Doxyfile (apidocs target still
      exists in makefile)

 highlight-Makefile.patch | 117 +++++++++++++++++++++++++++++++----------------
 highlight.spec           |  20 ++++----
 2 files changed, 90 insertions(+), 47 deletions(-)
---
diff --git a/highlight.spec b/highlight.spec
index 654cf22..823725e 100644
--- a/highlight.spec
+++ b/highlight.spec
@@ -1,22 +1,24 @@
 #
 # Conditional build:
-%bcond_without	apidocs # don't generate apidocs subpackage
+%bcond_with	apidocs # don't generate apidocs subpackage
 
 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:	2.16
-Release:	3
+Version:	3.30
+Release:	1
 License:	GPL v3
 Group:		Applications/Publishing
 Source0:	http://www.andre-simon.de/zip/%{name}-%{version}.tar.bz2
-# Source0-md5:	08f1429a6db258ab1a7eecbb4e0d44b2
+# Source0-md5:	3636b0db7ba0285bac4f27b34a38bf16
 Patch0:		%{name}-Makefile.patch
 URL:		http://www.andre-simon.de/
 BuildRequires:	QtCore-devel
 BuildRequires:	QtGui-devel
+BuildRequires:	boost-devel
 %{?with_apidocs:BuildRequires:	doxygen}
 BuildRequires:	libstdc++-devel
+BuildRequires:	lua52-devel
 BuildRequires:	qt4-build
 BuildRequires:	qt4-qmake
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -70,16 +72,14 @@ RTF, TeX, LaTeX, XSL-FO, and XML.
 %setup -q
 %patch0 -p1
 
-%{__rm} src/gui-qt/moc_*.cpp
-
 %build
 %{__make} \
 	CXX="%{__cxx}" \
-	CXXFLAGS="%{rpmcxxflags}"
+	CXXFLAGS="%{rpmcxxflags} -std=c++11"
 %{__make} gui \
 	QMAKE=qmake-qt4 \
 	CXX="%{__cxx}" \
-	CXXFLAGS="%{rpmcxxflags} "'$(DEFINES)'
+	CXXFLAGS="%{rpmcxxflags} -std=c++11 "'$(DEFINES)'
 
 %{?with_apidocs:%{__make} apidocs}
 
@@ -121,8 +121,12 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/%{name}-gui
 %dir %{_datadir}/%{name}/gui_files
 %dir %{_datadir}/%{name}/gui_files/l10n
+%lang(cs) %dir %{_datadir}/%{name}/gui_files/l10n/highlight_cs_CZ.qm
 %lang(de) %dir %{_datadir}/%{name}/gui_files/l10n/highlight_de_DE.qm
 %lang(es) %dir %{_datadir}/%{name}/gui_files/l10n/highlight_es_ES.qm
+%lang(zh) %dir %{_datadir}/%{name}/gui_files/l10n/highlight_zh_CN.qm
 %{_datadir}/%{name}/gui_files/ext
+%dir %{_datadir}/%{name}/plugins
+%{_datadir}/%{name}/plugins/*.lua
 %{_desktopdir}/*.desktop
 %{_pixmapsdir}/*.xpm
diff --git a/highlight-Makefile.patch b/highlight-Makefile.patch
index 1d0b274..67d9b36 100644
--- a/highlight-Makefile.patch
+++ b/highlight-Makefile.patch
@@ -1,40 +1,79 @@
---- highlight-2.9/src/makefile.orig	2009-04-23 05:32:21.000000000 +0200
-+++ highlight-2.9/src/makefile	2009-05-27 18:57:01.000000000 +0200
+--- 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
 @@ -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}
-@@ -17,8 +17,8 @@
- 
- CXX=c++
- 
--CFLAGS:=-O2 ${CFLAGS}
--#CFLAGS:=-ggdb ${CFLAGS}
-+CXXFLAGS:=-O2 ${CXXFLAGS}
-+#CXXFLAGS:=-ggdb ${CXXFLAGS}
- 
- SO_VERSION=2.13
- 
-@@ -38,7 +38,7 @@
- 	HL_DATA_DIR = /usr/share/highlight/
- endif
- ifdef PIC
--	CFLAGS+=-fPIC
-+	CXXFLAGS+=-fPIC
- endif
- 
- # Do not strip by default (Mac OS X lazy pointer issues)
-@@ -48,7 +48,7 @@
- #LDFLAGS = ${LDFLAGS} -s
- #LDFLAGS= -Wl,--as-needed
- 
--CXX_COMPILE=${CXX} ${CFLAGS} -c -I ${CORE_DIR}
-+CXX_COMPILE=${CXX} ${CXXFLAGS} -c -I ${CORE_DIR}
- 
- # Data directories (data dir, configuration file dir)
- CXX_DIR=-DHL_DATA_DIR=\"${HL_DATA_DIR}\" -DHL_CONFIG_DIR=\"${HL_CONFIG_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}
+@@ -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) {
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/highlight.git/commitdiff/7a8012a758c41bd8fb54241ac15d21973f081a31

More information about the pld-cvs-commit mailing list