Date: Friday, March 15, 2019 @ 21:58:52 Author: heftig Revision: 442056
3.32.0-1 Modified: gnome-software/trunk/PKGBUILD ----------+ PKGBUILD | 38 +++++++++++++++++++++++--------------- 1 file changed, 23 insertions(+), 15 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2019-03-15 21:48:32 UTC (rev 442055) +++ PKGBUILD 2019-03-15 21:58:52 UTC (rev 442056) @@ -4,7 +4,7 @@ pkgbase=gnome-software pkgname=(gnome-software gnome-software-packagekit-plugin) -pkgver=3.30.6 +pkgver=3.32.0 pkgrel=1 pkgdesc="GNOME Software Tools" url="https://wiki.gnome.org/Apps/Software/" @@ -11,8 +11,9 @@ arch=(x86_64) license=(GPL2) makedepends=(appstream-glib gnome-desktop libpackagekit-glib flatpak fwupd ostree - docbook-xsl git gobject-introspection gspell gtk-doc meson valgrind) -_commit=ae42d5130a200a0fe60c011f29e4e699be639cf4 # tags/3.30.6^0 + docbook-xsl git gobject-introspection gspell gtk-doc meson valgrind + gnome-online-accounts libxmlb) +_commit=bed994cc6e3c41a92efd6b2847ef978d5b2cd3a3 # tags/3.32.0^0 source=("git+https://gitlab.gnome.org/GNOME/gnome-software.git#commit=$_commit") sha256sums=('SKIP') @@ -26,20 +27,29 @@ } build() { - arch-meson $pkgbase build \ - -D ubuntuone=false \ - -D ubuntu_reviews=false + arch-meson $pkgbase build ninja -C build } check() { # build container troubles - meson test -C build || : + meson test -C build --print-errorlogs || : } +_pick() { + local p="$1" f d; shift + for f; do + d="$srcdir/$p/${f#$pkgdir/}" + mkdir -p "$(dirname "$d")" + mv "$f" "$d" + rmdir -p --ignore-fail-on-non-empty "$(dirname "$f")" + done +} + package_gnome-software() { groups=('gnome') - depends=(appstream-glib gnome-desktop gsettings-desktop-schemas gspell libpackagekit-glib) + depends=(libxmlb gnome-desktop gsettings-desktop-schemas gspell libpackagekit-glib + gnome-online-accounts) optdepends=('flatpak: Flatpak support plugin' 'fwupd: fwupd support plugin' 'ostree: OSTree support plugin') @@ -46,15 +56,13 @@ DESTDIR="$pkgdir" meson install -C build - # Split out packagekit plugin - mkdir "$srcdir"/packagekit-plugin - mv "$pkgdir"/usr/lib/gs-plugins-12/libgs_plugin_{packagekit*,systemd-updates}.so "$srcdir"/packagekit-plugin +### Split gnome-software-packagekit-plugin + _pick packagekit-plugin "$pkgdir"/usr/lib/gs-plugins-*/libgs_plugin_packagekit*.so + _pick packagekit-plugin "$pkgdir"/usr/lib/gs-plugins-*/libgs_plugin_systemd-updates.so } package_gnome-software-packagekit-plugin() { pkgdesc="PackageKit support plugin for GNOME Software" - depends=(archlinux-appstream-data gnome-software packagekit) - - mkdir -p "$pkgdir"/usr/lib/gs-plugins-12 - mv "$srcdir"/packagekit-plugin/* "$pkgdir"/usr/lib/gs-plugins-12/ + depends=(archlinux-appstream-data gnome-software packagekit appstream-glib) + mv packagekit-plugin/* "$pkgdir" }