| 1 |
commit: 0ce8647a88d4fc41b3ba91d70735e8184fe2d770 |
| 2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Jan 25 00:55:55 2022 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Jan 25 00:55:55 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0ce8647a |
| 7 |
|
| 8 |
media-gfx/frogr: fix build with meson 0.61 |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/831497 |
| 11 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 12 |
|
| 13 |
.../frogr/files/frogr-1.5-meson-0.61-build.patch | 33 ++++++++++++++++++++++ |
| 14 |
media-gfx/frogr/frogr-1.5.ebuild | 3 +- |
| 15 |
2 files changed, 35 insertions(+), 1 deletion(-) |
| 16 |
|
| 17 |
diff --git a/media-gfx/frogr/files/frogr-1.5-meson-0.61-build.patch b/media-gfx/frogr/files/frogr-1.5-meson-0.61-build.patch |
| 18 |
new file mode 100644 |
| 19 |
index 000000000000..cb72250ae72f |
| 20 |
--- /dev/null |
| 21 |
+++ b/media-gfx/frogr/files/frogr-1.5-meson-0.61-build.patch |
| 22 |
@@ -0,0 +1,33 @@ |
| 23 |
+https://gitlab.gnome.org/GNOME/frogr/-/merge_requests/5 |
| 24 |
+https://bugs.gentoo.org/831497 |
| 25 |
+ |
| 26 |
+From 1eeb32b94b9e14e7ea2b9267e3378bae9e3e852d Mon Sep 17 00:00:00 2001 |
| 27 |
+From: Jan Beich <jbeich@×××××××.org> |
| 28 |
+Date: Mon, 24 Jan 2022 12:22:25 +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:32:0: ERROR: Function does not take positional arguments. |
| 34 |
+data/meson.build:42:0: ERROR: Function does not take positional arguments. |
| 35 |
+--- a/data/meson.build |
| 36 |
++++ b/data/meson.build |
| 37 |
+@@ -29,7 +29,7 @@ data_conf.set('BINDIR', join_paths(prefix, bindir)) |
| 38 |
+ generated_desktop = configure_file(input: 'org.gnome.frogr.desktop.in.in', |
| 39 |
+ output: 'org.gnome.frogr.desktop.in', |
| 40 |
+ configuration: data_conf) |
| 41 |
+-i18n.merge_file('desktop', |
| 42 |
++i18n.merge_file( |
| 43 |
+ input: generated_desktop, |
| 44 |
+ output: 'org.gnome.frogr.desktop', |
| 45 |
+ install: true, |
| 46 |
+@@ -39,7 +39,7 @@ i18n.merge_file('desktop', |
| 47 |
+ |
| 48 |
+ # Appdata XML file |
| 49 |
+ appdatadir = join_paths(datadir, 'metainfo') |
| 50 |
+-i18n.merge_file('appdata', |
| 51 |
++i18n.merge_file( |
| 52 |
+ input: 'org.gnome.frogr.appdata.xml.in', |
| 53 |
+ output: 'org.gnome.frogr.appdata.xml', |
| 54 |
+ install: true, |
| 55 |
+GitLab |
| 56 |
|
| 57 |
diff --git a/media-gfx/frogr/frogr-1.5.ebuild b/media-gfx/frogr/frogr-1.5.ebuild |
| 58 |
index 011ea5c4f2b7..7d0577497123 100644 |
| 59 |
--- a/media-gfx/frogr/frogr-1.5.ebuild |
| 60 |
+++ b/media-gfx/frogr/frogr-1.5.ebuild |
| 61 |
@@ -1,4 +1,4 @@ |
| 62 |
-# Copyright 1999-2021 Gentoo Authors |
| 63 |
+# Copyright 1999-2022 Gentoo Authors |
| 64 |
# Distributed under the terms of the GNU General Public License v2 |
| 65 |
|
| 66 |
EAPI="6" |
| 67 |
@@ -31,6 +31,7 @@ DEPEND="${RDEPEND} |
| 68 |
|
| 69 |
PATCHES=( |
| 70 |
"${FILESDIR}/frogr-1.5-warning-level.patch" |
| 71 |
+ "${FILESDIR}/frogr-1.5-meson-0.61-build.patch" |
| 72 |
) |
| 73 |
|
| 74 |
src_configure() { |
Archives