testing/fontforge: upgrade to 20200314

testing/fontforge/APKBUILD

@@ -1,16 +1,14 @@
 # Contributor: Ed Robinson <ed@reevoo.com>
 # Maintainer: Ed Robinson <ed@reevoo.com>
 pkgname=fontforge
-pkgver=20190801
-pkgrel=1
+pkgver=20200314
+pkgrel=0
 pkgdesc="FontForge is a free (libre) font editor for Windows, Mac OS X and GNU+Linux."
-url="https://github.com/fontforge/fontforge"
+url="https://fontforge.org"
 arch="all !s390x"
 license="GPL-3.0-or-later"
 makedepends="
-	autoconf
-	automake
-	libtool
+	cmake
 	pango-dev
 	giflib-dev
 	tiff-dev
@@ -21,39 +19,48 @@ makedepends="
 	woff2-dev
 	gtk+3.0-dev
 	libuninameslist-dev
-	coreutils
+	readline-dev
 	"
 subpackages="
 	$pkgname-dev
 	$pkgname-doc
 	$pkgname-python3:_py3
 	"
-source="https://github.com/fontforge/fontforge/releases/download/$pkgver/fontforge-$pkgver.tar.gz
+source="https://github.com/fontforge/fontforge/releases/download/$pkgver/fontforge-$pkgver.tar.xz
 	fix-select.patch
-	python-3.8.patch
 	"
 
-prepare() {
-	default_prepare
-	autoreconf -vif
-}
-
 build() {
-	./configure \
-		--prefix=/usr \
-		--mandir=/usr/share/man \
-		--enable-python-extension \
-		--enable-woff2 \
-		--enable-gdk
-	make
+	if [ "$CBUILD" != "$CHOST" ]; then
+		CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux"
+	fi
+	cmake -B build . \
+		-DCMAKE_BUILD_TYPE=None \
+		-DCMAKE_INSTALL_PREFIX=/usr \
+		-DCMAKE_INSTALL_LIBDIR=lib \
+		-DENABLE_GUI=ON \
+		-DENABLE_X11=OFF \
+		-DENABLE_PYTHON_SCRIPTING=ON \
+		-DENABLE_PYTHON_EXTENSION=ON \
+		-DENABLE_LIBSPIRO=ON \
+		-DENABLE_LIBUNINAMESLIST=ON \
+		-DENABLE_LIBGIF=ON \
+		-DENABLE_LIBJPEG=ON \
+		-DENABLE_LIBPNG=ON \
+		-DENABLE_LIBREADLINE=ON \
+		-DENABLE_LIBTIFF=ON \
+		-DENABLE_WOFF2=ON \
+		-DENABLE_DOCS=OFF \
+		$CMAKE_CROSSOPTS .
+	make -C build
 }
 
 check() {
-	make check
+	make -C build check
 }
 
 package() {
-	make DESTDIR="$pkgdir" install
+	make -C build DESTDIR="$pkgdir" install
 }
 
 _py3() {
@@ -66,6 +73,5 @@ _py3() {
 	mv "$pkgdir"/usr/share/fontforge/python/excepthook.py "$subpkgdir"/usr/share/fontforge/python
 }
 
-sha512sums="78f3e1e94e38e26dcf52c6a0e038753033dc47052b7492f0ac0aaf1b8962e4e4bbf07c2550ef6014ea7290a6429bf669acb0691735efe0aee368480b4b7e6236  fontforge-20190801.tar.gz
-8cb3fb00fa537eab2d4b194916343a0e2aab85c2415a1944c0d0e648d62a7748d5d4465fb99cb92385b749e73abfcaa429f4c9d2bb4c2edea8febeb227add93a  fix-select.patch
-a7b2775131845b35227d465421d2b3e472b92f1c682462d7860aa6fead80f0e9949123e0c97ff819b3ab2223915e6fd50157bc799ccd48f1c8a1973c338e2bfa  python-3.8.patch"
+sha512sums="09f5dc93f87ca63668d72d108690604489d6b3cec7eedff1c07ad6d1ce5eae442ab60e79e71ae8b99e9808f3551011788025a86ffc3a9738518d99761d849975  fontforge-20200314.tar.xz
+8cb3fb00fa537eab2d4b194916343a0e2aab85c2415a1944c0d0e648d62a7748d5d4465fb99cb92385b749e73abfcaa429f4c9d2bb4c2edea8febeb227add93a  fix-select.patch"

testing/fontforge/python-3.8.patch

@@ -1,13 +0,0 @@
-diff --git a/m4/fontforge_arg_enable.m4 b/m4/fontforge_arg_enable.m4
-index 6f1177c..584261c 100644
---- a/m4/fontforge_arg_enable.m4
-+++ b/m4/fontforge_arg_enable.m4
-@@ -116,7 +116,7 @@ fi
- if test x"${i_do_have_python_scripting}" != xyes; then
-    i_want_python_ver=
- else
--   PKG_CHECK_MODULES([PYTHON],[python-"${PYTHON_VERSION}"], dnl   [PKG_CHECK_MODULES([PYTHONDEV],[python-"${PYTHON_VERSION}"],,[i_do_have_python_scripting=maybe])],
-+   PKG_CHECK_MODULES([PYTHON],[python-"${PYTHON_VERSION}"-embed], dnl   [PKG_CHECK_MODULES([PYTHONDEV],[python-"${PYTHON_VERSION}"],,[i_do_have_python_scripting=maybe])],
-       [PKG_CHECK_MODULES([PYTHONDEV],[python-"${PYTHON_VERSION}"],,[i_do_have_python_scripting=no])],
-       [i_do_have_python_scripting=no])
- dnl dnl TODO: have python3 AND python2, but only have python2 dev, but no python3 dev