Update to 42.alpha

2 files changed, 95 insertions, 54 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 3c194408404a..07f297a6c231 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,37 +1,45 @@
 pkgbase = gnome-software-git
 	pkgdesc = GNOME Software Tools
-	pkgver = 40.0+99+g3f5ae4dc
+	pkgver = 42.alpha+r120+g9e1abcb6
 	pkgrel = 1
 	url = https://wiki.gnome.org/Apps/Software/
 	arch = x86_64
+	arch = aarch64
 	license = GPL2
 	makedepends = appstream
-	makedepends = gsettings-desktop-schemas
-	makedepends = libpackagekit-glib
+	makedepends = docbook-xsl
 	makedepends = flatpak
 	makedepends = fwupd
-	makedepends = docbook-xsl
 	makedepends = git
+	makedepends = gnome-online-accounts
 	makedepends = gobject-introspection
+	makedepends = gsettings-desktop-schemas
 	makedepends = gspell
 	makedepends = gtk-doc
-	makedepends = meson
-	makedepends = valgrind
-	makedepends = gnome-online-accounts
+	makedepends = libadwaita
+	makedepends = libpackagekit-glib
+	makedepends = libsysprof-capture
 	makedepends = libxmlb
 	makedepends = malcontent
-	makedepends = libhandy
+	makedepends = meson
+	makedepends = valgrind
+	provides = gnome-software
+	provides = gnome-software-packagekit-plugin
+	conflicts = gnome-software
+	conflicts = gnome-software-packagekit-plugin
 	source = git+https://gitlab.gnome.org/GNOME/gnome-software.git
 	b2sums = SKIP
 
 pkgname = gnome-software-git
-	depends = libxmlb
+	groups = gnome
+	depends = appstream
+	depends = gnome-online-accounts
 	depends = gsettings-desktop-schemas
 	depends = gspell
+	depends = libadwaita
 	depends = libpackagekit-glib
-	depends = gnome-online-accounts
-	depends = appstream
-	depends = libhandy
+	depends = libsysprof-capture
+	depends = libxmlb
 	optdepends = flatpak: Flatpak support plugin
 	optdepends = fwupd: fwupd support plugin
 	optdepends = malcontent: Parental control plugin
@@ -41,7 +49,7 @@ pkgname = gnome-software-git
 pkgname = gnome-software-packagekit-plugin-git
 	pkgdesc = PackageKit support plugin for GNOME Software
 	depends = archlinux-appstream-data
-	depends = gnome-software
+	depends = gnome-software-git
 	depends = packagekit
 	provides = gnome-software-packagekit-plugin
 	conflicts = gnome-software-packagekit-plugin
diff --git a/PKGBUILD b/PKGBUILD
index b28715246b1e..0de3b164494c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,66 +1,99 @@
+# Maintainer: Philip Goto <philip.goto@gmail.com>
+
 pkgbase=gnome-software-git
 pkgname=(gnome-software-git gnome-software-packagekit-plugin-git)
-pkgver=40.0+99+g3f5ae4dc
+pkgver=42.alpha+r120+g9e1abcb6
 pkgrel=1
-pkgdesc="GNOME Software Tools"
-url="https://wiki.gnome.org/Apps/Software/"
-arch=(x86_64)
+pkgdesc='GNOME Software Tools'
+arch=(x86_64 aarch64)
+url='https://wiki.gnome.org/Apps/Software/'
 license=(GPL2)
-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')
-source=("git+https://gitlab.gnome.org/GNOME/gnome-software.git")
-b2sums=('SKIP')
+makedepends=(
+	appstream
+	docbook-xsl
+	flatpak
+	fwupd
+	git
+	gnome-online-accounts
+	gobject-introspection
+	gsettings-desktop-schemas
+	gspell
+	gtk-doc
+	libadwaita
+	libpackagekit-glib
+	libsysprof-capture
+	libxmlb
+	malcontent
+	meson
+	valgrind
+)
+provides=(gnome-software gnome-software-packagekit-plugin)
+conflicts=(gnome-software gnome-software-packagekit-plugin)
+source=('git+https://gitlab.gnome.org/GNOME/gnome-software.git')
+b2sums=(SKIP)
 
 pkgver() {
-  cd gnome-software
-  git describe --tags | sed 's/^GNOME_SOFTWARE_//;s/_/./g;s/-/+/g'
+ 	cd gnome-software
+ 	git describe --long --tags | sed 's/^GNOME_SOFTWARE_//;s/_/./g;s/[^-]*-g/r&/;s/-/+/g'
 }
 
 build() {
-  # Ensure static library is non-LTO compatible
-  CFLAGS+=" -ffat-lto-objects"
+	# Ensure static library is non-LTO compatible
+	CFLAGS+=" -ffat-lto-objects"
 
-  arch-meson gnome-software build -D sysprof=disabled
-  meson compile -C build
+	arch-meson gnome-software build -D soup2=true
+	meson compile -C build
 }
 
 check() {
-  # build container troubles
-  meson test -C build --print-errorlogs || :
+	# build container troubles
+	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
+	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-git() {
-  depends=('libxmlb' 'gsettings-desktop-schemas' 'gspell' 'libpackagekit-glib'
-           'gnome-online-accounts' 'appstream' 'libhandy')
-  optdepends=('flatpak: Flatpak support plugin'
-              'fwupd: fwupd support plugin'
-              'malcontent: Parental control plugin')
-  provides=('gnome-software')
-  conflicts=('gnome-software')
+	groups=(gnome)
+	depends=(
+		appstream
+		gnome-online-accounts
+		gsettings-desktop-schemas
+		gspell
+		libadwaita
+		libpackagekit-glib
+		libsysprof-capture
+		libxmlb
+	)
+	optdepends=(
+		'flatpak: Flatpak support plugin'
+		'fwupd: fwupd support plugin'
+		'malcontent: Parental control plugin'
+	)
+	provides=(gnome-software)
+	conflicts=(gnome-software)
 
-  DESTDIR="$pkgdir" meson install -C build
+	meson install -C build --destdir "$pkgdir"
 
-### Split gnome-software-packagekit-plugin-git
-  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
+	local pkglibdir="$pkgdir/usr/lib/gnome-software"
+	_pick packagekit-plugin "$pkglibdir"/plugins-*/libgs_plugin_packagekit*.so
 }
 
 package_gnome-software-packagekit-plugin-git() {
-  pkgdesc="PackageKit support plugin for GNOME Software"
-  depends=('archlinux-appstream-data' 'gnome-software' 'packagekit')
-  provides=('gnome-software-packagekit-plugin')
-  conflicts=('gnome-software-packagekit-plugin')
-  mv packagekit-plugin/* "$pkgdir"
+	pkgdesc="PackageKit support plugin for GNOME Software"
+	depends=(
+		archlinux-appstream-data
+		gnome-software-git
+		packagekit
+	)
+	provides=(gnome-software-packagekit-plugin)
+	conflicts=(gnome-software-packagekit-plugin)
+	mv packagekit-plugin/* "$pkgdir"
 }