commit: be21e1fa3d108b65ca026da9a9317259e9b438c0 Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> AuthorDate: Sat Jan 22 18:19:07 2022 +0000 Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> CommitDate: Sat Jan 22 18:19:07 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=be21e1fa
sci-geosciences/gnome-maps: backport fix for meson-0.61 Closes: https://bugs.gentoo.org/831655 Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org> .../gnome-maps/files/gnome-maps-meson-0.61.patch | 33 ++++++++++++++++++++++ sci-geosciences/gnome-maps/gnome-maps-40.5.ebuild | 6 +++- sci-geosciences/gnome-maps/gnome-maps-41.1.ebuild | 6 +++- sci-geosciences/gnome-maps/gnome-maps-41.2.ebuild | 4 +++ 4 files changed, 47 insertions(+), 2 deletions(-) diff --git a/sci-geosciences/gnome-maps/files/gnome-maps-meson-0.61.patch b/sci-geosciences/gnome-maps/files/gnome-maps-meson-0.61.patch new file mode 100644 index 000000000000..1ef4d4555c93 --- /dev/null +++ b/sci-geosciences/gnome-maps/files/gnome-maps-meson-0.61.patch @@ -0,0 +1,33 @@ +https://bugs.gentoo.org/831655 +https://gitlab.gnome.org/GNOME/gnome-maps/-/commit/def20cbb26e59e5023fe157e691de48d7afe7210 + +From e81cbf910755c0387677a43a7427da4ec073e1eb Mon Sep 17 00:00:00 2001 +From: Marcus Lundblad <m...@update.uu.se> +Date: Fri, 14 Jan 2022 23:33:43 +0100 +Subject: [PATCH] meson: Remove unnesseray argument to i18n.merg_file + +This causes a build failure with meson 0.60 (or later). +Remove it, as it's ignored also for earlier meson versions. + +Fixes #418 + +(cherry picked from commit def20cbb26e59e5023fe157e691de48d7afe7210) +--- + data/meson.build | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/data/meson.build b/data/meson.build +index 2be4ee73..4ef7eba0 100644 +--- a/data/meson.build ++++ b/data/meson.build +@@ -33,7 +33,6 @@ install_data( + appdata = app_id + '.appdata.xml' + + appdata_file = i18n.merge_file( +- appdata, + input: appdata + '.in', + output: appdata, + po_dir: po_dir, +-- +2.34.1 + diff --git a/sci-geosciences/gnome-maps/gnome-maps-40.5.ebuild b/sci-geosciences/gnome-maps/gnome-maps-40.5.ebuild index eefd96359122..a710f389c1d4 100644 --- a/sci-geosciences/gnome-maps/gnome-maps-40.5.ebuild +++ b/sci-geosciences/gnome-maps/gnome-maps-40.5.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 @@ -45,6 +45,10 @@ BDEPEND=" virtual/pkgconfig " +PATCHES=( + "${FILESDIR}/gnome-maps-meson-0.61.patch" +) + pkg_postinst() { xdg_pkg_postinst gnome2_schemas_update diff --git a/sci-geosciences/gnome-maps/gnome-maps-41.1.ebuild b/sci-geosciences/gnome-maps/gnome-maps-41.1.ebuild index 5ec15782805f..d91f09e96e6e 100644 --- a/sci-geosciences/gnome-maps/gnome-maps-41.1.ebuild +++ b/sci-geosciences/gnome-maps/gnome-maps-41.1.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 @@ -45,6 +45,10 @@ BDEPEND=" virtual/pkgconfig " +PATCHES=( + "${FILESDIR}/gnome-maps-meson-0.61.patch" +) + pkg_postinst() { xdg_pkg_postinst gnome2_schemas_update diff --git a/sci-geosciences/gnome-maps/gnome-maps-41.2.ebuild b/sci-geosciences/gnome-maps/gnome-maps-41.2.ebuild index c14cf93f29ac..678e95e601f2 100644 --- a/sci-geosciences/gnome-maps/gnome-maps-41.2.ebuild +++ b/sci-geosciences/gnome-maps/gnome-maps-41.2.ebuild @@ -45,6 +45,10 @@ BDEPEND=" virtual/pkgconfig " +PATCHES=( + "${FILESDIR}/gnome-maps-meson-0.61.patch" +) + pkg_postinst() { xdg_pkg_postinst gnome2_schemas_update
