summaryrefslogtreecommitdiff
path: root/games-board/gnome-mahjongg/files
diff options
context:
space:
mode:
authorV3n3RiX <venerix@koprulu.sector>2022-02-02 01:39:05 +0000
committerV3n3RiX <venerix@koprulu.sector>2022-02-02 01:39:05 +0000
commitfcc5224904648a8e6eb528d7603154160a20022f (patch)
tree3bfce096b38a9cea8eed13fc70c1526c456e9abd /games-board/gnome-mahjongg/files
parent2fd57282f0262ca084e05b0f2c63fbada395d02b (diff)
gentoo resync : 02.02.2022
Diffstat (limited to 'games-board/gnome-mahjongg/files')
-rw-r--r--games-board/gnome-mahjongg/files/gnome-mahjongg-3.38.3-meson-0.61.patch32
1 files changed, 32 insertions, 0 deletions
diff --git a/games-board/gnome-mahjongg/files/gnome-mahjongg-3.38.3-meson-0.61.patch b/games-board/gnome-mahjongg/files/gnome-mahjongg-3.38.3-meson-0.61.patch
new file mode 100644
index 000000000000..9b9f26d09f95
--- /dev/null
+++ b/games-board/gnome-mahjongg/files/gnome-mahjongg-3.38.3-meson-0.61.patch
@@ -0,0 +1,32 @@
+https://gitlab.gnome.org/GNOME/gnome-mahjongg/-/merge_requests/26
+https://bugs.gentoo.org/831466
+
+From 7604f8c8311f1088293596e639fefafdbeb73235 Mon Sep 17 00:00:00 2001
+From: Jan Beich <jbeich@FreeBSD.org>
+Date: Mon, 24 Jan 2022 11:22:48 +0000
+Subject: [PATCH] meson: drop unused argument for i18n.merge_file()
+
+Ignored in Meson < 0.60.0, deprecated since 0.60.1 and fatal since 0.61.0.
+
+data/meson.build:24:0: ERROR: Function does not take positional arguments.
+data/meson.build:45:0: ERROR: Function does not take positional arguments.
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -22,7 +22,6 @@ install_data ('smooth.png', install_dir: join_paths (pkgdatadir, 'themes'))
+ install_data ('edu_kang_xi.png', install_dir: join_paths (pkgdatadir, 'themes'))
+
+ desktop_file = i18n.merge_file (
+- 'desktop-file',
+ input: 'org.gnome.Mahjongg.desktop.in',
+ output: 'org.gnome.Mahjongg.desktop',
+ install: true,
+@@ -42,7 +41,7 @@ if desktop_file_validate.found()
+ )
+ endif
+
+-appdata_file = i18n.merge_file ('appdata-file',
++appdata_file = i18n.merge_file (
+ input: 'org.gnome.Mahjongg.appdata.xml.in',
+ output: 'org.gnome.Mahjongg.appdata.xml',
+ install: true,
+GitLab