diff options
| author | Simon McVittie <smcv@debian.org> | 2022-02-13 15:35:00 +0000 |
|---|---|---|
| committer | Simon McVittie <smcv@debian.org> | 2022-02-13 15:35:35 +0000 |
| commit | 2a99295513647043458e5abee23de2d33bfd9b9b (patch) | |
| tree | 64b44557f0a4b64aa16db166b24040155e2640c0 | |
| parent | c56e39c89ecd1a6b0ba02b7b39398259a61ce38d (diff) | |
Add patch from upstream to fix FTBFS with Meson 0.61debian/41.0-2
Closes: #1005548
| -rw-r--r-- | debian/changelog | 8 | ||||
| -rw-r--r-- | debian/patches/meson-Remove-incorrect-i18n.merge_file-argument.patch | 29 | ||||
| -rw-r--r-- | debian/patches/series | 1 |
3 files changed, 38 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog index ac6dd31b..a4165c18 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +gnome-music (41.0-2) unstable; urgency=medium + + * Team upload + * d/p/meson-Remove-incorrect-i18n.merge_file-argument.patch: + Add patch from upstream to fix FTBFS with Meson 0.61 (Closes: #1005548) + + -- Simon McVittie <smcv@debian.org> Sun, 13 Feb 2022 15:34:35 +0000 + gnome-music (41.0-1) unstable; urgency=medium * New upstream release diff --git a/debian/patches/meson-Remove-incorrect-i18n.merge_file-argument.patch b/debian/patches/meson-Remove-incorrect-i18n.merge_file-argument.patch new file mode 100644 index 00000000..51d90a75 --- /dev/null +++ b/debian/patches/meson-Remove-incorrect-i18n.merge_file-argument.patch @@ -0,0 +1,29 @@ +From: Jean Felder <jfelder@src.gnome.org> +Date: Thu, 18 Nov 2021 12:09:26 +0100 +Subject: meson: Remove incorrect i18n.merge_file argument + +The positional argument was being silently ignored until meson 0.60.0 +where it returns a deprecation message: +"DEPRECATION: i18n.merge_file does not take any positional +arguments. This will become a hard error in the next Meson release." + +See: https://github.com/mesonbuild/meson/issues/9441 + +Origin: upstream, 42, commit:d9f35b542adbf6b0e1114c7c077df04212a98fc7 +Bug-Debian: https://bugs.debian.org/1005574 +--- + data/meson.build | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/data/meson.build b/data/meson.build +index 25ff1e1..145ee52 100644 +--- a/data/meson.build ++++ b/data/meson.build +@@ -47,7 +47,6 @@ appdata_conf.set('appid', APPLICATION_ID) + appdata_conf.set('package_url', PACKAGE_URL) + appdata_conf.set('package_url_bug', PACKAGE_URL_BUG) + i18n.merge_file( +- 'appdata', + input: configure_file( + output: PROJECT_RDNN_NAME + '.appdata.xml.in', + input: PROJECT_RDNN_NAME + '.appdata.xml.in.in', diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 00000000..a34460bc --- /dev/null +++ b/debian/patches/series @@ -0,0 +1 @@ +meson-Remove-incorrect-i18n.merge_file-argument.patch |