commit 5126db626d6209f89c9bc6a655cfa85ff4fb0c22
Author: Jan Palus <[email protected]>
Date: Wed Jun 2 11:25:48 2021 +0000
build against unversioned lua
highlight-Makefile.patch | 15 ---------------
highlight.spec | 6 ++++--
2 files changed, 4 insertions(+), 17 deletions(-)
---
diff --git a/highlight.spec b/highlight.spec
index 38d16c3..4934a7f 100644
--- a/highlight.spec
+++ b/highlight.spec
@@ -17,7 +17,8 @@ URL: http://www.andre-simon.de/
BuildRequires: boost-devel
%{?with_apidocs:BuildRequires: doxygen}
BuildRequires: libstdc++-devel
-BuildRequires: lua53-devel
+BuildRequires: lua-devel >= 5.3
+BuildRequires: pkgconfig
BuildRequires: rpmbuild(macros) >= 1.752
%if %{with gui}
BuildRequires: Qt5Core-devel
@@ -80,7 +81,8 @@ RTF, TeX, LaTeX, XSL-FO, and XML.
%build
%{__make} \
CXX="%{__cxx}" \
- CXXFLAGS="%{rpmcxxflags} -std=c++11"
+ CXXFLAGS="%{rpmcxxflags} -std=c++11" \
+ LUA_PKG_NAME="lua"
%if %{with gui}
%{__make} gui \
QMAKE=qmake-qt5 \
diff --git a/highlight-Makefile.patch b/highlight-Makefile.patch
index aced04a..268b52d 100644
--- a/highlight-Makefile.patch
+++ b/highlight-Makefile.patch
@@ -55,18 +55,3 @@ diff -urN highlight-3.34.orig/src/makefile
highlight-3.34/src/makefile
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.3
- CONFIG += link_pkgconfig
-- PKGCONFIG += lua
-+ PKGCONFIG += lua5.3
-
- # to make it run within Qt Creator
- !contains(DEFINES, DATA_DIR.*) {
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/highlight.git/commitdiff/10fa87e64b8658687e54cb19aa95489b14f71ea0
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
