summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO20
-rw-r--r--PKGBUILD32
-rw-r--r--dockbarx.install3
3 files changed, 31 insertions, 24 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 3f9e504f7e09..a0c68d7283be 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,16 +1,16 @@
pkgbase = dockbarx-git
- pkgdesc = TaskBar with groupping and group manipulation
- pkgver = 1.0beta2+0+g38af1e8
+ pkgdesc = TaskBar with grouping and group manipulation
+ pkgver = 1.0beta3+17+g31209c2
pkgrel = 1
epoch = 2
- url = https://github.com/M7S/dockbarx
+ url = https://github.com/xuzhen/dockbarx
install = dockbarx.install
- arch = i688
- arch = x86_64
- arch = armv7h
- arch = aarch64
+ arch = any
license = GPL3
makedepends = python-setuptools
+ makedepends = python-installer
+ makedepends = python-build
+ makedepends = python-wheel
makedepends = python-polib
makedepends = git
depends = libkeybinder3
@@ -19,14 +19,14 @@ pkgbase = dockbarx-git
depends = python-gobject
depends = python-pillow
depends = python-xlib
- depends = python-xdg
- optdepends = mate-panel: mate applet
+ depends = python-pyxdg
+ optdepends = dockbarx-mate-applet: mate applet
optdepends = zeitgeist: recently used file list
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.0beta2+0+g38af1e8
+ provides = dockbarx=1.0beta3+17+g31209c2
conflicts = dockbarx
source = dockbarx::git+https://github.com/xuzhen/dockbarx.git#branch=pygi-python3
sha256sums = SKIP
diff --git a/PKGBUILD b/PKGBUILD
index c1718016f1dd..f64af3576003 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,16 +4,16 @@ _pkgname=dockbarx
pkgname=${_pkgname}-git
epoch=2
_pkgver=1.0beta
-pkgver=1.0beta2+0+g38af1e8
+pkgver=1.0beta3+17+g31209c2
pkgrel=1
-pkgdesc="TaskBar with groupping and group manipulation"
-arch=('i688' 'x86_64' 'armv7h' 'aarch64')
-url="https://github.com/M7S/dockbarx"
+pkgdesc="TaskBar with grouping and group manipulation"
+arch=('any')
+url="https://github.com/xuzhen/dockbarx"
license=('GPL3')
depends=('libkeybinder3' 'python-cairo' 'dbus-python' 'python-gobject' 'python-pillow'
- 'python-xlib' 'python-xdg')
-makedepends=('python-setuptools' 'python-polib' 'git')
-optdepends=('mate-panel: mate applet'
+ 'python-xlib' 'python-pyxdg')
+makedepends=('python-setuptools' 'python-installer' 'python-build' 'python-wheel' 'python-polib' 'git')
+optdepends=('dockbarx-mate-applet: mate applet'
'zeitgeist: recently used file list'
'xfce4-dockbarx-plugin>=0.6: xfce4-panel plugin'
'python-pyudev: dockx battery applet'
@@ -21,19 +21,23 @@ optdepends=('mate-panel: mate applet'
'python-lxml: import settings script')
provides=("${_pkgname}=${pkgver}")
conflicts=("${_pkgname}")
+install="${_pkgname}.install"
_branch='pygi-python3'
-source=("${_pkgname}::git+https://github.com/xuzhen/dockbarx.git#branch=${_branch}")
+source=("${_pkgname}::git+${url}.git#branch=${_branch}")
sha256sums=('SKIP')
-install="${_pkgname}.install"
pkgver() {
- cd "${srcdir}/${_pkgname}"
+ cd "${_pkgname}"
git describe --long --tags | sed 's:-beta:beta:;s:-:+:g'
}
+build() {
+ cd "${_pkgname}"
+ python -m build --wheel --no-isolation
+}
package() {
- cd "${srcdir}/${_pkgname}"
- python setup.py install --root "${pkgdir}" --optimize=1
-
- install -Dm644 "${srcdir}/${_pkgname}"/icons/hicolor/128x128/apps/dockbarx.png "${pkgdir}"/usr/share/pixmaps/dockbarx.png
+ cd "${_pkgname}"
+ python -m installer --destdir="$pkgdir" dist/*.whl
+
+ install -Dm644 "${srcdir}/${_pkgname}"/data/icons/hicolor/128x128/apps/dockbarx.png "${pkgdir}"/usr/share/pixmaps/dockbarx.png
}
diff --git a/dockbarx.install b/dockbarx.install
index e145edef1032..242dd1a00601 100644
--- a/dockbarx.install
+++ b/dockbarx.install
@@ -1,4 +1,7 @@
post_upgrade() {
+ echo "The MATE panel applet has moved to a separate repository"
+ echo "so is now packaged separately. Please install mate-dockbarx-applet-git."
+ echo
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."