From 095e14b7e22e82ed4c1719894fe1f432b67ee3d0 Mon Sep 17 00:00:00 2001
From: "A. Wilcox" <AWilcox@Wilcox-Tech.com>
Date: Sat, 11 Jan 2020 02:09:22 +0000
Subject: user/nml: Fix compatibility with py3-pillow >= 6.0

---
 user/nml/APKBUILD     | 12 ++++++------
 user/nml/pillow.patch | 14 ++++++++++++++
 2 files changed, 20 insertions(+), 6 deletions(-)
 create mode 100644 user/nml/pillow.patch

(limited to 'user')

diff --git a/user/nml/APKBUILD b/user/nml/APKBUILD
index 6b7f9facb..e47718dd0 100644
--- a/user/nml/APKBUILD
+++ b/user/nml/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=nml
 pkgver=0.4.5
-pkgrel=0
+pkgrel=1
 pkgdesc="NewGRF Meta Language utilities for OpenTTD mods"
 url="https://newgrf-specs.tt-wiki.net/wiki/NML:Main"
 arch="all"
@@ -10,21 +10,21 @@ license="GPL-2.0+"
 depends="python3 py3-pillow py3-ply"
 makedepends="python3-dev"
 subpackages=""
-source="http://bundles.openttdcoop.org/nml/releases/$pkgver/nml-$pkgver.tar.gz"
+source="http://bundles.openttdcoop.org/nml/releases/$pkgver/nml-$pkgver.tar.gz
+	pillow.patch
+	"
 
 build() {
-	cd "$builddir"
 	python3 setup.py build
 }
 
 check() {
-	cd "$builddir"
 	make -C regression
 }
 
 package() {
-	cd "$builddir"
 	python3 setup.py install --prefix=/usr --root="$pkgdir"
 }
 
-sha512sums="64b2f46a1c2e37fce8f51231094e30334f368b0db39c6a3977a144a798d8034d1abbe7c14af3921eb81f4b7caa193e7e53ccb9e27acd113e0407926b109ca952  nml-0.4.5.tar.gz"
+sha512sums="64b2f46a1c2e37fce8f51231094e30334f368b0db39c6a3977a144a798d8034d1abbe7c14af3921eb81f4b7caa193e7e53ccb9e27acd113e0407926b109ca952  nml-0.4.5.tar.gz
+06ba794eca5a4af5b06b8c4a223bb2006567cfced1d3017d380ef4c0000e69124e1f67855a982eff7a68aeb24ee30b080e345fa8d3e251a3553ea4153ed84e98  pillow.patch"
diff --git a/user/nml/pillow.patch b/user/nml/pillow.patch
new file mode 100644
index 000000000..4fb1f1247
--- /dev/null
+++ b/user/nml/pillow.patch
@@ -0,0 +1,14 @@
+--- nml-0.4.5/nml/version_info.py.old	2018-06-30 09:10:30.000000000 +0000
++++ nml-0.4.5/nml/version_info.py	2020-01-11 00:14:30.683254313 +0000
+@@ -71,7 +71,10 @@
+     #PIL
+     try:
+         from PIL import Image
+-        versions["PIL"] = Image.VERSION
++        if hasattr(Image, 'VERSION'):
++            versions["PIL"] = Image.VERSION
++        else:
++            versions["PIL"] = "1.1.7"  # Pillow
+     except ImportError:
+         try:
+             import Image
-- 
cgit v1.2.3-60-g2f50