[upd] 0.5.0→0.5.1

Add a patch to fix flex usage

3 files changed, 68 insertions, 6 deletions

diff --git a/.SRCINFO b/.SRCINFO
index da505a5191b8..53f9b5e9b872 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = libnpa
 	pkgdesc = Free library for manipulating Nitroplus game files
-	pkgver = 0.5.0
+	pkgver = 0.5.1
 	pkgrel = 1
 	url = http://dev.pulsir.eu/krofna/
 	arch = i686
@@ -10,8 +10,10 @@ pkgbase = libnpa
 	makedepends = boost
 	depends = boost-libs
 	depends = zlib
-	source = libnpa-0.5.0.tar.gz::https://github.com/FGRE/libnpa/archive/v0.5.0.tar.gz
-	sha256sums = 38367514f0a070bd3f2869c58c3603cb91a19633818aad9f01aa6f467f690e64
+	source = libnpa-0.5.1.tar.gz::https://github.com/FGRE/libnpa/archive/v0.5.1.tar.gz
+	source = libnpa-fix-flex-function-prototype.patch
+	sha256sums = bd2235afcf51b383546497e6d073523c9de300260ca8f20d44147dd9ebf77644
+	sha256sums = bdfbbb54e27cda8c7ce1e4b9ad31eb224fa9e88e2e18166a55d348e606086834
 
 pkgname = libnpa
 
diff --git a/PKGBUILD b/PKGBUILD
index 94189b77047f..f44a738741fd 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: carstene1ns <arch carsten-teibes de> - http://git.io/ctPKG
 
 pkgname=libnpa
-pkgver=0.5.0
+pkgver=0.5.1
 pkgrel=1
 arch=('i686' 'x86_64')
 license=('MIT')
@@ -9,8 +9,15 @@ pkgdesc='Free library for manipulating Nitroplus game files'
 url='http://dev.pulsir.eu/krofna/'
 depends=('boost-libs' 'zlib')
 makedepends=('cmake' 'boost')
-source=($pkgname-$pkgver.tar.gz::"https://github.com/FGRE/$pkgname/archive/v$pkgver.tar.gz")
-sha256sums=('38367514f0a070bd3f2869c58c3603cb91a19633818aad9f01aa6f467f690e64')
+source=($pkgname-$pkgver.tar.gz::"https://github.com/FGRE/$pkgname/archive/v$pkgver.tar.gz"
+        "$pkgname-fix-flex-function-prototype.patch")
+sha256sums=('bd2235afcf51b383546497e6d073523c9de300260ca8f20d44147dd9ebf77644'
+            'bdfbbb54e27cda8c7ce1e4b9ad31eb224fa9e88e2e18166a55d348e606086834')
+
+prepare() {
+  cd $pkgname-$pkgver
+  patch -Np1 < ../$pkgname-fix-flex-function-prototype.patch
+}
 
 build() {
   cd $pkgname-$pkgver
diff --git a/libnpa-fix-flex-function-prototype.patch b/libnpa-fix-flex-function-prototype.patch
new file mode 100644
index 000000000000..0e7ef8e07d09
--- /dev/null
+++ b/libnpa-fix-flex-function-prototype.patch
@@ -0,0 +1,53 @@
+From 3b3dfe69b694b6a8b67c53f87d605a6414fb0379 Mon Sep 17 00:00:00 2001
+From: Carsten Teibes <dev@f4ke.de>
+Date: Mon, 21 Nov 2016 01:13:22 +0100
+Subject: [PATCH] Fix flex function prototype for flex >= 2.6.1 Add explicit
+ flex/bison dependency for CMake
+
+---
+ CMakeLists.txt   | 5 +++--
+ include/flex.hpp | 5 ++---
+ 2 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index e3f10a1..5d5abe3 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -59,6 +59,7 @@ endif()
+ 
+ flex_target(lexer ${CMAKE_SOURCE_DIR}/src/lexer.l ${CMAKE_SOURCE_DIR}/src/lexer.cpp)
+ bison_target(parser ${CMAKE_SOURCE_DIR}/src/parser.y ${CMAKE_SOURCE_DIR}/src/parser.cpp)
++add_flex_bison_dependency(lexer parser)
+ 
+ add_library(npa SHARED
+     src/inpafile.cpp
+@@ -73,8 +74,8 @@ add_library(npa SHARED
+     src/npakeys.cpp
+     src/buffer.cpp
+     src/nsscompiler.cpp
+-    src/parser.cpp
+-    src/lexer.cpp
++    ${BISON_parser_OUTPUTS}
++    ${FLEX_lexer_OUTPUTS}
+     src/nsbconstants.cpp
+ )
+ target_link_libraries(npa ${Boost_LIBRARIES} ${ZLIB_LIBRARIES})
+diff --git a/include/flex.hpp b/include/flex.hpp
+index 6bce9bd..962fc25 100644
+--- a/include/flex.hpp
++++ b/include/flex.hpp
+@@ -3,9 +3,8 @@
+ 
+ typedef struct yy_buffer_state* YY_BUFFER_STATE;
+ extern int yyparse();
+-#if ((FLEX_VERSION_MAJOR) > 2 || \
+-    ((FLEX_VERSION_MAJOR == 2 && FLEX_VERSION_MINOR > 5) || \
+-    ((FLEX_VERSION_MAJOR == 2 && FLEX_VERSION_MINOR == 5 && FLEX_VERSION_PATCH > 35))))
++#if ((FLEX_VERSION_MAJOR == 2 && FLEX_VERSION_MINOR == 6 && FLEX_VERSION_PATCH == 0) || \
++    (FLEX_VERSION_MAJOR == 2 && FLEX_VERSION_MINOR == 5 && FLEX_VERSION_PATCH > 35))
+ extern YY_BUFFER_STATE yy_scan_bytes(const char* bytes, size_t len);
+ #else
+ extern YY_BUFFER_STATE yy_scan_bytes(const char* bytes, int len);
+-- 
+2.10.2
+