added optional dependencies for other DE's

4 files changed, 43 insertions, 22 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 3d4ec5ae9b5a..ed6612323915 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = budgie-windowshuffler-git
-	pkgdesc = GUI and keyboard friendly window arranger for the budgie and mate desktop
-	pkgver = r7.c2df993
+	pkgdesc = GUI and keyboard friendly window arranger for the Budgie and MATE desktop
+	pkgver = r22.01297f8
 	pkgrel = 1
 	url = https://github.com/UbuntuBudgie/window-shuffler
 	arch = any
@@ -10,11 +10,17 @@ pkgbase = budgie-windowshuffler-git
 	depends = python-cairo
 	depends = python-gobject
 	optdepends = budgie-desktop: The Budgie desktop
-	optdepends = mate-desktop
+	optdepends = mate-desktop: The MATE desktop
+	optdepends = libwnck3: required on GNOME, may be required on other desktops
+	optdepends = xorg-xprop: required on GNOME, may be required on other desktops
 	provides = budgie-windowshuffler
 	conflicts = budgie-windowshuffler
 	source = git+https://github.com/UbuntuBudgie/window-shuffler.git
+	source = budgie-window-shuffler-toggle
+	source = budgie-window-shuffler-toggle.desktop
 	sha256sums = SKIP
+	sha256sums = c4ebc452c537d39cd6650bc6d1b5349ea82b1765c25de960ae908d1e528932aa
+	sha256sums = d350ed513edc6433bc48abe1f0c97f04e7a489830086d5f8344dcf19d2b1e637
 
 pkgname = budgie-windowshuffler-git
 
diff --git a/PKGBUILD b/PKGBUILD
index c8d766fbd4d0..57d09a32f4cc 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,32 +1,37 @@
+# Maintainer: Mark Wagie <yochanan dot marqos at gmail dot com>
 pkgname=budgie-windowshuffler-git
-pkgver=r7.c2df993
+pkgver=r22.01297f8
 pkgrel=1
-pkgdesc='GUI and keyboard friendly window arranger for the budgie and mate desktop'
+pkgdesc='GUI and keyboard friendly window arranger for the Budgie and MATE desktop'
 arch=('any')
 url='https://github.com/UbuntuBudgie/window-shuffler'
 license=('GPL3')
 depends=('wmctrl' 'xdotool' 'python-cairo' 'python-gobject')
 optdepends=('budgie-desktop: The Budgie desktop'
-            'mate-desktop')
-provides=('budgie-windowshuffler')
-conflicts=('budgie-windowshuffler')
-source=('git+https://github.com/UbuntuBudgie/window-shuffler.git')
-sha256sums=('SKIP')
+            'mate-desktop: The MATE desktop'
+            'libwnck3: required on GNOME, may be required on other desktops'
+            'xorg-xprop: required on GNOME, may be required on other desktops')
+provides=("${pkgname%-git}")
+conflicts=("${pkgname%-git}")
+source=('git+https://github.com/UbuntuBudgie/window-shuffler.git'
+	'budgie-window-shuffler-toggle'
+	'budgie-window-shuffler-toggle.desktop')
+sha256sums=('SKIP'
+            'c4ebc452c537d39cd6650bc6d1b5349ea82b1765c25de960ae908d1e528932aa'
+            'd350ed513edc6433bc48abe1f0c97f04e7a489830086d5f8344dcf19d2b1e637')
 
 pkgver() {
-  cd window-shuffler
-  printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
+	cd window-shuffler
+	printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
 }
 
 package() {
-  cd window-shuffler
-  
-  install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
-  rm LICENSE
-  rm README.md
-  mkdir "${pkgdir}/usr/share/pixmaps/"
-  cp icons/* "${pkgdir}/usr/share/pixmaps/"
-  rm -rf icons
-  mkdir -p "${pkgdir}/usr/share/budgie-desktop/windowshuffler/"
-  cp ./* "${pkgdir}/usr/share/budgie-desktop/windowshuffler/"
+	cd window-shuffler
+	install -d $pkgdir/usr/share/pixmaps
+	cp -r icons/* $pkgdir/usr/share/pixmaps
+	rm -rf icons
+	install -d $pkgdir/usr/share/budgie-desktop/windowshuffler
+	cp -r ./* $pkgdir/usr/share/budgie-desktop/windowshuffler
+	install -Dm755 $srcdir/budgie-window-shuffler-toggle $pkgdir/usr/bin/budgie-window-shuffler-toggle
+	install -Dm644 $srcdir/budgie-window-shuffler-toggle.desktop $pkgdir/usr/share/applications/budgie-window-shuffler-toggle.desktop
 }
diff --git a/budgie-window-shuffler-toggle b/budgie-window-shuffler-toggle
new file mode 100644
index 000000000000..ff81813432db
--- /dev/null
+++ b/budgie-window-shuffler-toggle
@@ -0,0 +1,2 @@
+#!/bin/bash
+/usr/share/budgie-desktop/windowshuffler/matrix_wrapper $@
diff --git a/budgie-window-shuffler-toggle.desktop b/budgie-window-shuffler-toggle.desktop
new file mode 100755
index 000000000000..a65d0082e499
--- /dev/null
+++ b/budgie-window-shuffler-toggle.desktop
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Type=Application
+Icon=windowshuffler-symbolic
+Name=Budgie Window Shuffler Toggle
+Exec=budgie-window-shuffler-toggle
+Terminal=false
+Hidden=false
+Categories=Utility