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

[Balló György]

    Date: Thursday, January 18, 2018 @ 19:13:33
  Author: bgyorgy
Revision: 283980

upgpkg: gnome-software 3.26.5-2

Split out gnome-software-packagekit-plugin, make flatpak, fwupd, ostree and packagekit dependencies optional, disable useless ubuntuone and ubuntu-reviews plugins, add to the 'gnome' group

Added:
  gnome-software/trunk/0001-Fix-build-when-gtkspell-enabled.patch
Modified:
  gnome-software/trunk/PKGBUILD

--------------------------------------------+
 0001-Fix-build-when-gtkspell-enabled.patch |   41 ++++++++++++++++++++++++
 PKGBUILD                                   |   45 ++++++++++++++++++++-------
 2 files changed, 75 insertions(+), 11 deletions(-)

Added: 0001-Fix-build-when-gtkspell-enabled.patch
===================================================================
--- 0001-Fix-build-when-gtkspell-enabled.patch	                        (rev 0)
+++ 0001-Fix-build-when-gtkspell-enabled.patch	2018-01-18 19:13:33 UTC (rev 283980)
@@ -0,0 +1,41 @@
+From 88f0ba789a24973785444f18dc22e91ab38ea79e Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ball=C3=83=C2=B3=20Gy=C3=83=C2=B6rgy?= <ballogyor at gmail.com>
+Date: Thu, 18 Jan 2018 19:41:32 +0100
+Subject: [PATCH] Fix build when gtkspell enabled
+
+HAVE_GTKSPELL needs to be defined, otherwise the gtkspell related code never built.
+---
+ meson.build     | 1 +
+ src/meson.build | 4 ++++
+ 2 files changed, 5 insertions(+)
+
+diff --git a/meson.build b/meson.build
+index 00f3b2ab..c20f8a6f 100644
+--- a/meson.build
++++ b/meson.build
+@@ -125,6 +125,7 @@ endif
+ 
+ if get_option('enable-gtkspell')
+   gtkspell = dependency('gtkspell3-3.0')
++  conf.set('HAVE_GTKSPELL', 1)
+ endif
+ 
+ if get_option('enable-polkit')
+diff --git a/src/meson.build b/src/meson.build
+index bf189241..c90366b3 100644
+--- a/src/meson.build
++++ b/src/meson.build
+@@ -100,6 +100,10 @@ if get_option('enable-gnome-desktop')
+   gnome_software_dependencies += [gnome_desktop]
+ endif
+ 
++if get_option('enable-gtkspell')
++  gnome_software_dependencies += [gtkspell]
++endif
++
+ executable(
+   'gnome-software',
+   resources_src,
+-- 
+2.15.1
+

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-01-18 19:10:16 UTC (rev 283979)
+++ PKGBUILD	2018-01-18 19:13:33 UTC (rev 283980)
@@ -3,34 +3,57 @@
 # Contributor: Jan de Groot <jgc at archlinux.org>
 # Contributor: Yosef Or Boczko <yoseforb at gnome.org>
 
-pkgname=gnome-software
+pkgbase=gnome-software
+pkgname=(gnome-software gnome-software-packagekit-plugin)
 pkgver=3.26.5
-pkgrel=1
+pkgrel=2
 pkgdesc="GNOME Software Tools"
 arch=(x86_64)
 license=(GPL2)
 url="https://wiki.gnome.org/Apps/Software/"
-depends=(gtk3 appstream-glib libsoup gsettings-desktop-schemas gnome-desktop flatpak
-         packagekit archlinux-appstream-data gtkspell3 libgudev fwupd liboauth)
-makedepends=(python docbook-xsl git valgrind meson gobject-introspection gtk-doc)
+makedepends=(appstream-glib gnome-desktop gtkspell3 libpackagekit-glib flatpak fwupd ostree
+             docbook-xsl git gobject-introspection gtk-doc meson valgrind)
 _commit=7424bad60e8336079eb7db639e0cc96c99d98354  # tags/3.26.5^0
-source=("git+https://git.gnome.org/browse/gnome-software#commit=$_commit")
-sha256sums=('SKIP')
+source=("git+https://git.gnome.org/browse/gnome-software#commit=$_commit"
+        "0001-Fix-build-when-gtkspell-enabled.patch")
+sha256sums=('SKIP'
+            'c1c4e24d69625f444af32162319fd789f93ad761ea973c0035e5ca3ec761c10a')
 
 pkgver() {
-  cd $pkgname
+  cd $pkgbase
   git describe --tags | sed 's/^GNOME_SOFTWARE_//;s/_/./g;s/-/+/g'
 }
 
 prepare() {
-  cd $pkgname
+  cd $pkgbase
+  # Fix build when gtkspell enabled
+  # https://bugzilla.gnome.org/show_bug.cgi?id=792658
+  patch -Np1 -i ../0001-Fix-build-when-gtkspell-enabled.patch
 }
 
 build() {
-  arch-meson $pkgname build -Denable-rpm=false
+  arch-meson $pkgbase build -Denable-rpm=false -Denable-ubuntuone=false -Denable-ubuntu-reviews=false
   ninja -C build
 }
 
-package() {
+package_gnome-software() {
+  groups=('gnome')
+  depends=(appstream-glib gnome-desktop gsettings-desktop-schemas gtkspell3 libpackagekit-glib)
+  optdepends=('flatpak: Flatpak support plugin'
+              'fwupd: fwupd support plugin'
+              'ostree: OSTree support plugin')
+
   DESTDIR="$pkgdir" ninja -C build install
+
+  # Split out packagekit plugin
+  mkdir "$srcdir"/packagekit-plugin
+  mv "$pkgdir"/usr/lib/gs-plugins-11/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/
+}