Gentoo Archives: gentoo-commits

From: Sam James <sam@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: games-board/gnome-mahjongg/, games-board/gnome-mahjongg/files/
Date: Tue, 25 Jan 2022 01:09:47
Message-Id: 1643072299.a674576191fa3649c7d008202f3c6af71768af70.sam@gentoo
1 commit: a674576191fa3649c7d008202f3c6af71768af70
2 Author: Sam James <sam <AT> gentoo <DOT> org>
3 AuthorDate: Tue Jan 25 00:58:19 2022 +0000
4 Commit: Sam James <sam <AT> gentoo <DOT> org>
5 CommitDate: Tue Jan 25 00:58:19 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a6745761
7
8 games-board/gnome-mahjongg: fix build with meson 0.61
9
10 Closes: https://bugs.gentoo.org/831466
11 Signed-off-by: Sam James <sam <AT> gentoo.org>
12
13 .../files/gnome-mahjongg-3.38.3-meson-0.61.patch | 32 ++++++++++++++++++++++
14 .../gnome-mahjongg/gnome-mahjongg-3.38.3.ebuild | 6 +++-
15 2 files changed, 37 insertions(+), 1 deletion(-)
16
17 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
18 new file mode 100644
19 index 000000000000..9b9f26d09f95
20 --- /dev/null
21 +++ b/games-board/gnome-mahjongg/files/gnome-mahjongg-3.38.3-meson-0.61.patch
22 @@ -0,0 +1,32 @@
23 +https://gitlab.gnome.org/GNOME/gnome-mahjongg/-/merge_requests/26
24 +https://bugs.gentoo.org/831466
25 +
26 +From 7604f8c8311f1088293596e639fefafdbeb73235 Mon Sep 17 00:00:00 2001
27 +From: Jan Beich <jbeich@×××××××.org>
28 +Date: Mon, 24 Jan 2022 11:22:48 +0000
29 +Subject: [PATCH] meson: drop unused argument for i18n.merge_file()
30 +
31 +Ignored in Meson < 0.60.0, deprecated since 0.60.1 and fatal since 0.61.0.
32 +
33 +data/meson.build:24:0: ERROR: Function does not take positional arguments.
34 +data/meson.build:45:0: ERROR: Function does not take positional arguments.
35 +--- a/data/meson.build
36 ++++ b/data/meson.build
37 +@@ -22,7 +22,6 @@ install_data ('smooth.png', install_dir: join_paths (pkgdatadir, 'themes'))
38 + install_data ('edu_kang_xi.png', install_dir: join_paths (pkgdatadir, 'themes'))
39 +
40 + desktop_file = i18n.merge_file (
41 +- 'desktop-file',
42 + input: 'org.gnome.Mahjongg.desktop.in',
43 + output: 'org.gnome.Mahjongg.desktop',
44 + install: true,
45 +@@ -42,7 +41,7 @@ if desktop_file_validate.found()
46 + )
47 + endif
48 +
49 +-appdata_file = i18n.merge_file ('appdata-file',
50 ++appdata_file = i18n.merge_file (
51 + input: 'org.gnome.Mahjongg.appdata.xml.in',
52 + output: 'org.gnome.Mahjongg.appdata.xml',
53 + install: true,
54 +GitLab
55
56 diff --git a/games-board/gnome-mahjongg/gnome-mahjongg-3.38.3.ebuild b/games-board/gnome-mahjongg/gnome-mahjongg-3.38.3.ebuild
57 index b6a00c10a6e5..d7c2f9a1096b 100644
58 --- a/games-board/gnome-mahjongg/gnome-mahjongg-3.38.3.ebuild
59 +++ b/games-board/gnome-mahjongg/gnome-mahjongg-3.38.3.ebuild
60 @@ -1,4 +1,4 @@
61 -# Copyright 1999-2021 Gentoo Authors
62 +# Copyright 1999-2022 Gentoo Authors
63 # Distributed under the terms of the GNU General Public License v2
64
65 EAPI=7
66 @@ -30,6 +30,10 @@ BDEPEND="
67 virtual/pkgconfig
68 "
69
70 +PATCHES=(
71 + "${FILESDIR}"/${PN}-3.38.3-meson-0.61.patch
72 +)
73 +
74 src_prepare() {
75 xdg_src_prepare
76 vala_src_prepare