From d65402e5bd42daecdcd0c666195dc9c57eb0615d Mon Sep 17 00:00:00 2001
From: Natanael Copa <ncopa@alpinelinux.org>
Date: Thu, 23 Apr 2015 09:34:41 +0000
Subject: main/highlight: upgrade to 3.22

---
 main/highlight/APKBUILD             | 19 +++++++++--------
 main/highlight/lua-pkg-config.patch | 42 ++++++++++++++++++-------------------
 2 files changed, 31 insertions(+), 30 deletions(-)

diff --git a/main/highlight/APKBUILD b/main/highlight/APKBUILD
index 6a559d798c..6d7c917876 100644
--- a/main/highlight/APKBUILD
+++ b/main/highlight/APKBUILD
@@ -1,7 +1,8 @@
 # Contributor: Carlo Landmeter <clandmeter@gmail.com>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+_luaver=5.3
 pkgname=highlight
-pkgver=3.21
+pkgver=3.22
 pkgrel=0
 pkgdesc="Fast and flexible source code highlighter"
 url="http://www.andre-simon.de/doku/highlight/highlight.html"
@@ -9,7 +10,7 @@ arch="all"
 license="GPLv3"
 depends=""
 depends_dev=""
-makedepends="$depends_dev lua5.2-dev boost-dev"
+makedepends="$depends_dev lua${_luaver}-dev boost-dev"
 install=""
 subpackages="$pkgname-doc"
 source="http://www.andre-simon.de/zip/highlight-$pkgver.tar.bz2
@@ -30,7 +31,7 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	make cli LUAPC=lua5.2
+	make cli LUAPC=lua${_luaver}
 }
 
 package() {
@@ -39,9 +40,9 @@ package() {
 	find "$pkgdir" -name '*.la' -delete
 }
 
-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"
+md5sums="6e6e12b7ee966fe6b1a31eeda3f0761a  highlight-3.22.tar.bz2
+3169160e55414c91c749a6c6a17ff531  lua-pkg-config.patch"
+sha256sums="4776ce4305e6f92d8a9faf5d0aeffd56f413ad57e55303e7a2a6357387ec056f  highlight-3.22.tar.bz2
+21ffdda3c4c6ad949f214a406267955b968cc2efdcd366d5ad4334264e81b817  lua-pkg-config.patch"
+sha512sums="9b5d0b46ab99f48baa2756c0f819434b2c01ceadd276a6d16939e0949fcdd8fddedf6c21ff8421b715ffae2d2c88f2b07357c5062124f83bcfe8dcca9c62ab07  highlight-3.22.tar.bz2
+57913ebff939568fcb984ad40f3124391543bdaea4e5f018e98d28dda95b2d3cf17e88ba32b573ae4428cd70c4dce1d0c2338c40e00c546c432c633bda0180bf  lua-pkg-config.patch"
diff --git a/main/highlight/lua-pkg-config.patch b/main/highlight/lua-pkg-config.patch
index c8cb831699..c1416a062b 100644
--- a/main/highlight/lua-pkg-config.patch
+++ b/main/highlight/lua-pkg-config.patch
@@ -1,25 +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
+ 
+ # 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)
+ # 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)
-- 
cgit v1.2.3