summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorTed Alff2020-08-02 15:22:41 -0400
committerTed Alff2020-08-02 15:22:41 -0400
commit305a19647c9efe4ea1f30f8ce57d31b4906d0568 (patch)
tree4b3ff7e944f6ff15e745d8d91e2aa7a05c546892
parentdb09891f5231e82fb572e9ef5744867535d8868e (diff)
downloadaur-305a19647c9efe4ea1f30f8ce57d31b4906d0568.tar.gz
Switch to GTK3 branch.
-rw-r--r--.SRCINFO48
-rw-r--r--PKGBUILD48
-rw-r--r--dockbarx.install14
3 files changed, 55 insertions, 55 deletions
diff --git a/.SRCINFO b/.SRCINFO
index b8ef0c3ee8b..7842f769b58 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,38 +1,32 @@
-# Generated by mksrcinfo v8
-# Sat Feb 17 03:02:23 UTC 2018
pkgbase = dockbarx-git
pkgdesc = TaskBar with groupping and group manipulation
- pkgver = 0.93+0+g8429c63
+ pkgver = 1.0beta+r820+4a5b382
pkgrel = 1
- epoch = 1
url = https://github.com/M7S/dockbarx
- arch = i686
+ install = dockbarx.install
+ arch = i688
arch = x86_64
+ arch = armv7h
+ arch = aarch64
license = GPL3
+ makedepends = python-setuptools
+ makedepends = python-polib
makedepends = git
- depends = python2-wnck
- depends = pygtk
- depends = python2-xdg
- depends = python2-dbus
- depends = python2-numpy
- depends = python2-pillow
- depends = python2-keybinder2
- depends = hicolor-icon-theme
- depends = python2-xlib
- depends = python2-gconf
- depends = python2-six
- optdepends = avant-window-navigator: AWN DockBarX Plugin
- optdepends = xfce4-dockbarx-plugin: Xfce4 Panel Plugin
+ depends = libkeybinder3
+ depends = python-cairo
+ depends = python-dbus
+ depends = python-gobject
+ depends = python-pillow
+ depends = python-xlib
+ depends = python-xdg
+ optdepends = mate-panel: mate applet
optdepends = zeitgeist: recently used file list
- optdepends = compiz-fusion-plugins-main: opacify plugin
- optdepends = dockmanager: dockmanager plugins
- optdepends = cardapio-bzr: required to run menu applet for dockx (standalone dock)
- provides = dockbarx=0.93
- conflicts = dockbarx
- conflicts = dockbarx-awn-applet-bzr
- replaces = dockbarx-awn-applet-bzr
- replaces = dockbarx-bzr
- source = dockbarx::git+https://github.com/M7S/dockbarx.git
+ optdepends = xfce4-dockbarx-plugin>=0.6: xfce4-panel plugin
+ optdepends = python-pyudev: dockx battery applet
+ optdepends = gconf: export settings from older versions of dockbarx
+ optdepends = python-lxml: import settings script
+ provides = dockbarx=1.0beta+r820+4a5b382
+ source = dockbarx::git+https://github.com/M7S/dockbarx.git#branch=pygi-python3
sha256sums = SKIP
pkgname = dockbarx-git
diff --git a/PKGBUILD b/PKGBUILD
index fd268a7a005..ce47cab42a8 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
}
diff --git a/dockbarx.install b/dockbarx.install
new file mode 100644
index 00000000000..e145edef103
--- /dev/null
+++ b/dockbarx.install
@@ -0,0 +1,14 @@
+post_upgrade() {
+ echo "In version 1.0beta configuration is moved from gconf"
+ echo "to gsettings. To migrate your settings you will need to "
+ echo "have the optional dependencies 'gconf' and 'python-lxml' installed."
+ echo
+ echo "Dump the preferences from GConf: "
+ echo "\$ gconftool --dump /apps/dockbarx > dockbarx.xml"
+ echo
+ echo "Run the migration tool: "
+ echo "\$ dbx_migrate_settings dockbarx.xml"
+ echo ""
+ echo "Move your application folder: "
+ echo "\$ mv ~/.dockbarx ~/.local/share/dockbarx "
+}