Gentoo Archives: gentoo-commits

From: Sam James <sam@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-vcs/gitg/files/, dev-vcs/gitg/
Date: Tue, 25 Jan 2022 00:49:59
Message-Id: 1643071750.251a5eaab6db713f85ab69342c1ceef85526834a.sam@gentoo
1 commit: 251a5eaab6db713f85ab69342c1ceef85526834a
2 Author: Christophe Lermytte <gentoo <AT> lermytte <DOT> be>
3 AuthorDate: Mon Jan 24 22:53:45 2022 +0000
4 Commit: Sam James <sam <AT> gentoo <DOT> org>
5 CommitDate: Tue Jan 25 00:49:10 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=251a5eaa
7
8 dev-vcs/gitg: fix build with meson-0.61
9
10 Closes: https://bugs.gentoo.org/831666
11 Signed-off-by: Christophe Lermytte <gentoo <AT> lermytte.be>
12 Signed-off-by: Sam James <sam <AT> gentoo.org>
13
14 .../files/41-fix-build-with-meson-0.61.1.patch | 38 ++++++++++++++++++++++
15 dev-vcs/gitg/gitg-41.ebuild | 4 +++
16 2 files changed, 42 insertions(+)
17
18 diff --git a/dev-vcs/gitg/files/41-fix-build-with-meson-0.61.1.patch b/dev-vcs/gitg/files/41-fix-build-with-meson-0.61.1.patch
19 new file mode 100644
20 index 000000000000..0467f7d1ad89
21 --- /dev/null
22 +++ b/dev-vcs/gitg/files/41-fix-build-with-meson-0.61.1.patch
23 @@ -0,0 +1,38 @@
24 +https://gitlab.gnome.org/GNOME/gitg/-/commit/1978973b12848741b08695ec2020bac98584d636
25 +https://bugs.gentoo.org/831666
26 +
27 +From: Jan Beich <jbeich@×××××××.org>
28 +Date: Mon, 24 Jan 2022 12:17:52 +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:8:0: ERROR: Function does not take positional arguments.
34 +data/meson.build:44:0: ERROR: Function does not take positional arguments.
35 +---
36 + data/meson.build | 2 --
37 + 1 file changed, 2 deletions(-)
38 +
39 +diff --git a/data/meson.build b/data/meson.build
40 +index a8b90fd1..2413531d 100644
41 +--- a/data/meson.build
42 ++++ b/data/meson.build
43 +@@ -6,7 +6,6 @@ desktop_config = configuration_data()
44 + desktop_config.set('icon', application_id)
45 + desktop_config.set('binary', gitg_name)
46 + i18n.merge_file(
47 +- desktop,
48 + type: 'desktop',
49 + input: configure_file(
50 + input: desktop + '.in.in',
51 +@@ -42,7 +41,6 @@ appdata_config = configuration_data()
52 + appdata_config.set('app-id', application_id)
53 + appdata_config.set('gettext', gitg_name)
54 + i18n.merge_file(
55 +- appdata,
56 + type: 'xml',
57 + input: configure_file(
58 + input: appdata + '.in.in',
59 +--
60 +GitLab
61 +
62
63 diff --git a/dev-vcs/gitg/gitg-41.ebuild b/dev-vcs/gitg/gitg-41.ebuild
64 index 37bca5db740d..1474422be37b 100644
65 --- a/dev-vcs/gitg/gitg-41.ebuild
66 +++ b/dev-vcs/gitg/gitg-41.ebuild
67 @@ -48,6 +48,10 @@ DEPEND="${RDEPEND}
68 virtual/pkgconfig
69 "
70
71 +PATCHES=(
72 + "${FILESDIR}/${PV}"-fix-build-with-meson-0.61.1.patch
73 +)
74 +
75 src_prepare() {
76 default
77 vala_src_prepare