From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/gnome-photos/files/, media-gfx/gnome-photos/
Date: Tue, 25 Jan 2022 00:49:50 +0000 (UTC) [thread overview]
Message-ID: <1643071743.bb777f201ef3a24e837c860118b12bc6fee0ecea.sam@gentoo> (raw)
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() {
reply other threads:[~2022-01-25 0:49 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1643071743.bb777f201ef3a24e837c860118b12bc6fee0ecea.sam@gentoo \
--to=sam@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox