| 1 |
commit: ce97cf736d5a6de2311fcb2bf345b7ebc9f043c3 |
| 2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Jan 25 02:15:28 2022 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Jan 25 02:15:28 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ce97cf73 |
| 7 |
|
| 8 |
dev-util/devhelp: fix build with meson 0.61 |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/831928 |
| 11 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 12 |
|
| 13 |
dev-util/devhelp/devhelp-41.2.ebuild | 4 ++- |
| 14 |
dev-util/devhelp/files/41.2-meson-0.61.patch | 52 ++++++++++++++++++++++++++++ |
| 15 |
2 files changed, 55 insertions(+), 1 deletion(-) |
| 16 |
|
| 17 |
diff --git a/dev-util/devhelp/devhelp-41.2.ebuild b/dev-util/devhelp/devhelp-41.2.ebuild |
| 18 |
index 0d4bb96937b5..7892dd7fcbf5 100644 |
| 19 |
--- a/dev-util/devhelp/devhelp-41.2.ebuild |
| 20 |
+++ b/dev-util/devhelp/devhelp-41.2.ebuild |
| 21 |
@@ -1,4 +1,4 @@ |
| 22 |
-# Copyright 1999-2021 Gentoo Authors |
| 23 |
+# Copyright 1999-2022 Gentoo Authors |
| 24 |
# Distributed under the terms of the GNU General Public License v2 |
| 25 |
|
| 26 |
EAPI=7 |
| 27 |
@@ -45,6 +45,8 @@ BDEPEND=" |
| 28 |
PATCHES=( |
| 29 |
"${FILESDIR}"/${PV}-optional-introspection.patch |
| 30 |
"${FILESDIR}"/${PV}-webkitgtk40.patch |
| 31 |
+ |
| 32 |
+ "${FILESDIR}"/${PV}-meson-0.61.patch |
| 33 |
) |
| 34 |
|
| 35 |
pkg_setup() { |
| 36 |
|
| 37 |
diff --git a/dev-util/devhelp/files/41.2-meson-0.61.patch b/dev-util/devhelp/files/41.2-meson-0.61.patch |
| 38 |
new file mode 100644 |
| 39 |
index 000000000000..dd75f802056a |
| 40 |
--- /dev/null |
| 41 |
+++ b/dev-util/devhelp/files/41.2-meson-0.61.patch |
| 42 |
@@ -0,0 +1,52 @@ |
| 43 |
+https://gitlab.gnome.org/GNOME/devhelp/-/merge_requests/43.patch |
| 44 |
+https://gitlab.gnome.org/GNOME/devhelp/-/merge_requests/42.patch |
| 45 |
+https://bugs.gentoo.org/831928 |
| 46 |
+ |
| 47 |
+From f1c27fd4eaa59e86005f9698bb839451a2f0ef44 Mon Sep 17 00:00:00 2001 |
| 48 |
+From: r-value <i@××××××.moe> |
| 49 |
+Date: Wed, 17 Nov 2021 18:02:20 +0800 |
| 50 |
+Subject: [PATCH] Remove incorrect arg for i18n.merge_file |
| 51 |
+ |
| 52 |
+`i18n.merge_file` has been ignoring positional arguments and |
| 53 |
+explicitly rejects with error "ERROR: Function does not take |
| 54 |
+positional arguments" since meson 0.60.0 |
| 55 |
+--- |
| 56 |
+ data/meson.build | 2 -- |
| 57 |
+ plugins/gedit-plugin/meson.build | 1 - |
| 58 |
+ 2 files changed, 3 deletions(-) |
| 59 |
+ |
| 60 |
+diff --git a/data/meson.build b/data/meson.build |
| 61 |
+index c6aeffb4..0bc531a2 100644 |
| 62 |
+--- a/data/meson.build |
| 63 |
++++ b/data/meson.build |
| 64 |
+@@ -19,7 +19,6 @@ appdata_conf = configuration_data() |
| 65 |
+ appdata_conf.set('application_id', APPLICATION_ID) |
| 66 |
+ appdata = APPLICATION_ID + '.appdata.xml' |
| 67 |
+ appdata_file = I18N.merge_file( |
| 68 |
+- appdata, |
| 69 |
+ input: configure_file( |
| 70 |
+ input: 'org.gnome.Devhelp.appdata.xml.in.in', |
| 71 |
+ output: APPLICATION_ID + '.appdata.xml.in', |
| 72 |
+@@ -45,7 +44,6 @@ desktop_conf = configuration_data() |
| 73 |
+ desktop_conf.set('application_id', APPLICATION_ID) |
| 74 |
+ desktop = APPLICATION_ID + '.desktop' |
| 75 |
+ desktop_file = I18N.merge_file( |
| 76 |
+- desktop, |
| 77 |
+ type: 'desktop', |
| 78 |
+ input: configure_file( |
| 79 |
+ input: 'org.gnome.Devhelp.desktop.in.in', |
| 80 |
+diff --git a/plugins/gedit-plugin/meson.build b/plugins/gedit-plugin/meson.build |
| 81 |
+index 4f779886..877a01ff 100644 |
| 82 |
+--- a/plugins/gedit-plugin/meson.build |
| 83 |
++++ b/plugins/gedit-plugin/meson.build |
| 84 |
+@@ -7,7 +7,6 @@ install_data( |
| 85 |
+ |
| 86 |
+ plugin_info_file = 'devhelp.plugin' |
| 87 |
+ I18N.merge_file( |
| 88 |
+- plugin_info_file, |
| 89 |
+ type: 'desktop', |
| 90 |
+ input: plugin_info_file + '.desktop.in', |
| 91 |
+ output: plugin_info_file, |
| 92 |
+-- |
| 93 |
+GitLab |
| 94 |
+ |
Archives