summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristophe Lermytte <gentoo@lermytte.be>2022-02-20 15:49:50 +0100
committerSam James <sam@gentoo.org>2022-02-20 21:16:56 +0000
commit77ec3f42dbb2a2cc03d33429947a2561704597a2 (patch)
tree76835b696dc49ace39305371a0e87632910a957d /gnome-extra/gnome-characters
parentapp-office/gnome-todo: fix build with meson 0.61 (diff)
downloadgentoo-77ec3f42dbb2a2cc03d33429947a2561704597a2.tar.gz
gentoo-77ec3f42dbb2a2cc03d33429947a2561704597a2.tar.bz2
gentoo-77ec3f42dbb2a2cc03d33429947a2561704597a2.zip
gnome-extra/gnome-characters: fix build with meson 0.61
Fix in upstream master but together with other things that I did not want to pull in, so just fixing the build problem in anticipation of a new upstream release. Signed-off-by: Christophe Lermytte <gentoo@lermytte.be> Closes: https://bugs.gentoo.org/831471 Closes: https://github.com/gentoo/gentoo/pull/24282 Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'gnome-extra/gnome-characters')
-rw-r--r--gnome-extra/gnome-characters/files/fix-build-with-meson-0.61.patch20
-rw-r--r--gnome-extra/gnome-characters/gnome-characters-41.0.ebuild6
2 files changed, 25 insertions, 1 deletions
diff --git a/gnome-extra/gnome-characters/files/fix-build-with-meson-0.61.patch b/gnome-extra/gnome-characters/files/fix-build-with-meson-0.61.patch
new file mode 100644
index 00000000000..4033314ea51
--- /dev/null
+++ b/gnome-extra/gnome-characters/files/fix-build-with-meson-0.61.patch
@@ -0,0 +1,20 @@
+Part of https://gitlab.gnome.org/GNOME/gnome-characters/-/commit/3b84cc750b70482a1cc30864dc51cde60df0332d
+https://bugs.gentoo.org/831471
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -47,7 +47,6 @@
+ desktop_conf.set('bindir', characters_bindir)
+
+ i18n.merge_file(
+- 'desktop-file',
+ type: 'desktop',
+ input: configure_file (
+ input: characters_name + '.desktop.in',
+@@ -61,7 +60,6 @@
+ )
+
+ appdata_file = i18n.merge_file(
+- 'appdata-file',
+ input: characters_name + '.appdata.xml.in',
+ output: characters_application_id + '.appdata.xml',
+ po_dir: po_dir,
diff --git a/gnome-extra/gnome-characters/gnome-characters-41.0.ebuild b/gnome-extra/gnome-characters/gnome-characters-41.0.ebuild
index 3154b414c2f..94bf27f7f3b 100644
--- a/gnome-extra/gnome-characters/gnome-characters-41.0.ebuild
+++ b/gnome-extra/gnome-characters/gnome-characters-41.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -31,6 +31,10 @@ BDEPEND="
virtual/pkgconfig
"
+PATCHES=(
+ "${FILESDIR}"/fix-build-with-meson-0.61.patch
+)
+
pkg_postinst() {
xdg_pkg_postinst
gnome2_schemas_update