plover: upgpkg 4.0.0.dev12; conform to PEP 517; move to python 3

3 files changed, 72 insertions, 55 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 6f5c6da7e7da..2f5956f9ed6f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,28 +1,30 @@
 pkgbase = plover
-	pkgdesc = Free and open source real-time stenography engine.
-	pkgver = 3.1.1
-	pkgrel = 3
-	url = http://www.openstenoproject.org/plover/
+	pkgdesc = Free and open source real-time stenography engine
+	pkgver = 4.0.0.dev12
+	pkgrel = 1
+	url = https://www.openstenoproject.org/plover/
 	arch = any
 	license = GPL2
-	makedepends = python2-mock
-	makedepends = python2-pytest
-	makedepends = python2-setuptools-scm
-	depends = python2
-	depends = python2-appdirs
-	depends = python2-dbus
-	depends = python2-cython-hidapi
-	depends = python2-pyserial
-	depends = python2-setuptools
-	depends = python2-six
-	depends = python2-xlib
-	depends = wmctrl
-	depends = wxpython
-	depends = xorg-xprop
-	provides = plover
-	conflicts = plover-git
-	source = https://github.com/openstenoproject/plover/releases/download/v3.1.1/plover-3.1.1.tar.gz
-	sha1sums = e391a61f7c4082ae74042cb7415fef52c1cd4498
+	checkdepends = python-mock
+	checkdepends = python-pytest
+	checkdepends = python-pytest-qt
+	checkdepends = python-pytest-xvfb
+	makedepends = python-babel
+	makedepends = python-build
+	makedepends = python-installer
+	makedepends = python-wheel
+	depends = dbus
+	depends = python
+	depends = python-appdirs
+	depends = python-plover_stroke>=1.1.0
+	depends = python-pyqt5
+	depends = python-pyserial
+	depends = python-rtf_tokenize
+	depends = python-setuptools
+	depends = python-wcwidth
+	depends = python-xlib
+	depends = qt5-svg
+	source = plover-4.0.0.dev12.tar.gz::https://github.com/openstenoproject/plover/archive/refs/tags/v4.0.0.dev12.tar.gz
+	b2sums = 36b1bf4c30623e5ccb76fe3c2afbac43ba1407b1dcf1b654383c660aaf4f9d73d7ee9be2fae5616bd38f9746abc13bb2d8f66f553684fcf2b3fd91b489ee2503
 
 pkgname = plover
-
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000000..05c6d4d4c97b
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,4 @@
+*
+!.gitignore
+!.SRCINFO
+!PKGBUILD
diff --git a/PKGBUILD b/PKGBUILD
index df7c5abbb6b8..2deff9f168ae 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,44 +1,55 @@
-# Maintainer: Benoit Pierre <benoit.pierre@gmail.com>
+# Maintainer: éclairevoyant
+# Contributor: Benoit Pierre <benoit dot pierre at gmail dot com>
 
 pkgname=plover
-pkgdesc="Free and open source real-time stenography engine."
-pkgver=3.1.1
-pkgrel=3
-arch=('any')
-license=('GPL2')
+pkgdesc="Free and open source real-time stenography engine"
+pkgver=4.0.0.dev12
+pkgrel=1
+arch=(any)
+license=(GPL2)
 depends=(
-  'python2'
-  'python2-appdirs'
-  'python2-dbus'
-  'python2-cython-hidapi'
-  'python2-pyserial'
-  'python2-setuptools'
-  'python2-six'
-  'python2-xlib'
-  'wmctrl'
-  'wxpython'
-  'xorg-xprop'
+	dbus
+	python
+	python-appdirs
+	'python-plover_stroke>=1.1.0'
+	python-pyqt5
+	python-pyserial
+	python-rtf_tokenize
+	python-setuptools
+	python-wcwidth
+	python-xlib
+	qt5-svg
 )
 makedepends=(
-  'python2-mock'
-  'python2-pytest'
-  'python2-setuptools-scm'
+	python-babel
+	python-build
+	python-installer
+	python-wheel
 )
-provides=('plover')
-conflicts=('plover-git')
-url="http://www.openstenoproject.org/plover/"
-source=(https://github.com/openstenoproject/plover/releases/download/v$pkgver/plover-$pkgver.tar.gz)
-sha1sums=(e391a61f7c4082ae74042cb7415fef52c1cd4498)
+checkdepends=(
+	python-mock
+	python-pytest
+	python-pytest-qt
+	python-pytest-xvfb
+)
+url="https://www.openstenoproject.org/plover/"
+source=("$pkgname-$pkgver.tar.gz::https://github.com/openstenoproject/$pkgname/archive/refs/tags/v$pkgver.tar.gz")
+b2sums=('36b1bf4c30623e5ccb76fe3c2afbac43ba1407b1dcf1b654383c660aaf4f9d73d7ee9be2fae5616bd38f9746abc13bb2d8f66f553684fcf2b3fd91b489ee2503')
+
+build() {
+	cd $pkgname-$pkgver
+	python -m build -wn
+}
+
 
 check() {
-  cd "$pkgname-$pkgver"
-  python2 setup.py test
+	cd $pkgname-$pkgver
+	PYTEST_DISABLE_PLUGIN_AUTOLOAD=1 python -m pytest -p pytest-qt -p xvfb test
 }
 
 package() {
-  cd "$pkgname-$pkgver"
-  python2 setup.py install --root="$pkgdir"
-  chmod og+rX -R "$pkgdir"
+	cd $pkgname-$pkgver
+	python -m installer -d "$pkgdir" dist/*.whl
+	install -vDm644 plover/assets/$pkgname.png -t "$pkgdir/usr/share/pixmaps/"
+	install -vDm644 linux/$pkgname.desktop -t "$pkgdir/usr/share/applications/"
 }
-
-# vim:set sw=2 sts=2 et: