From 5c317f14581e16fc1ad5978d7724e8fc2afa690a Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Tue, 25 Jan 2022 10:11:02 +0100 Subject: [PATCH 01/41] meson: fix for meson 0.61 --- srcpkgs/meson/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/meson/template b/srcpkgs/meson/template index 67fa3514289f..e2f1db7c49a2 100644 --- a/srcpkgs/meson/template +++ b/srcpkgs/meson/template @@ -1,6 +1,6 @@ # Template file for 'meson' pkgname=meson -version=0.60.3 +version=0.61.1 revision=1 build_style=python3-module hostmakedepends="python3-devel python3-setuptools" @@ -14,7 +14,7 @@ license="Apache-2.0" homepage="https://mesonbuild.com" changelog="https://github.com/mesonbuild/meson/blob/master/docs/markdown/Release-notes-for-${version%.*}.0.md" distfiles="https://github.com/mesonbuild/meson/releases/download/$version/$pkgname-$version.tar.gz" -checksum=87ca5fa9358a01864529392bd64e027158eb94afca7c7766b1866ef27eccb98e +checksum=feb2cefb325b437dbf36146df7c6b87688ddff0b0205caa31dc64055c6da410c # XXX: sanitizers aren't available on musl if [ "$XBPS_TARGET_LIBC" = glibc ]; then From 82e6ad93c48421918300ad1738a6514f282878a3 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Tue, 25 Jan 2022 10:10:58 +0100 Subject: [PATCH 02/41] GPaste: fix for meson 0.61 --- srcpkgs/GPaste/patches/meson-0.61.patch | 59 +++++++++++++++++++++++++ 1 file changed, 59 insertions(+) create mode 100644 srcpkgs/GPaste/patches/meson-0.61.patch diff --git a/srcpkgs/GPaste/patches/meson-0.61.patch b/srcpkgs/GPaste/patches/meson-0.61.patch new file mode 100644 index 000000000000..42f79a5d97e7 --- /dev/null +++ b/srcpkgs/GPaste/patches/meson-0.61.patch @@ -0,0 +1,59 @@ +From 1ec2699daa600e34d73b8d200dd7bb22f4eace27 Mon Sep 17 00:00:00 2001 +From: Marc-Antoine Perennou +Date: Fri, 7 Jan 2022 10:42:41 +0100 +Subject: [PATCH] fix build with meson 0.60 + +Fixes #385 + +Signed-off-by: Marc-Antoine Perennou +--- + data/appstream/meson.build | 3 +-- + data/desktop/meson.build | 3 +-- + meson.build | 2 +- + 3 files changed, 3 insertions(+), 5 deletions(-) + +diff --git a/data/appstream/meson.build b/data/appstream/meson.build +index 8f5fe29a..f279be66 100644 +--- a/data/appstream/meson.build ++++ b/data/appstream/meson.build +@@ -1,8 +1,7 @@ + i18n.merge_file( +- 'gpaste-appdata', + input: 'org.gnome.GPaste.Ui.appdata.xml.in', + po_dir: gpaste_po_dir, + output: 'org.gnome.GPaste.Ui.appdata.xml', + install: true, + install_dir: join_paths(get_option('datadir'), 'metainfo'), +-) +\ No newline at end of file ++) +diff --git a/data/desktop/meson.build b/data/desktop/meson.build +index 6268765c..18be1b69 100644 +--- a/data/desktop/meson.build ++++ b/data/desktop/meson.build +@@ -5,11 +5,10 @@ untranslated_desktop_file = configure_file( + ) + + i18n.merge_file( +- 'gpaste-desktop-file', + input: untranslated_desktop_file, + po_dir: gpaste_po_dir, + type: 'desktop', + output: 'org.gnome.GPaste.Ui.desktop', + install: true, + install_dir: join_paths(get_option('datadir'), 'applications'), +-) +\ No newline at end of file ++) +diff --git a/meson.build b/meson.build +index 1b0095f3..676ad4e3 100644 +--- a/meson.build ++++ b/meson.build +@@ -1,6 +1,6 @@ + project('GPaste', + 'c', +- version: '3.42.1', ++ version: '3.42.2', + meson_version: '>=0.50.0', + ) + From 80d507b0974a35cd690c9b7c8dfe895dba1b8d7d Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Tue, 25 Jan 2022 10:10:58 +0100 Subject: [PATCH 03/41] Marker: fix for meson 0.61 --- srcpkgs/Marker/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/Marker/template b/srcpkgs/Marker/template index be02723dc4ed..eed5bddc36c3 100644 --- a/srcpkgs/Marker/template +++ b/srcpkgs/Marker/template @@ -4,7 +4,7 @@ version=2020.04.04 revision=1 wrksrc=marker build_style=meson -hostmakedepends="glib-devel pkg-config" +hostmakedepends="glib-devel pkg-config itstool gettext" makedepends="gtksourceview-devel gtkspell3-devel gtk+3-devel libglib-devel webkit2gtk-devel" depends="iso-codes" From 23f7e2b1c9d455acf7e0b566c9880871e060d879 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Tue, 25 Jan 2022 10:10:58 +0100 Subject: [PATCH 04/41] accountsservice: fix for meson 0.61 --- .../accountsservice/patches/meson-0.61.patch | 29 +++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 srcpkgs/accountsservice/patches/meson-0.61.patch diff --git a/srcpkgs/accountsservice/patches/meson-0.61.patch b/srcpkgs/accountsservice/patches/meson-0.61.patch new file mode 100644 index 000000000000..9245afdd47d2 --- /dev/null +++ b/srcpkgs/accountsservice/patches/meson-0.61.patch @@ -0,0 +1,29 @@ +From ac9b14f1c1bbca413987d0bbfeaad05804107e9a Mon Sep 17 00:00:00 2001 +From: Luca Boccassi +Date: Sun, 31 Oct 2021 12:29:14 +0000 +Subject: Fix build with meson 0.60 + +Positional parameters to merge_file() were never allowed and always +ignored, so just drop it. +See: https://github.com/mesonbuild/meson/issues/9441 + +Fixes #97 +--- + data/meson.build | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/data/meson.build b/data/meson.build +index 70edf89..9e80299 100644 +--- a/data/meson.build ++++ b/data/meson.build +@@ -33,7 +33,6 @@ configure_file( + policy = act_namespace.to_lower() + '.policy' + + i18n.merge_file( +- policy, + input: policy + '.in', + output: policy, + po_dir: po_dir, +-- +cgit v1.2.1 + From 754c18681de1c4f04c6fae2f8d84f588f6819e88 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Tue, 25 Jan 2022 10:10:58 +0100 Subject: [PATCH 05/41] aisleriot: fix for meson 0.61 --- srcpkgs/aisleriot/patches/meson-0.61.patch | 33 ++++++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 srcpkgs/aisleriot/patches/meson-0.61.patch diff --git a/srcpkgs/aisleriot/patches/meson-0.61.patch b/srcpkgs/aisleriot/patches/meson-0.61.patch new file mode 100644 index 000000000000..340e8fe7d2cf --- /dev/null +++ b/srcpkgs/aisleriot/patches/meson-0.61.patch @@ -0,0 +1,33 @@ +From 4bf6fcf5c8043adfcadd948e678cc68f150cc998 Mon Sep 17 00:00:00 2001 +From: Christian Persch +Date: Tue, 14 Dec 2021 23:41:22 +0100 +Subject: [PATCH] build: Fix build with meson 0.60 + +Fixes: https://gitlab.gnome.org/GNOME/aisleriot/-/issues/916 +--- + data/meson.build | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/data/meson.build b/data/meson.build +index 9f88c2f3..c97e0b2e 100644 +--- a/data/meson.build ++++ b/data/meson.build +@@ -18,7 +18,6 @@ + metainfodir = ar_prefix / ar_datadir / 'metainfo' + + i18n.merge_file( +- 'sol.metainfo.xml', + input: 'sol.metainfo.xml.in', + output: '@BASENAME@', + po_dir: po_dir, +@@ -35,7 +34,6 @@ desktop_in = files( + ) + + i18n.merge_file( +- 'sol.desktop', + input: desktop_in, + output: '@BASENAME@', + type: 'desktop', +-- +GitLab + From 76ef38e2d2ae075433e2fb51beae2cc30af52397 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Tue, 25 Jan 2022 10:10:59 +0100 Subject: [PATCH 06/41] apostrophe: fix for meson 0.61 --- srcpkgs/apostrophe/patches/meson-0.61.patch | 33 +++++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 srcpkgs/apostrophe/patches/meson-0.61.patch diff --git a/srcpkgs/apostrophe/patches/meson-0.61.patch b/srcpkgs/apostrophe/patches/meson-0.61.patch new file mode 100644 index 000000000000..4aee57b95c12 --- /dev/null +++ b/srcpkgs/apostrophe/patches/meson-0.61.patch @@ -0,0 +1,33 @@ +From a714d5f3c35f8ef8442615ed551c5bc2edb05cba Mon Sep 17 00:00:00 2001 +From: mhaquila +Date: Fri, 21 Jan 2022 13:05:24 +0100 +Subject: [PATCH] fix: i18n.merge_file does not take positional arguments + +Correct issues of data/meson.build: 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 ee19288..c25cbc6 100644 +--- a/data/meson.build ++++ b/data/meson.build +@@ -2,7 +2,6 @@ + desktop_conf = configuration_data() + desktop_conf.set('icon', application_id) + desktop_file = i18n.merge_file( +- 'desktop', + input: configure_file( + input: 'org.gnome.gitlab.somas.Apostrophe.desktop.in.in', + output: '@BASENAME@', +@@ -46,7 +45,6 @@ metainfo_configured = configure_file( + # ) + + appdata_file = i18n.merge_file( +- 'appdata', + input: metainfo_configured, + output: '@0@.metainfo.xml'.format(application_id), + po_dir: podir, +-- +GitLab + From 484f05cf8d810f396f88f9d40246a4afbba52f0a Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Tue, 25 Jan 2022 10:10:59 +0100 Subject: [PATCH 07/41] bijiben: fix for meson 0.61 --- srcpkgs/bijiben/patches/meson-0.61.patch | 46 ++++++++++++++++++++++++ 1 file changed, 46 insertions(+) create mode 100644 srcpkgs/bijiben/patches/meson-0.61.patch diff --git a/srcpkgs/bijiben/patches/meson-0.61.patch b/srcpkgs/bijiben/patches/meson-0.61.patch new file mode 100644 index 000000000000..7576536953a1 --- /dev/null +++ b/srcpkgs/bijiben/patches/meson-0.61.patch @@ -0,0 +1,46 @@ +From 01ccae2ccb640b2d33fd09c3dfb7d605830b5b0f Mon Sep 17 00:00:00 2001 +From: Michal Vasilek +Date: Sat, 22 Jan 2022 23:16:37 +0100 +Subject: [PATCH] meson: fix build with meson 0.61 + +i18n.merge_file doesn't accept positional arguments +--- + data/appdata/meson.build | 1 - + data/meson.build | 2 -- + 2 files changed, 3 deletions(-) + +diff --git a/data/appdata/meson.build b/data/appdata/meson.build +index 48a31e3..d78d052 100644 +--- a/data/appdata/meson.build ++++ b/data/appdata/meson.build +@@ -1,7 +1,6 @@ + info = 'org.gnome.Notes.appdata.xml' + + i18n.merge_file( +- info, + input: info + '.in', + output: info, + po_dir: po_dir, +diff --git a/data/meson.build b/data/meson.build +index d00d98f..556d564 100644 +--- a/data/meson.build ++++ b/data/meson.build +@@ -4,7 +4,6 @@ subdir('appdata') + mime = 'org.gnome.Notes.xml' + + i18n.merge_file( +- mime, + input: mime + '.in', + output: mime, + po_dir: po_dir, +@@ -18,7 +17,6 @@ desktop_conf = configuration_data() + desktop_conf.set ('icon', application_id) + + i18n.merge_file( +- desktop, + type: 'desktop', + input: configure_file( + input: files (desktop + '.in'), +-- +2.34.1 + From b3446cc5780d69fa9b102d3535bbd8c1db5ccea5 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Tue, 25 Jan 2022 10:10:59 +0100 Subject: [PATCH 08/41] budgie-desktop: fix for meson 0.61 --- .../budgie-desktop/patches/meson-0.61.patch | 25 +++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 srcpkgs/budgie-desktop/patches/meson-0.61.patch diff --git a/srcpkgs/budgie-desktop/patches/meson-0.61.patch b/srcpkgs/budgie-desktop/patches/meson-0.61.patch new file mode 100644 index 000000000000..dfff3e2e16ed --- /dev/null +++ b/srcpkgs/budgie-desktop/patches/meson-0.61.patch @@ -0,0 +1,25 @@ +From 04fce6f4c166113bc4d5d5c2d97c30352a1cdede Mon Sep 17 00:00:00 2001 +From: Jon Turney +Date: Tue, 23 Nov 2021 16:48:44 +0000 +Subject: [PATCH] meson: Drop spurious 3rd positional argument to + gnome.compile_resources + +This may become an error with some future meson version: + + src/raven/meson.build:6:0: ERROR: gnome.compile_resources takes exactly 2 arguments, but got 3. +--- + src/raven/meson.build | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/src/raven/meson.build b/src/raven/meson.build +index 2830e39a..9394b895 100644 +--- a/budgie-desktop-10.5.3/src/raven/meson.build ++++ b/budgie-desktop-10.5.3/src/raven/meson.build +@@ -6,7 +6,6 @@ gresource = join_paths(meson.current_source_dir(), 'ui', 'budgie-raven.gresource + libraven_resources = gnome.compile_resources( + 'budgie-raven-resources', + gresource, +- 'budgie-daemon.gresource.xml', + source_dir: join_paths(meson.current_source_dir(), 'ui'), + c_name: 'budgie_raven', + ) From 791c8cbf89ea03df66db5369f93db80a3789375b Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Tue, 25 Jan 2022 10:10:59 +0100 Subject: [PATCH 09/41] cinnamon: fix for meson 0.61 --- srcpkgs/cinnamon/patches/meson-0.61.patch | 53 +++++++++++++++++++++++ 1 file changed, 53 insertions(+) create mode 100644 srcpkgs/cinnamon/patches/meson-0.61.patch diff --git a/srcpkgs/cinnamon/patches/meson-0.61.patch b/srcpkgs/cinnamon/patches/meson-0.61.patch new file mode 100644 index 000000000000..f0937a355f92 --- /dev/null +++ b/srcpkgs/cinnamon/patches/meson-0.61.patch @@ -0,0 +1,53 @@ +From 37de1aaae1edd1fbcd3c2ef2ac5f4baa4c8e2751 Mon Sep 17 00:00:00 2001 +From: Eli Schwartz +Date: Tue, 11 Jan 2022 18:14:35 -0500 +Subject: [PATCH] Revert "build: disable gir install via list to pacify meson + >= 0.60.2 (#10489)" + +This reverts commit 8fc2df08b40aa3e1958ed2fde853c50676d8cf48. + +This commit was wrong, because it tried to work around a bug in a single +version of meson by using something that isn't, wasn't, and won't be a +valid value. + +The fixed version of meson 0.60.x has been out for a while now, which +once again accepts `false`, and 0.61.0 also accepts `false` but was +known at the time of this workaround to not work in meson-git master +(now meson 0.61.0). + +Using `false` is acceptable and the failure to accept it has been +qualified as a meson regression. Using `[false]` is just... trying to +fuzz meson with random objects until you get something that slips its +way through the argument checker and produces desired effects on the +python implementation level. +--- + src/meson.build | 2 +- + src/st/meson.build | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/meson.build b/src/meson.build +index 7999c0a67b..34b130d50f 100644 +--- a/src/meson.build ++++ b/src/meson.build +@@ -196,7 +196,7 @@ cinnamon_gir = gnome.generate_gir( + includes: cinnamon_gir_includes, + install: true, + install_dir_typelib: pkglibdir, +- install_dir_gir: [false], ++ install_dir_gir: false, + extra_args: [ + '-DST_COMPILATION', + '--quiet', +diff --git a/src/st/meson.build b/src/st/meson.build +index d299727d06..ec7d7b30a1 100644 +--- a/src/st/meson.build ++++ b/src/st/meson.build +@@ -213,7 +213,7 @@ st_gir = gnome.generate_gir( + includes: st_gir_includes, + install: true, + install_dir_typelib: pkglibdir, +- install_dir_gir: [false], ++ install_dir_gir: false, + extra_args: [ + '-DST_COMPILATION', + '--quiet', From 7f5b2df79173382648742796b170ea08eaf75061 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Tue, 25 Jan 2022 10:10:59 +0100 Subject: [PATCH 10/41] 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 000000000000..f8e7f64a60c0 --- /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 166f7a957085..000000000000 --- a/srcpkgs/d-feet/x +++ /dev/null @@ -1 +0,0 @@ -xbps-query: option requires an argument -- 's' From 48cdaf0751ad7ddd4e2a773788b6bbaae9ae465d Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Tue, 25 Jan 2022 10:10:59 +0100 Subject: [PATCH 11/41] dconf-editor: fix for meson 0.61 --- srcpkgs/dconf-editor/patches/meson-0.61.patch | 33 +++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 srcpkgs/dconf-editor/patches/meson-0.61.patch diff --git a/srcpkgs/dconf-editor/patches/meson-0.61.patch b/srcpkgs/dconf-editor/patches/meson-0.61.patch new file mode 100644 index 000000000000..b6f06606e882 --- /dev/null +++ b/srcpkgs/dconf-editor/patches/meson-0.61.patch @@ -0,0 +1,33 @@ +From 56474378568e6ff4af8aa912810323e808c1d977 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin +Date: Fri, 21 Jan 2022 22:22:58 +0100 +Subject: [PATCH] editor/meson.build: fix meson 0.61 errors + +Signed-off-by: Alexander Kanavin +--- + editor/meson.build | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/editor/meson.build b/editor/meson.build +index 4c89ab99..0eb3bb1a 100644 +--- a/editor/meson.build ++++ b/editor/meson.build +@@ -1,7 +1,6 @@ + desktop = dconf_editor_namespace + '.desktop' + + i18n.merge_file ( +- desktop, + type: 'desktop', + input: desktop + '.in', + output: desktop, +@@ -26,7 +25,6 @@ configure_file( + appdata = dconf_editor_namespace + '.appdata.xml' + + i18n.merge_file( +- appdata, + input: appdata + '.in', + output: appdata, + po_dir: po_dir, +-- +GitLab + From 3ce22a171f1c18cea5e451db68efe3c88809c429 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Tue, 25 Jan 2022 10:10:59 +0100 Subject: [PATCH 12/41] devhelp: fix for meson 0.61 --- srcpkgs/devhelp/patches/meson-0.61.patch | 48 ++++++++++++++++++++++++ 1 file changed, 48 insertions(+) create mode 100644 srcpkgs/devhelp/patches/meson-0.61.patch diff --git a/srcpkgs/devhelp/patches/meson-0.61.patch b/srcpkgs/devhelp/patches/meson-0.61.patch new file mode 100644 index 000000000000..dfea339688e3 --- /dev/null +++ b/srcpkgs/devhelp/patches/meson-0.61.patch @@ -0,0 +1,48 @@ +From f1c27fd4eaa59e86005f9698bb839451a2f0ef44 Mon Sep 17 00:00:00 2001 +From: r-value +Date: Wed, 17 Nov 2021 18:02:20 +0800 +Subject: [PATCH] Remove incorrect arg for i18n.merge_file + +`i18n.merge_file` has been ignoring positional arguments and +explicitly rejects with error "ERROR: Function does not take +positional arguments" since meson 0.60.0 +--- + data/meson.build | 2 -- + plugins/gedit-plugin/meson.build | 1 - + 2 files changed, 3 deletions(-) + +diff --git a/data/meson.build b/data/meson.build +index c6aeffb4..0bc531a2 100644 +--- a/data/meson.build ++++ b/data/meson.build +@@ -19,7 +19,6 @@ appdata_conf = configuration_data() + appdata_conf.set('application_id', APPLICATION_ID) + appdata = APPLICATION_ID + '.appdata.xml' + appdata_file = I18N.merge_file( +- appdata, + input: configure_file( + input: 'org.gnome.Devhelp.appdata.xml.in.in', + output: APPLICATION_ID + '.appdata.xml.in', +@@ -45,7 +44,6 @@ desktop_conf = configuration_data() + desktop_conf.set('application_id', APPLICATION_ID) + desktop = APPLICATION_ID + '.desktop' + desktop_file = I18N.merge_file( +- desktop, + type: 'desktop', + input: configure_file( + input: 'org.gnome.Devhelp.desktop.in.in', +diff --git a/plugins/gedit-plugin/meson.build b/plugins/gedit-plugin/meson.build +index 4f779886..877a01ff 100644 +--- a/plugins/gedit-plugin/meson.build ++++ b/plugins/gedit-plugin/meson.build +@@ -7,7 +7,6 @@ install_data( + + plugin_info_file = 'devhelp.plugin' + I18N.merge_file( +- plugin_info_file, + type: 'desktop', + input: plugin_info_file + '.desktop.in', + output: plugin_info_file, +-- +GitLab + From 026d8ca28ca4056a5da189b676b1008b9febe508 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Tue, 25 Jan 2022 10:10:59 +0100 Subject: [PATCH 13/41] dpdk: fix for meson 0.61 --- srcpkgs/dpdk/patches/meson-0.61.patch | 55 +++++++++++++++++++++++++++ 1 file changed, 55 insertions(+) create mode 100644 srcpkgs/dpdk/patches/meson-0.61.patch diff --git a/srcpkgs/dpdk/patches/meson-0.61.patch b/srcpkgs/dpdk/patches/meson-0.61.patch new file mode 100644 index 000000000000..5a5a7316ec8b --- /dev/null +++ b/srcpkgs/dpdk/patches/meson-0.61.patch @@ -0,0 +1,55 @@ +From 499fe9dfcfc721f327b9f58a0f1d9d15eea6a8ee Mon Sep 17 00:00:00 2001 +From: Bruce Richardson +Date: Fri, 17 Jan 2020 11:22:35 +0000 +Subject: [PATCH] doc: add dependency on examples for API doxygen + +For the doxygen API for the examples folder, we can generate a build +dependency file when we generate the examples.dox file. This allows +correct rebuilds if the files in examples change. + +Signed-off-by: Bruce Richardson +Acked-by: Luca Boccassi +--- + doc/api/generate_examples.sh | 4 ++++ + doc/api/meson.build | 5 ++--- + 2 files changed, 6 insertions(+), 3 deletions(-) + +diff --git a/doc/api/generate_examples.sh b/doc/api/generate_examples.sh +index 6fcfe513b60..dae7ee0be05 100755 +--- a/doc/api/generate_examples.sh ++++ b/doc/api/generate_examples.sh +@@ -5,6 +5,10 @@ + EXAMPLES_DIR=$1 + API_EXAMPLES=$2 + ++# generate a .d file including both C files and also build files, so we can ++# detect both file changes and file additions/deletions ++echo "$API_EXAMPLES: $(find ${EXAMPLES_DIR} -type f \( -name '*.c' -o -name 'meson.build' \) -printf '%p ' )" > ${API_EXAMPLES}.d ++ + exec > "${API_EXAMPLES}" + printf '/**\n' + printf '@page examples DPDK Example Programs\n\n' +diff --git a/doc/api/meson.build b/doc/api/meson.build +index c72b880e103..899e930fa65 100644 +--- a/doc/api/meson.build ++++ b/doc/api/meson.build +@@ -15,7 +15,6 @@ generate_doxygen = find_program('generate_doxygen.sh') + generate_examples = find_program('generate_examples.sh') + generate_css = find_program('doxy-html-custom.sh') + +-inputdir = join_paths(meson.source_root(), 'examples') + htmldir = join_paths('share', 'doc', 'dpdk') + + # due to the following bug: https://github.com/mesonbuild/meson/issues/4107 +@@ -24,9 +23,9 @@ htmldir = join_paths('share', 'doc', 'dpdk') + # false it would be impossible to install the docs. + # So use a configure option for now. + example = custom_target('examples.dox', +- input: inputdir, + output: 'examples.dox', +- command: [generate_examples, '@INPUT@', '@OUTPUT@'], ++ command: [generate_examples, join_paths(meson.source_root(), 'examples'), '@OUTPUT@'], ++ depfile: 'examples.dox.d', + install: get_option('enable_docs'), + install_dir: htmldir, + build_by_default: get_option('enable_docs')) From 89d599d44eefd8df59f6f7d82cb6724ce730db79 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Tue, 25 Jan 2022 10:10:59 +0100 Subject: [PATCH 14/41] epiphany: fix for meson 0.61 --- srcpkgs/epiphany/patches/meson-0.61.patch | 33 +++++++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 srcpkgs/epiphany/patches/meson-0.61.patch diff --git a/srcpkgs/epiphany/patches/meson-0.61.patch b/srcpkgs/epiphany/patches/meson-0.61.patch new file mode 100644 index 000000000000..1584627ca2d9 --- /dev/null +++ b/srcpkgs/epiphany/patches/meson-0.61.patch @@ -0,0 +1,33 @@ +From bfbb5f7bab38301d8a4a444173acdae8d9692146 Mon Sep 17 00:00:00 2001 +From: rvalue +Date: Wed, 24 Nov 2021 04:52:42 +0000 +Subject: [PATCH] Remove incorrect args for i18n.merge_file + +Part-of: +--- + data/meson.build | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/data/meson.build b/data/meson.build +index 46df3fd80..eac6b8224 100644 +--- a/data/meson.build ++++ b/data/meson.build +@@ -16,7 +16,6 @@ install_data( + desktop_conf = configuration_data() + desktop_conf.set('icon', application_id) + desktop = i18n.merge_file( +- 'desktop', + input: configure_file( + input: files('org.gnome.Epiphany.desktop.in.in'), + output: 'org.gnome.Epiphany.desktop.in', +@@ -32,7 +31,6 @@ desktop = i18n.merge_file( + appdata_conf = configuration_data() + appdata_conf.set('appid', application_id) + appdata = i18n.merge_file( +- 'appdata', + input: configure_file( + input: files('org.gnome.Epiphany.appdata.xml.in.in'), + output: 'org.gnome.Epiphany.appdata.xml.in', +-- +GitLab + From 8e83343101cfb14a572cf3e2a661d761f484372f Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Tue, 25 Jan 2022 10:10:59 +0100 Subject: [PATCH 15/41] evince: fix for meson 0.61 --- srcpkgs/evince/patches/meson-0.61.patch | 52 +++++++++++++++++++++++++ 1 file changed, 52 insertions(+) create mode 100644 srcpkgs/evince/patches/meson-0.61.patch diff --git a/srcpkgs/evince/patches/meson-0.61.patch b/srcpkgs/evince/patches/meson-0.61.patch new file mode 100644 index 000000000000..baed9dc1af8f --- /dev/null +++ b/srcpkgs/evince/patches/meson-0.61.patch @@ -0,0 +1,52 @@ +From 1060b24d051607f14220f148d2f7723b29897a54 Mon Sep 17 00:00:00 2001 +From: r-value +Date: Wed, 17 Nov 2021 18:22:45 +0800 +Subject: [PATCH] Remove incorrect args for i18n.merge_file + +`i18n.merge_file` has been ignoring positional arguments for +a time and explicitly rejects with error since meson 0.60.0 +--- + backend/meson.build | 1 - + data/meson.build | 1 - + meson.build | 1 - + 3 files changed, 3 deletions(-) + +diff --git a/backend/meson.build b/backend/meson.build +index e44c1d6d7..ab3df9acf 100644 +--- a/backend/meson.build ++++ b/backend/meson.build +@@ -50,7 +50,6 @@ foreach backend, backend_mime_types: backends + ) + + i18n.merge_file( +- appstream, + input: appstream_in, + output: appstream, + po_dir: po_dir, +diff --git a/data/meson.build b/data/meson.build +index 8a308b853..afc302098 100644 +--- a/data/meson.build ++++ b/data/meson.build +@@ -15,7 +15,6 @@ foreach desktop: desktops + ) + + i18n.merge_file( +- desktop, + type: 'desktop', + input: desktop_in, + output: desktop, +diff --git a/meson.build b/meson.build +index 34c86661f..f74efb3c4 100644 +--- a/meson.build ++++ b/meson.build +@@ -492,7 +492,6 @@ install_headers( + appdata = ev_namespace + '.appdata.xml' + + i18n.merge_file( +- appdata, + input: appdata + '.in', + output: appdata, + po_dir: po_dir, +-- +GitLab + From 281756c5d45e7e688c1ac889fdc5b2137bc1d703 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Tue, 25 Jan 2022 10:11:00 +0100 Subject: [PATCH 16/41] fprintd: fix for meson 0.61 --- srcpkgs/fprintd/patches/meson-0.61.patch | 146 +++++++++++++++++++++++ 1 file changed, 146 insertions(+) create mode 100644 srcpkgs/fprintd/patches/meson-0.61.patch diff --git a/srcpkgs/fprintd/patches/meson-0.61.patch b/srcpkgs/fprintd/patches/meson-0.61.patch new file mode 100644 index 000000000000..836c7e036054 --- /dev/null +++ b/srcpkgs/fprintd/patches/meson-0.61.patch @@ -0,0 +1,146 @@ +From 50943b1bd4f18d103c35233f0446ce7a31d1817e Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= +Date: Wed, 27 Oct 2021 15:44:31 +0200 +Subject: [PATCH] build: Do not use positional arguments in i18n.merge_file + +This was never really used and it's breaking meson 60. +While this may just become a warning in 60.1, it's just better to avoid +using it. + +See: https://github.com/mesonbuild/meson/issues/9441 +--- + data/meson.build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/data/meson.build b/data/meson.build +index 92bfa2e..ece5fc6 100644 +--- a/data/meson.build ++++ b/data/meson.build +@@ -24,7 +24,7 @@ if get_option('systemd') + endif + + polkit_policy = 'net.reactivated.fprint.device.policy' +-polkit_policy_target = i18n.merge_file(polkit_policy, ++polkit_policy_target = i18n.merge_file( + input: '@0@.in'.format(polkit_policy), + output: polkit_policy, + po_dir: meson.source_root() / 'po', +-- +GitLab + +From f4256533d1ffdc203c3f8c6ee42e8dcde470a93f Mon Sep 17 00:00:00 2001 +From: Eli Schwartz +Date: Tue, 11 Jan 2022 21:06:35 -0500 +Subject: [PATCH] use more idiomatic/correct embedded shell scripting + +Formatting arguments into code is fragile, and meson natively knows how +to pass files as arguments via argv. So pass them as arguments to the +shell. +--- + doc/dbus/meson.build | 9 ++++----- + 1 file changed, 4 insertions(+), 5 deletions(-) + +diff --git a/doc/dbus/meson.build b/doc/dbus/meson.build +index 802938e..861da64 100644 +--- a/doc/dbus/meson.build ++++ b/doc/dbus/meson.build +@@ -19,11 +19,10 @@ foreach interface_file: dbus_interfaces_files + capture: true, + command: [ + bash, '-c', +- 'cat @INPUT@;' + +- xsltproc.path() + ' @0@/@1@ '.format( +- meson.source_root(), +- files('spec-to-docbook.xsl')[0]) + +- interface_file.full_path() + '| tail -n +2;', ++ 'cat "$1"; "$2" "$3" "$4" | tail -n +2', ++ '_', # argv0 ignored ++ '@INPUT@', ++ xsltproc, files('spec-to-docbook.xsl')[0], interface_file + ], + ) + endforeach +-- +GitLab + +From 2c34cef5ef2004d8479475db5523c572eb409a6b Mon Sep 17 00:00:00 2001 +From: Eli Schwartz +Date: Tue, 11 Jan 2022 20:46:29 -0500 +Subject: [PATCH] remove pointless copying of files into build directory + +I'm not entirely sure what this did, but it seems to be obsoleted by +commit 93bad825406d13ed5eb2cf27541dc58194bef8f3. +--- + doc/dbus/meson.build | 6 +++--- + src/meson.build | 20 ++++++------------- + ....xml => net.reactivated.Fprint.Device.xml} | 0 + ...xml => net.reactivated.Fprint.Manager.xml} | 0 + 4 files changed, 9 insertions(+), 17 deletions(-) + rename src/{device.xml => net.reactivated.Fprint.Device.xml} (100%) + rename src/{manager.xml => net.reactivated.Fprint.Manager.xml} (100%) + +diff --git a/doc/dbus/meson.build b/doc/dbus/meson.build +index 861da64..431127d 100644 +--- a/doc/dbus/meson.build ++++ b/doc/dbus/meson.build +@@ -9,13 +9,13 @@ docbook_xml_header = custom_target('docbook_xml_header', + ) + + dbus_interfaces_refs = [] +-foreach interface_file: dbus_interfaces_files +- basename = run_command('basename', interface_file.full_path(), '.xml').stdout().strip() ++foreach interface_file: dbus_interfaces ++ basename = run_command('basename', interface_file, '.xml').stdout().strip() + dbus_interfaces_refs += custom_target(basename + '_ref', + input: docbook_xml_header, + output: basename + '.ref.xml', + build_by_default: true, +- depends: interface_file, ++ depend_files: interface_file, + capture: true, + command: [ + bash, '-c', +diff --git a/src/meson.build b/src/meson.build +index 1df6216..a7ce3fe 100644 +--- a/src/meson.build ++++ b/src/meson.build +@@ -1,22 +1,14 @@ + bash = find_program('bash') +-dbus_interfaces = ['Manager', 'Device'] +-dbus_interfaces_files = [] ++dbus_interfaces = files( ++ 'net.reactivated.Fprint.Manager.xml', ++ 'net.reactivated.Fprint.Device.xml', ++) + +-foreach interface_name: dbus_interfaces +- interface = interface_name.to_lower() +- interface_file = interface + '.xml' +- dbus_interfaces_files += custom_target('dbus_interface_' + interface, +- input: interface_file, +- output: 'net.reactivated.Fprint.@0@.xml'.format(interface_name), +- command: ['cp', '@INPUT@', '@OUTPUT@'], +- install: true, +- install_dir: dbus_interfaces_dir, +- ) +-endforeach ++install_data(dbus_interfaces, install_dir: dbus_interfaces_dir) + + # NOTE: We should pass "--glib-min-required 2.64" but cannot + fprintd_dbus_sources_base = gnome.gdbus_codegen('fprintd-dbus', +- sources: dbus_interfaces_files, ++ sources: dbus_interfaces, + autocleanup: 'all', + interface_prefix: 'net.reactivated.Fprint.', + namespace: 'FprintDBus', +diff --git a/src/device.xml b/src/net.reactivated.Fprint.Device.xml +similarity index 100% +rename from src/device.xml +rename to src/net.reactivated.Fprint.Device.xml +diff --git a/src/manager.xml b/src/net.reactivated.Fprint.Manager.xml +similarity index 100% +rename from src/manager.xml +rename to src/net.reactivated.Fprint.Manager.xml +-- +GitLab + From b0946e6753ba273a5a808d5d826c3c379cd77676 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Tue, 25 Jan 2022 10:11:00 +0100 Subject: [PATCH 17/41] fractal: fix for meson 0.61 --- srcpkgs/fractal/patches/meson-0.61.patch | 35 ++++++++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 srcpkgs/fractal/patches/meson-0.61.patch diff --git a/srcpkgs/fractal/patches/meson-0.61.patch b/srcpkgs/fractal/patches/meson-0.61.patch new file mode 100644 index 000000000000..79197803abf5 --- /dev/null +++ b/srcpkgs/fractal/patches/meson-0.61.patch @@ -0,0 +1,35 @@ +From 6fa1a23596d65d94aa889efe725174e6cd2903f0 Mon Sep 17 00:00:00 2001 +From: Jonas Platte +Date: Sun, 31 Oct 2021 15:23:31 +0100 +Subject: [PATCH] Remove deprecated positional argument to i18n.merge_file + +See https://github.com/mesonbuild/meson/issues/9441 +--- + fractal-gtk/res/meson.build | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/fractal-gtk/res/meson.build b/fractal-gtk/res/meson.build +index 7a7a7d65..a176787c 100644 +--- a/fractal-gtk/res/meson.build ++++ b/fractal-gtk/res/meson.build +@@ -2,7 +2,7 @@ subdir('icons') + + desktop_conf = configuration_data() + desktop_conf.set('icon', application_id) +-desktop_file = i18n.merge_file ('desktop-file', ++desktop_file = i18n.merge_file ( + type: 'desktop', + input: configure_file( + input: files('org.gnome.Fractal.desktop.in.in'), +@@ -28,7 +28,7 @@ endif + + metainfo_conf = configuration_data() + metainfo_conf.set('appid', application_id) +-metainfo_file = i18n.merge_file ('metainfo-file', ++metainfo_file = i18n.merge_file ( + input: configure_file( + input: files('org.gnome.Fractal.metainfo.xml.in.in'), + output: 'org.gnome.Fractal.metainfo.xml.in', +-- +GitLab + From a33cbc8d12a72fafaea17017522dd5259733c109 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Tue, 25 Jan 2022 10:11:00 +0100 Subject: [PATCH 18/41] gcr: fix for meson 0.61 --- srcpkgs/gcr/patches/meson-0.61.patch | 59 ++++++++++++++++++++++++++++ 1 file changed, 59 insertions(+) create mode 100644 srcpkgs/gcr/patches/meson-0.61.patch diff --git a/srcpkgs/gcr/patches/meson-0.61.patch b/srcpkgs/gcr/patches/meson-0.61.patch new file mode 100644 index 000000000000..21c1c3610226 --- /dev/null +++ b/srcpkgs/gcr/patches/meson-0.61.patch @@ -0,0 +1,59 @@ +From b3ca1d02bb0148ca787ac4aead164d7c8ce2c4d8 Mon Sep 17 00:00:00 2001 +From: Jakub Jirutka +Date: Wed, 12 Jan 2022 00:24:20 +0100 +Subject: [PATCH] meson: Fix unknown kw argument in gnome.generate_gir + +This argument has been removed in Meson 0.61.0: + + gck/meson.build:130:2: ERROR: gnome.generate_gir got unknown keyword arguments "packages" + +https://github.com/mesonbuild/meson/commit/f8fc5cb860465718fe7c79a1bf1fe00659f138de: + +> The packages argument to gnome.generate_gir was allowed, but never did anything, so stop passing it. + +Fixes #89 +--- + gck/meson.build | 1 - + gcr/meson.build | 1 - + ui/meson.build | 1 - + 3 files changed, 3 deletions(-) + +diff --git a/gck/meson.build b/gck/meson.build +index 756b486..a21a1e9 100644 +--- a/gck/meson.build ++++ b/gck/meson.build +@@ -131,7 +131,6 @@ if get_option('introspection') + sources: gck_gir_sources, + namespace: 'Gck', + nsversion: '@0@'.format(gck_major_version), +- packages: gck_deps, + export_packages: 'gck-@0@'.format(gck_major_version), + includes: [ 'GObject-2.0', 'Gio-2.0' ], + header: 'gck/gck.h', +diff --git a/gcr/meson.build b/gcr/meson.build +index 2233a44..c83641b 100644 +--- a/gcr/meson.build ++++ b/gcr/meson.build +@@ -190,7 +190,6 @@ if get_option('introspection') + sources: [ gcr_base_public_sources, gcr_base_headers ], + namespace: 'Gcr', + nsversion: '@0@'.format(gcr_major_version), +- packages: gcr_base_deps, + export_packages: 'gcr-base-@0@'.format(gcr_major_version), + includes: [ + 'GObject-2.0', +diff --git a/ui/meson.build b/ui/meson.build +index e656ea2..32ee057 100644 +--- a/ui/meson.build ++++ b/ui/meson.build +@@ -152,7 +152,6 @@ if get_option('introspection') + export_packages: 'gcr-ui-@0@'.format(gcr_major_version), + identifier_prefix: 'Gcr', + symbol_prefix: 'gcr', +- packages: gcr_ui_deps, + includes: [ + 'GObject-2.0', + 'Gio-2.0', +-- +GitLab + From 80d384add3c92b79ad8ade581e13214c8c26451b Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Tue, 25 Jan 2022 10:11:00 +0100 Subject: [PATCH 19/41] gedit: fix for meson 0.61 --- srcpkgs/gedit/patches/meson-0.61.patch | 34 ++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 srcpkgs/gedit/patches/meson-0.61.patch diff --git a/srcpkgs/gedit/patches/meson-0.61.patch b/srcpkgs/gedit/patches/meson-0.61.patch new file mode 100644 index 000000000000..94d849f596b2 --- /dev/null +++ b/srcpkgs/gedit/patches/meson-0.61.patch @@ -0,0 +1,34 @@ +From c6c7c6580bc7f82a7d449b8ee33ae44f8b6f4a1f Mon Sep 17 00:00:00 2001 +From: rvalue +Date: Wed, 15 Dec 2021 07:02:09 +0000 +Subject: [PATCH] Remove incorrect args for i18n.merge_file + +The positional argument has been silently ignored for a time. And it causes failure +with "ERROR: Function does not take positional arguments" since meson 0.60.0 +--- + data/meson.build | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/data/meson.build b/data/meson.build +index 774618b3d..0077b49c5 100644 +--- a/data/meson.build ++++ b/data/meson.build +@@ -4,7 +4,6 @@ install_man('gedit.1') + + appdata = 'org.gnome.gedit.appdata.xml' + appdata_file = i18n.merge_file( +- appdata, + input: appdata + '.in', + output: appdata, + po_dir: '../po/', +@@ -23,7 +22,6 @@ endif + + desktop_file = 'org.gnome.gedit.desktop' + desktop_output_file = i18n.merge_file( +- desktop_file, + type: 'desktop', + input: desktop_file + '.in', + output: desktop_file, +-- +GitLab + From 33bf88c3416ac553265bb7cd91b60ba494eee3e2 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Tue, 25 Jan 2022 10:11:00 +0100 Subject: [PATCH 20/41] gedit-plugins: fix for meson 0.61 --- .../gedit-plugins/patches/meson-0.61.patch | 246 ++++++++++++++++++ 1 file changed, 246 insertions(+) create mode 100644 srcpkgs/gedit-plugins/patches/meson-0.61.patch diff --git a/srcpkgs/gedit-plugins/patches/meson-0.61.patch b/srcpkgs/gedit-plugins/patches/meson-0.61.patch new file mode 100644 index 000000000000..ab292f4389cf --- /dev/null +++ b/srcpkgs/gedit-plugins/patches/meson-0.61.patch @@ -0,0 +1,246 @@ +From 7805e0d648d79d317cce76a87a5de42817fd5c6d Mon Sep 17 00:00:00 2001 +From: Michal Vasilek +Date: Sun, 23 Jan 2022 14:43:47 +0100 +Subject: [PATCH] meson: fix build with meson 0.61 + +i18n.merge_file doesn't accept positional arguments +--- + plugins/bookmarks/meson.build | 1 - + plugins/bracketcompletion/meson.build | 1 - + plugins/charmap/meson.build | 1 - + plugins/codecomment/meson.build | 1 - + plugins/colorpicker/meson.build | 1 - + plugins/colorschemer/meson.build | 1 - + plugins/commander/meson.build | 1 - + plugins/drawspaces/meson.build | 1 - + plugins/findinfiles/meson.build | 1 - + plugins/git/meson.build | 1 - + plugins/joinlines/meson.build | 1 - + plugins/multiedit/meson.build | 1 - + plugins/smartspaces/meson.build | 1 - + plugins/synctex/meson.build | 1 - + plugins/terminal/meson.build | 1 - + plugins/textsize/meson.build | 1 - + plugins/translate/meson.build | 1 - + plugins/wordcompletion/meson.build | 1 - + 18 files changed, 18 deletions(-) + +diff --git a/plugins/bookmarks/meson.build b/plugins/bookmarks/meson.build +index 4e09d60..ed051c6 100644 +--- a/plugins/bookmarks/meson.build ++++ b/plugins/bookmarks/meson.build +@@ -41,7 +41,6 @@ bookmarks_plugin = custom_target( + ) + + bookmarks_metainfo = i18n.merge_file( +- 'gedit-bookmarks.metainfo.xml', + input: 'gedit-bookmarks.metainfo.xml.in', + output: 'gedit-bookmarks.metainfo.xml', + po_dir: join_paths(srcdir, 'po'), +diff --git a/plugins/bracketcompletion/meson.build b/plugins/bracketcompletion/meson.build +index 4d2ff4d..5f3e653 100644 +--- a/plugins/bracketcompletion/meson.build ++++ b/plugins/bracketcompletion/meson.build +@@ -30,7 +30,6 @@ bracketcompletion_plugin = custom_target( + ) + + bracketcompletion_metainfo = i18n.merge_file( +- 'gedit-bracketcompletion.metainfo.xml', + input: 'gedit-bracketcompletion.metainfo.xml.in', + output: 'gedit-bracketcompletion.metainfo.xml', + po_dir: join_paths(srcdir, 'po'), +diff --git a/plugins/charmap/meson.build b/plugins/charmap/meson.build +index b7d1115..1cf02b4 100644 +--- a/plugins/charmap/meson.build ++++ b/plugins/charmap/meson.build +@@ -26,7 +26,6 @@ charmap_plugin = custom_target( + ) + + charmap_metainfo = i18n.merge_file( +- 'gedit-charmap.metainfo.xml', + input: 'gedit-charmap.metainfo.xml.in', + output: 'gedit-charmap.metainfo.xml', + po_dir: join_paths(srcdir, 'po'), +diff --git a/plugins/codecomment/meson.build b/plugins/codecomment/meson.build +index 49594dd..dd053b3 100644 +--- a/plugins/codecomment/meson.build ++++ b/plugins/codecomment/meson.build +@@ -30,7 +30,6 @@ codecomment_plugin = custom_target( + ) + + codecomment_metainfo = i18n.merge_file( +- 'gedit-codecomment.metainfo.xml', + input: 'gedit-codecomment.metainfo.xml.in', + output: 'gedit-codecomment.metainfo.xml', + po_dir: join_paths(srcdir, 'po'), +diff --git a/plugins/colorpicker/meson.build b/plugins/colorpicker/meson.build +index 889c9ce..c617d59 100644 +--- a/plugins/colorpicker/meson.build ++++ b/plugins/colorpicker/meson.build +@@ -30,7 +30,6 @@ colorpicker_plugin = custom_target( + ) + + colorpicker_metainfo = i18n.merge_file( +- 'gedit-colorpicker.metainfo.xml', + input: 'gedit-colorpicker.metainfo.xml.in', + output: 'gedit-colorpicker.metainfo.xml', + po_dir: join_paths(srcdir, 'po'), +diff --git a/plugins/colorschemer/meson.build b/plugins/colorschemer/meson.build +index fcb904e..0b1a483 100644 +--- a/plugins/colorschemer/meson.build ++++ b/plugins/colorschemer/meson.build +@@ -39,7 +39,6 @@ colorschemer_plugin = custom_target( + ) + + colorschemer_metainfo = i18n.merge_file( +- 'gedit-colorschemer.metainfo.xml', + input: 'gedit-colorschemer.metainfo.xml.in', + output: 'gedit-colorschemer.metainfo.xml', + po_dir: join_paths(srcdir, 'po'), +diff --git a/plugins/commander/meson.build b/plugins/commander/meson.build +index 2fedf80..d9bbb32 100644 +--- a/plugins/commander/meson.build ++++ b/plugins/commander/meson.build +@@ -35,7 +35,6 @@ commander_plugin = custom_target( + ) + + commander_metainfo = i18n.merge_file( +- 'gedit-commander.metainfo.xml', + input: 'gedit-commander.metainfo.xml.in', + output: 'gedit-commander.metainfo.xml', + po_dir: join_paths(srcdir, 'po'), +diff --git a/plugins/drawspaces/meson.build b/plugins/drawspaces/meson.build +index 75610cb..30d27aa 100644 +--- a/plugins/drawspaces/meson.build ++++ b/plugins/drawspaces/meson.build +@@ -56,7 +56,6 @@ install_data( + ) + + drawspaces_metainfo = i18n.merge_file( +- 'gedit-drawspaces.metainfo.xml', + input: 'gedit-drawspaces.metainfo.xml.in', + output: 'gedit-drawspaces.metainfo.xml', + po_dir: join_paths(srcdir, 'po'), +diff --git a/plugins/findinfiles/meson.build b/plugins/findinfiles/meson.build +index d900159..16c6885 100644 +--- a/plugins/findinfiles/meson.build ++++ b/plugins/findinfiles/meson.build +@@ -62,7 +62,6 @@ findinfiles_plugin = custom_target( + ) + + findinfiles_metainfo = i18n.merge_file( +- 'gedit-findinfiles.metainfo.xml', + input: 'gedit-findinfiles.metainfo.xml.in', + output: 'gedit-findinfiles.metainfo.xml', + po_dir: join_paths(srcdir, 'po'), +diff --git a/plugins/git/meson.build b/plugins/git/meson.build +index f6f2b0b..cfd3b65 100644 +--- a/plugins/git/meson.build ++++ b/plugins/git/meson.build +@@ -26,7 +26,6 @@ git_plugin = custom_target( + ) + + git_metainfo = i18n.merge_file( +- 'gedit-git.metainfo.xml', + input: 'gedit-git.metainfo.xml.in', + output: 'gedit-git.metainfo.xml', + po_dir: join_paths(srcdir, 'po'), +diff --git a/plugins/joinlines/meson.build b/plugins/joinlines/meson.build +index 12f081e..abf9673 100644 +--- a/plugins/joinlines/meson.build ++++ b/plugins/joinlines/meson.build +@@ -30,7 +30,6 @@ joinlines_plugin = custom_target( + ) + + joinlines_metainfo = i18n.merge_file( +- 'gedit-joinlines.metainfo.xml', + input: 'gedit-joinlines.metainfo.xml.in', + output: 'gedit-joinlines.metainfo.xml', + po_dir: join_paths(srcdir, 'po'), +diff --git a/plugins/multiedit/meson.build b/plugins/multiedit/meson.build +index 855e8ca..bd676a7 100644 +--- a/plugins/multiedit/meson.build ++++ b/plugins/multiedit/meson.build +@@ -26,7 +26,6 @@ multiedit_plugin = custom_target( + ) + + multiedit_metainfo = i18n.merge_file( +- 'gedit-multiedit.metainfo.xml', + input: 'gedit-multiedit.metainfo.xml.in', + output: 'gedit-multiedit.metainfo.xml', + po_dir: join_paths(srcdir, 'po'), +diff --git a/plugins/smartspaces/meson.build b/plugins/smartspaces/meson.build +index e2e682a..7a814c3 100644 +--- a/plugins/smartspaces/meson.build ++++ b/plugins/smartspaces/meson.build +@@ -34,7 +34,6 @@ smartspaces_plugin = custom_target( + ) + + smartspaces_metainfo = i18n.merge_file( +- 'gedit-smartspaces.metainfo.xml', + input: 'gedit-smartspaces.metainfo.xml.in', + output: 'gedit-smartspaces.metainfo.xml', + po_dir: join_paths(srcdir, 'po'), +diff --git a/plugins/synctex/meson.build b/plugins/synctex/meson.build +index c6be01d..68bad3f 100644 +--- a/plugins/synctex/meson.build ++++ b/plugins/synctex/meson.build +@@ -26,7 +26,6 @@ synctex_plugin = custom_target( + ) + + synctex_metainfo = i18n.merge_file( +- 'gedit-synctex.metainfo.xml', + input: 'gedit-synctex.metainfo.xml.in', + output: 'gedit-synctex.metainfo.xml', + po_dir: join_paths(srcdir, 'po'), +diff --git a/plugins/terminal/meson.build b/plugins/terminal/meson.build +index 4f56418..9dcdc6f 100644 +--- a/plugins/terminal/meson.build ++++ b/plugins/terminal/meson.build +@@ -38,7 +38,6 @@ install_data( + ) + + terminal_metainfo = i18n.merge_file( +- 'gedit-terminal.metainfo.xml', + input: 'gedit-terminal.metainfo.xml.in', + output: 'gedit-terminal.metainfo.xml', + po_dir: join_paths(srcdir, 'po'), +diff --git a/plugins/textsize/meson.build b/plugins/textsize/meson.build +index c7baa86..e1a4a78 100644 +--- a/plugins/textsize/meson.build ++++ b/plugins/textsize/meson.build +@@ -26,7 +26,6 @@ textsize_plugin = custom_target( + ) + + textsize_metainfo = i18n.merge_file( +- 'gedit-textsize.metainfo.xml', + input: 'gedit-textsize.metainfo.xml.in', + output: 'gedit-textsize.metainfo.xml', + po_dir: join_paths(srcdir, 'po'), +diff --git a/plugins/translate/meson.build b/plugins/translate/meson.build +index e87001e..ddb7ba3 100644 +--- a/plugins/translate/meson.build ++++ b/plugins/translate/meson.build +@@ -47,7 +47,6 @@ install_data( + ) + + translate_metainfo = i18n.merge_file( +- 'gedit-translate.metainfo.xml', + input: 'gedit-translate.metainfo.xml.in', + output: 'gedit-translate.metainfo.xml', + po_dir: join_paths(srcdir, 'po'), +diff --git a/plugins/wordcompletion/meson.build b/plugins/wordcompletion/meson.build +index 8a5f34b..e3a1b6d 100644 +--- a/plugins/wordcompletion/meson.build ++++ b/plugins/wordcompletion/meson.build +@@ -55,7 +55,6 @@ install_data( + ) + + wordcompletion_metainfo = i18n.merge_file( +- 'gedit-wordcompletion.metainfo.xml', + input: 'gedit-wordcompletion.metainfo.xml.in', + output: 'gedit-wordcompletion.metainfo.xml', + po_dir: join_paths(srcdir, 'po'), +-- +2.34.1 + From 1eb9bfa3c2eccaac2e071e4d51ea592aa492e83a Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Tue, 25 Jan 2022 10:11:00 +0100 Subject: [PATCH 21/41] gitg: fix for meson 0.61 --- srcpkgs/gitg/patches/meson-0.61.patch | 33 +++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 srcpkgs/gitg/patches/meson-0.61.patch diff --git a/srcpkgs/gitg/patches/meson-0.61.patch b/srcpkgs/gitg/patches/meson-0.61.patch new file mode 100644 index 000000000000..330d45fc5ad8 --- /dev/null +++ b/srcpkgs/gitg/patches/meson-0.61.patch @@ -0,0 +1,33 @@ +From c81e1579afe7f221371b6866c25f388f48747728 Mon Sep 17 00:00:00 2001 +From: Michal Vasilek +Date: Sun, 23 Jan 2022 14:54:31 +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 a8b90fd1..2413531d 100644 +--- a/data/meson.build ++++ b/data/meson.build +@@ -6,7 +6,6 @@ desktop_config = configuration_data() + desktop_config.set('icon', application_id) + desktop_config.set('binary', gitg_name) + i18n.merge_file( +- desktop, + type: 'desktop', + input: configure_file( + input: desktop + '.in.in', +@@ -42,7 +41,6 @@ appdata_config = configuration_data() + appdata_config.set('app-id', application_id) + appdata_config.set('gettext', gitg_name) + i18n.merge_file( +- appdata, + type: 'xml', + input: configure_file( + input: appdata + '.in.in', +-- +2.34.1 + From 51321e499f44dbff8a67d176f8e6957ae8e268ba Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Tue, 25 Jan 2022 10:11:00 +0100 Subject: [PATCH 22/41] gnome-boxes: fix for meson 0.61 --- srcpkgs/gnome-boxes/patches/meson-0.61.patch | 36 ++++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 srcpkgs/gnome-boxes/patches/meson-0.61.patch diff --git a/srcpkgs/gnome-boxes/patches/meson-0.61.patch b/srcpkgs/gnome-boxes/patches/meson-0.61.patch new file mode 100644 index 000000000000..3d9c56f5841c --- /dev/null +++ b/srcpkgs/gnome-boxes/patches/meson-0.61.patch @@ -0,0 +1,36 @@ +From fd0acfbe79444687c73dea182c2d1a5fa1c77324 Mon Sep 17 00:00:00 2001 +From: Michal Vasilek +Date: Sat, 15 Jan 2022 00:07:31 +0100 +Subject: [PATCH] build: remove positional i18n.merge_file arguments + +otherwise building with meson 0.61+ fails: + + ERROR: Function does not take positional arguments. +--- + data/meson.build | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/data/meson.build b/data/meson.build +index d32638a8..2dc1798b 100644 +--- a/data/meson.build ++++ b/data/meson.build +@@ -20,7 +20,6 @@ resources = gnome.compile_resources ('org.gnome.Boxes', + desktop_conf = configuration_data () + desktop_conf.set ('icon', application_id) + desktop = i18n.merge_file ( +- 'desktop', + input: configure_file ( + input: files ('org.gnome.Boxes.desktop.in'), + output: 'org.gnome.Boxes.desktop.in', +@@ -65,7 +64,7 @@ configure_file ( + + appdata_conf = configuration_data() + appdata_conf.set('appid', application_id) +-appdata_file = i18n.merge_file ('appdata-file', ++appdata_file = i18n.merge_file ( + input: configure_file ( + input: files ('org.gnome.Boxes.appdata.xml.in'), + output: 'org.gnome.Boxes.appdata.xml.in', +-- +2.34.1 + From 011410efc532cfa3f9c58b46bb49d49ec89d1a0f Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Tue, 25 Jan 2022 10:11:00 +0100 Subject: [PATCH 23/41] gnome-calendar: fix for meson 0.61 --- srcpkgs/gnome-calendar/patches/meson-0.61.patch | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 srcpkgs/gnome-calendar/patches/meson-0.61.patch diff --git a/srcpkgs/gnome-calendar/patches/meson-0.61.patch b/srcpkgs/gnome-calendar/patches/meson-0.61.patch new file mode 100644 index 000000000000..e2df31e0760e --- /dev/null +++ b/srcpkgs/gnome-calendar/patches/meson-0.61.patch @@ -0,0 +1,10 @@ +--- a/data/appdata/meson.build ++++ b/data/appdata/meson.build +@@ -1,7 +1,6 @@ + appdata_conf = configuration_data() + appdata_conf.set('appid', application_id) + appdata = i18n.merge_file( +- 'appdata', + input: configure_file( + input: files('org.gnome.Calendar.appdata.xml.in.in'), + output: 'org.gnome.Calendar.appdata.xml.in', From d78e9e38fc869514da5429e07c6fcc0a8bbd4b96 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Tue, 25 Jan 2022 10:11:00 +0100 Subject: [PATCH 24/41] gnome-characters: fix for meson 0.61 --- .../gnome-characters/patches/meson-0.61.patch | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 srcpkgs/gnome-characters/patches/meson-0.61.patch diff --git a/srcpkgs/gnome-characters/patches/meson-0.61.patch b/srcpkgs/gnome-characters/patches/meson-0.61.patch new file mode 100644 index 000000000000..248f8d5dced7 --- /dev/null +++ b/srcpkgs/gnome-characters/patches/meson-0.61.patch @@ -0,0 +1,18 @@ +--- a/data/meson.build ++++ b/data/meson.build +@@ -47,7 +47,6 @@ desktop_conf.set('appid', characters_application_id) + desktop_conf.set('bindir', characters_bindir) + + i18n.merge_file( +- 'desktop-file', + type: 'desktop', + input: configure_file ( + input: characters_name + '.desktop.in', +@@ -61,7 +60,6 @@ i18n.merge_file( + ) + + appdata_file = i18n.merge_file( +- 'appdata-file', + input: characters_name + '.appdata.xml.in', + output: characters_application_id + '.appdata.xml', + po_dir: po_dir, From 215ab694f3b88eaf09f3a176924e37643ccc881d Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Tue, 25 Jan 2022 10:11:00 +0100 Subject: [PATCH 25/41] gnome-control-center: fix for meson 0.61 --- .../patches/meson-0.61.patch | 504 ++++++++++++++++++ 1 file changed, 504 insertions(+) create mode 100644 srcpkgs/gnome-control-center/patches/meson-0.61.patch diff --git a/srcpkgs/gnome-control-center/patches/meson-0.61.patch b/srcpkgs/gnome-control-center/patches/meson-0.61.patch new file mode 100644 index 000000000000..66bfa7a35ed6 --- /dev/null +++ b/srcpkgs/gnome-control-center/patches/meson-0.61.patch @@ -0,0 +1,504 @@ +From 37b29c32cbecfd89c9c5e0169e0f2876f00ef5eb Mon Sep 17 00:00:00 2001 +From: Jan Beich +Date: Fri, 7 Jan 2022 01:53:52 +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. + +panels/applications/meson.build:10:5: ERROR: Function does not take positional arguments. +panels/background/meson.build:10:5: ERROR: Function does not take positional arguments. +panels/camera/meson.build:10:5: ERROR: Function does not take positional arguments. +[...] +--- + panels/applications/meson.build | 1 - + panels/background/meson.build | 1 - + panels/bluetooth/meson.build | 1 - + panels/camera/meson.build | 1 - + panels/color/meson.build | 1 - + panels/datetime/meson.build | 2 -- + panels/default-apps/meson.build | 1 - + panels/diagnostics/meson.build | 1 - + panels/display/meson.build | 1 - + panels/info-overview/meson.build | 1 - + panels/keyboard/meson.build | 2 -- + panels/location/meson.build | 1 - + panels/lock/meson.build | 1 - + panels/microphone/meson.build | 1 - + panels/mouse/meson.build | 1 - + panels/multitasking/meson.build | 1 - + panels/network/meson.build | 1 - + panels/notifications/meson.build | 1 - + panels/online-accounts/meson.build | 1 - + panels/power/meson.build | 1 - + panels/printers/meson.build | 1 - + panels/region/meson.build | 1 - + panels/removable-media/meson.build | 1 - + panels/search/meson.build | 1 - + panels/sharing/meson.build | 2 -- + panels/sound/meson.build | 1 - + panels/thunderbolt/meson.build | 1 - + panels/universal-access/meson.build | 1 - + panels/usage/meson.build | 1 - + panels/user-accounts/meson.build | 2 -- + panels/wacom/meson.build | 1 - + panels/wwan/meson.build | 1 - + shell/appdata/meson.build | 1 - + shell/meson.build | 1 - + tests/interactive-panels/applications/meson.build | 1 - + 35 files changed, 39 deletions(-) + +diff --git a/panels/applications/meson.build b/panels/applications/meson.build +index d511bf640..bd4fd6442 100644 +--- a/panels/applications/meson.build ++++ b/panels/applications/meson.build +@@ -8,7 +8,6 @@ desktop_in = configure_file( + ) + + i18n.merge_file( +- desktop, + type : 'desktop', + input : desktop_in, + output : desktop, +diff --git a/panels/background/meson.build b/panels/background/meson.build +index 226547232..b2ee1df16 100644 +--- a/panels/background/meson.build ++++ b/panels/background/meson.build +@@ -8,7 +8,6 @@ desktop_in = configure_file( + ) + + i18n.merge_file( +- desktop, + type: 'desktop', + input: desktop_in, + output: desktop, +diff --git a/panels/bluetooth/meson.build b/panels/bluetooth/meson.build +index c3fce7467..4bed812a9 100644 +--- a/panels/bluetooth/meson.build ++++ b/panels/bluetooth/meson.build +@@ -8,7 +8,6 @@ desktop_in = configure_file( + ) + + i18n.merge_file( +- desktop, + type: 'desktop', + input: desktop_in, + output: desktop, +diff --git a/panels/camera/meson.build b/panels/camera/meson.build +index 4f2611879..bf2e727cf 100644 +--- a/panels/camera/meson.build ++++ b/panels/camera/meson.build +@@ -8,7 +8,6 @@ desktop_in = configure_file( + ) + + i18n.merge_file( +- desktop, + type: 'desktop', + input: desktop_in, + output: desktop, +diff --git a/panels/color/meson.build b/panels/color/meson.build +index 156df6e47..9368ae97f 100644 +--- a/panels/color/meson.build ++++ b/panels/color/meson.build +@@ -8,7 +8,6 @@ desktop_in = configure_file( + ) + + i18n.merge_file( +- desktop, + type: 'desktop', + input: desktop_in, + output: desktop, +diff --git a/panels/datetime/meson.build b/panels/datetime/meson.build +index 65683941f..9bbdc7ce0 100644 +--- a/panels/datetime/meson.build ++++ b/panels/datetime/meson.build +@@ -8,7 +8,6 @@ desktop_in = configure_file( + ) + + i18n.merge_file( +- desktop, + type: 'desktop', + input: desktop_in, + output: desktop, +@@ -20,7 +19,6 @@ i18n.merge_file( + polkit = 'org.gnome.controlcenter.@0@.policy'.format(cappletname) + + i18n.merge_file( +- polkit, + input: polkit + '.in', + output: polkit, + po_dir: po_dir, +diff --git a/panels/default-apps/meson.build b/panels/default-apps/meson.build +index 68550062d..2a24321a0 100644 +--- a/panels/default-apps/meson.build ++++ b/panels/default-apps/meson.build +@@ -8,7 +8,6 @@ desktop_in = configure_file( + ) + + i18n.merge_file( +- desktop, + type: 'desktop', + input: desktop_in, + output: desktop, +diff --git a/panels/diagnostics/meson.build b/panels/diagnostics/meson.build +index fac9b4cd8..2f25c2194 100644 +--- a/panels/diagnostics/meson.build ++++ b/panels/diagnostics/meson.build +@@ -8,7 +8,6 @@ desktop_in = configure_file( + ) + + i18n.merge_file( +- desktop, + type: 'desktop', + input: desktop_in, + output: desktop, +diff --git a/panels/display/meson.build b/panels/display/meson.build +index 97db0ebdc..726a898b9 100644 +--- a/panels/display/meson.build ++++ b/panels/display/meson.build +@@ -8,7 +8,6 @@ desktop_in = configure_file( + ) + + i18n.merge_file( +- desktop, + type: 'desktop', + input: desktop_in, + output: desktop, +diff --git a/panels/info-overview/meson.build b/panels/info-overview/meson.build +index b941f0833..1cc062eee 100644 +--- a/panels/info-overview/meson.build ++++ b/panels/info-overview/meson.build +@@ -8,7 +8,6 @@ desktop_in = configure_file( + ) + + i18n.merge_file( +- desktop, + type: 'desktop', + input: desktop_in, + output: desktop, +diff --git a/panels/keyboard/meson.build b/panels/keyboard/meson.build +index 68c5eae3d..991fb8122 100644 +--- a/panels/keyboard/meson.build ++++ b/panels/keyboard/meson.build +@@ -8,7 +8,6 @@ desktop_in = configure_file( + ) + + i18n.merge_file( +- desktop, + type: 'desktop', + input: desktop_in, + output: desktop, +@@ -45,7 +44,6 @@ xml_files = [ + + foreach file: xml_files + i18n.merge_file( +- file, + input: file + '.in', + output: file, + po_dir: po_dir, +diff --git a/panels/location/meson.build b/panels/location/meson.build +index bfc6e82ad..f4c835d92 100644 +--- a/panels/location/meson.build ++++ b/panels/location/meson.build +@@ -8,7 +8,6 @@ desktop_in = configure_file( + ) + + i18n.merge_file( +- desktop, + type: 'desktop', + input: desktop_in, + output: desktop, +diff --git a/panels/lock/meson.build b/panels/lock/meson.build +index 0661af4fa..18dbfb2b3 100644 +--- a/panels/lock/meson.build ++++ b/panels/lock/meson.build +@@ -8,7 +8,6 @@ desktop_in = configure_file( + ) + + i18n.merge_file( +- desktop, + type: 'desktop', + input: desktop_in, + output: desktop, +diff --git a/panels/microphone/meson.build b/panels/microphone/meson.build +index e0847a4c4..bc7f73a20 100644 +--- a/panels/microphone/meson.build ++++ b/panels/microphone/meson.build +@@ -8,7 +8,6 @@ desktop_in = configure_file( + ) + + i18n.merge_file( +- desktop, + type: 'desktop', + input: desktop_in, + output: desktop, +diff --git a/panels/mouse/meson.build b/panels/mouse/meson.build +index 357aaae81..7b46097f4 100644 +--- a/panels/mouse/meson.build ++++ b/panels/mouse/meson.build +@@ -8,7 +8,6 @@ desktop_in = configure_file( + ) + + i18n.merge_file( +- desktop, + type: 'desktop', + input: desktop_in, + output: desktop, +diff --git a/panels/multitasking/meson.build b/panels/multitasking/meson.build +index 772b63813..53fd0d8ea 100644 +--- a/panels/multitasking/meson.build ++++ b/panels/multitasking/meson.build +@@ -8,7 +8,6 @@ desktop_in = configure_file( + ) + + i18n.merge_file( +- desktop, + type: 'desktop', + input: desktop_in, + output: desktop, +diff --git a/panels/network/meson.build b/panels/network/meson.build +index d7cd6e419..43a569092 100644 +--- a/panels/network/meson.build ++++ b/panels/network/meson.build +@@ -25,7 +25,6 @@ foreach name: panel_names + ) + + i18n.merge_file( +- desktop, + type: 'desktop', + input: desktop_in, + output: desktop, +diff --git a/panels/notifications/meson.build b/panels/notifications/meson.build +index df702614a..1b04b243d 100644 +--- a/panels/notifications/meson.build ++++ b/panels/notifications/meson.build +@@ -8,7 +8,6 @@ desktop_in = configure_file( + ) + + i18n.merge_file( +- desktop, + type: 'desktop', + input: desktop_in, + output: desktop, +diff --git a/panels/online-accounts/meson.build b/panels/online-accounts/meson.build +index 82f1d569a..687097724 100644 +--- a/panels/online-accounts/meson.build ++++ b/panels/online-accounts/meson.build +@@ -8,7 +8,6 @@ desktop_in = configure_file( + ) + + i18n.merge_file( +- desktop, + type: 'desktop', + input: desktop_in, + output: desktop, +diff --git a/panels/power/meson.build b/panels/power/meson.build +index 0e3ea1d56..1cafe2a1b 100644 +--- a/panels/power/meson.build ++++ b/panels/power/meson.build +@@ -8,7 +8,6 @@ desktop_in = configure_file( + ) + + i18n.merge_file( +- desktop, + type: 'desktop', + input: desktop_in, + output: desktop, +diff --git a/panels/printers/meson.build b/panels/printers/meson.build +index ccce64cb7..042c67acc 100644 +--- a/panels/printers/meson.build ++++ b/panels/printers/meson.build +@@ -8,7 +8,6 @@ desktop_in = configure_file( + ) + + i18n.merge_file( +- desktop, + type: 'desktop', + input: desktop_in, + output: desktop, +diff --git a/panels/region/meson.build b/panels/region/meson.build +index 68b7f000e..27bc5ff33 100644 +--- a/panels/region/meson.build ++++ b/panels/region/meson.build +@@ -8,7 +8,6 @@ desktop_in = configure_file( + ) + + i18n.merge_file( +- desktop, + type: 'desktop', + input: desktop_in, + output: desktop, +diff --git a/panels/removable-media/meson.build b/panels/removable-media/meson.build +index b51799af9..fc07c48e5 100644 +--- a/panels/removable-media/meson.build ++++ b/panels/removable-media/meson.build +@@ -8,7 +8,6 @@ desktop_in = configure_file( + ) + + i18n.merge_file( +- desktop, + type: 'desktop', + input: desktop_in, + output: desktop, +diff --git a/panels/search/meson.build b/panels/search/meson.build +index 39b076bd8..a4dd79d96 100644 +--- a/panels/search/meson.build ++++ b/panels/search/meson.build +@@ -8,7 +8,6 @@ desktop_in = configure_file( + ) + + i18n.merge_file( +- desktop, + type: 'desktop', + input: desktop_in, + output: desktop, +diff --git a/panels/sharing/meson.build b/panels/sharing/meson.build +index 035883950..99b15620d 100644 +--- a/panels/sharing/meson.build ++++ b/panels/sharing/meson.build +@@ -8,7 +8,6 @@ desktop_in = configure_file( + ) + + i18n.merge_file( +- desktop, + type: 'desktop', + input: desktop_in, + output: desktop, +@@ -29,7 +28,6 @@ polkit_in = configure_file( + ) + + i18n.merge_file( +- polkit, + input: polkit_in, + output: polkit, + po_dir: po_dir, +diff --git a/panels/sound/meson.build b/panels/sound/meson.build +index fa0f1281f..18f75dd4f 100644 +--- a/panels/sound/meson.build ++++ b/panels/sound/meson.build +@@ -8,7 +8,6 @@ desktop_in = configure_file( + ) + + i18n.merge_file( +- desktop, + type: 'desktop', + input: desktop_in, + output: desktop, +diff --git a/panels/thunderbolt/meson.build b/panels/thunderbolt/meson.build +index 796524a1f..79291b003 100644 +--- a/panels/thunderbolt/meson.build ++++ b/panels/thunderbolt/meson.build +@@ -8,7 +8,6 @@ desktop_in = configure_file( + ) + + i18n.merge_file( +- desktop, + type: 'desktop', + input: desktop_in, + output: desktop, +diff --git a/panels/universal-access/meson.build b/panels/universal-access/meson.build +index 17015c08b..b7e5a4196 100644 +--- a/panels/universal-access/meson.build ++++ b/panels/universal-access/meson.build +@@ -8,7 +8,6 @@ desktop_in = configure_file( + ) + + i18n.merge_file( +- desktop, + type: 'desktop', + input: desktop_in, + output: desktop, +diff --git a/panels/usage/meson.build b/panels/usage/meson.build +index 74f720ecd..6047ce0ec 100644 +--- a/panels/usage/meson.build ++++ b/panels/usage/meson.build +@@ -8,7 +8,6 @@ desktop_in = configure_file( + ) + + i18n.merge_file( +- desktop, + type: 'desktop', + input: desktop_in, + output: desktop, +diff --git a/panels/user-accounts/meson.build b/panels/user-accounts/meson.build +index 895b0dfe0..19d70fb59 100644 +--- a/panels/user-accounts/meson.build ++++ b/panels/user-accounts/meson.build +@@ -8,7 +8,6 @@ desktop_in = configure_file( + ) + + i18n.merge_file( +- desktop, + type: 'desktop', + input: desktop_in, + output: desktop, +@@ -85,7 +84,6 @@ meson.add_install_script('sh', '-c', + polkit = 'org.gnome.controlcenter.@0@.policy'.format(cappletname) + + i18n.merge_file( +- polkit, + input: polkit + '.in', + output: polkit, + po_dir: po_dir, +diff --git a/panels/wacom/meson.build b/panels/wacom/meson.build +index 30bbb6b04..7b03ce9e8 100644 +--- a/panels/wacom/meson.build ++++ b/panels/wacom/meson.build +@@ -30,7 +30,6 @@ desktop_in = configure_file( + ) + + i18n.merge_file( +- desktop, + type : 'desktop', + input : desktop_in, + output : desktop, +diff --git a/panels/wwan/meson.build b/panels/wwan/meson.build +index 7a33ac5c8..c8ecef6d5 100644 +--- a/panels/wwan/meson.build ++++ b/panels/wwan/meson.build +@@ -12,7 +12,6 @@ desktop_in = configure_file( + ) + + i18n.merge_file( +- desktop, + type : 'desktop', + input : desktop_in, + output : desktop, +diff --git a/shell/appdata/meson.build b/shell/appdata/meson.build +index 3b36171fb..fdb827969 100644 +--- a/shell/appdata/meson.build ++++ b/shell/appdata/meson.build +@@ -1,7 +1,6 @@ + appdata = 'gnome-control-center.appdata.xml' + + i18n.merge_file( +- appdata, + input: appdata + '.in', + output: appdata, + po_dir: po_dir, +diff --git a/shell/meson.build b/shell/meson.build +index 2a6cbf46f..56ec21249 100644 +--- a/shell/meson.build ++++ b/shell/meson.build +@@ -23,7 +23,6 @@ desktop_in = configure_file( + ) + + i18n.merge_file( +- desktop, + type : 'desktop', + input : desktop_in, + output : desktop, +diff --git a/tests/interactive-panels/applications/meson.build b/tests/interactive-panels/applications/meson.build +index 2657f9588..82eed4d5e 100644 +--- a/tests/interactive-panels/applications/meson.build ++++ b/tests/interactive-panels/applications/meson.build +@@ -12,7 +12,6 @@ desktop_files = [ + + foreach desktop_file : desktop_files + i18n.merge_file( +- desktop, + type : 'desktop', + input : 'gtp-@0@.desktop.in'.format(desktop_file), + output : 'gnome-@0@-panel.desktop'.format(desktop_file), +-- +GitLab + From 5b5a6f1d3710b4ef96c5956512df2023800b5e13 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Tue, 25 Jan 2022 10:11:01 +0100 Subject: [PATCH 26/41] gnome-disk-utility: fix for meson 0.61 --- .../patches/meson-0.61.patch | 34 +++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 srcpkgs/gnome-disk-utility/patches/meson-0.61.patch diff --git a/srcpkgs/gnome-disk-utility/patches/meson-0.61.patch b/srcpkgs/gnome-disk-utility/patches/meson-0.61.patch new file mode 100644 index 000000000000..09e0c33d0798 --- /dev/null +++ b/srcpkgs/gnome-disk-utility/patches/meson-0.61.patch @@ -0,0 +1,34 @@ +From 46ed7d26873b9741dff61f9df8e7778a8dc6f5cc Mon Sep 17 00:00:00 2001 +From: rvalue +Date: Fri, 17 Dec 2021 12:29:30 +0000 +Subject: [PATCH] build: fix arguments of i18n.merge_file + +`i18n.merge_file` has been ignoring positional arguments for a time +and explicitly rejects with error since meson 0.60.0 +--- + data/meson.build | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/data/meson.build b/data/meson.build +index e38a1d8e..38fb5207 100644 +--- a/data/meson.build ++++ b/data/meson.build +@@ -11,7 +11,6 @@ desktops = [ + + foreach desktop: desktops + i18n.merge_file ( +- desktop, + type: 'desktop', + input: desktop + '.in', + output: desktop, +@@ -38,7 +37,6 @@ install_data( + info = 'org.gnome.DiskUtility.appdata.xml' + + i18n.merge_file( +- info, + input: info + '.in', + output: info, + po_dir: po_dir, +-- +GitLab + From 4a9d6f39bd7a0defe75703b6f531dfd208427ac1 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Tue, 25 Jan 2022 10:11:01 +0100 Subject: [PATCH 27/41] gnome-font-viewer: fix for meson 0.61 --- .../patches/meson-0.61.patch | 40 +++++++++++++++++++ 1 file changed, 40 insertions(+) create mode 100644 srcpkgs/gnome-font-viewer/patches/meson-0.61.patch diff --git a/srcpkgs/gnome-font-viewer/patches/meson-0.61.patch b/srcpkgs/gnome-font-viewer/patches/meson-0.61.patch new file mode 100644 index 000000000000..072ce27fd0d2 --- /dev/null +++ b/srcpkgs/gnome-font-viewer/patches/meson-0.61.patch @@ -0,0 +1,40 @@ +From 218166246e29a39e2eac8d3f06976038571b0603 Mon Sep 17 00:00:00 2001 +From: r-value +Date: Thu, 30 Dec 2021 17:14:47 +0800 +Subject: [PATCH] Fix meson build with meson 0.60.0+ + +`i18n.merge_file` has been ignoring positional arguments for a time +and explicitly rejects with error since meson 0.60.0 +--- + data/meson.build | 2 +- + src/meson.build | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/data/meson.build b/data/meson.build +index bfc9caa..8e42134 100644 +--- a/data/meson.build ++++ b/data/meson.build +@@ -1,6 +1,6 @@ + appdatadir = join_paths(datadir, 'metainfo') + appdata_file = 'org.gnome.font-viewer.appdata.xml' +-merged_appdata = i18n.merge_file(appdata_file, ++merged_appdata = i18n.merge_file( + input: appdata_file + '.in', + output: appdata_file, + po_dir: '../po', +diff --git a/src/meson.build b/src/meson.build +index f863d45..826c59b 100644 +--- a/src/meson.build ++++ b/src/meson.build +@@ -39,7 +39,7 @@ desktop_file = 'org.gnome.font-viewer.desktop' + desktop_conf = configuration_data() + desktop_conf.set('VERSION', meson.project_version()) + desktop_conf.set('APPLICATION_ID', application_id) +-i18n.merge_file(desktop_file, ++i18n.merge_file( + input: configure_file(input: desktop_file + '.in.in', + output: desktop_file + '.in', + configuration: desktop_conf), +-- +GitLab + From c9b0fd3ff999c5e77257582203256280e406f7f8 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Tue, 25 Jan 2022 10:11:01 +0100 Subject: [PATCH 28/41] gnome-initial-setup: fix for meson 0.61 --- .../patches/meson-0.61.patch | 40 +++++++++++++++++++ 1 file changed, 40 insertions(+) create mode 100644 srcpkgs/gnome-initial-setup/patches/meson-0.61.patch diff --git a/srcpkgs/gnome-initial-setup/patches/meson-0.61.patch b/srcpkgs/gnome-initial-setup/patches/meson-0.61.patch new file mode 100644 index 000000000000..d69875006b6c --- /dev/null +++ b/srcpkgs/gnome-initial-setup/patches/meson-0.61.patch @@ -0,0 +1,40 @@ +From 6423c28949f667bd9a3a05f017c4b36fc5bf994b Mon Sep 17 00:00:00 2001 +From: Will Thompson +Date: Fri, 17 Dec 2021 11:40:53 +0000 +Subject: [PATCH] build: Fix Meson deprecation warning + + Configuring gnome-initial-setup-copy-worker.desktop.in using configuration + DEPRECATION: i18n.merge_file does not take any positional arguments. This will become a hard error in the next Meson release. + Configuring gnome-initial-setup-first-login.desktop.in using configuration + DEPRECATION: i18n.merge_file does not take any positional arguments. This will become a hard error in the next Meson release. + Configuring gnome-initial-setup.desktop.in using configuration + DEPRECATION: i18n.merge_file does not take any positional arguments. This will become a hard error in the next Meson release. + +These invocations both correctly specify the 'type' keyword argument. +--- + data/meson.build | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/data/meson.build b/data/meson.build +index ae8d9f95..31fa2f93 100644 +--- a/data/meson.build ++++ b/data/meson.build +@@ -31,7 +31,6 @@ desktop_conf.set('systemd_hidden', enable_systemd ? 'true' : 'false') + + foreach desktop_file: autostart_files + i18n.merge_file( +- 'desktop', + input: configure_file( + input: files(desktop_file + '.in.in'), + output: desktop_file + '.in', +@@ -46,7 +45,6 @@ foreach desktop_file: autostart_files + endforeach + + i18n.merge_file( +- 'desktop', + input: configure_file( + input: files('gnome-initial-setup.desktop.in.in'), + output: 'gnome-initial-setup.desktop.in', +-- +GitLab + From 31d1dd5b7eac5a88eeeff4b96c303eb684e2e1a8 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Tue, 25 Jan 2022 10:11:01 +0100 Subject: [PATCH 29/41] gnome-maps: fix for meson 0.61 --- srcpkgs/gnome-maps/patches/meson-0.61.patch | 28 +++++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 srcpkgs/gnome-maps/patches/meson-0.61.patch diff --git a/srcpkgs/gnome-maps/patches/meson-0.61.patch b/srcpkgs/gnome-maps/patches/meson-0.61.patch new file mode 100644 index 000000000000..c3a82764da5b --- /dev/null +++ b/srcpkgs/gnome-maps/patches/meson-0.61.patch @@ -0,0 +1,28 @@ +From def20cbb26e59e5023fe157e691de48d7afe7210 Mon Sep 17 00:00:00 2001 +From: Marcus Lundblad +Date: Fri, 14 Jan 2022 23:33:43 +0100 +Subject: [PATCH] meson: Remove unnesseray argument to i18n.merg_file + +This causes a build failure with meson 0.60 (or later). +Remove it, as it's ignored also for earlier meson versions. + +Fixes #418 +--- + data/meson.build | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/data/meson.build b/data/meson.build +index 30d45db1..fc2c411b 100644 +--- a/data/meson.build ++++ b/data/meson.build +@@ -33,7 +33,6 @@ + appdata = app_id + '.appdata.xml' + + appdata_file = i18n.merge_file( +- appdata, + input: appdata + '.in', + output: appdata, + po_dir: po_dir, +-- +GitLab + From a9715e39c9176f6c245a9d04e35cc2b343beb7d6 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Tue, 25 Jan 2022 10:11:01 +0100 Subject: [PATCH 30/41] gnome-music: fix for meson 0.61 --- srcpkgs/gnome-music/patches/meson-0.61.patch | 30 ++++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 srcpkgs/gnome-music/patches/meson-0.61.patch diff --git a/srcpkgs/gnome-music/patches/meson-0.61.patch b/srcpkgs/gnome-music/patches/meson-0.61.patch new file mode 100644 index 000000000000..aca43b5608a2 --- /dev/null +++ b/srcpkgs/gnome-music/patches/meson-0.61.patch @@ -0,0 +1,30 @@ +From d9f35b542adbf6b0e1114c7c077df04212a98fc7 Mon Sep 17 00:00:00 2001 +From: Jean Felder +Date: Thu, 18 Nov 2021 12:09:26 +0100 +Subject: [PATCH] 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 +--- + data/meson.build | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/data/meson.build b/data/meson.build +index 25ff1e102..145ee5221 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', +-- +GitLab + From 9315abdfff2b46cc5443bdbfb944a43f3011162c Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Tue, 25 Jan 2022 10:11:01 +0100 Subject: [PATCH 31/41] gnome-settings-daemon: fix for meson 0.61 --- .../patches/meson-0.61.patch | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 srcpkgs/gnome-settings-daemon/patches/meson-0.61.patch diff --git a/srcpkgs/gnome-settings-daemon/patches/meson-0.61.patch b/srcpkgs/gnome-settings-daemon/patches/meson-0.61.patch new file mode 100644 index 000000000000..cc1d253553f2 --- /dev/null +++ b/srcpkgs/gnome-settings-daemon/patches/meson-0.61.patch @@ -0,0 +1,20 @@ +--- a/plugins/power/meson.build ++++ b/plugins/power/meson.build +@@ -76,7 +76,6 @@ if host_is_linux + ) + + i18n.merge_file( +- policy, + input: policy_in, + output: policy, + po_dir: po_dir, +--- a/plugins/wacom/meson.build ++++ b/plugins/wacom/meson.build +@@ -7,7 +7,6 @@ policy_in = configure_file( + ) + + i18n.merge_file( +- policy, + input: policy_in, + output: policy, + po_dir: po_dir, From 03a291388e6563cf04bcf6ade5d4854c9d6f2f6c Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Tue, 25 Jan 2022 10:11:01 +0100 Subject: [PATCH 32/41] gnome-shell: fix for meson 0.61 --- srcpkgs/gnome-shell/patches/meson-0.61.patch | 82 ++++++++++++++++++++ 1 file changed, 82 insertions(+) create mode 100644 srcpkgs/gnome-shell/patches/meson-0.61.patch diff --git a/srcpkgs/gnome-shell/patches/meson-0.61.patch b/srcpkgs/gnome-shell/patches/meson-0.61.patch new file mode 100644 index 000000000000..ad3b7ef3923a --- /dev/null +++ b/srcpkgs/gnome-shell/patches/meson-0.61.patch @@ -0,0 +1,82 @@ +From 65450a836ee9e0722a2d4c3327f52345eae293c6 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Florian=20M=C3=BCllner?= +Date: Thu, 23 Dec 2021 17:18:16 +0100 +Subject: [PATCH] build: Drop incorrect positional arg + +Unlike other targets that take a name, i18n.merge_file() does not. + +Part-of: +--- + data/meson.build | 2 +- + src/calendar-server/meson.build | 2 +- + subprojects/extensions-app/data/meson.build | 2 +- + subprojects/extensions-app/data/metainfo/meson.build | 2 +- + subprojects/extensions-tool/src/templates/meson.build | 2 +- + 5 files changed, 5 insertions(+), 5 deletions(-) + +diff --git a/data/meson.build b/data/meson.build +index f924fdf806..76ae45c93a 100644 +--- a/data/meson.build ++++ b/data/meson.build +@@ -16,7 +16,7 @@ desktopconf.set('bindir', bindir) + desktopconf.set('systemd_hidden', have_systemd ? 'true' : 'false') + + foreach desktop_file : desktop_files +- i18n.merge_file('desktop', ++ i18n.merge_file( + input: configure_file( + input: desktop_file + '.in.in', + output: desktop_file + '.in', +diff --git a/src/calendar-server/meson.build b/src/calendar-server/meson.build +index 7363282a59..8b4ef411c8 100644 +--- a/src/calendar-server/meson.build ++++ b/src/calendar-server/meson.build +@@ -27,7 +27,7 @@ configure_file( + install_dir: servicedir + ) + +-i18n.merge_file('evolution-calendar.desktop', ++i18n.merge_file( + input: 'evolution-calendar.desktop.in', + output: 'evolution-calendar.desktop', + po_dir: po_dir, +diff --git a/subprojects/extensions-app/data/meson.build b/subprojects/extensions-app/data/meson.build +index d7e7d4001c..4b601e8bd1 100644 +--- a/subprojects/extensions-app/data/meson.build ++++ b/subprojects/extensions-app/data/meson.build +@@ -14,7 +14,7 @@ desktopconf.set('bindir', bindir) + desktopconf.set('app_id', app_id) + desktopconf.set('prgname', prgname) + +-i18n.merge_file('desktop', ++i18n.merge_file( + input: configure_file( + input: base_id + '.desktop.in.in', + output: desktop_file + '.in', +diff --git a/subprojects/extensions-app/data/metainfo/meson.build b/subprojects/extensions-app/data/metainfo/meson.build +index c4962c0576..a19bfa80a4 100644 +--- a/subprojects/extensions-app/data/metainfo/meson.build ++++ b/subprojects/extensions-app/data/metainfo/meson.build +@@ -1,5 +1,5 @@ + metainfo = app_id + '.metainfo.xml' +-i18n.merge_file(metainfo, ++i18n.merge_file( + input: base_id + '.metainfo.xml.in', + output: metainfo, + po_dir: po_dir, +diff --git a/subprojects/extensions-tool/src/templates/meson.build b/subprojects/extensions-tool/src/templates/meson.build +index 670e2bf448..d693bfaddb 100644 +--- a/subprojects/extensions-tool/src/templates/meson.build ++++ b/subprojects/extensions-tool/src/templates/meson.build +@@ -4,7 +4,7 @@ template_metas = [ + ] + template_deps = [] + foreach template : template_metas +- template_deps += i18n.merge_file(template, ++ template_deps += i18n.merge_file( + input: template + '.in', + output: template, + po_dir: po_dir, +-- +GitLab + From 43004ef14ae7832d84600e64f6796061fd8e563d Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Tue, 25 Jan 2022 10:11:01 +0100 Subject: [PATCH 33/41] gnome-terminal: fix for meson 0.61 --- .../gnome-terminal/patches/meson-0.61.patch | 47 +++++++++++++++++++ 1 file changed, 47 insertions(+) create mode 100644 srcpkgs/gnome-terminal/patches/meson-0.61.patch diff --git a/srcpkgs/gnome-terminal/patches/meson-0.61.patch b/srcpkgs/gnome-terminal/patches/meson-0.61.patch new file mode 100644 index 000000000000..8b6edbb923a2 --- /dev/null +++ b/srcpkgs/gnome-terminal/patches/meson-0.61.patch @@ -0,0 +1,47 @@ +From 9a168cc23962ce9fa106dc8a40407d381a3db403 Mon Sep 17 00:00:00 2001 +From: Christian Persch +Date: Fri, 14 Jan 2022 11:33:32 +0100 +Subject: [PATCH] build: Fix for newer meson + +--- + data/meson.build | 5 +---- + 1 file changed, 1 insertion(+), 4 deletions(-) + +diff --git a/data/meson.build b/data/meson.build +index 79d97e5b..e0bcbb91 100644 +--- a/data/meson.build ++++ b/data/meson.build +@@ -18,7 +18,6 @@ + metainfodir = gt_datadir / 'metainfo' + + i18n.merge_file( +- gt_dns_name + '.metainfo.xml', + input: gt_dns_name + '.metainfo.xml.in', + output: '@BASENAME@', + po_dir: po_dir, +@@ -27,7 +26,6 @@ i18n.merge_file( + ) + + i18n.merge_file( +- gt_dns_name + '.Nautilus.metainfo.xml', + input: gt_dns_name + '.Nautilus.metainfo.xml.in', + output: '@BASENAME@', + po_dir: po_dir, +@@ -40,7 +38,6 @@ i18n.merge_file( + desktopdatadir = gt_datadir / 'applications' + + i18n.merge_file( +- gt_dns_name + '.desktop', + input: gt_dns_name + '.desktop.in', + output: '@BASENAME@', + type: 'desktop', +@@ -57,4 +54,4 @@ meson.add_install_script( + + # Subdirs + +-subdir('icons') +\ No newline at end of file ++subdir('icons') +-- +GitLab + From 8e8334ceef969fa25dec92d5868e260acb5060d1 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Tue, 25 Jan 2022 10:11:01 +0100 Subject: [PATCH 34/41] gnome-weather: fix for meson 0.61 --- srcpkgs/gnome-weather/patches/meson-0.61.patch | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 srcpkgs/gnome-weather/patches/meson-0.61.patch diff --git a/srcpkgs/gnome-weather/patches/meson-0.61.patch b/srcpkgs/gnome-weather/patches/meson-0.61.patch new file mode 100644 index 000000000000..a305b8c54dc4 --- /dev/null +++ b/srcpkgs/gnome-weather/patches/meson-0.61.patch @@ -0,0 +1,10 @@ +--- a/data/meson.build ++++ b/data/meson.build +@@ -59,7 +59,6 @@ endif + appdata_conf = configuration_data() + appdata_conf.set('app_id', weather_id) + appdata = i18n.merge_file( +- 'appdata', + input: configure_file( + input: '@0@.appdata.xml.in.in'.format(default_id), + output: '@0@.appdata.xml.in'.format(default_id), From cf1444266a23602d97b3bc06b2ee4295d26e8c1b Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Tue, 25 Jan 2022 10:11:01 +0100 Subject: [PATCH 35/41] gobject-introspection: fix for meson 0.61 --- .../patches/meson-0.61.patch | 294 ++++++++++++++++++ 1 file changed, 294 insertions(+) create mode 100644 srcpkgs/gobject-introspection/patches/meson-0.61.patch diff --git a/srcpkgs/gobject-introspection/patches/meson-0.61.patch b/srcpkgs/gobject-introspection/patches/meson-0.61.patch new file mode 100644 index 000000000000..44bf409b1164 --- /dev/null +++ b/srcpkgs/gobject-introspection/patches/meson-0.61.patch @@ -0,0 +1,294 @@ +From 827494d6415b696a98fa195cbd883b50cc893bfc Mon Sep 17 00:00:00 2001 +From: Emmanuele Bassi +Date: Tue, 11 Jan 2022 15:47:50 +0000 +Subject: [PATCH] doctool: Add templates_dir CLI argument + +We can find the templates directory using the module file once +installed, but when running uninstalled we need to have a way to specify +where the templates can be found in the sources directory. +--- + giscanner/docmain.py | 4 +++- + giscanner/docwriter.py | 14 ++++++++------ + 2 files changed, 11 insertions(+), 7 deletions(-) + +diff --git a/giscanner/docmain.py b/giscanner/docmain.py +index dab063ef..88430f05 100644 +--- a/giscanner/docmain.py ++++ b/giscanner/docmain.py +@@ -51,6 +51,8 @@ def doc_main(args): + parser.add_argument("-s", "--write-sections-file", + action="store_const", dest="format", const="sections", + help="Backwards-compatible equivalent to -f sections") ++ parser.add_argument("--templates-dir", ++ action="store") + + args = parser.parse_args(args[1:]) + if not args.output: +@@ -74,7 +76,7 @@ def doc_main(args): + with open(args.output, 'w', encoding='utf-8') as fp: + write_sections_file(fp, sections_file) + else: +- writer = DocWriter(transformer, args.language, args.format) ++ writer = DocWriter(transformer, args.language, args.format, args.templates_dir) + writer.write(args.output) + + return 0 +diff --git a/giscanner/docwriter.py b/giscanner/docwriter.py +index d0cd610f..b72ab2ac 100644 +--- a/giscanner/docwriter.py ++++ b/giscanner/docwriter.py +@@ -1288,7 +1288,7 @@ LANGUAGES = { + + + class DocWriter(object): +- def __init__(self, transformer, language, output_format): ++ def __init__(self, transformer, language, output_format, templates_dir=None): + self._transformer = transformer + + try: +@@ -1300,18 +1300,20 @@ class DocWriter(object): + self._formatter = formatter_class(self._transformer) + self._language = self._formatter.language + self._output_format = output_format ++ self._templates_dir = templates_dir + + self._lookup = self._get_template_lookup() + + def _get_template_lookup(self): +- if 'UNINSTALLED_INTROSPECTION_SRCDIR' in os.environ: ++ if self._templates_dir is not None: ++ srcdir = self._templates_dir ++ elif 'UNINSTALLED_INTROSPECTION_SRCDIR' in os.environ: + top_srcdir = os.environ['UNINSTALLED_INTROSPECTION_SRCDIR'] +- srcdir = os.path.join(top_srcdir, 'giscanner') ++ srcdir = os.path.join(top_srcdir, 'giscanner', 'doctemplates') + else: +- srcdir = os.path.dirname(__file__) ++ srcdir = os.path.join(os.path.dirname(__file__), 'doctemplates') + +- template_dir = os.path.join(srcdir, 'doctemplates', +- self._formatter.output_format) ++ template_dir = os.path.join(srcdir, self._formatter.output_format) + + return TemplateLookup(directories=[template_dir], + module_directory=tempfile.mkdtemp(), +-- +GitLab + +From effb1e09dee263cdac4ec593e8caf316e6f01fe2 Mon Sep 17 00:00:00 2001 +From: Emmanuele Bassi +Date: Tue, 11 Jan 2022 15:51:10 +0000 +Subject: [PATCH] build: Avoid the doctemplates hack +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +The hack that copies the doctemplates directory into the build +directory has stopped working with newer versions of Meson; while it's +possible to copy files, custom_target() cannot depend on a directory. +Additionally, the dependency has always been broken. + +Instead, we enumerate the template files—after all, it's not like they +change a lot—and then we list them as dependencies for the test targets. + +Fixes: #414 +--- + giscanner/doctemplates/devdocs/meson.build | 19 +++++++ + giscanner/doctemplates/mallard/meson.build | 63 ++++++++++++++++++++++ + giscanner/meson.build | 14 ++--- + tests/scanner/meson.build | 24 +++++---- + 4 files changed, 98 insertions(+), 22 deletions(-) + create mode 100644 giscanner/doctemplates/devdocs/meson.build + create mode 100644 giscanner/doctemplates/mallard/meson.build + +diff --git a/giscanner/doctemplates/devdocs/meson.build b/giscanner/doctemplates/devdocs/meson.build +new file mode 100644 +index 00000000..2037182a +--- /dev/null ++++ b/giscanner/doctemplates/devdocs/meson.build +@@ -0,0 +1,19 @@ ++doc_templates += files([ ++ 'Gjs/_doc.tmpl', ++ 'Gjs/_index.tmpl', ++ 'Gjs/_method.tmpl', ++ 'Gjs/_methods.tmpl', ++ 'Gjs/_properties.tmpl', ++ 'Gjs/_signals.tmpl', ++ 'Gjs/_staticmethods.tmpl', ++ 'Gjs/_vfuncs.tmpl', ++ 'Gjs/base.tmpl', ++ 'Gjs/callback.tmpl', ++ 'Gjs/class.tmpl', ++ 'Gjs/default.tmpl', ++ 'Gjs/enum.tmpl', ++ 'Gjs/function.tmpl', ++ 'Gjs/interface.tmpl', ++ 'Gjs/method.tmpl', ++ 'Gjs/namespace.tmpl', ++]) +diff --git a/giscanner/doctemplates/mallard/meson.build b/giscanner/doctemplates/mallard/meson.build +new file mode 100644 +index 00000000..5fe4e2af +--- /dev/null ++++ b/giscanner/doctemplates/mallard/meson.build +@@ -0,0 +1,63 @@ ++base_templates = files([ ++ 'base.tmpl', ++ 'class.tmpl', ++ 'namespace.tmpl', ++]) ++ ++c_templates = files([ ++ 'C/callback.tmpl', ++ 'C/class.tmpl', ++ 'C/constructor.tmpl', ++ 'C/default.tmpl', ++ 'C/enum.tmpl', ++ 'C/field.tmpl', ++ 'C/function.tmpl', ++ 'C/interface.tmpl', ++ 'C/method.tmpl', ++ 'C/namespace.tmpl', ++ 'C/property.tmpl', ++ 'C/record.tmpl', ++ 'C/signal.tmpl', ++ 'C/vfunc.tmpl', ++]) ++ ++gjs_templates = files([ ++ 'Gjs/callback.tmpl', ++ 'Gjs/class.tmpl', ++ 'Gjs/constructor.tmpl', ++ 'Gjs/default.tmpl', ++ 'Gjs/enum.tmpl', ++ 'Gjs/field.tmpl', ++ 'Gjs/function.tmpl', ++ 'Gjs/interface.tmpl', ++ 'Gjs/method.tmpl', ++ 'Gjs/namespace.tmpl', ++ 'Gjs/property.tmpl', ++ 'Gjs/record.tmpl', ++ 'Gjs/signal.tmpl', ++ 'Gjs/vfunc.tmpl', ++]) ++ ++py_templates = files([ ++ 'Python/callback.tmpl', ++ 'Python/class.tmpl', ++ 'Python/constructor.tmpl', ++ 'Python/default.tmpl', ++ 'Python/enum.tmpl', ++ 'Python/field.tmpl', ++ 'Python/function.tmpl', ++ 'Python/interface.tmpl', ++ 'Python/method.tmpl', ++ 'Python/namespace.tmpl', ++ 'Python/property.tmpl', ++ 'Python/record.tmpl', ++ 'Python/signal.tmpl', ++ 'Python/vfunc.tmpl', ++]) ++ ++doc_templates += [ ++ base_templates, ++ c_templates, ++ gjs_templates, ++ py_templates, ++] +diff --git a/giscanner/meson.build b/giscanner/meson.build +index 41edcd44..3d7dc678 100644 +--- a/giscanner/meson.build ++++ b/giscanner/meson.build +@@ -53,17 +53,9 @@ configure_file(input : '../girepository/gdump.c', + + install_subdir('doctemplates', install_dir: giscannerdir) + +-# XXX: this doesn't track the input, but there is nothing to copy many files +-# in meson. +-doc_templates = custom_target('copy-templates', +- input : 'doctemplates', +- output : 'doctemplates', +- command : [ +- python, '-c', +- 'import sys, shutil;' + +- 'shutil.rmtree(sys.argv[2], ignore_errors=True);' + +- 'shutil.copytree(sys.argv[1], sys.argv[2])', +- '@INPUT@', '@OUTPUT@']) ++doc_templates = [] ++subdir('doctemplates/devdocs') ++subdir('doctemplates/mallard') + + flex = find_program('flex', 'win_flex') + bison = find_program('bison', 'win_bison') +diff --git a/tests/scanner/meson.build b/tests/scanner/meson.build +index 5176b957..b81b3fd5 100644 +--- a/tests/scanner/meson.build ++++ b/tests/scanner/meson.build +@@ -525,19 +525,26 @@ foreach gir : test_girs + endforeach + + if has_girdoctool and glib_dep.type_name() == 'pkgconfig' ++ doctool_env = environment() ++ doctool_env.set('srcdir', meson.current_source_dir()) ++ doctool_env.set('builddir', meson.current_build_dir()) ++ + foreach language : ['C', 'Python', 'Gjs'] + regress_docs = custom_target( + 'generate-docs-' + language, + input: regress_gir, +- depends: [doc_templates], ++ depend_files: doc_templates, + build_by_default: not cairo_deps_found, ++ env: doctool_env, + output: 'Regress-1.0-' + language, + command: [ + python, girdoctool, + '--add-include-path=' + join_paths(build_root, 'gir'), + '--add-include-path=' + meson.current_build_dir(), + '--language', language, +- '@INPUT@', '-o', '@OUTPUT@'], ++ '--templates-dir=' + join_paths(meson.current_source_dir(), '../../giscanner/doctemplates'), ++ '@INPUT@', '-o', '@OUTPUT@', ++ ], + ) + + if cairo_deps_found +@@ -546,10 +553,7 @@ if has_girdoctool and glib_dep.type_name() == 'pkgconfig' + python, + args: [gi_tester, 'Regress-1.0-' + language], + depends: [regress_docs], +- env: [ +- 'srcdir=' + meson.current_source_dir(), +- 'builddir=' + meson.current_build_dir(), +- ], ++ env: doctool_env, + ) + endif + endforeach +@@ -557,9 +561,10 @@ if has_girdoctool and glib_dep.type_name() == 'pkgconfig' + regress_sections = custom_target( + 'generate-docs-sections', + input: regress_gir, +- depends: [doc_templates], ++ depend_files: [doc_templates], + build_by_default: not cairo_deps_found, + output: 'Regress-1.0-sections.txt', ++ env: doctool_env, + command: [ + python, girdoctool, + '--add-include-path=' + join_paths(build_root, 'gir'), +@@ -574,10 +579,7 @@ if has_girdoctool and glib_dep.type_name() == 'pkgconfig' + python, + args: [gi_tester, 'Regress-1.0-sections.txt'], + depends: [regress_sections], +- env: [ +- 'srcdir=' + meson.current_source_dir(), +- 'builddir=' + meson.current_build_dir(), +- ], ++ env: doctool_env, + ) + endif + endif +-- +GitLab + From e3730ee44dbdee10bcaf79f5a71bc467275e35f4 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Tue, 25 Jan 2022 10:11:01 +0100 Subject: [PATCH 36/41] gthumb: fix for meson 0.61 --- .../patches/linguas-remove-duplicate.patch | 24 +++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 srcpkgs/gthumb/patches/linguas-remove-duplicate.patch diff --git a/srcpkgs/gthumb/patches/linguas-remove-duplicate.patch b/srcpkgs/gthumb/patches/linguas-remove-duplicate.patch new file mode 100644 index 000000000000..00e9dde84669 --- /dev/null +++ b/srcpkgs/gthumb/patches/linguas-remove-duplicate.patch @@ -0,0 +1,24 @@ +From daef485dffd67319c114cf1bda453bf6157e11ff Mon Sep 17 00:00:00 2001 +From: Paolo Bacchilega +Date: Tue, 11 Jan 2022 12:30:44 +0100 +Subject: [PATCH] LINGUAS: removed duplicated entry + +--- + help/LINGUAS | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/help/LINGUAS b/help/LINGUAS +index b615195e..aabf71ac 100644 +--- a/help/LINGUAS ++++ b/help/LINGUAS +@@ -9,7 +9,6 @@ eu + fr + hu + id +-id + nl + oc + sl +-- +GitLab + From d1a3f13239eef69e0042654bdcf29989df82a1db Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Tue, 25 Jan 2022 10:11:02 +0100 Subject: [PATCH 37/41] p11-kit: fix for meson 0.61 --- srcpkgs/p11-kit/patches/meson-0.61.patch | 42 ++++++++++++++++++++++++ 1 file changed, 42 insertions(+) create mode 100644 srcpkgs/p11-kit/patches/meson-0.61.patch diff --git a/srcpkgs/p11-kit/patches/meson-0.61.patch b/srcpkgs/p11-kit/patches/meson-0.61.patch new file mode 100644 index 000000000000..c8b6d6cf3ef4 --- /dev/null +++ b/srcpkgs/p11-kit/patches/meson-0.61.patch @@ -0,0 +1,42 @@ +From 18c5f0f8b931c2ddd4a13ae06048630f50341bc6 Mon Sep 17 00:00:00 2001 +From: Eli Schwartz +Date: Tue, 11 Jan 2022 23:25:05 -0500 +Subject: [PATCH] gtkdoc: remove dependencies on custom target files + +Sadly, the `dependencies` kwarg does not actually do what it seems to be +trying to be used for, here. It is for listing dependency or library +objects whose compiler flags should be added to gtkdoc-scangobj. + +It will not actually add ninja target dependencies. The similar kwarg in +other meson functions (e.g. genmarshal and compile_schemas) that *do* +allow adding target dependencies, is `depend_files`. + +Older versions of meson simply did nothing in an if/elif/elif block +where these custom_targets never matched anything, and were thus +silently ignored. + +Meson 0.61 type-validates the arguments and rejects CustomTarget as +invalid: + +``` +doc/manual/meson.build:72:8: ERROR: gnome.gtkdoc keyword argument 'dependencies' was of type array[CustomTarget | PkgConfigDependency] but should have been array[Dependency | SharedLibrary | StaticLibrary] +``` + +Fixes #406 +--- + doc/manual/meson.build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/doc/manual/meson.build b/doc/manual/meson.build +index cf8758db..560df8db 100644 +--- a/doc/manual/meson.build ++++ b/doc/manual/meson.build +@@ -73,7 +73,7 @@ if get_option('gtk_doc') + main_xml: 'p11-kit-docs.xml', + namespace: 'p11_kit', + src_dir: 'p11-kit', +- dependencies: libffi_deps + dlopen_deps + xml_deps, ++ dependencies: libffi_deps + dlopen_deps, + scan_args: [ + '--ignore-headers=' + ' '.join(ignore_headers), + '--rebuild-types', From 83280497ea557bf6be1737cab2a7d34aaf1a68db Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Tue, 25 Jan 2022 10:11:02 +0100 Subject: [PATCH 38/41] shotwell: fix for meson 0.61 --- srcpkgs/shotwell/patches/meson-0.61.patch | 27 +++++++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 srcpkgs/shotwell/patches/meson-0.61.patch diff --git a/srcpkgs/shotwell/patches/meson-0.61.patch b/srcpkgs/shotwell/patches/meson-0.61.patch new file mode 100644 index 000000000000..f33fa2af1637 --- /dev/null +++ b/srcpkgs/shotwell/patches/meson-0.61.patch @@ -0,0 +1,27 @@ +From cc328b43ebb9a54a256ec73a86fb18381b2038e6 Mon Sep 17 00:00:00 2001 +From: Eli Schwartz +Date: Tue, 11 Jan 2022 21:57:26 -0500 +Subject: [PATCH] fix duplicate languages causing meson 0.61 to error out + +It tried to create multiple targets with the same name and generating +the same file. On older versions of meson, this was a run_target and +just ran twice, but was still wrong. +--- + help/LINGUAS | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/help/LINGUAS b/help/LINGUAS +index 68f089c4..5352eecd 100644 +--- a/help/LINGUAS ++++ b/help/LINGUAS +@@ -6,7 +6,6 @@ es + fr + hu + id +-id + lv + pt_BR + sv +-- +GitLab + From 3f87f64ca8e8fae91f1115ecbef5cd021465be49 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Tue, 25 Jan 2022 10:11:02 +0100 Subject: [PATCH 39/41] totem: fix for meson 0.61 --- srcpkgs/totem/patches/meson-0.61.patch | 39 ++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 srcpkgs/totem/patches/meson-0.61.patch diff --git a/srcpkgs/totem/patches/meson-0.61.patch b/srcpkgs/totem/patches/meson-0.61.patch new file mode 100644 index 000000000000..8f05c5c7a015 --- /dev/null +++ b/srcpkgs/totem/patches/meson-0.61.patch @@ -0,0 +1,39 @@ +From 61e3a957cb7339c6614e764fcf1120d967d687e9 Mon Sep 17 00:00:00 2001 +From: Bastien Nocera +Date: Thu, 6 Jan 2022 17:21:28 +0100 +Subject: [PATCH] build: Remove unused i18n.merge_file() "name" + +data/meson.build:78:0: ERROR: Function does not take positional arguments. +data/appdata/meson.build:3:0: ERROR: Function does not take positional arguments. +--- + data/appdata/meson.build | 1 - + data/meson.build | 1 - + 2 files changed, 2 deletions(-) + +diff --git a/data/appdata/meson.build b/data/appdata/meson.build +index c4d17e927..c2e646327 100644 +--- a/data/appdata/meson.build ++++ b/data/appdata/meson.build +@@ -1,7 +1,6 @@ + appdata = 'org.gnome.Totem.appdata.xml' + + appdata_file = i18n.merge_file ( +- 'appdata', + input: appdata + '.in', + output: appdata, + install: true, +diff --git a/data/meson.build b/data/meson.build +index b31ce755c..8eebe3db1 100644 +--- a/data/meson.build ++++ b/data/meson.build +@@ -76,7 +76,6 @@ desktop_in = configure_file( + ) + + desktop_file = i18n.merge_file ( +- desktop, + type: 'desktop', + input: desktop_in, + output: desktop, +-- +GitLab + From 6cbdb53123a7dc0fee3a72a21483946db79a3407 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Tue, 25 Jan 2022 10:11:02 +0100 Subject: [PATCH 40/41] virt-viewer: fix for meson 0.61 --- srcpkgs/virt-viewer/patches/meson-0.61.patch | 41 ++++++++++++++++++++ 1 file changed, 41 insertions(+) create mode 100644 srcpkgs/virt-viewer/patches/meson-0.61.patch diff --git a/srcpkgs/virt-viewer/patches/meson-0.61.patch b/srcpkgs/virt-viewer/patches/meson-0.61.patch new file mode 100644 index 000000000000..5432b7f53237 --- /dev/null +++ b/srcpkgs/virt-viewer/patches/meson-0.61.patch @@ -0,0 +1,41 @@ +From 41cc016278e713d3db156761fce6437dff81a53a Mon Sep 17 00:00:00 2001 +From: Michal Vasilek +Date: Sat, 22 Jan 2022 23:28:20 +0100 +Subject: [PATCH] meson: fix build with meson 0.61 + +i18n.merge_file doesn't accept positional arguments +--- + data/meson.build | 3 --- + 1 file changed, 3 deletions(-) + +diff --git a/data/meson.build b/data/meson.build +index d718491..4325108 100644 +--- a/data/meson.build ++++ b/data/meson.build +@@ -2,7 +2,6 @@ if host_machine.system() != 'windows' + desktop = 'remote-viewer.desktop' + + i18n.merge_file ( +- desktop, + type: 'desktop', + input: desktop + '.in', + output: desktop, +@@ -14,7 +13,6 @@ if host_machine.system() != 'windows' + mimetypes = 'virt-viewer-mime.xml' + + i18n.merge_file ( +- mimetypes, + type: 'xml', + input: mimetypes + '.in', + output: mimetypes, +@@ -27,7 +25,6 @@ if host_machine.system() != 'windows' + metainfo = 'remote-viewer.appdata.xml' + + i18n.merge_file ( +- metainfo, + type: 'xml', + input: metainfo + '.in', + output: metainfo, +-- +2.34.1 + From 6ef59b18947f871bd9687cbe4ca0b6356e5d1adf Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Tue, 25 Jan 2022 10:11:02 +0100 Subject: [PATCH 41/41] zathura: fix for meson 0.61 --- srcpkgs/zathura/patches/meson-0.61.patch | 34 ++++++++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 srcpkgs/zathura/patches/meson-0.61.patch diff --git a/srcpkgs/zathura/patches/meson-0.61.patch b/srcpkgs/zathura/patches/meson-0.61.patch new file mode 100644 index 000000000000..3ab1bf60e171 --- /dev/null +++ b/srcpkgs/zathura/patches/meson-0.61.patch @@ -0,0 +1,34 @@ +From c6ec5044c5ff843979050bfb81742d14740bb656 Mon Sep 17 00:00:00 2001 +From: Sebastian Ramacher +Date: Sat, 30 Oct 2021 15:41:25 +0200 +Subject: [PATCH] Fix build with meson 0.60 + +--- + data/meson.build | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/data/meson.build b/data/meson.build +index 4fd602e..464ff3a 100644 +--- a/data/meson.build ++++ b/data/meson.build +@@ -19,7 +19,7 @@ endif + i18n = import('i18n') + podir = join_paths(meson.project_source_root(), 'po') + +-desktop = i18n.merge_file('desktop', ++desktop = i18n.merge_file( + input: 'org.pwmt.zathura.desktop.in', + output: 'org.pwmt.zathura.desktop', + install: true, +@@ -28,7 +28,7 @@ desktop = i18n.merge_file('desktop', + type: 'desktop' + ) + +-appdata = i18n.merge_file('appdata', ++appdata = i18n.merge_file( + input: 'org.pwmt.zathura.appdata.xml.in', + output: 'org.pwmt.zathura.appdata.xml', + install: true, +-- +2.26.2 +