1 |
commit: 1f1a40a417c7706d03a9d87ed2bf1550fbb92c02 |
2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Jan 25 01:06:06 2022 +0000 |
4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Jan 25 01:06:06 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1f1a40a4 |
7 |
|
8 |
app-editors/gedit: fix build with meson 0.61 |
9 |
|
10 |
Closes: https://bugs.gentoo.org/831925 |
11 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
12 |
|
13 |
app-editors/gedit/files/40.1-fix-meson-0.61.patch | 29 +++++++++++++++++++++++ |
14 |
app-editors/gedit/gedit-40.1.ebuild | 4 +++- |
15 |
2 files changed, 32 insertions(+), 1 deletion(-) |
16 |
|
17 |
diff --git a/app-editors/gedit/files/40.1-fix-meson-0.61.patch b/app-editors/gedit/files/40.1-fix-meson-0.61.patch |
18 |
new file mode 100644 |
19 |
index 000000000000..cac046067cb2 |
20 |
--- /dev/null |
21 |
+++ b/app-editors/gedit/files/40.1-fix-meson-0.61.patch |
22 |
@@ -0,0 +1,29 @@ |
23 |
+https://gitlab.gnome.org/GNOME/gedit/-/merge_requests/124.patch |
24 |
+https://bugs.gentoo.org/831925 |
25 |
+ |
26 |
+From c6c7c6580bc7f82a7d449b8ee33ae44f8b6f4a1f Mon Sep 17 00:00:00 2001 |
27 |
+From: rvalue <i@××××××.moe> |
28 |
+Date: Wed, 15 Dec 2021 07:02:09 +0000 |
29 |
+Subject: [PATCH] Remove incorrect args for i18n.merge_file |
30 |
+ |
31 |
+The positional argument has been silently ignored for a time. And it causes failure |
32 |
+with "ERROR: Function does not take positional arguments" since meson 0.60.0 |
33 |
+--- a/data/meson.build |
34 |
++++ b/data/meson.build |
35 |
+@@ -4,7 +4,6 @@ install_man('gedit.1') |
36 |
+ |
37 |
+ appdata = 'org.gnome.gedit.appdata.xml' |
38 |
+ appdata_file = i18n.merge_file( |
39 |
+- appdata, |
40 |
+ input: appdata + '.in', |
41 |
+ output: appdata, |
42 |
+ po_dir: '../po/', |
43 |
+@@ -23,7 +22,6 @@ endif |
44 |
+ |
45 |
+ desktop_file = 'org.gnome.gedit.desktop' |
46 |
+ desktop_output_file = i18n.merge_file( |
47 |
+- desktop_file, |
48 |
+ type: 'desktop', |
49 |
+ input: desktop_file + '.in', |
50 |
+ output: desktop_file, |
51 |
+GitLab |
52 |
|
53 |
diff --git a/app-editors/gedit/gedit-40.1.ebuild b/app-editors/gedit/gedit-40.1.ebuild |
54 |
index faf11bb7ae49..07697d136123 100644 |
55 |
--- a/app-editors/gedit/gedit-40.1.ebuild |
56 |
+++ b/app-editors/gedit/gedit-40.1.ebuild |
57 |
@@ -1,4 +1,4 @@ |
58 |
-# Copyright 1999-2021 Gentoo Authors |
59 |
+# Copyright 1999-2022 Gentoo Authors |
60 |
# Distributed under the terms of the GNU General Public License v2 |
61 |
|
62 |
EAPI=7 |
63 |
@@ -58,6 +58,8 @@ PATCHES=( |
64 |
# Make gspell and python optional |
65 |
"${FILESDIR}"/3.38-make-gspell-optional.patch |
66 |
"${FILESDIR}"/3.38-make-python-optional.patch |
67 |
+ |
68 |
+ "${FILESDIR}"/${PV}-fix-meson-0.61.patch |
69 |
) |
70 |
|
71 |
pkg_setup() { |