diff options
Diffstat (limited to 'user/nml')
| -rw-r--r-- | user/nml/APKBUILD | 11 | ||||
| -rw-r--r-- | user/nml/pillow.patch | 14 |
2 files changed, 4 insertions, 21 deletions
diff --git a/user/nml/APKBUILD b/user/nml/APKBUILD index e47718dd0..8cc91663b 100644 --- a/user/nml/APKBUILD +++ b/user/nml/APKBUILD @@ -1,8 +1,8 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=nml -pkgver=0.4.5 -pkgrel=1 +pkgver=0.6.1 +pkgrel=0 pkgdesc="NewGRF Meta Language utilities for OpenTTD mods" url="https://newgrf-specs.tt-wiki.net/wiki/NML:Main" arch="all" @@ -10,9 +10,7 @@ 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 - pillow.patch - " +source="https://github.com/OpenTTD/$pkgname/releases/download/$pkgver/$pkgname-$pkgver.tar.gz" build() { python3 setup.py build @@ -26,5 +24,4 @@ package() { python3 setup.py install --prefix=/usr --root="$pkgdir" } -sha512sums="64b2f46a1c2e37fce8f51231094e30334f368b0db39c6a3977a144a798d8034d1abbe7c14af3921eb81f4b7caa193e7e53ccb9e27acd113e0407926b109ca952 nml-0.4.5.tar.gz -06ba794eca5a4af5b06b8c4a223bb2006567cfced1d3017d380ef4c0000e69124e1f67855a982eff7a68aeb24ee30b080e345fa8d3e251a3553ea4153ed84e98 pillow.patch" +sha512sums="41b1f1c256543ef42067ef3bb81dbb10771498f3dc06e6ce1b328723710380b2a6dad52b2258716b6caab3e4f17d22d57992c76e0800440b9daff5811304e016 nml-0.6.1.tar.gz" diff --git a/user/nml/pillow.patch b/user/nml/pillow.patch deleted file mode 100644 index 4fb1f1247..000000000 --- a/user/nml/pillow.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- 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 |