[arch-commits] Commit in gnome-settings-daemon/trunk (PKGBUILD fix-meson.diff)

[Jan Steffens]

    Date: Saturday, April 2, 2022 @ 13:34:11
  Author: heftig
Revision: 441245

42.1-1

Modified:
  gnome-settings-daemon/trunk/PKGBUILD
Deleted:
  gnome-settings-daemon/trunk/fix-meson.diff

----------------+
 PKGBUILD       |   23 +++++++++--------------
 fix-meson.diff |   24 ------------------------
 2 files changed, 9 insertions(+), 38 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2022-04-02 13:23:32 UTC (rev 441244)
+++ PKGBUILD	2022-04-02 13:34:11 UTC (rev 441245)
@@ -1,39 +1,34 @@
 # Maintainer: Jan Alexander Steffens (heftig) <heftig at archlinux.org>
 
 pkgname=gnome-settings-daemon
-pkgver=41.0
-pkgrel=2
+pkgver=42.1
+pkgrel=1
 pkgdesc="GNOME Settings Daemon"
 url="https://gitlab.gnome.org/GNOME/gnome-settings-daemon"
 arch=(x86_64)
 license=(GPL)
-depends=(dconf gnome-desktop gsettings-desktop-schemas libcanberra-pulse libnotify systemd libwacom
-         pulseaudio pulseaudio-alsa upower librsvg libgweather geocode-glib geoclue nss libgudev
-         gtk3 libnm gcr)
+depends=(dconf gnome-desktop gsettings-desktop-schemas libcanberra-pulse
+         libnotify systemd libwacom pulseaudio pulseaudio-alsa upower librsvg
+         libgweather-4 geocode-glib geoclue nss libgudev gtk3 libnm gcr)
 makedepends=(libxslt docbook-xsl python git meson usbguard)
 checkdepends=(python-gobject python-dbusmock)
 optdepends=('usbguard: USB protection support')
 groups=(gnome)
 backup=(etc/xdg/Xwayland-session.d/00-xrdb)
-_commit=6466cae65b2bf962894b71e54a62355148709e4a  # tags/41.0^0
+_commit=946e4bbea6cc078776901459dc69fd65888b2a16  # tags/42.1^0
 source=("git+https://gitlab.gnome.org/GNOME/gnome-settings-daemon.git#commit=$_commit"
-        "git+https://gitlab.gnome.org/GNOME/libgnome-volume-control.git"
-        fix-meson.diff)
+        "git+https://gitlab.gnome.org/GNOME/libgnome-volume-control.git")
 sha256sums=('SKIP'
-            'SKIP'
-            '704984a4f6cb6fb47c0a6dab7766c1e4e968c47a374deacc085bf629dcf02ad0')
+            'SKIP')
 
 pkgver() {
   cd $pkgname
-  git describe --tags | sed 's/^GNOME_SETTINGS_DAEMON_//;s/_/./g;s/-/+/g'
+  git describe --tags | sed 's/[^-]*-g/r&/;s/-/+/g'
 }
 
 prepare() {
   cd $pkgname
 
-  # Fix build with Meson 0.61.0
-  git apply -3 ../fix-meson.diff
-
   git submodule init
   git submodule set-url subprojects/gvc "$srcdir/libgnome-volume-control"
   git submodule update

Deleted: fix-meson.diff
===================================================================
--- fix-meson.diff	2022-04-02 13:23:32 UTC (rev 441244)
+++ fix-meson.diff	2022-04-02 13:34:11 UTC (rev 441245)
@@ -1,24 +0,0 @@
-diff --git i/plugins/power/meson.build w/plugins/power/meson.build
-index 69e619f2..014bb6da 100644
---- i/plugins/power/meson.build
-+++ w/plugins/power/meson.build
-@@ -76,7 +76,6 @@ if host_is_linux
-   )
- 
-   i18n.merge_file(
--    policy,
-     input: policy_in,
-     output: policy,
-     po_dir: po_dir,
-diff --git i/plugins/wacom/meson.build w/plugins/wacom/meson.build
-index d8dd0ec7..c00323d4 100644
---- i/plugins/wacom/meson.build
-+++ w/plugins/wacom/meson.build
-@@ -7,7 +7,6 @@ policy_in = configure_file(
- )
- 
- i18n.merge_file(
--  policy,
-   input: policy_in,
-   output: policy,
-   po_dir: po_dir,