community/gnome-software: upgrade to 3.38.0

2 files changed, 4 insertions, 114 deletions

diff --git a/community/gnome-software/445.patch b/community/gnome-software/445.patch
deleted file mode 100644
index a60fb67e095..00000000000
--- a/community/gnome-software/445.patch
+++ /dev/null
@@ -1,105 +0,0 @@
-From e91ea5d802b794947b21d438f3defdfd9309d860 Mon Sep 17 00:00:00 2001
-From: Rasmus Thomsen <oss@cogitri.dev>
-Date: Fri, 17 Apr 2020 14:45:59 +0200
-Subject: [PATCH 1/2] build: use meson functionality to generate .pc file
-
-This should be sufficiently stable now and also fixes a few things
-in the pkgconfig file, like minimum required versions of dependants
-and also fixes linking against gnome-software with pkgconfig, previously
-only -L/usr/lib was passed to the linker and not -lgnome-software
----
- lib/meson.build | 45 +++++++++++----------------------------------
- 1 file changed, 11 insertions(+), 34 deletions(-)
-
-diff --git a/lib/meson.build b/lib/meson.build
-index 376beebd..a41f63bb 100644
---- a/lib/meson.build
-+++ b/lib/meson.build
-@@ -1,40 +1,6 @@
- cargs = ['-DG_LOG_DOMAIN="Gs"']
- cargs += ['-DLOCALPLUGINDIR=""']
- 
--# we can't use conf as this is set_quoted()
--
--pkconf = configuration_data()
--pkconf.set('prefix', get_option('prefix'))
--pkconf.set('libdir',
--           join_paths(get_option('prefix'),
--                      get_option('libdir')))
--pkconf.set('includedir',
--           join_paths(get_option('prefix'),
--                      get_option('includedir')))
--pkconf.set('GS_PLUGIN_API_VERSION', gs_plugin_api_version)
--pkconf.set('VERSION', meson.project_version())
--configure_file(
--  input : 'gnome-software.pc.in',
--  output : 'gnome-software.pc',
--  install_dir: join_paths(get_option('libdir'), 'pkgconfig'),
--  configuration : pkconf
--)
--
--# XXX: This can probably be used (after testing), once
--# https://github.com/mesonbuild/meson/pull/1688 is merged
--#pkg = import('pkgconfig')
--#
--#pkg.generate(
--#    description : 'GNOME Software is a software center for GNOME',
--#    filebase : 'gnome-software',
--#    name : 'gnome-software',
--#    requires: [ 'gobject-2.0', 'gdk-3.0', 'appstream-glib', 'libsoup-2.4', 'gio-unix-2.0'],
--#    requires_private : [ 'gthread-2.0', 'atk' ],
--#    subdirs : [ 'gnome-software' ],
--#    variables : [ 'plugindir=${libdir}/lib/gs-plugins-' + gs_plugin_api_version ]
--#    version : meson.project_version()
--#)
--
- install_headers([
-     'gnome-software.h',
-     'gs-app.h',
-@@ -98,6 +64,17 @@ libgnomesoftware = static_library(
-   c_args : cargs,
- )
- 
-+pkg = import('pkgconfig')
-+
-+pkg.generate(
-+    libgnomesoftware,
-+    description : 'GNOME Software is a software center for GNOME',
-+    filebase : 'gnome-software',
-+    name : 'gnome-software',
-+    subdirs : 'gnome-software',
-+    variables : 'plugindir=${libdir}/gs-plugins-' + gs_plugin_api_version,
-+)
-+
- executable(
-   'gnome-software-cmd',
-   sources : [
--- 
-2.24.1
-
-
-From d3fae3b356edc59b53e476de19549c118a6bdc78 Mon Sep 17 00:00:00 2001
-From: Rasmus Thomsen <oss@cogitri.dev>
-Date: Fri, 17 Apr 2020 15:21:25 +0200
-Subject: [PATCH 2/2] build: install libgnomesoftware
-
-This is useful for e.g. out-of-tree plugins
----
- lib/meson.build | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/lib/meson.build b/lib/meson.build
-index a41f63bb..1c00d4f3 100644
---- a/lib/meson.build
-+++ b/lib/meson.build
-@@ -62,6 +62,7 @@ libgnomesoftware = static_library(
-   ],
-   dependencies : librarydeps,
-   c_args : cargs,
-+  install: true,
- )
- 
- pkg = import('pkgconfig')
--- 
-2.24.1
-
diff --git a/community/gnome-software/APKBUILD b/community/gnome-software/APKBUILD
index 9f82ed31549..db0eaa8eb1f 100644
--- a/community/gnome-software/APKBUILD
+++ b/community/gnome-software/APKBUILD
@@ -1,8 +1,8 @@
 # Contributor: Rasmus Thomsen <oss@cogitri.dev>
 # Maintainer: Rasmus Thomsen <oss@cogitri.dev>
 pkgname=gnome-software
-pkgver=3.36.1
-pkgrel=3
+pkgver=3.38.0
+pkgrel=0
 pkgdesc="Software lets you install and update applications and system extensions"
 url="https://wiki.gnome.org/Apps/Software"
 arch="all !s390x !mips !mips64"
@@ -13,10 +13,7 @@ makedepends="meson appstream-glib-dev gdk-pixbuf-dev libxmlb-dev glib-dev gtk+3.
 options="!check" # lots of failing tests
 subpackages="$pkgname-lang $pkgname-doc $pkgname-dbg $pkgname-static
 	$pkgname-dev $pkgname-plugin-flatpak:flatpak_plugin"
-source="https://download.gnome.org/sources/gnome-software/${pkgver%.*}/gnome-software-$pkgver.tar.xz
-	445.patch
-	install-more-headers.patch
-	"
+source="https://download.gnome.org/sources/gnome-software/${pkgver%.*}/gnome-software-$pkgver.tar.xz"
 
 case "$CARCH" in
 	x86*) makedepends="$makedepends fwupd-dev" ;;
@@ -55,6 +52,4 @@ flatpak_plugin() {
 	amove usr/share/metainfo/org.gnome.Software.Plugin.Flatpak.metainfo.xml
 }
 
-sha512sums="7d0e8c16192bbbc8f166db137dbd2e6ff9e85f7d3d37f63f41211ba3838e392bd87a8d9bf09d31b43f6d21e1a099ecdeff9114ae27fae40d563671f0bcbe50d4  gnome-software-3.36.1.tar.xz
-2a8746ac0f948022b10fd29bcaf159d428954061d5ae19db86a09733f69901eda61e109ed4b3d3d484d91c182b2967e4b3bc11ce78774885bb9105a752c55c35  445.patch
-e7de617dbdecaa46fad25d8fe7d7ea5db324aaed73555bbe6814357b4ac3b787269653863679cff4318250dcc7729299b549f41220f441d9033a448af28da9dd  install-more-headers.patch"
+sha512sums="0563f01c23f91047f45e9b0e2e5729065b2703dbf8dd76af105c1bb87654fb40076bdcfc87a8a3922e8a60422d06158a76a3763f52629dec3e15e49a68e68cf2  gnome-software-3.38.0.tar.xz"