1 |
commit: 2d2f6dbd13a295524fc2d39039ef983e828efd84 |
2 |
Author: Christophe Lermytte <gentoo <AT> lermytte <DOT> be> |
3 |
AuthorDate: Mon Jan 24 22:57:11 2022 +0000 |
4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Jan 25 00:49:11 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2d2f6dbd |
7 |
|
8 |
games-puzzle/gnome-sudoku: fix build with meson-0.61 |
9 |
|
10 |
Closes: https://bugs.gentoo.org/831556 |
11 |
Signed-off-by: Christophe Lermytte <gentoo <AT> lermytte.be> |
12 |
Closes: https://github.com/gentoo/gentoo/pull/23947 |
13 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
14 |
|
15 |
.../files/40.2-fix-build-with-meson-0.61.1.patch | 40 ++++++++++++++++++++++ |
16 |
games-puzzle/gnome-sudoku/gnome-sudoku-40.2.ebuild | 4 +++ |
17 |
2 files changed, 44 insertions(+) |
18 |
|
19 |
diff --git a/games-puzzle/gnome-sudoku/files/40.2-fix-build-with-meson-0.61.1.patch b/games-puzzle/gnome-sudoku/files/40.2-fix-build-with-meson-0.61.1.patch |
20 |
new file mode 100644 |
21 |
index 000000000000..02d125685ac1 |
22 |
--- /dev/null |
23 |
+++ b/games-puzzle/gnome-sudoku/files/40.2-fix-build-with-meson-0.61.1.patch |
24 |
@@ -0,0 +1,40 @@ |
25 |
+https://gitlab.gnome.org/GNOME/gnome-sudoku/-/commit/7c9935a02b48f332f67bad3e4ee020b75591084a |
26 |
+https://bugs.gentoo.org/831556 |
27 |
+ |
28 |
+From: Jan Beich <jbeich@×××××××.org> |
29 |
+Date: Mon, 24 Jan 2022 11:44:06 +0000 |
30 |
+Subject: [PATCH] meson: drop unused argument for i18n.merge_file() |
31 |
+ |
32 |
+Ignored in Meson < 0.60.0, deprecated since 0.60.1 and fatal since 0.61.0. |
33 |
+ |
34 |
+data/meson.build:5:0: ERROR: Function does not take positional arguments. |
35 |
+data/meson.build:24:0: ERROR: Function does not take positional arguments. |
36 |
+--- |
37 |
+ data/meson.build | 4 ++-- |
38 |
+ 1 file changed, 2 insertions(+), 2 deletions(-) |
39 |
+ |
40 |
+diff --git a/data/meson.build b/data/meson.build |
41 |
+index f18f247..9c95e02 100644 |
42 |
+--- a/data/meson.build |
43 |
++++ b/data/meson.build |
44 |
+@@ -2,7 +2,7 @@ resource_files = files('gnome-sudoku.gresource.xml') |
45 |
+ |
46 |
+ resources = gnome.compile_resources('gnome-sudoku', resource_files) |
47 |
+ |
48 |
+-desktop_file = i18n.merge_file('desktop', |
49 |
++desktop_file = i18n.merge_file( |
50 |
+ input: '@0@××××××××.in'.format(application_id), |
51 |
+ output: '@0@.desktop'.format(application_id), |
52 |
+ install: true, |
53 |
+@@ -21,7 +21,7 @@ if desktop_file_validate.found() |
54 |
+ ) |
55 |
+ endif |
56 |
+ |
57 |
+-appdata_file = i18n.merge_file('appdata', |
58 |
++appdata_file = i18n.merge_file( |
59 |
+ input: '@0@××××××××××××.in'.format(application_id), |
60 |
+ output: '@0@××××××××.xml'.format(application_id), |
61 |
+ install: true, |
62 |
+-- |
63 |
+GitLab |
64 |
+ |
65 |
|
66 |
diff --git a/games-puzzle/gnome-sudoku/gnome-sudoku-40.2.ebuild b/games-puzzle/gnome-sudoku/gnome-sudoku-40.2.ebuild |
67 |
index 4f5555a63086..d54c45ae2d2a 100644 |
68 |
--- a/games-puzzle/gnome-sudoku/gnome-sudoku-40.2.ebuild |
69 |
+++ b/games-puzzle/gnome-sudoku/gnome-sudoku-40.2.ebuild |
70 |
@@ -33,6 +33,10 @@ BDEPEND=" |
71 |
virtual/pkgconfig |
72 |
" |
73 |
|
74 |
+PATCHES=( |
75 |
+ "${FILESDIR}/${PV}"-fix-build-with-meson-0.61.1.patch |
76 |
+) |
77 |
+ |
78 |
src_prepare() { |
79 |
xdg_src_prepare |
80 |
vala_src_prepare |