diff options
-rw-r--r-- | development/highlight/highlight.SlackBuild | 10 | ||||
-rw-r--r-- | development/highlight/highlight.info | 2 | ||||
-rw-r--r-- | development/highlight/lua-qt.patch | 25 |
3 files changed, 4 insertions, 33 deletions
diff --git a/development/highlight/highlight.SlackBuild b/development/highlight/highlight.SlackBuild index ebb3bf94e0..0ac103806a 100644 --- a/development/highlight/highlight.SlackBuild +++ b/development/highlight/highlight.SlackBuild @@ -22,11 +22,13 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# 20241017 bkw: Modified by SlackBuilds.org, BUILD=2: build with lua-5.4. + cd $(dirname $0) ; CWD=$(pwd) PRGNAM=highlight VERSION=${VERSION:-4.7} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -42,9 +44,6 @@ if [ -z "$ARCH" ]; then esac fi -# If the variable PRINT_PACKAGE_NAME is set, then this script will report what -# the name of the created package would be, and then exit. This information -# could be useful to other scripts. if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" exit 0 @@ -65,9 +64,6 @@ 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 ef92753436..5673286c95 100644 --- a/development/highlight/highlight.info +++ b/development/highlight/highlight.info @@ -5,6 +5,6 @@ DOWNLOAD="http://www.andre-simon.de/zip/highlight-4.7.tar.bz2" MD5SUM="cc5f3a857aa6c6d9f23ea3e36522f959" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="lua53" +REQUIRES="lua" MAINTAINER="Ozan Türkyılmaz" EMAIL="ozan.turkyilmaz@gmail.com" diff --git a/development/highlight/lua-qt.patch b/development/highlight/lua-qt.patch deleted file mode 100644 index 6078f07dd9..0000000000 --- a/development/highlight/lua-qt.patch +++ /dev/null @@ -1,25 +0,0 @@ -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.*) { |