commit: bb4c69bb3eec7768ec55dfa21a1ec60be70d63ac Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Thu Jan 20 10:52:57 2022 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Thu Jan 20 10:52:57 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bb4c69bb
sys-apps/gnome-disk-utility: fix build with meson 0.61 Closes: https://bugs.gentoo.org/831552 Signed-off-by: Sam James <sam <AT> gentoo.org> .../gnome-disk-utility-41.0-meson-0.61-build.patch | 28 ++++++++++++++++++++++ .../gnome-disk-utility-41.0.ebuild | 6 ++++- 2 files changed, 33 insertions(+), 1 deletion(-) diff --git a/sys-apps/gnome-disk-utility/files/gnome-disk-utility-41.0-meson-0.61-build.patch b/sys-apps/gnome-disk-utility/files/gnome-disk-utility-41.0-meson-0.61-build.patch new file mode 100644 index 000000000000..c28b9002575e --- /dev/null +++ b/sys-apps/gnome-disk-utility/files/gnome-disk-utility-41.0-meson-0.61-build.patch @@ -0,0 +1,28 @@ +https://gitlab.gnome.org/GNOME/gnome-disk-utility/-/commit/46ed7d26873b9741dff61f9df8e7778a8dc6f5cc +https://bugs.gentoo.org/831552 + +From: rvalue <[email protected]> +Date: Fri, 17 Dec 2021 12:29:30 +0000 +Subject: [PATCH] build: fix arguments of i18n.merge_file + +`i18n.merge_file` has been ignoring positional arguments for a time +and explicitly rejects with error since meson 0.60.0 +--- a/data/meson.build ++++ b/data/meson.build +@@ -11,7 +11,6 @@ desktops = [ + + foreach desktop: desktops + i18n.merge_file ( +- desktop, + type: 'desktop', + input: desktop + '.in', + output: desktop, +@@ -38,7 +37,6 @@ install_data( + info = 'org.gnome.DiskUtility.appdata.xml' + + i18n.merge_file( +- info, + input: info + '.in', + output: info, + po_dir: po_dir, +GitLab diff --git a/sys-apps/gnome-disk-utility/gnome-disk-utility-41.0.ebuild b/sys-apps/gnome-disk-utility/gnome-disk-utility-41.0.ebuild index 8a105cdcc510..29b765c1c98d 100644 --- a/sys-apps/gnome-disk-utility/gnome-disk-utility-41.0.ebuild +++ b/sys-apps/gnome-disk-utility/gnome-disk-utility-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 @@ -43,6 +43,10 @@ BDEPEND=" virtual/pkgconfig " +PATCHES=( + "${FILESDIR}"/${P}-meson-0.61-build.patch +) + src_configure() { local emesonargs=( -Dlogind=$(usex systemd libsystemd $(usex elogind libelogind none))
