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

[Jan Steffens]

    Date: Monday, January 17, 2022 @ 21:31:26
  Author: heftig
Revision: 434637

fix build with meson 0.61.0

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

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

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2022-01-17 21:15:15 UTC (rev 434636)
+++ PKGBUILD	2022-01-17 21:31:26 UTC (rev 434637)
@@ -17,9 +17,11 @@
 backup=(etc/xdg/Xwayland-session.d/00-xrdb)
 _commit=6466cae65b2bf962894b71e54a62355148709e4a  # tags/41.0^0
 source=("git+https://gitlab.gnome.org/GNOME/gnome-settings-daemon.git#commit=$_commit"
-        "git+https://gitlab.gnome.org/GNOME/libgnome-volume-control.git")
+        "git+https://gitlab.gnome.org/GNOME/libgnome-volume-control.git"
+        fix-meson.diff)
 sha256sums=('SKIP'
-            'SKIP')
+            'SKIP'
+            '704984a4f6cb6fb47c0a6dab7766c1e4e968c47a374deacc085bf629dcf02ad0')
 
 pkgver() {
   cd $pkgname
@@ -29,6 +31,9 @@
 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

Added: fix-meson.diff
===================================================================
--- fix-meson.diff	                        (rev 0)
+++ fix-meson.diff	2022-01-17 21:31:26 UTC (rev 434637)
@@ -0,0 +1,24 @@
+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,