Gentoo Archives: gentoo-commits

From: Sam James <sam@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-text/gtranslator/files/, app-text/gtranslator/
Date: Tue, 25 Jan 2022 02:31:47
Message-Id: 1643077892.d20307bf0fbaa96de81a26f454dc000e0042eb57.sam@gentoo
1 commit: d20307bf0fbaa96de81a26f454dc000e0042eb57
2 Author: Sam James <sam <AT> gentoo <DOT> org>
3 AuthorDate: Tue Jan 25 02:31:23 2022 +0000
4 Commit: Sam James <sam <AT> gentoo <DOT> org>
5 CommitDate: Tue Jan 25 02:31:32 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d20307bf
7
8 app-text/gtranslator: fix build with meson 0.61
9
10 Closes: https://bugs.gentoo.org/831966
11 Signed-off-by: Sam James <sam <AT> gentoo.org>
12
13 .../files/gtranslator-40.0-meson-0.61.patch | 30 ++++++++++++++++++++++
14 app-text/gtranslator/gtranslator-40.0.ebuild | 6 ++++-
15 2 files changed, 35 insertions(+), 1 deletion(-)
16
17 diff --git a/app-text/gtranslator/files/gtranslator-40.0-meson-0.61.patch b/app-text/gtranslator/files/gtranslator-40.0-meson-0.61.patch
18 new file mode 100644
19 index 000000000000..a43a32eb4a6b
20 --- /dev/null
21 +++ b/app-text/gtranslator/files/gtranslator-40.0-meson-0.61.patch
22 @@ -0,0 +1,30 @@
23 +https://gitlab.gnome.org/GNOME/gtranslator/-/commit/7ac572cc8c8c37ca3826ecf0d395edd3c38e8e22.patch
24 +https://bugs.gentoo.org/831966
25 +
26 +From: Jan Beich <jbeich@×××××××.org>
27 +Date: Mon, 24 Jan 2022 11:57:43 +0000
28 +Subject: [PATCH] meson: drop unused argument for i18n.merge_file()
29 +
30 +Ignored in Meson < 0.60.0, deprecated since 0.60.1 and fatal since 0.61.0.
31 +
32 +data/meson.build:15:0: ERROR: Function does not take positional arguments.
33 +data/meson.build:37:0: ERROR: Function does not take positional arguments.
34 +--- a/data/meson.build
35 ++++ b/data/meson.build
36 +@@ -13,7 +13,6 @@ desktop_in = configure_file(
37 + )
38 +
39 + i18n.merge_file(
40 +- desktop,
41 + type: 'desktop',
42 + input: desktop_in,
43 + output: '@0@.desktop'.format(gtr_app_id),
44 +@@ -35,7 +34,6 @@ appdata_in = configure_file(
45 + )
46 +
47 + i18n.merge_file(
48 +- appdata,
49 + input: appdata_in,
50 + output: appdata,
51 + po_dir: po_dir,
52 +GitLab
53
54 diff --git a/app-text/gtranslator/gtranslator-40.0.ebuild b/app-text/gtranslator/gtranslator-40.0.ebuild
55 index 00fa6d54bb65..bb0973914e18 100644
56 --- a/app-text/gtranslator/gtranslator-40.0.ebuild
57 +++ b/app-text/gtranslator/gtranslator-40.0.ebuild
58 @@ -1,4 +1,4 @@
59 -# Copyright 1999-2021 Gentoo Authors
60 +# Copyright 1999-2022 Gentoo Authors
61 # Distributed under the terms of the GNU General Public License v2
62
63 EAPI=7
64 @@ -40,6 +40,10 @@ BDEPEND="
65 virtual/pkgconfig
66 "
67
68 +PATCHES=(
69 + "${FILESDIR}"/${P}-meson-0.61.patch
70 +)
71 +
72 src_configure() {
73 local emesonargs=(
74 $(meson_use gtk-doc gtk_doc)