diff -Nru sound-juicer-3.38.0/debian/changelog sound-juicer-3.38.0/debian/changelog --- sound-juicer-3.38.0/debian/changelog 2020-10-06 00:54:21.000000000 +0000 +++ sound-juicer-3.38.0/debian/changelog 2022-02-18 21:16:14.000000000 +0000 @@ -1,3 +1,10 @@ +sound-juicer (3.38.0-2) unstable; urgency=medium + + * Drop unneeded -Wl,--as-needed and -Wno-unused-parameter + * Cherry-pick patch to fix build with latest meson (Closes: #1005525) + + -- Jeremy Bicha Fri, 18 Feb 2022 16:16:14 -0500 + sound-juicer (3.38.0-1) unstable; urgency=medium * New upstream release diff -Nru sound-juicer-3.38.0/debian/patches/meson-drop-unused-argument-for-i18n.merge_file.patch sound-juicer-3.38.0/debian/patches/meson-drop-unused-argument-for-i18n.merge_file.patch --- sound-juicer-3.38.0/debian/patches/meson-drop-unused-argument-for-i18n.merge_file.patch 1970-01-01 00:00:00.000000000 +0000 +++ sound-juicer-3.38.0/debian/patches/meson-drop-unused-argument-for-i18n.merge_file.patch 2022-02-18 21:16:14.000000000 +0000 @@ -0,0 +1,33 @@ +From: Jan Beich +Date: Tue, 25 Jan 2022 12:15:31 +0000 +Subject: 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. + +(cherry picked from commit 9f97ca1faca396099f52264a9729aa355f8d122e) +--- + data/meson.build | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/data/meson.build b/data/meson.build +index ccff2d8..4dac816 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, diff -Nru sound-juicer-3.38.0/debian/patches/series sound-juicer-3.38.0/debian/patches/series --- sound-juicer-3.38.0/debian/patches/series 2020-10-06 00:54:21.000000000 +0000 +++ sound-juicer-3.38.0/debian/patches/series 2022-02-18 21:16:14.000000000 +0000 @@ -1,3 +1,4 @@ metainfo-no-network.patch Fix-showing-icon-in-the-about-dialog.patch build-fix-doc-directory.patch +meson-drop-unused-argument-for-i18n.merge_file.patch diff -Nru sound-juicer-3.38.0/debian/rules sound-juicer-3.38.0/debian/rules --- sound-juicer-3.38.0/debian/rules 2020-10-06 00:54:21.000000000 +0000 +++ sound-juicer-3.38.0/debian/rules 2022-02-18 21:16:14.000000000 +0000 @@ -1,9 +1,7 @@ #!/usr/bin/make -f export DEB_BUILD_MAINT_OPTIONS = hardening=+all -export DEB_LDFLAGS_MAINT_APPEND = -Wl,-O1 -Wl,-z,defs -Wl,--as-needed - -export DEB_CFLAGS_MAINT_APPEND = -Wno-unused-parameter +export DEB_LDFLAGS_MAINT_APPEND = -Wl,-O1 -Wl,-z,defs %: dh $@