Fix package

2 files changed, 45 insertions, 38 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 1e136de1d92a..3c194408404a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,16 +1,15 @@
 pkgbase = gnome-software-git
 	pkgdesc = GNOME Software Tools
-	pkgver = 3.36.0+1+ge5f3d50f
+	pkgver = 40.0+99+g3f5ae4dc
 	pkgrel = 1
 	url = https://wiki.gnome.org/Apps/Software/
 	arch = x86_64
 	license = GPL2
-	makedepends = appstream-glib
-	makedepends = gnome-desktop
+	makedepends = appstream
+	makedepends = gsettings-desktop-schemas
 	makedepends = libpackagekit-glib
 	makedepends = flatpak
 	makedepends = fwupd
-	makedepends = ostree
 	makedepends = docbook-xsl
 	makedepends = git
 	makedepends = gobject-introspection
@@ -18,20 +17,24 @@ pkgbase = gnome-software-git
 	makedepends = gtk-doc
 	makedepends = meson
 	makedepends = valgrind
+	makedepends = gnome-online-accounts
+	makedepends = libxmlb
 	makedepends = malcontent
+	makedepends = libhandy
 	source = git+https://gitlab.gnome.org/GNOME/gnome-software.git
-	sha256sums = SKIP
+	b2sums = SKIP
 
 pkgname = gnome-software-git
-	groups = gnome
-	depends = appstream-glib
-	depends = gnome-desktop
+	depends = libxmlb
 	depends = gsettings-desktop-schemas
 	depends = gspell
 	depends = libpackagekit-glib
+	depends = gnome-online-accounts
+	depends = appstream
+	depends = libhandy
 	optdepends = flatpak: Flatpak support plugin
 	optdepends = fwupd: fwupd support plugin
-	optdepends = ostree: OSTree support plugin
+	optdepends = malcontent: Parental control plugin
 	provides = gnome-software
 	conflicts = gnome-software
 
@@ -42,4 +45,3 @@ pkgname = gnome-software-packagekit-plugin-git
 	depends = packagekit
 	provides = gnome-software-packagekit-plugin
 	conflicts = gnome-software-packagekit-plugin
-
diff --git a/PKGBUILD b/PKGBUILD
index d0782c4b494c..b28715246b1e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,61 +1,66 @@
-# Maintainer: Ricardo Liang (rliang) <ricardoliang@gmail.com>
-
 pkgbase=gnome-software-git
 pkgname=(gnome-software-git gnome-software-packagekit-plugin-git)
-pkgver=3.36.0+1+ge5f3d50f
+pkgver=40.0+99+g3f5ae4dc
 pkgrel=1
 pkgdesc="GNOME Software Tools"
 url="https://wiki.gnome.org/Apps/Software/"
 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 malcontent)
+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")
-sha256sums=('SKIP')
+b2sums=('SKIP')
 
 pkgver() {
   cd gnome-software
   git describe --tags | sed 's/^GNOME_SOFTWARE_//;s/_/./g;s/-/+/g'
 }
 
-prepare() {
-  cd gnome-software
-}
-
 build() {
-  arch-meson gnome-software build \
-    -D ubuntuone=false \
-    -D ubuntu_reviews=false
-  ninja -C build
+  # Ensure static library is non-LTO compatible
+  CFLAGS+=" -ffat-lto-objects"
+
+  arch-meson gnome-software build -D sysprof=disabled
+  meson compile -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-git() {
-  groups=('gnome')
-  provides=('gnome-software')
-  conflicts=('gnome-software')
-  depends=(appstream-glib gnome-desktop gsettings-desktop-schemas gspell libpackagekit-glib)
+  depends=('libxmlb' 'gsettings-desktop-schemas' 'gspell' 'libpackagekit-glib'
+           'gnome-online-accounts' 'appstream' 'libhandy')
   optdepends=('flatpak: Flatpak support plugin'
               'fwupd: fwupd support plugin'
-              'ostree: OSTree support plugin')
+              'malcontent: Parental control plugin')
+  provides=('gnome-software')
+  conflicts=('gnome-software')
 
   DESTDIR="$pkgdir" meson install -C build
 
-  # Split out packagekit plugin
-  mkdir "$srcdir"/packagekit-plugin
-  mv "$pkgdir"/usr/lib/gs-plugins-*/libgs_plugin_{packagekit*,systemd-updates}.so "$srcdir"/packagekit-plugin
+### 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
 }
 
 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')
-  pkgdesc="PackageKit support plugin for GNOME Software"
-  depends=(archlinux-appstream-data gnome-software packagekit)
-
-  mkdir -p "$pkgdir"/usr/lib/gs-plugins-*
-  mv "$srcdir"/packagekit-plugin/* "$pkgdir"/usr/lib/gs-plugins-*/
+  mv packagekit-plugin/* "$pkgdir"
 }