From 46bbb5787fee06b37a1f1c5bfeab3d6cc69d8222 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Thu, 10 Mar 2022 21:57:05 +0100 Subject: [PATCH] hitori: fix for meson 0.61 --- srcpkgs/hitori/patches/meson-0.61.patch | 41 +++++++++++++++++++++++++ 1 file changed, 41 insertions(+) create mode 100644 srcpkgs/hitori/patches/meson-0.61.patch diff --git a/srcpkgs/hitori/patches/meson-0.61.patch b/srcpkgs/hitori/patches/meson-0.61.patch new file mode 100644 index 00000000000..37adaa0116e --- /dev/null +++ b/srcpkgs/hitori/patches/meson-0.61.patch @@ -0,0 +1,41 @@ +From d25728e122f1d7b985029a5ba96810c3e57c27f7 Mon Sep 17 00:00:00 2001 +From: Philip Withnall +Date: Tue, 2 Nov 2021 12:04:29 +0000 +Subject: [PATCH] build: Drop positional arguments from i18n.merge_file() calls +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Meson never took positional arguments in this function, but didn’t warn +about it until Meson 0.60. Drop the unnecessary arguments to fix the +warning. + +Signed-off-by: Philip Withnall +--- + data/meson.build | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/data/meson.build b/data/meson.build +index 97b8e68..c66a233 100644 +--- a/data/meson.build ++++ b/data/meson.build +@@ -1,6 +1,6 @@ + subdir('icons') + +-desktop_file = i18n.merge_file('desktop-file', ++desktop_file = i18n.merge_file( + type: 'desktop', + input: '@0@.desktop.in'.format(application_id), + output: '@0@.desktop'.format(application_id), +@@ -20,7 +20,7 @@ if desktop_file_validate.found() + ) + endif + +-appdata_file = i18n.merge_file('appdata-file', ++appdata_file = i18n.merge_file( + input: '@0@.appdata.xml.in'.format(application_id), + output: '@0@.appdata.xml'.format(application_id), + po_dir: join_paths(meson.source_root(), 'po'), +-- +GitLab +