summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatt Turner <mattst88@gentoo.org>2022-02-02 21:52:25 -0800
committerMatt Turner <mattst88@gentoo.org>2022-02-02 22:20:42 -0800
commitbae28b0b7b08931a69c159a7daf11d8f0cf07360 (patch)
treec13dbf173b591afa8a8d8b2ef7a4b8562daf066c /media-sound/sound-juicer/files
parentdev-libs/glib: Depend on dev-lang/python[xml] (diff)
downloadgentoo-bae28b0b7b08931a69c159a7daf11d8f0cf07360.tar.gz
gentoo-bae28b0b7b08931a69c159a7daf11d8f0cf07360.tar.bz2
gentoo-bae28b0b7b08931a69c159a7daf11d8f0cf07360.zip
media-sound/sound-juicer: Fix build with meson 0.61
Closes: https://bugs.gentoo.org/831477 Signed-off-by: Matt Turner <mattst88@gentoo.org>
Diffstat (limited to 'media-sound/sound-juicer/files')
-rw-r--r--media-sound/sound-juicer/files/3.38.0-meson-drop-unused-argument-for-i18n.merge_file.patch35
1 files changed, 35 insertions, 0 deletions
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
new file mode 100644
index 000000000000..586fc118921f
--- /dev/null
+++ b/media-sound/sound-juicer/files/3.38.0-meson-drop-unused-argument-for-i18n.merge_file.patch
@@ -0,0 +1,35 @@
+From 9f97ca1faca396099f52264a9729aa355f8d122e Mon Sep 17 00:00:00 2001
+From: Jan Beich <jbeich@FreeBSD.org>
+Date: Tue, 25 Jan 2022 12:15:31 +0000
+Subject: [PATCH] meson: drop unused argument for i18n.merge_file()
+
+Ignored in Meson < 0.60.0, deprecated since 0.60.1 and fatal since 0.61.0.
+
+data/meson.build:2:0: ERROR: Function does not take positional arguments.
+data/meson.build:31:0: ERROR: Function does not take positional arguments.
+---
+ data/meson.build | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/data/meson.build b/data/meson.build
+index ccff2d80..4dac8166 100644
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -1,6 +1,5 @@
+ # Desktop file
+ i18n.merge_file(
+- 'desktop',
+ input: configure_file(
+ input: 'org.gnome.SoundJuicer.desktop.in.in',
+ output: 'org.gnome.SoundJuicer.desktop.in',
+@@ -29,7 +28,6 @@ configure_file(
+
+ # Metainfo
+ metainfo_file = i18n.merge_file(
+- 'metainfo',
+ input: files(join_paths('metainfo', 'org.gnome.SoundJuicer.metainfo.xml.in')),
+ output: 'org.gnome.SoundJuicer.metainfo.xml',
+ po_dir: po_dir,
+--
+2.34.1
+