| 1 |
commit: 7a7df12b8d193f9c05d46eda0de60b70bd6337b6 |
| 2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Jan 25 02:09:30 2022 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Jan 25 02:09:30 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7a7df12b |
| 7 |
|
| 8 |
games-puzzle/gnome-tetravex: fix build with meson 0.61 |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/831493 |
| 11 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 12 |
|
| 13 |
.../files/gnome-tetravex-3.38.2-meson-0.61.patch | 33 ++++++++++++++++++++++ |
| 14 |
.../gnome-tetravex/gnome-tetravex-3.38.2.ebuild | 4 +++ |
| 15 |
2 files changed, 37 insertions(+) |
| 16 |
|
| 17 |
diff --git a/games-puzzle/gnome-tetravex/files/gnome-tetravex-3.38.2-meson-0.61.patch b/games-puzzle/gnome-tetravex/files/gnome-tetravex-3.38.2-meson-0.61.patch |
| 18 |
new file mode 100644 |
| 19 |
index 000000000000..97f27d95a06a |
| 20 |
--- /dev/null |
| 21 |
+++ b/games-puzzle/gnome-tetravex/files/gnome-tetravex-3.38.2-meson-0.61.patch |
| 22 |
@@ -0,0 +1,33 @@ |
| 23 |
+https://gitlab.gnome.org/GNOME/gnome-tetravex/-/merge_requests/20.patch |
| 24 |
+https://bugs.gentoo.org/831493 |
| 25 |
+ |
| 26 |
+From 80912d06f5e588f6aca966fa516103275e58d94e Mon Sep 17 00:00:00 2001 |
| 27 |
+From: Jan Beich <jbeich@×××××××.org> |
| 28 |
+Date: Mon, 24 Jan 2022 11:48:22 +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:37:0: ERROR: Function does not take positional arguments. |
| 34 |
+data/meson.build:59:0: ERROR: Function does not take positional arguments. |
| 35 |
+--- a/data/meson.build |
| 36 |
++++ b/data/meson.build |
| 37 |
+@@ -34,7 +34,7 @@ endif |
| 38 |
+ |
| 39 |
+ # Desktop file |
| 40 |
+ if get_option('build_gui') |
| 41 |
+- desktop_file = i18n.merge_file ('desktop-file', |
| 42 |
++ desktop_file = i18n.merge_file ( |
| 43 |
+ input: project_id + '.desktop.in', |
| 44 |
+ output: project_id + '.desktop', |
| 45 |
+ install: true, |
| 46 |
+@@ -56,7 +56,7 @@ endif |
| 47 |
+ |
| 48 |
+ # AppData file |
| 49 |
+ if get_option('build_gui') |
| 50 |
+- appdata_file = i18n.merge_file ('appdata-file', |
| 51 |
++ appdata_file = i18n.merge_file ( |
| 52 |
+ input: project_id + '.appdata.xml.in', |
| 53 |
+ output: project_id + '.appdata.xml', |
| 54 |
+ install: true, |
| 55 |
+GitLab |
| 56 |
|
| 57 |
diff --git a/games-puzzle/gnome-tetravex/gnome-tetravex-3.38.2.ebuild b/games-puzzle/gnome-tetravex/gnome-tetravex-3.38.2.ebuild |
| 58 |
index 1c9ab8809a6e..254fde622d9d 100644 |
| 59 |
--- a/games-puzzle/gnome-tetravex/gnome-tetravex-3.38.2.ebuild |
| 60 |
+++ b/games-puzzle/gnome-tetravex/gnome-tetravex-3.38.2.ebuild |
| 61 |
@@ -29,6 +29,10 @@ BDEPEND=" |
| 62 |
virtual/pkgconfig |
| 63 |
" |
| 64 |
|
| 65 |
+PATCHES=( |
| 66 |
+ "${FILESDIR}"/${PN}-3.38.2-meson-0.61.patch |
| 67 |
+) |
| 68 |
+ |
| 69 |
src_prepare() { |
| 70 |
xdg_src_prepare |
| 71 |
vala_src_prepare |
Archives