From e2697f700aaf4759e9410c0fb3eb30c7490f07f8 Mon Sep 17 00:00:00 2001 From: Kevin Mihelich <kevin@archlinuxarm.org> Date: Mon, 17 Sep 2018 18:42:46 +0000 Subject: [PATCH] community/gnome-software to 3.30.0-1 --- community/gnome-software/PKGBUILD | 33 +++++++++++++++++-------------- 1 file changed, 18 insertions(+), 15 deletions(-) diff --git a/community/gnome-software/PKGBUILD b/community/gnome-software/PKGBUILD index c711aaf87..6ea0b5090 100644 --- a/community/gnome-software/PKGBUILD +++ b/community/gnome-software/PKGBUILD @@ -1,23 +1,22 @@ -# $Id$ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Jan de Groot <jgc@archlinux.org> # Contributor: Yosef Or Boczko <yoseforb@gnome.org> # ALARM: Kevin Mihelich <kevin@archlinuxarm.og> -# - remove dependency on fwupd, specify -Denable-fwupd=false -# - remove makedepend on valgrind, specify -Denable-valgrind=false +# - remove dependency on fwupd, specify -Dfwupd=false +# - remove makedepend on valgrind, specify -Dvalgrind=false pkgbase=gnome-software pkgname=(gnome-software gnome-software-packagekit-plugin) -pkgver=3.28.2 +pkgver=3.30.0 pkgrel=1 pkgdesc="GNOME Software Tools" url="https://wiki.gnome.org/Apps/Software/" arch=(x86_64) license=(GPL2) -makedepends=(appstream-glib gnome-desktop gtkspell3 libpackagekit-glib flatpak ostree +makedepends=(appstream-glib gnome-desktop libpackagekit-glib flatpak ostree docbook-xsl git gobject-introspection gtk-doc meson gspell) -_commit=e9b9d0996293b28f5368f964d12c577dd0eb6dc3 # tags/3.28.2^0 +_commit=9f58ded14e355f663f4287dc3ce8802f4ece3547 # tags/3.30.0^0 source=("git+https://gitlab.gnome.org/GNOME/gnome-software.git#commit=$_commit") sha256sums=('SKIP') @@ -32,14 +31,18 @@ prepare() { build() { arch-meson $pkgbase build \ - -D enable-rpm=false \ - -D enable-ubuntuone=false \ - -D enable-ubuntu-reviews=false \ - -D enable-fwupd=false \ - -D enable-valgrind=false + -D ubuntuone=false \ + -D ubuntu_reviews=false \ + -D fwupd=false \ + -D valgrind=false ninja -C build } +check() { + # build container troubles + meson test -C build || : +} + package_gnome-software() { groups=('gnome') depends=(appstream-glib gnome-desktop gsettings-desktop-schemas gtkspell3 libpackagekit-glib gspell) @@ -47,17 +50,17 @@ package_gnome-software() { 'fwupd: fwupd support plugin' 'ostree: OSTree support plugin') - DESTDIR="$pkgdir" ninja -C build install + DESTDIR="$pkgdir" meson install -C build # Split out packagekit plugin mkdir "$srcdir"/packagekit-plugin - mv "$pkgdir"/usr/lib/gs-plugins-11/libgs_plugin_{packagekit*,systemd-updates}.so "$srcdir"/packagekit-plugin + mv "$pkgdir"/usr/lib/gs-plugins-12/libgs_plugin_{packagekit*,systemd-updates}.so "$srcdir"/packagekit-plugin } 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-11 - mv "$srcdir"/packagekit-plugin/* "$pkgdir"/usr/lib/gs-plugins-11/ + mkdir -p "$pkgdir"/usr/lib/gs-plugins-12 + mv "$srcdir"/packagekit-plugin/* "$pkgdir"/usr/lib/gs-plugins-12/ }