From 339b0db6a0fd6e3776ba496d803aa34c5d1fbb59 Mon Sep 17 00:00:00 2001
From: "A. Wilcox" <AWilcox@Wilcox-Tech.com>
Date: Mon, 14 Jan 2019 19:20:33 +0000
Subject: user/grfcodec: use va_lists properly

---
 user/grfcodec/APKBUILD      |  7 +++++--
 user/grfcodec/va_copy.patch | 16 ++++++++++++++++
 2 files changed, 21 insertions(+), 2 deletions(-)
 create mode 100644 user/grfcodec/va_copy.patch

(limited to 'user/grfcodec')

diff --git a/user/grfcodec/APKBUILD b/user/grfcodec/APKBUILD
index c0e97d2ac..7ca60e872 100644
--- a/user/grfcodec/APKBUILD
+++ b/user/grfcodec/APKBUILD
@@ -11,7 +11,9 @@ license="GPL-2.0-only"
 depends=""
 makedepends="boost-dev"
 subpackages="$pkgname-doc"
-source="https://binaries.openttd.org/extra/grfcodec/$pkgver/grfcodec-$pkgver-source.tar.xz"
+source="https://binaries.openttd.org/extra/grfcodec/$pkgver/grfcodec-$pkgver-source.tar.xz
+	va_copy.patch
+	"
 
 build() {
 	cd "$builddir"
@@ -23,4 +25,5 @@ package() {
 	make prefix=/usr DESTDIR="$pkgdir" install
 }
 
-sha512sums="543123c794bfdb5b6556f7a897bcd2f3bdd09be8ad6a4ff07b138e0cac62621a4801c732bb20099c1bb383ad5822fc4ade276d49acf2744c811edd10d7699480  grfcodec-6.0.6-source.tar.xz"
+sha512sums="543123c794bfdb5b6556f7a897bcd2f3bdd09be8ad6a4ff07b138e0cac62621a4801c732bb20099c1bb383ad5822fc4ade276d49acf2744c811edd10d7699480  grfcodec-6.0.6-source.tar.xz
+4e7034132f889ac62b82d08dae8c928c8a7efd5a0c3dc0d3f35d6c394fb78082a37a22678c5a428489bd26608d868054131a14fb10201d5ce478d46eb9c96890  va_copy.patch"
diff --git a/user/grfcodec/va_copy.patch b/user/grfcodec/va_copy.patch
new file mode 100644
index 000000000..04a549d60
--- /dev/null
+++ b/user/grfcodec/va_copy.patch
@@ -0,0 +1,16 @@
+--- grfcodec-6.0.6/src/sanity_defines.h.old	2015-05-09 10:59:46.000000000 +0000
++++ grfcodec-6.0.6/src/sanity_defines.h	2019-01-14 19:17:36.690000000 +0000
+@@ -77,10 +77,10 @@
+ 	~apWrapper(){va_end(_ap);}
+ 	operator va_list&(){return _ap;}
+ 	operator const va_list&()const{return _ap;}
+-#ifdef __va_copy
++#ifdef va_copy
+ 	va_list&operator=(va_list&ap){
+-	    __va_copy(_ap,ap);
+-		return _ap;
++	    va_copy(_ap,ap);
++	    return _ap;
+ 	}
+ #else
+ 	va_list const&operator=(va_list const&ap){
-- 
cgit v1.2.3-70-g09d2