From 67f2bd1c3afd5122ec79ec481668525d28bdfb78 Mon Sep 17 00:00:00 2001
From: Alexey Pavlov <alexpux@gmail.com>
Date: Tue, 20 Jun 2017 11:24:25 +0300
Subject: [PATCH] WIP upgrade python packages

---
 mingw-w64-python-reportlab/PKGBUILD | 21 ++++++++++++-------
 mingw-w64-python-scandir/PKGBUILD   | 31 +++++++++++++++++++----------
 2 files changed, 34 insertions(+), 18 deletions(-)

diff --git a/mingw-w64-python-reportlab/PKGBUILD b/mingw-w64-python-reportlab/PKGBUILD
index 7cc4b55d95..dbba30294f 100644
--- a/mingw-w64-python-reportlab/PKGBUILD
+++ b/mingw-w64-python-reportlab/PKGBUILD
@@ -4,17 +4,22 @@
 _realname=reportlab
 pkgbase=mingw-w64-python-${_realname}
 pkgname=("${MINGW_PACKAGE_PREFIX}-python2-${_realname}" "${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
-pkgver=3.0
-pkgrel=5
+pkgver=3.4.0
+pkgrel=1
 pkgdesc="A proven industry-strength PDF generating solution (mingw-w64)"
 arch=('any')
 license=('custom')
 url="https://www.reportlab.org/rl_toolkit.html"
 depends=("${MINGW_PACKAGE_PREFIX}-freetype")
 makedepends=("${MINGW_PACKAGE_PREFIX}-python2"
-             "${MINGW_PACKAGE_PREFIX}-python3")
-source=(https://www.reportlab.com/ftp/${_realname}-${pkgver}.tar.gz)
-sha256sums=('a8a75186a9f2cc219c9fee5ec52ae4e18084783906b6345109770ff933bed86f')
+             "${MINGW_PACKAGE_PREFIX}-python3"
+             "${MINGW_PACKAGE_PREFIX}-python2-pip"
+             "${MINGW_PACKAGE_PREFIX}-python3-pip"
+             "${MINGW_PACKAGE_PREFIX}-python2-Pillow"
+             "${MINGW_PACKAGE_PREFIX}-python3-Pillow")
+_dtoken="87/f9/53b34c58d3735a6df7d5c542bf4de60d699cfa6035e113ca08b3ecdcca3f"
+source=("https://pypi.python.org/packages/${_dtoken}/${_realname}-${pkgver}.tar.gz")
+sha256sums=('5beaf35e59dfd5ebd814fdefd76908292e818c982bd7332b5d347dfd2f01c343')
 
 prepare() {
   cp -r ${_realname}-${pkgver} build-python2
@@ -34,7 +39,8 @@ build() {
 }
 
 package_python2-reportlab() {
-  depends=("${MINGW_PACKAGE_PREFIX}-python2")
+  depends+=("${MINGW_PACKAGE_PREFIX}-python2-pip"
+            "${MINGW_PACKAGE_PREFIX}-python2-Pillow")
 
   cd "${srcdir}/build-python2"
   MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
@@ -45,7 +51,8 @@ package_python2-reportlab() {
 }
 
 package_python3-reportlab() {
-  depends=("${MINGW_PACKAGE_PREFIX}-python3")
+  depends+=("${MINGW_PACKAGE_PREFIX}-python3-pip"
+            "${MINGW_PACKAGE_PREFIX}-python3-Pillow")
 
   cd "${srcdir}/build-python3"
   MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
diff --git a/mingw-w64-python-scandir/PKGBUILD b/mingw-w64-python-scandir/PKGBUILD
index 682ea0242f..a7a3f40f3f 100644
--- a/mingw-w64-python-scandir/PKGBUILD
+++ b/mingw-w64-python-scandir/PKGBUILD
@@ -12,36 +12,45 @@ arch=('any')
 license=('BSD')
 makedepends=("${MINGW_PACKAGE_PREFIX}-python3-setuptools"
              "${MINGW_PACKAGE_PREFIX}-python2-setuptools")
-source=("${_realname}-${pkgver}.tar.gz"::https://github.com/benhoyt/scandir/archive/v${pkgver}.tar.gz)
-sha256sums=('3b2be74e0be665d22adaf841d1cadab7ed4aa2001a9bb81452e0f498cd0780d8')
+source=("${_realname}-${pkgver}.tar.gz"::https://github.com/benhoyt/scandir/archive/v${pkgver}.tar.gz
+        001-fix-windows-detect.patch)
+sha256sums=('3b2be74e0be665d22adaf841d1cadab7ed4aa2001a9bb81452e0f498cd0780d8'
+            '140a2d8f4f3747c58ef0b0efde4da7f2e0b7217c60b27fc5d778678d6f4ffccc')
 
 prepare() {
-  cp -a ${_realname}-${pkgver}{,-py2}
+  cd ${_realname}-${pkgver}
+  patch -p1 -i ${srcdir}/001-fix-windows-detect.patch
+
+  cd ${srcdir}
+  cp -r ${_realname}-${pkgver} build-python2-${CARCH}
+  cp -r ${_realname}-${pkgver} build-python3-${CARCH}
 }
 
 build() {
-  cd ${srcdir}/${_realname}-${pkgver}
-  python3 setup.py build
+  cd ${srcdir}/build-python3-${CARCH}
+  MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
+ ${MINGW_PREFIX}/bin/python3 setup.py build
 
-  cd ${srcdir}/${_realname}-${pkgver}-py2
-  python2 setup.py build
+  cd ${srcdir}/build-python2-${CARCH}
+  MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
+  ${MINGW_PREFIX}/bin/python2 setup.py build
 }
 
 package_python3-scandir() {
   depends=("${MINGW_PACKAGE_PREFIX}-python3")
 
-  cd ${srcdir}/${_realname}-${pkgver}
+  cd ${srcdir}/build-python3-${CARCH}
   MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
-  ${MINGW_PREFIX}/bin/python3 setup.py install --root=${pkgdir} --prefix=${MINGW_PREFIX} --optimize=1
+  ${MINGW_PREFIX}/bin/python3 setup.py install --root=${pkgdir} --prefix=${MINGW_PREFIX} --optimize=1 --skip-build
   install -Dm644 LICENSE.txt "${pkgdir}${MINGW_PREFIX}/share/licenses/python3-${_realname}/LICENSE.txt"
 }
 
 package_python2-scandir() {
   depends=("${MINGW_PACKAGE_PREFIX}-python2")
 
-  cd ${srcdir}/${_realname}-${pkgver}-py2
+  cd ${srcdir}/build-python2-${CARCH}
   MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
-  ${MINGW_PREFIX}/bin/python2 setup.py install --root=${pkgdir} --prefix=${MINGW_PREFIX} --optimize=1
+  ${MINGW_PREFIX}/bin/python2 setup.py install --root=${pkgdir} --prefix=${MINGW_PREFIX} --optimize=1 --skip-build
   install -Dm644 LICENSE.txt "${pkgdir}${MINGW_PREFIX}/share/licenses/python2-${_realname}/LICENSE.txt"
 }