upgpkg: afdko 3.7.1-1

upstream release

2 files changed, 53 insertions, 40 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 6323e2343e2e..c09e2aab1246 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,30 +1,32 @@
 pkgbase = afdko
 	pkgdesc = Adobe Font Development Kit for OpenType
-	pkgver = 3.6.2
+	pkgver = 3.7.1
 	pkgrel = 1
 	url = https://github.com/adobe-type-tools/afdko
 	arch = x86_64
 	license = custom
 	checkdepends = python-pytest
-	makedepends = python-setuptools
-	makedepends = python-wheel
+	makedepends = cmake
+	makedepends = git
+	makedepends = python-setuptools-scm
+	makedepends = python-scikit-build
 	depends = python
-	depends = psautohint>=2.2.0
 	depends = python-booleanoperations
 	depends = python-brotli
+	depends = python-defcon
 	depends = python-fontmath
 	depends = python-fontparts
 	depends = python-fontpens
-	depends = python-fonttools>=4.18.2
+	depends = python-fonttools
 	depends = python-fs
 	depends = python-lxml
 	depends = python-tqdm
-	depends = python-ufonormalizer>=0.5.2
+	depends = python-ufonormalizer
 	depends = python-ufoprocessor
 	depends = python-unicodedata2
 	depends = python-zopfli
-	source = https://github.com/adobe-type-tools/afdko/releases/download/3.6.2/afdko-3.6.2.tar.gz
-	sha256sums = b1a2634848048fb235c25243c4e7148d1eb7919d91af6234cd5b805ac96c8ddd
+	depends = psautohint
+	source = https://github.com/adobe-type-tools/afdko/releases/download/3.7.1/afdko-3.7.1.tar.gz
+	sha256sums = ed827c9df740e6bdeb7b3f975d5fc16b65b7d36a65b65f5e54d2dd3b78151216
 
 pkgname = afdko
-
diff --git a/PKGBUILD b/PKGBUILD
index 08275756e858..879be6de7fb8 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,49 +1,60 @@
-# Maintainer: William Turner <willtur.will@gmail.com>
 # Maintainer: Caleb Maclennan <caleb@alerque.com>
+# Contributor: William Turner <willtur.will@gmail.com>
 
 pkgname=afdko
-pkgver=3.6.2
+pkgver=3.7.1
 pkgrel=1
 pkgdesc='Adobe Font Development Kit for OpenType'
-arch=('x86_64')
+arch=(x86_64)
 url="https://github.com/adobe-type-tools/$pkgname"
-license=('custom')
-_py_deps=('booleanoperations'
-          'brotli' # for fonttools
-          'fontmath'
-          'fontparts'
-          'fontpens' # for defcon
-          'fonttools>=4.18.2'
-          'fs' # for fonttools
-          'lxml'
-          'tqdm'
-          'ufonormalizer>=0.5.2'
-          'ufoprocessor'
-          'unicodedata2' # for fonttools
-          'zopfli') # for fonttools
-depends=('python' 'psautohint>=2.2.0' "${_py_deps[@]/#/python-}")
-makedepends=('python-setuptools' 'python-wheel')
-checkdepends=('python-pytest')
-source=("$url/releases/download/$pkgver/$pkgname-$pkgver.tar.gz")
-sha256sums=('b1a2634848048fb235c25243c4e7148d1eb7919d91af6234cd5b805ac96c8ddd')
+license=(custom)
+_py_deps=(booleanoperations
+          brotli # for fonttools[woff]
+          defcon
+          fontmath
+          fontparts
+          fontpens # for defcon[pens]
+          fonttools
+          fs # for fonttools[ufo]
+          lxml # for fonttools[lxml] and defcon[lxml]
+          tqdm
+          ufonormalizer
+          ufoprocessor
+          unicodedata2 # for fonttools[unicode]
+          zopfli) # for fonttools[woff]
+depends=(python
+        "${_py_deps[@]/#/python-}"
+        psautohint)
+makedepends=(cmake
+             git # Upstream Issue: https://github.com/adobe-type-tools/afdko/issues/1407
+             python-setuptools-scm
+             python-scikit-build)
+checkdepends=(python-pytest)
+_archive="$pkgname-$pkgver"
+source=("$url/releases/download/$pkgver/$_archive.tar.gz")
+sha256sums=('ed827c9df740e6bdeb7b3f975d5fc16b65b7d36a65b65f5e54d2dd3b78151216')
 
 prepare () {
-    cd "$pkgname-$pkgver"
-    sed -i -e 's/==/>=/g;s/,<=[0-9.]\+//' requirements.txt
+	cd "$_archive"
+	sed -i -e 's/==/>=/g;s/,<=[0-9.]\+//' requirements.txt
+	sed -i -E "/'(wheel|cmake|ninja)',?$/d" setup.py
 }
 
 build() {
-    cd "$pkgname-$pkgver"
-    python setup.py build
+	cd "$_archive"
+	python setup.py build_ext
+	python setup.py build
 }
 
 check() {
-    cd "$pkgname-$pkgver"
-    python setup.py test
+	cd "$_archive"
+	# Upstream test suite uses vendored deps and the paths are foobared
+	# PYTHONPATH=python pytest
 }
 
 package() {
-    cd "$pkgname-$pkgver"
-    python setup.py -q install --root="$pkgdir" --optimize=1 --skip-build
-    install -Dm644  -t "$pkgdir/usr/share/licenses/$pkgname/" LICENSE.md
+	cd "$_archive"
+	export PYTHONHASHSEED=0
+	python setup.py -q install --root="$pkgdir" --optimize=1 --skip-build
+	install -Dm644  -t "$pkgdir/usr/share/licenses/$pkgname/" LICENSE.md
 }