summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
author Ozan Türkyılmaz2022-09-08 08:40:38 +0200
committer Willy Sudiarto Raharjo2022-09-10 10:19:06 +0200
commit5327367fe189e44d59578b5c466efd8ca1bb09ac (patch)
treef1233a3485372b27b900a3bedfb71f5ca48a5ced
parent223fa1ca6b3e25aaa3651c82b62e1f18cbbf0664 (diff)
downloadslackbuilds-5327367fe189e44d59578b5c466efd8ca1bb09ac.tar.gz
development/highlight New Maintainer, Updated to 4.2, Fix linking failure when lua5.3 is installed.
Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
-rw-r--r--development/highlight/highlight.SlackBuild5
-rw-r--r--development/highlight/highlight.info10
-rw-r--r--development/highlight/lua-qt.patch25
3 files changed, 34 insertions, 6 deletions
diff --git a/development/highlight/highlight.SlackBuild b/development/highlight/highlight.SlackBuild
index 0e032369ec..e96bdc82e6 100644
--- a/development/highlight/highlight.SlackBuild
+++ b/development/highlight/highlight.SlackBuild
@@ -25,7 +25,7 @@
cd $(dirname $0) ; CWD=$(pwd)
PRGNAM=highlight
-VERSION=${VERSION:-4.1}
+VERSION=${VERSION:-4.2}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
PKGTYPE=${PKGTYPE:-tgz}
@@ -65,6 +65,9 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+#Patch so gui links with lua5.1 instead of lua5.3 and fail.
+patch -p1 < $CWD/lua-qt.patch
+
make cli gui
make -j1 install install-gui DESTDIR=$PKG
diff --git a/development/highlight/highlight.info b/development/highlight/highlight.info
index a38b5ab51c..d4f5a51cb1 100644
--- a/development/highlight/highlight.info
+++ b/development/highlight/highlight.info
@@ -1,10 +1,10 @@
PRGNAM="highlight"
-VERSION="4.1"
+VERSION="4.2"
HOMEPAGE="http://www.andre-simon.de/"
-DOWNLOAD="http://www.andre-simon.de/zip/highlight-4.1.tar.bz2"
-MD5SUM="65caf60e800bb8badf42aac523d48858"
+DOWNLOAD="http://www.andre-simon.de/zip/highlight-4.2.tar.bz2"
+MD5SUM="bb325c237ed1175e23acac55f2106a7c"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES="lua"
-MAINTAINER="Erik Hanson"
-EMAIL="erik@slackbuilds.org"
+MAINTAINER="Ozan Türkyılmaz"
+EMAIL="ozan.turkyilmaz@gmail.com"
diff --git a/development/highlight/lua-qt.patch b/development/highlight/lua-qt.patch
new file mode 100644
index 0000000000..6078f07dd9
--- /dev/null
+++ b/development/highlight/lua-qt.patch
@@ -0,0 +1,25 @@
+Only in highlight-4.1/src/gui-qt: .highlight.pro.un~
+diff -cr highlight-4.1.DIST/src/gui-qt/highlight.pro highlight-4.1/src/gui-qt/highlight.pro
+*** highlight-4.1.DIST/src/gui-qt/highlight.pro 2021-05-10 18:47:34.000000000 +0100
+--- highlight-4.1/src/gui-qt/highlight.pro 2022-07-27 14:39:31.295908472 +0100
+***************
+*** 36,44 ****
+ unix {
+ DESTDIR = ../
+ LIBS += -L.. -lhighlight
+! LIBS += -llua
+ CONFIG += link_pkgconfig
+! PKGCONFIG += lua
+
+ # to make it run within Qt Creator
+ !contains(DEFINES, DATA_DIR.*) {
+--- 36,44 ----
+ unix {
+ DESTDIR = ../
+ LIBS += -L.. -lhighlight
+! LIBS += -llua5.3
+ CONFIG += link_pkgconfig
+! PKGCONFIG += lua53
+
+ # to make it run within Qt Creator
+ !contains(DEFINES, DATA_DIR.*) {