PR #26

3 files changed, 36 insertions, 14 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 47bcfa87d559..21ec01ee2f5e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,18 +1,22 @@
 pkgbase = protonup-git
 	pkgdesc = Install and Update Proton-GE
-	pkgver = 0.1.4.r2.gf60ee76
+	pkgver = 0.1.4.r9.gd8289b0
 	pkgrel = 1
 	url = https://github.com/AUNaseef/protonup
 	arch = any
 	license = GPL3
-	makedepends = python-setuptools
 	makedepends = git
+	makedepends = python-build
+	makedepends = python-installer
+	makedepends = python-setuptools
+	makedepends = python-wheel
 	depends = python
 	depends = python-requests
 	provides = protonup
 	conflicts = protonup
-	options = !emptydirs
 	source = git+https://github.com/AUNaseef/protonup.git
+	source = https://github.com/AUNaseef/protonup/pull/26.patch
 	sha256sums = SKIP
+	sha256sums = a4a2a4ea02d5457010994645a61e6c43cddaff33096a6f8ec6c2189898ddfed5
 
 pkgname = protonup-git
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000000..4dab8d6386e3
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,7 @@
+# Ignore everything
+*
+
+# But not these files...
+!.gitignore
+!PKGBUILD
+!.SRCINFO
diff --git a/PKGBUILD b/PKGBUILD
index e7e6f98068ab..d57d2e45e858 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,27 +1,38 @@
 # Maintainer: Tobias Frisch <thejackimonster@gmail.com>
+# Co-Maintainer: Mark Wagie <mark dot wagie at tutanota dot com>
 
 pkgname=protonup-git
-_realname=protonup
-pkgver=0.1.4.r2.gf60ee76
+pkgver=0.1.4.r9.gd8289b0
 pkgrel=1
 pkgdesc="Install and Update Proton-GE"
 arch=('any')
 url="https://github.com/AUNaseef/protonup"
 license=('GPL3')
 depends=('python' 'python-requests')
-makedepends=('python-setuptools' 'git')
-provides=(protonup)
-conflicts=(protonup)
-options=(!emptydirs)
-source=("git+https://github.com/AUNaseef/$_realname.git")
-sha256sums=('SKIP')
+makedepends=('git' 'python-build' 'python-installer' 'python-setuptools' 'python-wheel')
+provides=("${pkgname%-git}")
+conflicts=("${pkgname%-git}")
+source=('git+https://github.com/AUNaseef/protonup.git'
+        'https://github.com/AUNaseef/protonup/pull/26.patch')
+sha256sums=('SKIP'
+            'a4a2a4ea02d5457010994645a61e6c43cddaff33096a6f8ec6c2189898ddfed5')
+
+prepare() {
+  cd "$srcdir/${pkgname%-git}"
+  patch -Np1 -i ../26.patch
+}
 
 pkgver() {
-  cd "$srcdir/$_realname"
+  cd "$srcdir/${pkgname%-git}"
   git describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g'
 }
 
+build() {
+  cd "$srcdir/${pkgname%-git}"
+  python -m build --wheel --no-isolation
+}
+
 package() {
-  cd "$srcdir/$_realname"
-  python setup.py install --root="$pkgdir/" --optimize=1
+  cd "$srcdir/${pkgname%-git}"
+  python -m installer --destdir="$pkgdir" dist/*.whl
 }