diff options
| author | André Klitzing <aklitzing@gmail.com> | 2017-03-03 23:33:43 +0100 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2017-03-07 11:36:22 +0000 |
| commit | 96c60a9fd654adbf94d89c989977a174c91601d6 (patch) | |
| tree | e9104c41ceb15eecf2f52e9a05420699b0d85d55 /main/highlight | |
| parent | 47c8fda1d2a54d7c4fba220db6396146599bc30a (diff) | |
| download | aports-96c60a9fd654adbf94d89c989977a174c91601d6.tar.bz2 aports-96c60a9fd654adbf94d89c989977a174c91601d6.tar.xz | |
main/highlight: upgrade to 3.35
* Modernize abuild
* Update pkg-config patch
Diffstat (limited to 'main/highlight')
| -rw-r--r-- | main/highlight/APKBUILD | 36 | ||||
| -rw-r--r-- | main/highlight/lua.patch (renamed from main/highlight/lua-pkg-config.patch) | 52 |
2 files changed, 36 insertions, 52 deletions
diff --git a/main/highlight/APKBUILD b/main/highlight/APKBUILD index 4655d3e4c6..56b27c2e17 100644 --- a/main/highlight/APKBUILD +++ b/main/highlight/APKBUILD @@ -2,46 +2,28 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> _luaver=5.3 pkgname=highlight -pkgver=3.29 +pkgver=3.35 pkgrel=0 pkgdesc="Fast and flexible source code highlighter" url="http://www.andre-simon.de/doku/highlight/highlight.html" arch="all" license="GPLv3" -depends="" -depends_dev="" -makedepends="$depends_dev lua${_luaver}-dev boost-dev" -install="" +makedepends="lua${_luaver}-dev boost-dev" subpackages="$pkgname-doc" source="http://www.andre-simon.de/zip/highlight-$pkgver.tar.bz2 - lua-pkg-config.patch - " - -_builddir="$srcdir"/highlight-$pkgver -prepare() { - local i - cd "$_builddir" - for i in $source; do - case $i in - *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;; - esac - done - -} + lua.patch + " +builddir="$srcdir"/highlight-$pkgver build() { - cd "$_builddir" + cd "$builddir" make cli LUAPC=lua${_luaver} } package() { - cd "$_builddir" + cd "$builddir" make DESTDIR="$pkgdir" install } -md5sums="660908ef08bf0cd32663f3e228e8d160 highlight-3.29.tar.bz2 -3169160e55414c91c749a6c6a17ff531 lua-pkg-config.patch" -sha256sums="76cc769d98778985235c0b7d1345cff78c99f597b51edd4e9be7d3fc0160bf92 highlight-3.29.tar.bz2 -21ffdda3c4c6ad949f214a406267955b968cc2efdcd366d5ad4334264e81b817 lua-pkg-config.patch" -sha512sums="e17d780741ab64fbcf174100db3890dc1b8d5c41494901e1c01f1039177baabaa1fefeb72d30afa8723cb84f2cbb873378afcdfe8e8beba2e845c6abcec14ac9 highlight-3.29.tar.bz2 -57913ebff939568fcb984ad40f3124391543bdaea4e5f018e98d28dda95b2d3cf17e88ba32b573ae4428cd70c4dce1d0c2338c40e00c546c432c633bda0180bf lua-pkg-config.patch" +sha512sums="4f0959b4deacccf3de7137a4db45c2ec7091fb7427076cb5c5709a8d2027458328133ff541ebfb5cbe25fdcd9eebcd1cc9ed58526300d56ac6205fe6b806d211 highlight-3.35.tar.bz2 +3e1a8a4d770c0161f969fadd6fe309260470fa09d44453d6c582be34197bb751ae3422f16ecff46ab268bfe758bac7b3ef3a73d5afcb3c677458a41b323c0a97 lua.patch" diff --git a/main/highlight/lua-pkg-config.patch b/main/highlight/lua.patch index c1416a062b..fb3eeaa884 100644 --- a/main/highlight/lua-pkg-config.patch +++ b/main/highlight/lua.patch @@ -1,25 +1,27 @@ ---- ./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)
+--- a/src/makefile ++++ b/src/makefile +@@ -13,7 +13,8 @@ + # See src/gui-qt/highlight.pro for the Qt GUI compilation options + + #CXX=clang++ +-CXX=g++ ++#CXX=g++ ++CXX ?= c++ + + # was: qmake-qt5 + QMAKE=qmake +@@ -38,11 +39,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) |