Switched away from `setup.py` to `python -m build` and `python -m installer`.

2 files changed, 15 insertions, 11 deletions

diff --git a/.SRCINFO b/.SRCINFO
index bc929e80aad7..e5d8f6cb552a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,22 +1,23 @@
 pkgbase = ffgo-git
 	pkgdesc = A graphical launcher for FlightGear, i.e., a program whose purpose is to allow easy assembling and running of an fgfs command line. (Fork of and replacement for 'FGo!'.)
 	pkgver = 1.12.8.r601.20230917.f5624be
-	pkgrel = 1
+	pkgrel = 2
 	url = http://frougon.net/projects/FFGo/
 	arch = any
 	license = custom
 	makedepends = gettext
 	makedepends = imagemagick
 	makedepends = librsvg
+	makedepends = python-installer
 	makedepends = python-setuptools
 	makedepends = python-sphinx
+	makedepends = python-wheel
 	depends = flightgear
 	depends = python>=3.4
 	depends = python-condconfigparser
+	depends = python-geographiclib
+	depends = python-pillow
 	depends = tk>=8.5
-	optdepends = geographiclib
-	optdepends = python-geographiclib
-	optdepends = python-pillow
 	provides = ffgo=1.12.8.r601.20230917.f5624be
 	conflicts = ffgo
 	source = ffgo::git+https://github.com/frougon/FFGo.git
diff --git a/PKGBUILD b/PKGBUILD
index 6349892d5961..bc1ce071f1e9 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,11 +1,11 @@
-# Maintainer: dreieck (https://aur.archlinux.org/account/dreieck)
+# Maintainer:  dreieck (https://aur.archlinux.org/account/dreieck)
 # Contributer: Brian "Beej" Hall <beej@beej.us>
 # Contributer: Raphael Dümig <raphael[AT]duemig-neufahrn[DOT]de>
 
 _pkgname=ffgo
 pkgname="${_pkgname}-git"
 pkgver=1.12.8.r601.20230917.f5624be
-pkgrel=1
+pkgrel=2
 pkgdesc="A graphical launcher for FlightGear, i.e., a program whose purpose is to allow easy assembling and running of an fgfs command line. (Fork of and replacement for 'FGo!'.)"
 arch=('any')
 url="http://frougon.net/projects/FFGo/"
@@ -15,19 +15,22 @@ depends=(
   'flightgear'
   'python>=3.4'
   'python-condconfigparser'
+  'python-geographiclib'
+  'python-pillow'
   'tk>=8.5'
 )
 makedepends=(
   "gettext"
   "imagemagick"
   "librsvg"
+  "python-installer"
   "python-setuptools"
   "python-sphinx"
+  "python-wheel"
 )
 optdepends=(
-  "geographiclib"
-  "python-geographiclib"
-  "python-pillow"
+  # "python-geographiclib:  For more accurate location calculations."
+  # "python-pillow"
 )
 provides=(
   "${_pkgname}=${pkgver}"
@@ -62,13 +65,13 @@ build() {
   printf '%s\n' "${url}" > "upstream.url"
 
   make icons update-po update-mo update-pot doc
-  python setup.py build
+  python -m build --wheel --no-isolation
 }
 
 package() {
   cd "${srcdir}/${_pkgname}"
 
-  python setup.py install --root="$pkgdir" --optimize=1 --skip-build
+  python -m installer --destdir="$pkgdir" --compile-bytecode=2 dist/*.whl
 
   for _docfile in upstream.url ChangeLog ChangeLog.FGo README.rst; do
     install -D -v -m644 "${_docfile}" "${pkgdir}/usr/share/doc/${_pkgname}/${_docfile}"