[arch-commits] Commit in python-pillow/trunk (PKGBUILD)

[Eli Schwartz]

    Date: Wednesday, February 7, 2018 @ 00:32:20
  Author: eschwartz
Revision: 289673

upgpkg: python-pillow 5.0.0-1

upstream release
split out "sane" module
add optimized bytecode
enable testsuite
fix optdepends
FS#55226 enable complex text support

Modified:
  python-pillow/trunk/PKGBUILD

----------+
 PKGBUILD |  104 +++++++++++++++++++++++++++----------------------------------
 1 file changed, 47 insertions(+), 57 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-02-07 00:21:43 UTC (rev 289672)
+++ PKGBUILD	2018-02-07 00:32:20 UTC (rev 289673)
@@ -4,89 +4,79 @@
 
 pkgbase=python-pillow
 pkgname=(python-pillow python2-pillow)
-pkgver=4.3.0
+pkgver=5.0.0
 pkgrel=1
-# consider splitting out sane if this gets weird enough
-_sanever=2.8.3
 _appname=Pillow
 _py2basever=2.7
 _py3basever=3.6m
 pkgdesc="Python Imaging Library (PIL) fork. Python3 version."
 arch=('x86_64')
-url="http://python-pillow.github.io/"
+url="https://python-pillow.github.io/"
 license=('BSD')
-depends=('python' 'lcms2' 'libwebp' 'openjpeg2' 'python-olefile')
-optdepends=('tk: for the ImageTK module'
-            'sane: for the Sane module'
-            'python-pyqt5: for the ImageQt module'
-            'python-pyqt4: for the ImageQt module'
-            'python-pyside: for the ImageQt module')
-makedepends=('python-setuptools' 'python2-setuptools' 'lcms2' 'libwebp' 'openjpeg2' 'tk' 'sane')
+depends=('lcms2' 'libtiff' 'openjpeg2')
+optdepends=('freetype2: for the ImageFont module'
+            'libraqm: for complex text scripts'
+            'libwebp: for webp images'
+            'tk: for the ImageTK module')
+makedepends=('python-setuptools' 'python2-setuptools' 'freetype2' 'libraqm' 'libwebp' 'tk')
+checkdepends=('python-pytest' 'python2-pytest')
 source=("https://files.pythonhosted.org/packages/source/P/$_appname/$_appname-$pkgver.tar.gz"
-        "Sane-$_sanever.tar.gz::https://github.com/python-pillow/Sane/archive/v$_sanever.tar.gz")
-md5sums=('ac8904e17922c8a699ff7d6cb0cf89cd'
-         '96877da43524fdab2c367541da547d2b')
+        "freetype-2.9-testfailure.patch::https://github.com/python-pillow/Pillow/commit/4afed260dc8a2b926a8dccfeed45b085d67425ca.patch")
+md5sums=('08094bc48aae6877c94f8db4b8ee8e52'
+         '04e168f81a434e76dab09456ad7930f9')
 
 # future optional things:
 # libimagequant
 
 prepare() {
-  cd "$srcdir"
-  # allow sane to build
-  sed -i "s|os.path.join|'../libImaging', &|" "$srcdir/Sane-$_sanever/setup.py"
-  cp -r "$srcdir/Sane-$_sanever" "$srcdir/$_appname-$pkgver/Sane"
-  # py2 and py3
-  cp -r "$srcdir/$_appname-$pkgver" "$srcdir/${_appname}2-$pkgver"
-}  
+  cd "$srcdir/${_appname}-$pkgver"
+  patch -p1 < ../freetype-2.9-testfailure.patch
+}
 
+build() {
+  cd "$srcdir/${_appname}-$pkgver"
+  python setup.py build
+  python2 setup.py build
+}
+
+check() {
+  cd "$srcdir/${_appname}-$pkgver"
+
+  export PYTHONPATH="$PWD/build/lib.linux-$CARCH-${_py3basever%m}"
+  python selftest.py
+  pytest
+  export PYTHONPATH="$PWD/build/lib.linux-$CARCH-$_py2basever"
+  python2 selftest.py
+  pytest2
+}
+
 package_python-pillow() {
-  depends=('python' 'lcms2' 'libwebp' 'openjpeg2' 'python-olefile')
-  optdepends=('tk: for the ImageTK module'
-              'sane: for the Sane module'
-              'python-pyqt4: for the ImageQt module')
+  depends+=('python')
+  optdepends+=('python-olefile: OLE2 file support'
+               'python-pyqt4: for the ImageQt module'
+               'python-pyqt5: for the ImageQt module'
+               'python-pyside: for the ImageQt module')
   cd "$srcdir/$_appname-$pkgver"
-  python3 setup.py install --root="$pkgdir/" --optimize=0
-  pushd Sane
-    python3 setup.py install --root="$pkgdir/" --optimize=0
-  popd
+  python3 setup.py install --root="$pkgdir/" --optimize=1
   install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
 
   install -dm755 "$pkgdir/usr/include/python$_py3basever/"
-  install -m644 -t "$pkgdir/usr/include/python$_py3basever/" libImaging/*.h
-
-  # clean up bins
-  cd "$pkgdir/usr/bin"
-  for f in *.py; do
-    mv "$f" "${f%.py}"
-  done
+  install -m644 -t "$pkgdir/usr/include/python$_py3basever/" src/libImaging/*.h
 }
 
 package_python2-pillow() {
   pkgdesc="Python Imaging Library (PIL) fork. Python2 version."
-  depends=('python2' 'lcms2' 'libwebp' 'openjpeg2' 'python2-olefile')
-  optdepends=('tk: for the ImageTK module'
-              'sane: for the Sane module'
-              'python2-pyqt5: for the ImageQt module'
-              'python2-pyqt4: for the ImageQt module'
-              'python2-pyside: for the ImageQt module')
+  depends+=('python2')
+  optdepends+=('python2-olefile: OLE2 file support'
+               'python2-pyqt5: for the ImageQt module'
+               'python2-pyqt4: for the ImageQt module'
+               'python2-pyside: for the ImageQt module')
   provides=('python-imaging' 'python2-imaging')
   conflicts=('python-imaging' 'python2-imaging')
-  cd "$srcdir/${_appname}2-$pkgver"
-  sed -i 's|python$|python2|' PIL/OleFileIO.py
-  python2 setup.py install --root="$pkgdir/" --optimize=0
-  pushd Sane
-    python2 setup.py install --root="$pkgdir/" --optimize=0
-  popd
-
+  cd "$srcdir/${_appname}-$pkgver"
+  python2 setup.py install --root="$pkgdir/" --optimize=1
   install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
 
   install -dm755 "$pkgdir/usr/include/python$_py2basever/"
-  install -m644 -t "$pkgdir/usr/include/python$_py2basever/" libImaging/*.h
-
-  # clean up bins
-  cd "$pkgdir/usr/bin"
-  for f in *.py; do
-    mv "$f" "${f%.py}2"
-  done
+  install -m644 -t "$pkgdir/usr/include/python$_py2basever/" src/libImaging/*.h
 }
-