From 0b054f94f2e694937d1484abb022ee9e58d24d3a Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Tue, 25 Jan 2022 10:10:59 +0100 Subject: [PATCH] d-feet: fix for meson 0.61 --- srcpkgs/d-feet/patches/meson-0.61.patch | 33 +++++++++++++++++++++++++ srcpkgs/d-feet/x | 1 - 2 files changed, 33 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/d-feet/patches/meson-0.61.patch delete mode 100644 srcpkgs/d-feet/x diff --git a/srcpkgs/d-feet/patches/meson-0.61.patch b/srcpkgs/d-feet/patches/meson-0.61.patch new file mode 100644 index 0000000000..f8e7f64a60 --- /dev/null +++ b/srcpkgs/d-feet/patches/meson-0.61.patch @@ -0,0 +1,33 @@ +From b5a99f86395fd71dc08907ac3c5f2d757384c49f Mon Sep 17 00:00:00 2001 +From: Michal Vasilek +Date: Sun, 23 Jan 2022 12:35:26 +0100 +Subject: [PATCH] meson: fix build with meson 0.61 + +i18n.merge_file doesn't accept positional arguments +--- + data/meson.build | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/data/meson.build b/data/meson.build +index 026bd80..3b03b94 100644 +--- a/data/meson.build ++++ b/data/meson.build +@@ -13,7 +13,6 @@ desktop_in = configure_file( + ) + + i18n.merge_file( +- desktop, + type: 'desktop', + input: desktop_in, + output: '@BASENAME@', +@@ -25,7 +24,6 @@ i18n.merge_file( + appdata = df_namespace + '.appdata.xml' + + i18n.merge_file( +- appdata, + input: appdata + '.in', + output: '@BASENAME@', + po_dir: po_dir, +-- +2.34.1 + diff --git a/srcpkgs/d-feet/x b/srcpkgs/d-feet/x deleted file mode 100644 index 166f7a9570..0000000000 --- a/srcpkgs/d-feet/x +++ /dev/null @@ -1 +0,0 @@ -xbps-query: option requires an argument -- 's'