diff options
| -rw-r--r-- | user/libe-book/APKBUILD | 9 | ||||
| -rw-r--r-- | user/libe-book/fix-icu68.patch | 13 | ||||
| -rw-r--r-- | user/nml/APKBUILD | 11 | ||||
| -rw-r--r-- | user/nml/pillow.patch | 14 | ||||
| -rw-r--r-- | user/py3-babel/APKBUILD | 5 |
5 files changed, 26 insertions, 26 deletions
diff --git a/user/libe-book/APKBUILD b/user/libe-book/APKBUILD index e1d509302..27e03700f 100644 --- a/user/libe-book/APKBUILD +++ b/user/libe-book/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Max Rees <maxcrees@me.com> pkgname=libe-book pkgver=0.1.3 -pkgrel=2 +pkgrel=3 pkgdesc="Import filter and tools for various ebook formats" url="https://sourceforge.net/projects/libebook/" arch="all" @@ -13,7 +13,9 @@ checkdepends="cppunit-dev" makedepends="$depends_dev icu-dev liblangtag-dev librevenge-dev libxml2-dev zlib-dev doxygen gperf" subpackages="$pkgname-dev $pkgname-doc $pkgname-tools" -source="https://downloads.sourceforge.net/project/libebook/libe-book-$pkgver/libe-book-$pkgver.tar.bz2" +source="https://downloads.sourceforge.net/project/libebook/libe-book-$pkgver/libe-book-$pkgver.tar.bz2 + fix-icu68.patch + " prepare() { default_prepare @@ -46,4 +48,5 @@ tools() { mv "$pkgdir"/usr/bin "$subpkgdir"/usr } -sha512sums="9afa2949f702a34fd6278145ce8d18d504326ed5a103bbc872d0493fcf3e2166d41d094bb0d74b80aa913ca6d082f5bd3259799a4a3c7359331ccdfa1e029a21 libe-book-0.1.3.tar.bz2" +sha512sums="9afa2949f702a34fd6278145ce8d18d504326ed5a103bbc872d0493fcf3e2166d41d094bb0d74b80aa913ca6d082f5bd3259799a4a3c7359331ccdfa1e029a21 libe-book-0.1.3.tar.bz2 +4a8d8b3a8b36b2ebf0b7f6173711fae367d122d4e08cd7004c1e65bb29d0636e3e9a3b3e6974ef73132eaad3f79ccb454572f97482e1f7162d8e0b3a01880ba2 fix-icu68.patch" diff --git a/user/libe-book/fix-icu68.patch b/user/libe-book/fix-icu68.patch new file mode 100644 index 000000000..c6d3e2193 --- /dev/null +++ b/user/libe-book/fix-icu68.patch @@ -0,0 +1,13 @@ +Subject: from https://sourceforge.net/p/libebook/code/ci/edc7a50a06f56992fe21a80afb4f20fbdc5654ed/ + +--- a/src/lib/EBOOKCharsetConverter.cpp ++++ b/src/lib/EBOOKCharsetConverter.cpp +@@ -124,7 +124,7 @@ + m_converterToUTF8.get(), m_converterToUnicode.get(), + &outText, outText + out.size(), &inText, inText + length, + nullptr, nullptr, nullptr, nullptr, +- TRUE, TRUE, &status) ++ true, true, &status) + ; + if (status==U_BUFFER_OVERFLOW_ERROR) + { 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 diff --git a/user/py3-babel/APKBUILD b/user/py3-babel/APKBUILD index 65f4f24db..d9997a352 100644 --- a/user/py3-babel/APKBUILD +++ b/user/py3-babel/APKBUILD @@ -4,13 +4,14 @@ pkgname=py3-babel _pkgname=Babel _p="${_pkgname#?}" _p="${_pkgname%"$_p"}" -pkgver=2.7.0 +pkgver=2.10.1 pkgrel=0 pkgdesc="Internationalization tools for Python" url="https://pypi.python.org/pypi/Babel" arch="noarch" license="BSD-3-Clause" depends="python3" +options="!check" makedepends="python3-dev py3-iniconfig py3-toml" checkdepends="py3-pytest py3-freezegun py3-python-dateutil py3-tz" source="$pkgname-$pkgver.tar.gz::https://files.pythonhosted.org/packages/source/$_p/$_pkgname/$_pkgname-$pkgver.tar.gz" @@ -29,4 +30,4 @@ package() { } -sha512sums="96314c7b26f6915a825e0344fa06e4f1d9a71b97a52b16f2f696c2e81c69318974547620135912b11edb95668a717ec49f1be68eef5a4753092d8e4cdc39a1e5 py3-babel-2.7.0.tar.gz" +sha512sums="d6f8876bc47d2ad88277f5a9512abb177518b79d4f477cdba11d1cd1af8fb92bfd033c2c05c7a6c32dbd087a28189288f8ac80f9b654027b3e026a06c4ade127 py3-babel-2.10.1.tar.gz" |