choosewm: upgrade patches, fix KDE startup option, add backup

Signed-off-by: éclairevoyant <848000+eclairevoyant@users.noreply.github.com>

4 files changed, 42 insertions, 37 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 1b81b0632715..db11676da234 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,19 +1,18 @@
-# Generated by mksrcinfo v8
-# Thu May 10 11:50:55 UTC 2018
 pkgbase = choosewm
 	pkgdesc = Choose WM gui tool. Run it from ~/.xsession or ~/.xinitrc.
 	pkgver = 0.1.6
-	pkgrel = 2
-	url = http://packages.debian.org/unstable/x11/choosewm
+	pkgrel = 3
+	url = https://packages.debian.org/unstable/x11/choosewm
 	arch = i686
 	arch = x86_64
 	license = GPL
 	depends = gtk2
-	options = zipman
-	source = http://ftp.de.debian.org/debian/pool/main/c/choosewm/choosewm_0.1.6.orig.tar.gz
-	source = http://http.debian.net/debian/pool/main/c/choosewm/choosewm_0.1.6-3.debian.tar.gz
+	backup = var/lib/choosewm/windowmanagers
+	source = https://ftp.debian.org/debian/pool/main/c/choosewm/choosewm_0.1.6.orig.tar.gz
+	source = https://ftp.debian.org/debian/pool/main/c/choosewm/choosewm_0.1.6-3.1.debian.tar.xz
+	source = choosewm-windowmanagers
 	sha256sums = 10f1aedfccd3f8c39766cabb017fe3fa1acd349a6cfa0641e55d5e9b0f3b142b
-	sha256sums = d753c6d2fd2b753d3eb3b2439a2c49e9f3802641bdc64e63617147bc81c0b3b9
+	sha256sums = 28f3b42798d6ce7e39f9225ce88f09f67c3e04fe911c2d7a352cc8be5d19b344
+	sha256sums = f6fa084c0fbc0e009acaedd738c16e0fd69ad7b87245186671caa2613620c565
 
 pkgname = choosewm
-
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000000..3d3f8f3d22df
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,5 @@
+*
+!.gitignore
+!.SRCINFO
+!PKGBUILD
+!choosewm-windowmanagers
diff --git a/PKGBUILD b/PKGBUILD
index 3f2e25bbf89f..df7bcf286cc2 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,43 +1,37 @@
+# Maintainer: éclairevoyant
+
 pkgname=choosewm
 pkgver=0.1.6
-pkgrel=2
+_debrel=3.1
+pkgrel=3
 pkgdesc="Choose WM gui tool. Run it from ~/.xsession or ~/.xinitrc."
-arch=(i686 x86_64)
-url="http://packages.debian.org/unstable/x11/choosewm"
+arch=('i686' 'x86_64')
+url="https://packages.debian.org/unstable/x11/$pkgname"
 license=('GPL')
-depends=(gtk2)
-options=(zipman)
-source=(http://ftp.de.debian.org/debian/pool/main/c/choosewm/choosewm_$pkgver.orig.tar.gz
-	http://http.debian.net/debian/pool/main/c/choosewm/choosewm_$pkgver-3.debian.tar.gz)
+depends=('gtk2')
+backup=("var/lib/$pkgname/windowmanagers")
+source=(https://ftp.debian.org/debian/pool/main/c/$pkgname/${pkgname}_$pkgver{.orig.tar.gz,-$_debrel.debian.tar.xz}
+        $pkgname-windowmanagers)
 sha256sums=('10f1aedfccd3f8c39766cabb017fe3fa1acd349a6cfa0641e55d5e9b0f3b142b'
-            'd753c6d2fd2b753d3eb3b2439a2c49e9f3802641bdc64e63617147bc81c0b3b9')
+            '28f3b42798d6ce7e39f9225ce88f09f67c3e04fe911c2d7a352cc8be5d19b344'
+            'f6fa084c0fbc0e009acaedd738c16e0fd69ad7b87245186671caa2613620c565')
 
 prepare() {
-  cd "$srcdir/$pkgname-$pkgver"
-  cat ../debian/patches/series | while read p; do
-    patch -p1 <$srcdir/debian/patches/$p
-  done
+	cd $pkgname-$pkgver
+	cat ../debian/patches/series | while read p; do
+		patch -p1 < ../debian/patches/$p
+	done
 }
 
 build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  CPPFLAGS="$(pkg-config --cflags gtk+-2.0)" ./configure --prefix=/usr
-  make
+	cd $pkgname-$pkgver
+	CPPFLAGS="$(pkg-config --cflags gtk+-2.0)" ./configure --prefix=/usr
+	make
 }
 
 package() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  make DESTDIR="$pkgdir/" install
+	install -Dm644 $pkgname-windowmanagers "$pkgdir/var/lib/choosewm/windowmanagers"
 
-  mkdir -p $pkgdir/var/lib/choosewm
-  cat >$pkgdir/var/lib/choosewm/windowmanagers <<EOF
-Trivial Window Manager=/usr/bin/twm
-KDE=/usr/bin/startkde
-Gnome=/usr/bin/gnome-session
-Xfce=/usr/bin/xfce4-session
-IceWM=/usr/bin/icewm
-Ion3=/usr/bin/ion3
-FvWM=/usr/bin/fvwm
-EOF
+	cd $pkgname-$pkgver
+	make DESTDIR="$pkgdir/" install
 }
diff --git a/choosewm-windowmanagers b/choosewm-windowmanagers
new file mode 100644
index 000000000000..95eb3e6e9558
--- /dev/null
+++ b/choosewm-windowmanagers
@@ -0,0 +1,7 @@
+Trivial Window Manager=/usr/bin/twm
+KDE=/usr/bin/startplasma-x11
+Gnome=/usr/bin/gnome-session
+Xfce=/usr/bin/xfce4-session
+IceWM=/usr/bin/icewm
+Ion3=/usr/bin/ion3
+FvWM=/usr/bin/fvwm