diff options
| author |   Christophe Lermytte <gentoo@lermytte.be> | 2022-01-24 22:09:41 +0100 |
|---|---|---|
| committer |   Sam James <sam@gentoo.org> | 2022-01-25 00:49:03 +0000 |
| commit | bb777f201ef3a24e837c860118b12bc6fee0ecea (patch) | |
| tree | 67dd807721cb41a0b1fd085ddd3f0ae9a10fa8a0 /media-gfx | |
| parent | gnome-extra/gnome-boxes: fix build with meson-0.61 (diff) | |
| download | gentoo-bb777f201ef3a24e837c860118b12bc6fee0ecea.tar.gz gentoo-bb777f201ef3a24e837c860118b12bc6fee0ecea.tar.bz2 gentoo-bb777f201ef3a24e837c860118b12bc6fee0ecea.zip | |
media-gfx/gnome-photos: fix build with meson-0.61
Closes: https://bugs.gentoo.org/831933
Signed-off-by: Christophe Lermytte <gentoo@lermytte.be>
Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'media-gfx')
| -rw-r--r-- | media-gfx/gnome-photos/files/40.0-fix-build-with-meson-0.61.1.patch | 34 | ||||
| -rw-r--r-- | media-gfx/gnome-photos/gnome-photos-40.0.ebuild | 4 |
2 files changed, 38 insertions, 0 deletions
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() { |