1 |
commit: 58b0f5c691a22681cb9541d2d06698ccc8e33538 |
2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Jan 25 01:08:47 2022 +0000 |
4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Jan 25 01:08:47 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=58b0f5c6 |
7 |
|
8 |
games-board/gnome-mines: fix build with meson 0.61 |
9 |
|
10 |
Closes: https://bugs.gentoo.org/831454 |
11 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
12 |
|
13 |
.../files/gnome-mines-40.0-meson-0.61.patch | 33 ++++++++++++++++++++++ |
14 |
games-board/gnome-mines/gnome-mines-40.0.ebuild | 4 +++ |
15 |
2 files changed, 37 insertions(+) |
16 |
|
17 |
diff --git a/games-board/gnome-mines/files/gnome-mines-40.0-meson-0.61.patch b/games-board/gnome-mines/files/gnome-mines-40.0-meson-0.61.patch |
18 |
new file mode 100644 |
19 |
index 000000000000..291fc0b403e5 |
20 |
--- /dev/null |
21 |
+++ b/games-board/gnome-mines/files/gnome-mines-40.0-meson-0.61.patch |
22 |
@@ -0,0 +1,33 @@ |
23 |
+https://gitlab.gnome.org/GNOME/gnome-mines/-/merge_requests/31.patch |
24 |
+https://bugs.gentoo.org/831454 |
25 |
+ |
26 |
+From 0a10c3a8ae4395c8059875bcea74be5c17ef9a21 Mon Sep 17 00:00:00 2001 |
27 |
+From: Jan Beich <jbeich@×××××××.org> |
28 |
+Date: Mon, 24 Jan 2022 13:28:56 +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:18:0: ERROR: Function does not take positional arguments. |
34 |
+data/meson.build:38:0: ERROR: Function does not take positional arguments. |
35 |
+--- a/data/meson.build |
36 |
++++ b/data/meson.build |
37 |
+@@ -15,7 +15,7 @@ foreach theme: [ 'default', 'bgcolors', 'classic' ] |
38 |
+ endforeach |
39 |
+ endforeach |
40 |
+ |
41 |
+-desktop_file = i18n.merge_file ('desktop-file', |
42 |
++desktop_file = i18n.merge_file ( |
43 |
+ input: '@0@××××××××.in'.format(app_id), |
44 |
+ output: '@0@.desktop'.format(app_id), |
45 |
+ install: true, |
46 |
+@@ -35,7 +35,7 @@ if desktop_file_validate.found() |
47 |
+ endif |
48 |
+ |
49 |
+ |
50 |
+-appdata_file = i18n.merge_file ('appdata-file', |
51 |
++appdata_file = i18n.merge_file ( |
52 |
+ input: '@0@××××××××××××.in'.format(app_id), |
53 |
+ output: '@0@××××××××.xml'.format(app_id), |
54 |
+ install: true, |
55 |
+GitLab |
56 |
|
57 |
diff --git a/games-board/gnome-mines/gnome-mines-40.0.ebuild b/games-board/gnome-mines/gnome-mines-40.0.ebuild |
58 |
index aba0d63de94b..39154792afb5 100644 |
59 |
--- a/games-board/gnome-mines/gnome-mines-40.0.ebuild |
60 |
+++ b/games-board/gnome-mines/gnome-mines-40.0.ebuild |
61 |
@@ -31,6 +31,10 @@ BDEPEND=" |
62 |
gnome-base/librsvg:2[vala] |
63 |
" |
64 |
|
65 |
+PATCHES=( |
66 |
+ "${FILESDIR}"/${PN}-40.0-meson-0.61.patch |
67 |
+) |
68 |
+ |
69 |
src_prepare() { |
70 |
xdg_src_prepare |
71 |
vala_src_prepare |