diff options
Diffstat (limited to 'main/highlight')
| -rw-r--r-- | main/highlight/APKBUILD | 21 | ||||
| -rw-r--r-- | main/highlight/lua-pkg-config.patch | 25 | ||||
| -rw-r--r-- | main/highlight/lua5.1-compat.patch | 11 |
3 files changed, 36 insertions, 21 deletions
diff --git a/main/highlight/APKBUILD b/main/highlight/APKBUILD index 8b088eadbdf..6a559d798cb 100644 --- a/main/highlight/APKBUILD +++ b/main/highlight/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Carlo Landmeter <clandmeter@gmail.com> # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=highlight -pkgver=3.20 +pkgver=3.21 pkgrel=0 pkgdesc="Fast and flexible source code highlighter" url="http://www.andre-simon.de/doku/highlight/highlight.html" @@ -9,11 +9,12 @@ arch="all" license="GPLv3" depends="" depends_dev="" -makedepends="$depends_dev lua-dev boost-dev" +makedepends="$depends_dev lua5.2-dev boost-dev" install="" subpackages="$pkgname-doc" source="http://www.andre-simon.de/zip/highlight-$pkgver.tar.bz2 - lua5.1-compat.patch" + lua-pkg-config.patch + " _builddir="$srcdir"/highlight-$pkgver prepare() { @@ -29,7 +30,7 @@ prepare() { build() { cd "$_builddir" - make cli + make cli LUAPC=lua5.2 } package() { @@ -38,9 +39,9 @@ package() { find "$pkgdir" -name '*.la' -delete } -md5sums="9acf4b2928499eb00fcf4be9e7b791f8 highlight-3.20.tar.bz2 -2450274893ceaa7288ae3ce3c680540d lua5.1-compat.patch" -sha256sums="b503df491549b0745ef2dc20330c297e6fbfddc3a150cc416080815b6b03f20d highlight-3.20.tar.bz2 -2d907c2c8a62cf18e11b780ab51a63907df628fecab8f3072e752c2843b4169f lua5.1-compat.patch" -sha512sums="acd8173039e1f4c715e6bb19b90f5b9d6e2f063e36912ebd113375a2cf7bd2d95395a3582be5f0364d9c58abc8c25f8dd3fac49b2d24b5e2f00264112cf5e180 highlight-3.20.tar.bz2 -e2b4d01bc1483149fdabb3a5d6fc9d146f433bb61ef987e0377b751bde8fcb6a80d09f47d3d6cae6c45add11ef82ce9088eee750d68e84b42b3cbbdf7970b701 lua5.1-compat.patch" +md5sums="122cd432e84f0b29aed172435af31aed highlight-3.21.tar.bz2 +515af7c72fb3e19b2625ce24d77cf016 lua-pkg-config.patch" +sha256sums="0e4e80a56709ba6397b30efa4923c4ec3fbb700e9ee07da67494965f11351bf0 highlight-3.21.tar.bz2 +7102d9803c9342db1d62e31eef44e5ddb11029bb2d0e2889355f604325ae1270 lua-pkg-config.patch" +sha512sums="71f1a5804dee4220101c09f7a26c4a09683580cc59949eab5bec8ede91370d2f3535148bae03fdd6f0224e8e69b646f9d7a614c2ffdab43ef8032b7158d80833 highlight-3.21.tar.bz2 +c4f9c6296887cc3aeaa3cc1428da819193bfa083772b045768623b9e97fe2e36c56330b970638d94d6c7c05f3423dc849551a8f0f98f5515214acd2e4f5400b5 lua-pkg-config.patch" diff --git a/main/highlight/lua-pkg-config.patch b/main/highlight/lua-pkg-config.patch new file mode 100644 index 00000000000..c8cb8316991 --- /dev/null +++ b/main/highlight/lua-pkg-config.patch @@ -0,0 +1,25 @@ +--- ./src/makefile.orig ++++ ./src/makefile +@@ -12,7 +12,7 @@ + + # See src/gui-qt/highlight.pro for the Qt GUI compilation options + +-CXX=c++ ++CXX?=c++ + + # Added -qt4 because of Arch Linux Qt5 migration + QMAKE=qmake-qt4 +@@ -37,10 +37,11 @@ + # 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) ++LUAPC?=lua ++LUA_CFLAGS=$(shell pkg-config --cflags $(LUAPC)) + + # default lua lib +-LUA_LIBS=$(shell pkg-config --libs lua) ++LUA_LIBS=$(shell pkg-config --libs $(LUAPC)) + + # luajit lib + # LUA_LIBS=$(shell pkg-config --libs luajit) diff --git a/main/highlight/lua5.1-compat.patch b/main/highlight/lua5.1-compat.patch deleted file mode 100644 index 8fe59e9fb23..00000000000 --- a/main/highlight/lua5.1-compat.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/src/makefile -+++ b/src/makefile -@@ -38,7 +38,7 @@ - # - remove -DUSE_LUA52 - # - use lua5.1 in the pkg-config calls - --LUA_CFLAGS=$(shell pkg-config --cflags lua) -DUSE_LUA52 -+LUA_CFLAGS=$(shell pkg-config --cflags lua) - - # default lua lib - LUA_LIBS=$(shell pkg-config --libs lua) |