[arch-commits] Commit in gnome-software/trunk (PKGBUILD)

[Jan Steffens]

    Date: Saturday, April 2, 2022 @ 22:57:46
  Author: heftig
Revision: 441344

42.0-1

Modified:
  gnome-software/trunk/PKGBUILD

----------+
 PKGBUILD |   24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2022-04-02 22:56:26 UTC (rev 441343)
+++ PKGBUILD	2022-04-02 22:57:46 UTC (rev 441344)
@@ -1,27 +1,28 @@
 # Maintainer: Jan Alexander Steffens (heftig) <heftig at archlinux.org>
+# Contributor: Fabian Bornschein <fabiscafe-cat-mailbox-dog-org>
 # Contributor: Jan de Groot <jgc at archlinux.org>
 # Contributor: Yosef Or Boczko <yoseforb at gnome.org>
 
 pkgbase=gnome-software
 pkgname=(gnome-software gnome-software-packagekit-plugin)
-pkgver=41.5
+pkgver=42.0
 pkgrel=1
 pkgdesc="GNOME Software Tools"
 url="https://wiki.gnome.org/Apps/Software/"
 arch=(x86_64)
-license=(GPL2)
+license=(GPL)
 makedepends=(appstream gsettings-desktop-schemas libpackagekit-glib flatpak
-             fwupd docbook-xsl git gobject-introspection gspell gtk-doc meson
-             valgrind gnome-online-accounts libxmlb malcontent libhandy
+             fwupd docbook-xsl git gobject-introspection gtk-doc meson
+             valgrind gnome-online-accounts libxmlb malcontent gtk4 libadwaita
              libsysprof-capture)
 options=(debug)
-_commit=ccbc15cf533616383a8399b9b9f9a9a9c348dfca  # tags/41.5^0
+_commit=efa819612ad3f9e2985f6f5a2e06be54234bd4c8  # tags/42.0^0
 source=("git+https://gitlab.gnome.org/GNOME/gnome-software.git#commit=$_commit")
 sha256sums=('SKIP')
 
 pkgver() {
   cd $pkgbase
-  git describe --tags | sed 's/^GNOME_SOFTWARE_//;s/_/./g;s/[^-]*-g/r&/;s/-/+/g'
+  git describe --tags | sed 's/[^-]*-g/r&/;s/-/+/g'
 }
 
 prepare() {
@@ -32,13 +33,13 @@
   # Ensure static library is non-LTO compatible
   CFLAGS+=" -ffat-lto-objects"
 
-  arch-meson $pkgbase build
+  # Building with soup3 requires flatpak to be built with soup3
+  arch-meson $pkgbase build -D soup2=true
   meson compile -C build
 }
 
 check() {
-  # build container troubles
-  meson test -C build --print-errorlogs || :
+  meson test -C build --print-errorlogs
 }
 
 _pick() {
@@ -53,8 +54,8 @@
 
 package_gnome-software() {
   groups=(gnome)
-  depends=(libxmlb gsettings-desktop-schemas gspell libpackagekit-glib
-           gnome-online-accounts appstream libhandy libsysprof-capture)
+  depends=(libxmlb gsettings-desktop-schemas libpackagekit-glib gtk4 libadwaita
+           gnome-online-accounts appstream libsysprof-capture)
   optdepends=('flatpak: Flatpak support plugin'
               'fwupd: fwupd support plugin'
               'malcontent: Parental control plugin')
@@ -63,7 +64,6 @@
 
   local pkglibdir="$pkgdir/usr/lib/gnome-software"
   _pick packagekit-plugin "$pkglibdir"/plugins-*/libgs_plugin_packagekit*.so
-  _pick packagekit-plugin "$pkglibdir"/plugins-*/libgs_plugin_systemd-updates.so
 }
 
 package_gnome-software-packagekit-plugin() {