Version update: 0.5

2 files changed, 27 insertions, 10 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 4cab4b2b03f6..3d39942ecb17 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,18 +1,24 @@
+# Generated by mksrcinfo v8
+# Mon Jun 12 13:50:26 UTC 2017
 pkgbase = xfce4-dockbarx-plugin
 	pkgdesc = Embed DockbarX in the xfce4-panel
-	pkgver = 0.4.1
+	pkgver = 0.5
 	pkgrel = 1
 	url = https://github.com/TiZ-EX1/xfce4-dockbarx-plugin
 	arch = i686
 	arch = x86_64
 	license = X11
 	makedepends = python2
+	makedepends = git
 	depends = vala
 	depends = dockbarx>=0.91
 	depends = xfce4-panel
 	conflicts = xfce4-dockbarx-plugin-git
-	source = xfce4-dockbarx-plugin-0.4.1.tar.gz::https://github.com/TiZ-EX1/xfce4-dockbarx-plugin/archive/v0.4.1.tar.gz
-	sha256sums = c55e5231ae8b69ab10c22ab5150e47f5392b2398572e753cbcb1a147362e0ba5
+	conflicts = dockbarx-gtk3-git
+	source = xfce4-dockbarx-plugin::git+https://github.com/TiZ-EX1/xfce4-dockbarx-plugin#commit=cf16d6f415d03828e7a702550a0552ed5ea7ce0c
+	source = pref_dialog_fix.patch::https://github.com/TiZ-EX1/xfce4-dockbarx-plugin/commit/960ed3806d00b33b6a254fb583b366177ba56b77.patch
+	sha256sums = SKIP
+	sha256sums = 04892f2eb8413a79288b234ed61af588a66f70553a9db9272d8f1d7904ad1dfa
 
 pkgname = xfce4-dockbarx-plugin
 
diff --git a/PKGBUILD b/PKGBUILD
index 7d4187d6a746..54b93ef80d09 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,28 +1,39 @@
 # Contributor: twa022 <twa022 at gmail dot com>
 
 pkgname=xfce4-dockbarx-plugin
-pkgver=0.4.1
+pkgver=0.5
 pkgrel=1
 pkgdesc="Embed DockbarX in the xfce4-panel"
 arch=('i686' 'x86_64')
 url="https://github.com/TiZ-EX1/xfce4-dockbarx-plugin"
 license=('X11')
 depends=('vala' 'dockbarx>=0.91' 'xfce4-panel')
-makedepends=('python2')
-conflicts=("$pkgname"-git)
+makedepends=('python2' 'git')
+conflicts=("${pkgname}-git" 'dockbarx-gtk3-git') # Unfortunately doesn't work with the GTK3 version of dockbarx yet
 
-source=( ${pkgname}-${pkgver}.tar.gz::https://github.com/TiZ-EX1/${pkgname}/archive/v${pkgver}.tar.gz )
-sha256sums=('c55e5231ae8b69ab10c22ab5150e47f5392b2398572e753cbcb1a147362e0ba5')
+#source=( ${pkgname}-${pkgver}.tar.gz::https://github.com/TiZ-EX1/${pkgname}/archive/v${pkgver}.tar.gz )
+#sha256sums=('c55e5231ae8b69ab10c22ab5150e47f5392b2398572e753cbcb1a147362e0ba5')
+# Version 0.5 was never properly tagged, so use the commit directly
+_commit='cf16d6f415d03828e7a702550a0552ed5ea7ce0c' # 1 after version bump with updated README
+source=("${pkgname}::git+https://github.com/TiZ-EX1/xfce4-dockbarx-plugin#commit=${_commit}"
+        'pref_dialog_fix.patch::https://github.com/TiZ-EX1/xfce4-dockbarx-plugin/commit/960ed3806d00b33b6a254fb583b366177ba56b77.patch')
+sha256sums=('SKIP'
+            '04892f2eb8413a79288b234ed61af588a66f70553a9db9272d8f1d7904ad1dfa')
+
+prepare() {
+  cd ${srcdir}/${pkgname} #-${pkgver}
+  patch -Np1 -i ../pref_dialog_fix.patch
+}
 
 build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
+  cd ${srcdir}/${pkgname} #-${pkgver}
   sed -i 's:env python$:&2:' waf wscript
   PREFIX=/usr ./waf configure
   ./waf build
 }
 
 package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
+  cd ${srcdir}/${pkgname} #-${pkgver}
   DESTDIR="${pkgdir}" ./waf install
 }