1 |
commit: bae28b0b7b08931a69c159a7daf11d8f0cf07360 |
2 |
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Feb 3 05:52:25 2022 +0000 |
4 |
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Feb 3 06:20:42 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bae28b0b |
7 |
|
8 |
media-sound/sound-juicer: Fix build with meson 0.61 |
9 |
|
10 |
Closes: https://bugs.gentoo.org/831477 |
11 |
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org> |
12 |
|
13 |
...-drop-unused-argument-for-i18n.merge_file.patch | 35 ++++++++++++++++++++++ |
14 |
.../sound-juicer/sound-juicer-3.38.0.ebuild | 4 +++ |
15 |
2 files changed, 39 insertions(+) |
16 |
|
17 |
diff --git a/media-sound/sound-juicer/files/3.38.0-meson-drop-unused-argument-for-i18n.merge_file.patch b/media-sound/sound-juicer/files/3.38.0-meson-drop-unused-argument-for-i18n.merge_file.patch |
18 |
new file mode 100644 |
19 |
index 000000000000..586fc118921f |
20 |
--- /dev/null |
21 |
+++ b/media-sound/sound-juicer/files/3.38.0-meson-drop-unused-argument-for-i18n.merge_file.patch |
22 |
@@ -0,0 +1,35 @@ |
23 |
+From 9f97ca1faca396099f52264a9729aa355f8d122e Mon Sep 17 00:00:00 2001 |
24 |
+From: Jan Beich <jbeich@×××××××.org> |
25 |
+Date: Tue, 25 Jan 2022 12:15:31 +0000 |
26 |
+Subject: [PATCH] meson: drop unused argument for i18n.merge_file() |
27 |
+ |
28 |
+Ignored in Meson < 0.60.0, deprecated since 0.60.1 and fatal since 0.61.0. |
29 |
+ |
30 |
+data/meson.build:2:0: ERROR: Function does not take positional arguments. |
31 |
+data/meson.build:31:0: ERROR: Function does not take positional arguments. |
32 |
+--- |
33 |
+ data/meson.build | 2 -- |
34 |
+ 1 file changed, 2 deletions(-) |
35 |
+ |
36 |
+diff --git a/data/meson.build b/data/meson.build |
37 |
+index ccff2d80..4dac8166 100644 |
38 |
+--- a/data/meson.build |
39 |
++++ b/data/meson.build |
40 |
+@@ -1,6 +1,5 @@ |
41 |
+ # Desktop file |
42 |
+ i18n.merge_file( |
43 |
+- 'desktop', |
44 |
+ input: configure_file( |
45 |
+ input: 'org.gnome.SoundJuicer.desktop.in.in', |
46 |
+ output: 'org.gnome.SoundJuicer.desktop.in', |
47 |
+@@ -29,7 +28,6 @@ configure_file( |
48 |
+ |
49 |
+ # Metainfo |
50 |
+ metainfo_file = i18n.merge_file( |
51 |
+- 'metainfo', |
52 |
+ input: files(join_paths('metainfo', 'org.gnome.SoundJuicer.metainfo.xml.in')), |
53 |
+ output: 'org.gnome.SoundJuicer.metainfo.xml', |
54 |
+ po_dir: po_dir, |
55 |
+-- |
56 |
+2.34.1 |
57 |
+ |
58 |
|
59 |
diff --git a/media-sound/sound-juicer/sound-juicer-3.38.0.ebuild b/media-sound/sound-juicer/sound-juicer-3.38.0.ebuild |
60 |
index 3516bda7b7e5..b5cda89740e5 100644 |
61 |
--- a/media-sound/sound-juicer/sound-juicer-3.38.0.ebuild |
62 |
+++ b/media-sound/sound-juicer/sound-juicer-3.38.0.ebuild |
63 |
@@ -47,6 +47,10 @@ BDEPEND=" |
64 |
virtual/pkgconfig |
65 |
" |
66 |
|
67 |
+PATCHES=( |
68 |
+ "${FILESDIR}"/${PV}-meson-drop-unused-argument-for-i18n.merge_file.patch |
69 |
+) |
70 |
+ |
71 |
src_prepare() { |
72 |
# Avoid sandbox failures |
73 |
sed -i -e '/gst_inspect/d' meson.build || die |