Include patch for freedesktop.org actions

2 files changed, 24 insertions, 15 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 93cf29951c5d..e436ae63f4c0 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by mksrcinfo v8
-# Tue Sep  6 18:29:23 UTC 2016
+# Sat Nov 18 18:04:02 UTC 2017
 pkgbase = dockbarx
 	pkgdesc = TaskBar with groupping and group manipulation
 	pkgver = 0.92
-	pkgrel = 2
+	pkgrel = 3
 	url = https://github.com/M7S/dockbarx
 	arch = i686
 	arch = x86_64
@@ -25,9 +25,11 @@ pkgbase = dockbarx
 	optdepends = compiz-fusion-plugins-main: opacify plugin
 	optdepends = dockmanager: dockmanager plugins
 	optdepends = cardapio-bzr: required to run menu applet for dockx (standalone dock)
-	conflicts = dockbarx-bzr
+	conflicts = dockbarx-git
 	source = dockbarx-0.92.tar.gz::https://github.com/M7S/dockbarx/archive/0.92.tar.gz
+	source = freedesktop_quicklist.patch::https://github.com/M7S/dockbarx/commit/db984a935c60253dcf3c5cbdb2e623b4692b038d.patch
 	sha256sums = eb7630c0cebeb84ba9f66c60d77ec082afe56b264db4139436913ebdf2b1b7ea
+	sha256sums = 6eba00088c1094aee041b26407d5c8e9f19da2eaee491cc9aff92a11285efba2
 
 pkgname = dockbarx
 
diff --git a/PKGBUILD b/PKGBUILD
index 028e4bd180a9..989d7729b691 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=dockbarx
 pkgver=0.92
-pkgrel=2
+pkgrel=3
 pkgdesc="TaskBar with groupping and group manipulation"
 arch=('i686' 'x86_64')
 url="https://github.com/M7S/dockbarx"
@@ -17,22 +17,29 @@ optdepends=('avant-window-navigator: AWN DockBarX Plugin'
             'compiz-fusion-plugins-main: opacify plugin'
             'dockmanager: dockmanager plugins'
             'cardapio-bzr: required to run menu applet for dockx (standalone dock)')
-conflicts=('dockbarx-bzr')
-source=(${pkgname}-${pkgver}.tar.gz::https://github.com/M7S/dockbarx/archive/${pkgver}.tar.gz )
-sha256sums=('eb7630c0cebeb84ba9f66c60d77ec082afe56b264db4139436913ebdf2b1b7ea')
+conflicts=('dockbarx-git')
+source=("${pkgname}-${pkgver}.tar.gz::https://github.com/M7S/dockbarx/archive/${pkgver}.tar.gz"
+        'freedesktop_quicklist.patch::https://github.com/M7S/dockbarx/commit/db984a935c60253dcf3c5cbdb2e623b4692b038d.patch')
+sha256sums=('eb7630c0cebeb84ba9f66c60d77ec082afe56b264db4139436913ebdf2b1b7ea'
+            '6eba00088c1094aee041b26407d5c8e9f19da2eaee491cc9aff92a11285efba2')
+
+prepare() {
+  cd "${srcdir}/${_pkgname}"
+  patch -Np1 -i ../freedesktop_quicklist.patch
+}
 
 package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
+  cd "${srcdir}/${pkgname}-${pkgver}"
 
-  python2 setup.py install --root ${pkgdir}
+  python2 setup.py install --root "${pkgdir}"
 
-  mkdir -p ${pkgdir}/usr/share/avant-window-navigator/applets
-  cp -r AWN/* ${pkgdir}/usr/share/avant-window-navigator/applets
+  mkdir -p "${pkgdir}"/usr/share/avant-window-navigator/applets
+  cp -r AWN/* "${pkgdir}"/usr/share/avant-window-navigator/applets
   
-  mkdir -p ${pkgdir}/usr/share/pixmaps
-  install -Dm644 ${srcdir}/${pkgname}-${pkgver}/icons/hicolor/128x128/apps/dockbarx.png ${pkgdir}/usr/share/pixmaps/dockbarx.png
+  mkdir -p "${pkgdir}"/usr/share/pixmaps
+  install -Dm644 "${srcdir}/${pkgname}-${pkgver}"/icons/hicolor/128x128/apps/dockbarx.png "${pkgdir}"/usr/share/pixmaps/dockbarx.png
 
-  sed -i 's:^Categories=.*:Categories=GTK;GNOME;Settings;X-GNOME-PersonalSettings;:' ${pkgdir}/usr/share/applications/dbx_preference.desktop
-  sed -i 's:\(/usr/bin/python\)\([^2]\):\12\2:' ${pkgdir}/usr/bin/{dockbarx_factory,dbx_preference,dockx}
+  sed -i 's:^Categories=.*:Categories=GTK;GNOME;Settings;X-GNOME-PersonalSettings;:' "${pkgdir}"/usr/share/applications/dbx_preference.desktop
+  sed -i 's:\(/usr/bin/python\)\([^2]\):\12\2:' "${pkgdir}"/usr/bin/{dockbarx_factory,dbx_preference,dockx}
 
 }