main/py3-pillow: move from main/py-pillow, upgrade to 7.1.1

2026-05-04 20:06:43 +02:00 · 2020-04-12 21:47:24 +02:00 · 2020-04-12 21:47:24 +02:00 · c622dede8b
commit c622dede8b
parent c319485df2
3 changed files with 46 additions and 78 deletions
--- a/main/py-pillow/APKBUILD
+++ b/main/py-pillow/APKBUILD
@ -1,67 +0,0 @@
-# Contributor: Fabian Affolter <fabian@affolter-engineering.ch>
-# Maintainer: Fabian Affolter <fabian@affolter-engineering.ch>
-pkgname=py-pillow
-_pkgname=Pillow
-pkgver=6.2.2
-pkgrel=1
-pkgdesc="Python Imaging Library"
-options="!check"
-url="https://python-pillow.org"
-arch="all"
-license="custom:PIL"
-depends="py-olefile"
-makedepends="python2-dev python3-dev py2-setuptools py3-setuptools freetype-dev
-	jpeg-dev libwebp-dev tiff-dev libpng-dev lcms2-dev libjpeg-turbo-dev
-	zlib-dev"
-subpackages="py2-${pkgname#py-}:_py2 py3-${pkgname#py-}:_py3"
-source="https://files.pythonhosted.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz
-	py-pillow-fix-pytest-ver.patch"
-builddir="$srcdir/$_pkgname-$pkgver"
-
-# secfixes:
-#   6.2.2-r0:
-#     - CVE-2019-19911
-#     - CVE-2020-5310
-#     - CVE-2020-5311
-#     - CVE-2020-5312
-#     - CVE-2020-5313
-
-build() {
-	# zlib resides in lib
-	export CFLAGS="$CFLAGS -L/lib"
-	python2 setup.py build
-	python3 setup.py build
-}
-
-check() {
-	rm -f Tests/test_imageshow.py
-	python2 setup.py test -v
-	python3 setup.py test -v
-}
-
-package() {
-	mkdir -p "$pkgdir"
-}
-
-_py2() {
-	replaces="$pkgname py-imaging"
-	depends="${depends//py-/py2-}"
-	_py python2
-}
-
-_py3() {
-	depends="${depends//py-/py3-}"
-	_py python3
-}
-
-_py() {
-	local python="$1"
-	pkgdesc="$pkgdesc (for $python)"
-	install_if="$pkgname=$pkgver-r$pkgrel $python"
-
-	cd "$builddir"
-	$python setup.py install --prefix=/usr --root="$subpkgdir"
-}
-
-sha512sums="517c971d4fb23a47466a7e8326c8c29291f7832d4521001c1898d6223ea25d4b0a8b7c8f7e78dd706f421229a8261b558b9fbdc43e47a0a2a7b2b4bbc1a21eff  Pillow-6.2.2.tar.gz
-b33216541d7cdeb481d650b7cafeb44333244abbdab035ff5aa086c8dc9c5b2e1e9e294048f299f803d251c7a70ac4ea0a68ba28e7a9ced136287d61310708cf  py-pillow-fix-pytest-ver.patch"
--- a/main/py-pillow/py-pillow-fix-pytest-ver.patch
+++ b/main/py-pillow/py-pillow-fix-pytest-ver.patch
@ -1,11 +0,0 @@
--- ./setup.py.orig
-+++ ./setup.py
-@@ -881,7 +881,7 @@
-         ext_modules=[Extension("PIL._imaging", ["_imaging.c"])],
-         include_package_data=True,
-         setup_requires=pytest_runner,
-        tests_require=["pytest"],
-+        tests_require=["pytest < 5"],
-         packages=["PIL"],
-         package_dir={"": "src"},
-         keywords=["Imaging"],
--- a/main/py3-pillow/APKBUILD
+++ b/main/py3-pillow/APKBUILD
@ -0,0 +1,46 @@
+# Contributor: Fabian Affolter <fabian@affolter-engineering.ch>
+# Maintainer: Fabian Affolter <fabian@affolter-engineering.ch>
+pkgname=py3-pillow
+_pkgname=Pillow
+pkgver=7.1.1
+pkgrel=0
+pkgdesc="Python Imaging Library"
+options="!check"
+url="https://python-pillow.org/"
+arch="all"
+license="custom:PIL"
+depends="py3-olefile"
+makedepends="python3-dev py3-setuptools freetype-dev
+	openjpeg-dev libimagequant-dev libwebp-dev tiff-dev libpng-dev lcms2-dev libjpeg-turbo-dev
+	libwebp-dev libxcb-dev zlib-dev"
+checkdepends="py3-pytest py3-numpy"
+source="https://files.pythonhosted.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz"
+builddir="$srcdir/$_pkgname-$pkgver"
+
+provides="py-pillow=$pkgver-r$pkgrel" # backwards compatibility
+replaces="py-pillow" # backwards compatiblity
+
+# secfixes:
+#   6.2.2-r0:
+#     - CVE-2019-19911
+#     - CVE-2020-5310
+#     - CVE-2020-5311
+#     - CVE-2020-5312
+#     - CVE-2020-5313
+
+build() {
+	# zlib resides in lib
+	export CFLAGS="$CFLAGS -L/lib"
+	python3 setup.py build
+}
+
+check() {
+	python3 setup.py test
+	python3 selftest.py
+}
+
+package() {
+	python3 setup.py install --prefix=/usr --root="$pkgdir"
+}
+
+sha512sums="aeb99802cd4dcf33f70cdd842904f8481a31e6162d9b31dc243e38adfc5403c69818f2cc23fa5fa7987965c90da409fde3202bc0fd4bf13ba014fff3668814a3  Pillow-7.1.1.tar.gz"