1 |
commit: bb777f201ef3a24e837c860118b12bc6fee0ecea |
2 |
Author: Christophe Lermytte <gentoo <AT> lermytte <DOT> be> |
3 |
AuthorDate: Mon Jan 24 21:09:41 2022 +0000 |
4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Jan 25 00:49:03 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bb777f20 |
7 |
|
8 |
media-gfx/gnome-photos: fix build with meson-0.61 |
9 |
|
10 |
Closes: https://bugs.gentoo.org/831933 |
11 |
Signed-off-by: Christophe Lermytte <gentoo <AT> lermytte.be> |
12 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
13 |
|
14 |
.../files/40.0-fix-build-with-meson-0.61.1.patch | 34 ++++++++++++++++++++++ |
15 |
media-gfx/gnome-photos/gnome-photos-40.0.ebuild | 4 +++ |
16 |
2 files changed, 38 insertions(+) |
17 |
|
18 |
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 |
19 |
new file mode 100644 |
20 |
index 000000000000..dbd8d72ffb67 |
21 |
--- /dev/null |
22 |
+++ b/media-gfx/gnome-photos/files/40.0-fix-build-with-meson-0.61.1.patch |
23 |
@@ -0,0 +1,34 @@ |
24 |
+https://gitlab.gnome.org/GNOME/gnome-photos/-/commit/a0ac868a19d55dc52100e54fe4b2d29041bc6752 |
25 |
+https://bugs.gentoo.org/831933 |
26 |
+ |
27 |
+From: rvalue <i@××××××.moe> |
28 |
+Date: Fri, 21 Jan 2022 12:36:02 +0000 |
29 |
+Subject: [PATCH] meson: remove incorrect args for i18n.merge_file |
30 |
+ |
31 |
+--- |
32 |
+ data/meson.build | 2 -- |
33 |
+ 1 file changed, 2 deletions(-) |
34 |
+ |
35 |
+diff --git a/data/meson.build b/data/meson.build |
36 |
+index 6e7192e0..94271de2 100644 |
37 |
+--- a/data/meson.build |
38 |
++++ b/data/meson.build |
39 |
+@@ -3,7 +3,6 @@ subdir('icons') |
40 |
+ appdata = photos_namespace + '.appdata.xml' |
41 |
+ |
42 |
+ i18n.merge_file( |
43 |
+- appdata, |
44 |
+ input: appdata + '.in', |
45 |
+ output: appdata, |
46 |
+ po_dir: po_dir, |
47 |
+@@ -23,7 +22,6 @@ desktop_in = configure_file( |
48 |
+ ) |
49 |
+ |
50 |
+ i18n.merge_file( |
51 |
+- desktop, |
52 |
+ type: 'desktop', |
53 |
+ input: desktop_in, |
54 |
+ output: desktop, |
55 |
+-- |
56 |
+GitLab |
57 |
+ |
58 |
|
59 |
diff --git a/media-gfx/gnome-photos/gnome-photos-40.0.ebuild b/media-gfx/gnome-photos/gnome-photos-40.0.ebuild |
60 |
index 3e60765e15a2..fd1a73e46a8f 100644 |
61 |
--- a/media-gfx/gnome-photos/gnome-photos-40.0.ebuild |
62 |
+++ b/media-gfx/gnome-photos/gnome-photos-40.0.ebuild |
63 |
@@ -59,6 +59,10 @@ BDEPEND=" |
64 |
test? ( $(python_gen_any_dep 'dev-util/dogtail[${PYTHON_USEDEP}]') ) |
65 |
" |
66 |
|
67 |
+PATCHES=( |
68 |
+ "${FILESDIR}/${PV}"-fix-build-with-meson-0.61.1.patch |
69 |
+) |
70 |
+ |
71 |
DOCS=() # meson installs docs itself |
72 |
|
73 |
python_check_deps() { |