From 513add185c4fe7f8ed07fe517a1a4079ef4ceab4 Mon Sep 17 00:00:00 2001
From: "MARINA\\jpmug" <jpmugaas@suddenlink.net>
Date: Wed, 9 Feb 2022 17:31:24 -0500
Subject: [PATCH 1/4] new library - ufolib2, updated fontools dependency and
 remove pytest-runner.

---
 mingw-w64-python-fonttools/PKGBUILD |  9 +++--
 mingw-w64-python-ufolib2/PKGBUILD   | 60 +++++++++++++++++++++++++++++
 2 files changed, 66 insertions(+), 3 deletions(-)
 create mode 100644 mingw-w64-python-ufolib2/PKGBUILD

diff --git a/mingw-w64-python-fonttools/PKGBUILD b/mingw-w64-python-fonttools/PKGBUILD
index 635375dc34..3e5102eab6 100644
--- a/mingw-w64-python-fonttools/PKGBUILD
+++ b/mingw-w64-python-fonttools/PKGBUILD
@@ -7,7 +7,7 @@ provides=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
 conflicts=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
 replaces=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
 pkgver=4.28.5
-pkgrel=1
+pkgrel=2
 pkgdesc="Converts OpenType and TrueType fonts to and from XML (mingw-w64)"
 arch=('any')
 mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32')
@@ -20,7 +20,10 @@ optdepends=("${MINGW_PACKAGE_PREFIX}-python-brotli: WOFF 1.0 and WOFF 2.0 webfon
             "${MINGW_PACKAGE_PREFIX}-python-sympy: for fontTools.misc.symfont, module for symbolic font statistics analysis")
 makedepends=("${MINGW_PACKAGE_PREFIX}-python-matplotlib"
              "${MINGW_PACKAGE_PREFIX}-python-setuptools")
-checkdepends=("${MINGW_PACKAGE_PREFIX}-python-pytest-runner")
+checkdepends=("${MINGW_PACKAGE_PREFIX}-python-pyfilesystem2"
+              "${MINGW_PACKAGE_PREFIX}-python-pytest"
+              "${MINGW_PACKAGE_PREFIX}-python-brotli"
+              "${MINGW_PACKAGE_PREFIX}-python-ufolib2")
 options=('staticlibs' 'strip' '!debug')
 source=("${_realname}-${pkgver}.zip::https://pypi.org/packages/source/${_realname::1}/${_realname}/${_realname}-${pkgver}.zip")
 sha256sums=('545c05d0f7903a863c2020e07b8f0a57517f2c40d940bded77076397872d14ca')
@@ -41,7 +44,7 @@ build() {
 check() {
   msg "Python test for ${CARCH}"
   cd "${srcdir}/python-build-${CARCH}"
-  ${MINGW_PREFIX}/bin/python setup.py pytest || warning "Tests failed"
+  PYTHONPATH=Lib ${MINGW_PREFIX}/bin/pytest || warning "Tests failed"
 }
 
 package() {
diff --git a/mingw-w64-python-ufolib2/PKGBUILD b/mingw-w64-python-ufolib2/PKGBUILD
new file mode 100644
index 0000000000..2c462fcc28
--- /dev/null
+++ b/mingw-w64-python-ufolib2/PKGBUILD
@@ -0,0 +1,60 @@
+# Maintainer: J. Peter Mugaas <jpmugaas@suddenlink.net>
+
+_realname=ufolib2
+_pyname=ufoLib2
+pkgbase=mingw-w64-python-${_realname}
+pkgname=("${MINGW_PACKAGE_PREFIX}-python-${_realname}")
+pkgver=0.13.1
+pkgrel=1
+pkgdesc="A library to deal with UFO font sources (mingw-w64)"
+arch=('any')
+mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64')
+url='https://github.com/fonttools/${_realname}'
+license=('LICENSE')
+_pydeps=(attrs
+         cattrs
+         fonttools
+         pyfilesystem2 # for fonttools[ufo]
+         lxml)
+depends=("${MINGW_PACKAGE_PREFIX}-python" "${MINGW_PACKAGE_PREFIX}-python-installer"
+         "${_pydeps[@]/#/${MINGW_PACKAGE_PREFIX}-python-}")
+makedepends=("${MINGW_PACKAGE_PREFIX}-python-build")
+checkdepends=("${MINGW_PACKAGE_PREFIX}-python-pytest")
+source=("https://pypi.org/packages/source/${_pyname::1}/${_pyname}/${_pyname}-${pkgver}.tar.gz")
+sha256sums=('3275a2da623e6d4b7ee29c984cdb3a5b86bbc23f0a1ce94486d8bb5c308aa47b')
+
+prepare() {
+  cd "${srcdir}/${_pyname}-${pkgver}"
+
+  ## (OPTIONAL) Only if setuptools-scm is used
+  # Set version for setuptools_scm
+  export SETUPTOOLS_SCM_PRETEND_VERSION=${pkgver}
+}
+
+build() {
+  msg "Python build for ${MSYSTEM}"
+  cd "${srcdir}"
+  cp -r "${_pyname}-${pkgver}" "python-build-${MSYSTEM}" && cd "python-build-${MSYSTEM}"
+
+  ${MINGW_PREFIX}/bin/python -m build --wheel --skip-dependency-check --no-isolation
+}
+
+check() {
+  msg "Python test for ${MSYSTEM}"
+  cd "${srcdir}/python-build-${MSYSTEM}"
+
+# The test command will usually depend upon what is contained in the tox.ini file
+# or in the [testenv:py] section of the pyproject.toml file.
+  ${MINGW_PREFIX}/bin/python -m pytest
+}
+
+package() {
+  msg "Python install for ${MSYSTEM}"
+  cd "${srcdir}/python-build-${MSYSTEM}"
+
+  MSYS2_ARG_CONV_EXCL="--prefix=" \
+    ${MINGW_PREFIX}/bin/python -m installer --prefix=${MINGW_PREFIX} \
+    --destdir="${pkgdir}" dist/*.whl
+
+  install -Dm644 LICENSE "${pkgdir}${MINGW_PREFIX}/share/licenses/python-${_realname}/LICENSE"
+}

From 83833328ce2187c6b86087c400c6afbbd322d573 Mon Sep 17 00:00:00 2001
From: "MARINA\\jpmug" <jpmugaas@suddenlink.net>
Date: Wed, 9 Feb 2022 18:30:03 -0500
Subject: [PATCH 2/4] Add setup and installer as makedepends.

---
 mingw-w64-python-ufolib2/PKGBUILD | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/mingw-w64-python-ufolib2/PKGBUILD b/mingw-w64-python-ufolib2/PKGBUILD
index 2c462fcc28..2acf307883 100644
--- a/mingw-w64-python-ufolib2/PKGBUILD
+++ b/mingw-w64-python-ufolib2/PKGBUILD
@@ -16,9 +16,11 @@ _pydeps=(attrs
          fonttools
          pyfilesystem2 # for fonttools[ufo]
          lxml)
-depends=("${MINGW_PACKAGE_PREFIX}-python" "${MINGW_PACKAGE_PREFIX}-python-installer"
+depends=("${MINGW_PACKAGE_PREFIX}-python"
          "${_pydeps[@]/#/${MINGW_PACKAGE_PREFIX}-python-}")
-makedepends=("${MINGW_PACKAGE_PREFIX}-python-build")
+makedepends=("${MINGW_PACKAGE_PREFIX}-python-build"
+             "${MINGW_PACKAGE_PREFIX}-python-installer" 
+             "${MINGW_PACKAGE_PREFIX}-python-setuptools")
 checkdepends=("${MINGW_PACKAGE_PREFIX}-python-pytest")
 source=("https://pypi.org/packages/source/${_pyname::1}/${_pyname}/${_pyname}-${pkgver}.tar.gz")
 sha256sums=('3275a2da623e6d4b7ee29c984cdb3a5b86bbc23f0a1ce94486d8bb5c308aa47b')

From dd535972875538d8842a96fc60552929fad40044 Mon Sep 17 00:00:00 2001
From: "J. Peter Mugaas" <jpmugaas@suddenlink.net>
Date: Wed, 9 Feb 2022 18:40:06 -0500
Subject: [PATCH 3/4] Update mingw-w64-python-ufolib2/PKGBUILD

Co-authored-by: Christoph Reiter <reiter.christoph@gmail.com>
---
 mingw-w64-python-ufolib2/PKGBUILD | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mingw-w64-python-ufolib2/PKGBUILD b/mingw-w64-python-ufolib2/PKGBUILD
index 2acf307883..fe06833504 100644
--- a/mingw-w64-python-ufolib2/PKGBUILD
+++ b/mingw-w64-python-ufolib2/PKGBUILD
@@ -10,7 +10,7 @@ pkgdesc="A library to deal with UFO font sources (mingw-w64)"
 arch=('any')
 mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64')
 url='https://github.com/fonttools/${_realname}'
-license=('LICENSE')
+license=('spdx:Apache-2.0')
 _pydeps=(attrs
          cattrs
          fonttools

From 15ab2d66cfc4d37b86053e1d40b8671520a0f610 Mon Sep 17 00:00:00 2001
From: "J. Peter Mugaas" <jpmugaas@suddenlink.net>
Date: Thu, 10 Feb 2022 00:58:48 -0500
Subject: [PATCH 4/4] Update mingw-w64-python-ufolib2/PKGBUILD

Co-authored-by: Christoph Reiter <reiter.christoph@gmail.com>
---
 mingw-w64-python-ufolib2/PKGBUILD | 1 +
 1 file changed, 1 insertion(+)

diff --git a/mingw-w64-python-ufolib2/PKGBUILD b/mingw-w64-python-ufolib2/PKGBUILD
index fe06833504..859bcf7c5b 100644
--- a/mingw-w64-python-ufolib2/PKGBUILD
+++ b/mingw-w64-python-ufolib2/PKGBUILD
@@ -20,6 +20,7 @@ depends=("${MINGW_PACKAGE_PREFIX}-python"
          "${_pydeps[@]/#/${MINGW_PACKAGE_PREFIX}-python-}")
 makedepends=("${MINGW_PACKAGE_PREFIX}-python-build"
              "${MINGW_PACKAGE_PREFIX}-python-installer" 
+             "${MINGW_PACKAGE_PREFIX}-python-wheel"
              "${MINGW_PACKAGE_PREFIX}-python-setuptools")
 checkdepends=("${MINGW_PACKAGE_PREFIX}-python-pytest")
 source=("https://pypi.org/packages/source/${_pyname::1}/${_pyname}/${_pyname}-${pkgver}.tar.gz")