[gentoo-commits] repo/gentoo:master commit in: gnome-extra/gnome-tweaks/files/, gnome-extra/gnome-tweaks/

[Sam James]

commit:     b7a3043f861a5656eeeda12898a109786e0a410e
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 25 02:01:18 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Jan 25 02:01:18 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b7a3043f

gnome-extra/gnome-tweaks: fix build with meson 0.61

Closes: https://bugs.gentoo.org/831937
Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../files/gnome-tweaks-40.0-meson-0.61.patch       | 31 ++++++++++++++++++++++
 gnome-extra/gnome-tweaks/gnome-tweaks-40.0.ebuild  |  4 ++-
 2 files changed, 34 insertions(+), 1 deletion(-)

diff --git a/gnome-extra/gnome-tweaks/files/gnome-tweaks-40.0-meson-0.61.patch b/gnome-extra/gnome-tweaks/files/gnome-tweaks-40.0-meson-0.61.patch
new file mode 100644
index 000000000000..9ef4db33ecb5
--- /dev/null
+++ b/gnome-extra/gnome-tweaks/files/gnome-tweaks-40.0-meson-0.61.patch
@@ -0,0 +1,31 @@
+https://gitlab.gnome.org/GNOME/gnome-tweaks/-/merge_requests/86.patch
+https://bugs.gentoo.org/831937
+
+From 56f39dc7d04a1be91de1149683874f9c83b794fb Mon Sep 17 00:00:00 2001
+From: Mae Dartmann <mae@××××××××××××××.me>
+Date: Sat, 22 Jan 2022 18:09:21 +0100
+Subject: [PATCH] meson: fix invalid positional argument
+
+This was deprecated in meson 0.60 and removed in 0.61. See
+https://github.com/mesonbuild/meson/pull/9445 for details.
+
+Signed-off-by: Mae Dartmann <mae@××××××××××××××.me>
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -1,5 +1,5 @@
+ appdata_file = 'org.gnome.tweaks.appdata.xml'
+-i18n.merge_file(appdata_file,
++i18n.merge_file(
+   input: appdata_file + '.in',
+   output: appdata_file,
+   po_dir: '../po',
+@@ -8,7 +8,7 @@ i18n.merge_file(appdata_file,
+ )
+ 
+ desktop_file = 'org.gnome.tweaks.desktop'
+-i18n.merge_file(desktop_file,
++i18n.merge_file(
+   input: desktop_file + '.in',
+   output: desktop_file,
+   po_dir: '../po',
+GitLab

diff --git a/gnome-extra/gnome-tweaks/gnome-tweaks-40.0.ebuild b/gnome-extra/gnome-tweaks/gnome-tweaks-40.0.ebuild
index c5732da246a7..68e456f9a872 100644
--- a/gnome-extra/gnome-tweaks/gnome-tweaks-40.0.ebuild
+++ b/gnome-extra/gnome-tweaks/gnome-tweaks-40.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -40,6 +40,8 @@ BDEPEND=">=sys-devel/gettext-0.19.8"
 
 PATCHES=(
 	"${FILESDIR}"/3.28.1-gentoo-cursor-themes.patch # Add contents of Gentoo's cursor theme directory to cursor theme list
+
+	"${FILESDIR}"/${PN}-40.0-meson-0.61.patch
 )
 
 src_install() {