Switch to GTK3 branch.

1 files changed, 20 insertions, 28 deletions

diff --git a/PKGBUILD b/PKGBUILD
index fd268a7a005c..ce47cab42a80 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,45 +1,37 @@
 # Contributor: twa022 <twa022 at gmail dot com>
 
-pkgname=dockbarx-git
 _pkgname=dockbarx
-epoch=1
-pkgver=0.93+0+g8429c63
+pkgname=${_pkgname}-git
+_pkgver=1.0beta
+pkgver=1.0beta+r820+4a5b382
 pkgrel=1
 pkgdesc="TaskBar with groupping and group manipulation"
-arch=('i686' 'x86_64')
+arch=('i688' 'x86_64' 'armv7h' 'aarch64')
 url="https://github.com/M7S/dockbarx"
 license=('GPL3')
-depends=('python2-wnck' 'pygtk' 'python2-xdg' 'python2-dbus' 'python2-numpy' 
-         'python2-pillow' 'python2-keybinder2' 'hicolor-icon-theme' 'python2-xlib'
-         'python2-gconf' 'python2-six')
-optdepends=('avant-window-navigator: AWN DockBarX Plugin'
-            'xfce4-dockbarx-plugin: Xfce4 Panel Plugin'
+depends=('libkeybinder3' 'python-cairo' 'python-dbus' 'python-gobject' 'python-pillow'
+         'python-xlib' 'python-xdg')
+makedepends=('python-setuptools' 'python-polib' 'git')
+optdepends=('mate-panel: mate applet'
             'zeitgeist: recently used file list'
-            'compiz-fusion-plugins-main: opacify plugin'
-            'dockmanager: dockmanager plugins'
-            'cardapio-bzr: required to run menu applet for dockx (standalone dock)')
-makedepends=('git')
-conflicts=("${_pkgname}" 'dockbarx-awn-applet-bzr')
-replaces=('dockbarx-awn-applet-bzr' 'dockbarx-bzr')
-provides=("${_pkgname}=${pkgver%%+*}")
-source=("${_pkgname}"::git+https://github.com/M7S/dockbarx.git)
+            'xfce4-dockbarx-plugin>=0.6: xfce4-panel plugin'
+            'python-pyudev: dockx battery applet'
+            'gconf: export settings from older versions of dockbarx'
+            'python-lxml: import settings script')
+provides=("${_pkgname}=${pkgver}")
+_branch='pygi-python3'
+source=("${_pkgname}::git+https://github.com/M7S/dockbarx.git#branch=${_branch}")
 sha256sums=('SKIP')
+install="${_pkgname}.install"
 
-pkgver() { 
-  cd "${srcdir}/${_pkgname}" 
-  git describe --long --tags | sed -r "s/-/+/g"
+pkgver() {
+  cd "${srcdir}/${_pkgname}"
+  printf "%s+r%s+%s" "${_pkgver}" "$( git rev-list --count HEAD )" "$( git rev-parse --short HEAD )"
 }
 
 package() {
   cd "${srcdir}/${_pkgname}"
+  python setup.py install --root "${pkgdir}" --optimize=1
 
-  python2 setup.py install --root "${pkgdir}"
-
-  mkdir -p "${pkgdir}"/usr/share/avant-window-navigator/applets
-  cp -r "${srcdir}/${_pkgname}"/AWN/* "${pkgdir}"/usr/share/avant-window-navigator/applets
-  
-  mkdir -p "${pkgdir}"/usr/share/pixmaps
   install -Dm644 "${srcdir}/${_pkgname}"/icons/hicolor/128x128/apps/dockbarx.png "${pkgdir}"/usr/share/pixmaps/dockbarx.png
-
-  sed -i 's:^Categories=.*:Categories=Settings:' "${pkgdir}"/usr/share/applications/dbx_preference.desktop
 }