[gentoo-commits] repo/gentoo:master commit in: media-gfx/gnome-photos/files/, media-gfx/gnome-photos/

[gentoo-commits] repo/gentoo:master commit in: media-gfx/gnome-photos/files/, media-gfx/gnome-photos/

[Sam James]

commit:     bb777f201ef3a24e837c860118b12bc6fee0ecea
Author:     Christophe Lermytte <gentoo <AT> lermytte <DOT> be>
AuthorDate: Mon Jan 24 21:09:41 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Jan 25 00:49:03 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bb777f20

media-gfx/gnome-photos: fix build with meson-0.61

Closes: https://bugs.gentoo.org/831933
Signed-off-by: Christophe Lermytte <gentoo <AT> lermytte.be>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../files/40.0-fix-build-with-meson-0.61.1.patch   | 34 ++++++++++++++++++++++
 media-gfx/gnome-photos/gnome-photos-40.0.ebuild    |  4 +++
 2 files changed, 38 insertions(+)

diff --git a/media-gfx/gnome-photos/files/40.0-fix-build-with-meson-0.61.1.patch b/media-gfx/gnome-photos/files/40.0-fix-build-with-meson-0.61.1.patch
new file mode 100644
index 000000000000..dbd8d72ffb67
--- /dev/null
+++ b/media-gfx/gnome-photos/files/40.0-fix-build-with-meson-0.61.1.patch
@@ -0,0 +1,34 @@
+https://gitlab.gnome.org/GNOME/gnome-photos/-/commit/a0ac868a19d55dc52100e54fe4b2d29041bc6752
+https://bugs.gentoo.org/831933
+
+From: rvalue <i@rvalue.moe>
+Date: Fri, 21 Jan 2022 12:36:02 +0000
+Subject: [PATCH] meson: remove incorrect args for i18n.merge_file
+
+---
+ data/meson.build | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/data/meson.build b/data/meson.build
+index 6e7192e0..94271de2 100644
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -3,7 +3,6 @@ subdir('icons')
+ appdata = photos_namespace + '.appdata.xml'
+ 
+ i18n.merge_file(
+-  appdata,
+   input: appdata + '.in',
+   output: appdata,
+   po_dir: po_dir,
+@@ -23,7 +22,6 @@ desktop_in = configure_file(
+ )
+ 
+ i18n.merge_file(
+-  desktop,
+   type: 'desktop',
+   input: desktop_in,
+   output: desktop,
+-- 
+GitLab
+

diff --git a/media-gfx/gnome-photos/gnome-photos-40.0.ebuild b/media-gfx/gnome-photos/gnome-photos-40.0.ebuild
index 3e60765e15a2..fd1a73e46a8f 100644
--- a/media-gfx/gnome-photos/gnome-photos-40.0.ebuild
+++ b/media-gfx/gnome-photos/gnome-photos-40.0.ebuild
@@ -59,6 +59,10 @@ BDEPEND="
 	test? ( $(python_gen_any_dep 'dev-util/dogtail[${PYTHON_USEDEP}]') )
 "
 
+PATCHES=(
+	"${FILESDIR}/${PV}"-fix-build-with-meson-0.61.1.patch
+)
+
 DOCS=() # meson installs docs itself
 
 python_check_deps() {