From 71c35a9ad2927098801e5e280b15e1098b4aee43 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Milo=C5=A1=20Komar=C4=8Devi=C4=87?=
 <miloskomarcevic@aim.com>
Date: Mon, 12 Apr 2021 09:16:28 +0200
Subject: [PATCH 1/2] python-jsonschema: add six dep, sync w/ template

---
 mingw-w64-python-jsonschema/PKGBUILD          | 31 +++++++++++--------
 .../jsonschema3-i686.install                  | 17 ----------
 .../jsonschema3-x86_64.install                | 14 ---------
 3 files changed, 18 insertions(+), 44 deletions(-)
 delete mode 100644 mingw-w64-python-jsonschema/jsonschema3-i686.install
 delete mode 100644 mingw-w64-python-jsonschema/jsonschema3-x86_64.install

diff --git a/mingw-w64-python-jsonschema/PKGBUILD b/mingw-w64-python-jsonschema/PKGBUILD
index 5db7e56d0d..c645c6921d 100644
--- a/mingw-w64-python-jsonschema/PKGBUILD
+++ b/mingw-w64-python-jsonschema/PKGBUILD
@@ -7,7 +7,7 @@ provides=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
 conflicts=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
 replaces=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
 pkgver=3.2.0
-pkgrel=1
+pkgrel=2
 pkgdesc="An implementation of JSON Schema validation for Python (mingw-w64)"
 arch=('any')
 mingw_arch=('mingw32' 'mingw64' 'ucrt64')
@@ -17,38 +17,43 @@ depends=("${MINGW_PACKAGE_PREFIX}-python"
          "${MINGW_PACKAGE_PREFIX}-python-setuptools"
          "${MINGW_PACKAGE_PREFIX}-python-attrs"
          "${MINGW_PACKAGE_PREFIX}-python-pyrsistent"
+         "${MINGW_PACKAGE_PREFIX}-python-six"
          "${MINGW_PACKAGE_PREFIX}-python-importlib-metadata")
 makedepends=("${MINGW_PACKAGE_PREFIX}-python-setuptools-scm")
-install=${_realname}3-${CARCH}.install
+options=('staticlibs' 'strip' '!debug')
 source=("${_realname}-${pkgver}.tar.gz::https://github.com/Julian/jsonschema/archive/v${pkgver}.tar.gz")
 sha256sums=('026ffa0674256c9b0fda123ea84774d6650a949bb71eebf5d87f90ec255b7c9e')
 
 prepare() {
-  rm -rf python-build-${CARCH} | true
+  rm -rf python-build-${CARCH} || true
   cp -r "${_realname}-${pkgver}" "python-build-${CARCH}"
 
+  # Set version for setuptools_scm
   export SETUPTOOLS_SCM_PRETEND_VERSION=${pkgver}
 }
 
 build() {
+  msg "Python build for ${CARCH}"  
   cd "${srcdir}/python-build-${CARCH}"
   ${MINGW_PREFIX}/bin/python setup.py build
 }
 
+check() {
+  msg "Python test for ${CARCH}"
+  cd "${srcdir}/python-build-${CARCH}"
+  ${MINGW_PREFIX}/bin/python setup.py check
+}
+
 package() {
   cd "${srcdir}/python-build-${CARCH}"
-
   MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
-  ${MINGW_PREFIX}/bin/python setup.py install \
-    --prefix=${MINGW_PREFIX} --root=${pkgdir} --optimize=1 --skip-build
+  ${MINGW_PREFIX}/bin/python setup.py install --prefix=${MINGW_PREFIX} \
+    --root="${pkgdir}" --optimize=1 --skip-build
 
-  find "${pkgdir}/" -name "*.pyc" -delete
-  find "${pkgdir}/" -type d -empty -delete
-
-  install -D -m644 json/LICENSE ${pkgdir}${MINGW_PREFIX}/share/licenses/python-${_realname}/LICENSE
+  install -Dm644 json/LICENSE "${pkgdir}${MINGW_PREFIX}/share/licenses/python-${_realname}/LICENSE"
   
-  local _mingw_prefix=$(cygpath -am ${MINGW_PREFIX})
-  for _ff in ${pkgdir}${MINGW_PREFIX}/bin/*.py; do
-    sed -e "s|${_mingw_prefix}|${MINGW_PREFIX}|g" -i ${_ff}
+  # remove shebang line
+  for _f in "${pkgdir}${MINGW_PREFIX}"/bin/*-script.py; do
+    sed -e '1 { s/^#!.*$// }' -i ${_f}
   done
 }
diff --git a/mingw-w64-python-jsonschema/jsonschema3-i686.install b/mingw-w64-python-jsonschema/jsonschema3-i686.install
deleted file mode 100644
index cd41b522ab..0000000000
--- a/mingw-w64-python-jsonschema/jsonschema3-i686.install
+++ /dev/null
@@ -1,17 +0,0 @@
-post_install() {
-  cd mingw32
-  local _prefix=$(pwd -W)
-  cd -
-  local _it
-# "somepackage" should be replaced with the name of your .EXE w/o 2 and .exe ext
-# Like this:
-# For "myexe.exe", it would be "myexe" .
-  for _it in jsonschema; do
-    sed -e "s|/mingw32|${_prefix}|g" \
-        -i ${_prefix}/bin/${_it}-script.py
-  done
-}
-
-post_upgrade() {
-  post_install
-}
diff --git a/mingw-w64-python-jsonschema/jsonschema3-x86_64.install b/mingw-w64-python-jsonschema/jsonschema3-x86_64.install
deleted file mode 100644
index a94a7d84e5..0000000000
--- a/mingw-w64-python-jsonschema/jsonschema3-x86_64.install
+++ /dev/null
@@ -1,14 +0,0 @@
-post_install() {
-  cd mingw64
-  local _prefix=$(pwd -W)
-  cd -
-  local _it
-  for _it in jsonschema; do
-    sed -e "s|/mingw64|${_prefix}|g" \
-        -i ${_prefix}/bin/${_it}-script.py
-  done
-}
-
-post_upgrade() {
-  post_install
-}

From deacc32fb0455643ef9948ae7edb9afd736df6aa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Milo=C5=A1=20Komar=C4=8Devi=C4=87?=
 <miloskomarcevic@aim.com>
Date: Tue, 13 Apr 2021 09:34:26 +0200
Subject: [PATCH 2/2] python-jsonschema: restore removal of compiled files

---
 mingw-w64-python-jsonschema/PKGBUILD | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/mingw-w64-python-jsonschema/PKGBUILD b/mingw-w64-python-jsonschema/PKGBUILD
index c645c6921d..57197fdcc2 100644
--- a/mingw-w64-python-jsonschema/PKGBUILD
+++ b/mingw-w64-python-jsonschema/PKGBUILD
@@ -33,7 +33,7 @@ prepare() {
 }
 
 build() {
-  msg "Python build for ${CARCH}"  
+  msg "Python build for ${CARCH}"
   cd "${srcdir}/python-build-${CARCH}"
   ${MINGW_PREFIX}/bin/python setup.py build
 }
@@ -50,8 +50,11 @@ package() {
   ${MINGW_PREFIX}/bin/python setup.py install --prefix=${MINGW_PREFIX} \
     --root="${pkgdir}" --optimize=1 --skip-build
 
+  find "${pkgdir}/" -name "*.pyc" -delete
+  find "${pkgdir}/" -type d -empty -delete
+
   install -Dm644 json/LICENSE "${pkgdir}${MINGW_PREFIX}/share/licenses/python-${_realname}/LICENSE"
-  
+
   # remove shebang line
   for _f in "${pkgdir}${MINGW_PREFIX}"/bin/*-script.py; do
     sed -e '1 { s/^#!.*$// }' -i ${_f}