Switch to xuzhen's branch -- where all development is currently happening.

2 files changed, 10 insertions, 17 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 66c0410c2890..d6032bc7e2c7 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,8 @@
 pkgbase = dockbarx
 	pkgdesc = TaskBar with groupping and group manipulation
-	pkgver = 1.0beta+r820+4a5b382
-	pkgrel = 4
+	pkgver = 1.0beta+r850+a3e2186
+	pkgrel = 1
+	epoch = 1
 	url = https://github.com/M7S/dockbarx
 	install = dockbarx.install
 	arch = i688
@@ -25,10 +26,8 @@ pkgbase = dockbarx
 	optdepends = python-pyudev: dockx battery applet
 	optdepends = gconf: export settings from older versions of dockbarx
 	optdepends = python-lxml: import settings script
-	source = dockbarx::git+https://github.com/M7S/dockbarx.git#commit=4a5b382f03402e58cbbaaeb2ee3be4fbbb795aba
-	source = xuzhen_fixes_pr142_thru_f772075.patch
+	source = dockbarx::git+https://github.com/xuzhen/dockbarx.git#commit=a3e21862962c23ba1f8bb2cede11cc728f7f4071
 	sha256sums = SKIP
-	sha256sums = c95ceebf2391d8bedb4fe0014474d7e91ad894b0d7eba1c1e76046c74e8a5457
 
 pkgname = dockbarx
 
diff --git a/PKGBUILD b/PKGBUILD
index 149c62981493..4b34d08c62ff 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,9 +1,10 @@
 # Contributor: twa022 <twa022 at gmail dot com>
 
 pkgname=dockbarx
+epoch=1
 _pkgver=1.0beta
-pkgver=1.0beta+r820+4a5b382
-pkgrel=4
+pkgver=1.0beta+r850+a3e2186
+pkgrel=1
 pkgdesc="TaskBar with groupping and group manipulation"
 arch=('i688' 'x86_64' 'armv7h' 'aarch64')
 url="https://github.com/M7S/dockbarx"
@@ -17,11 +18,9 @@ optdepends=('mate-panel: mate applet'
             'python-pyudev: dockx battery applet'
             'gconf: export settings from older versions of dockbarx'
             'python-lxml: import settings script')
-_commit='4a5b382f03402e58cbbaaeb2ee3be4fbbb795aba'
-source=("${pkgname}::git+https://github.com/M7S/dockbarx.git#commit=${_commit}"
-        'xuzhen_fixes_pr142_thru_f772075.patch')
-sha256sums=('SKIP'
-            'c95ceebf2391d8bedb4fe0014474d7e91ad894b0d7eba1c1e76046c74e8a5457')
+_commit='a3e21862962c23ba1f8bb2cede11cc728f7f4071'
+source=("${pkgname}::git+https://github.com/xuzhen/dockbarx.git#commit=${_commit}")
+sha256sums=('SKIP')
 install="${pkgname}.install"
 
 pkgver() {
@@ -29,11 +28,6 @@ pkgver() {
   printf "%s+r%s+%s" "${_pkgver}" "$( git rev-list --count HEAD )" "$( git rev-parse --short HEAD )"
 }
 
-prepare() {
-  cd "${srcdir}/${pkgname}"
-  patch -Np1 -i ../xuzhen_fixes_pr142_thru_f772075.patch
-}
-
 package() {
   cd "${srcdir}/${pkgname}"
   python setup.py install --root "${pkgdir}" --optimize=1