* [PR PATCH] meson 0.61
@ 2022-01-25 9:13 paper42
2022-03-15 21:28 ` [PR PATCH] [Updated] " paper42
` (4 more replies)
0 siblings, 5 replies; 6+ messages in thread
From: paper42 @ 2022-01-25 9:13 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1243 bytes --]
There is a new pull request by paper42 against master on the void-packages repository
https://github.com/paper42/void-packages meson-0.61
https://github.com/void-linux/void-packages/pull/35226
meson 0.61
WIP, many packages still need to be fixed
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration)
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/35226.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-meson-0.61-35226.patch --]
[-- Type: text/x-diff, Size: 107229 bytes --]
From 5c317f14581e16fc1ad5978d7724e8fc2afa690a Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
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 <michal@vasilek.cz>
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 <Marc-Antoine@Perennou.com>
+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 <Marc-Antoine@Perennou.com>
+---
+ 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 <michal@vasilek.cz>
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 <michal@vasilek.cz>
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 <bluca@debian.org>
+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 <michal@vasilek.cz>
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 <chpe@src.gnome.org>
+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 <michal@vasilek.cz>
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 <mhaquila@pharosmaris.net>
+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 <michal@vasilek.cz>
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 <michal@vasilek.cz>
+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 <michal@vasilek.cz>
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 <jon.turney@dronecode.org.uk>
+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 <michal@vasilek.cz>
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 <eschwartz@archlinux.org>
+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 <michal@vasilek.cz>
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 <michal@vasilek.cz>
+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 <michal@vasilek.cz>
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 <alex@linutronix.de>
+Date: Fri, 21 Jan 2022 22:22:58 +0100
+Subject: [PATCH] editor/meson.build: fix meson 0.61 errors
+
+Signed-off-by: Alexander Kanavin <alex@linutronix.de>
+---
+ 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 <michal@vasilek.cz>
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 <i@rvalue.moe>
+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 <michal@vasilek.cz>
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 <bruce.richardson@intel.com>
+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 <bruce.richardson@intel.com>
+Acked-by: Luca Boccassi <bluca@debian.org>
+---
+ 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 <michal@vasilek.cz>
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 <i@rvalue.moe>
+Date: Wed, 24 Nov 2021 04:52:42 +0000
+Subject: [PATCH] Remove incorrect args for i18n.merge_file
+
+Part-of: <https://gitlab.gnome.org/GNOME/epiphany/-/merge_requests/1031>
+---
+ 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 <michal@vasilek.cz>
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 <i@rvalue.moe>
+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 <michal@vasilek.cz>
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?= <mail@3v1n0.net>
+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 <eschwartz@archlinux.org>
+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 <eschwartz@archlinux.org>
+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 <michal@vasilek.cz>
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 <jplatte+git@posteo.de>
+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 <michal@vasilek.cz>
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 <jakub@jirutka.cz>
+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 <michal@vasilek.cz>
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 <i@rvalue.moe>
+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 <michal@vasilek.cz>
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 <michal@vasilek.cz>
+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 <michal@vasilek.cz>
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 <michal@vasilek.cz>
+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 <michal@vasilek.cz>
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 <michal@vasilek.cz>
+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 <michal@vasilek.cz>
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 <michal@vasilek.cz>
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 <michal@vasilek.cz>
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 <jbeich@FreeBSD.org>
+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 <michal@vasilek.cz>
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 <i@rvalue.moe>
+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 <michal@vasilek.cz>
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 <i@rvalue.moe>
+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 <michal@vasilek.cz>
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 <will@willthompson.co.uk>
+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 <michal@vasilek.cz>
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 <ml@update.uu.se>
+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 <michal@vasilek.cz>
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 <jfelder@src.gnome.org>
+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 <michal@vasilek.cz>
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 <michal@vasilek.cz>
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?= <fmuellner@gnome.org>
+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: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/2078>
+---
+ 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 <michal@vasilek.cz>
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 <chpe@src.gnome.org>
+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 <michal@vasilek.cz>
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 <michal@vasilek.cz>
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 <ebassi@gnome.org>
+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 <ebassi@gnome.org>
+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 <michal@vasilek.cz>
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 <paobac@src.gnome.org>
+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 <michal@vasilek.cz>
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 <eschwartz@archlinux.org>
+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 <michal@vasilek.cz>
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 <eschwartz@archlinux.org>
+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 <michal@vasilek.cz>
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 <hadess@hadess.net>
+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 <michal@vasilek.cz>
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 <michal@vasilek.cz>
+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 <michal@vasilek.cz>
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 <sebastian@ramacher.at>
+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
+
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PR PATCH] [Updated] meson 0.61
2022-01-25 9:13 [PR PATCH] meson 0.61 paper42
@ 2022-03-15 21:28 ` paper42
2022-03-16 23:16 ` paper42
` (3 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: paper42 @ 2022-03-15 21:28 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1248 bytes --]
There is an updated pull request by paper42 against master on the void-packages repository
https://github.com/paper42/void-packages meson-0.61
https://github.com/void-linux/void-packages/pull/35226
meson 0.61
WIP, many packages still need to be fixed
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration)
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/35226.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-meson-0.61-35226.patch --]
[-- Type: text/x-diff, Size: 169935 bytes --]
From df6d8783c3a0a7a0d7adbf8822d28148c42797d1 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 10 Mar 2022 22:09:02 +0100
Subject: [PATCH 01/82] granite: update to 6.2.0.
---
common/shlibs | 2 +-
srcpkgs/granite/template | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 230fc6a994c0..b954a2c71843 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1190,7 +1190,7 @@ libconfig.so.11 libconfig-1.7.1_1
libopusfile.so.0 opusfile-0.12_2
libopusurl.so.0 opusfile-0.12_2
libopusenc.so.0 libopusenc-0.2_1
-libgranite.so.5 granite-0.5.0_1
+libgranite.so.6 granite-6.2.0_1
libprotobuf-vala.so.0 libprotobuf-vala-0.1.0_1
librlog.so.5 librlog-1.4_1
libtinyxml.so.0 tinyxml-2.6.2_1
diff --git a/srcpkgs/granite/template b/srcpkgs/granite/template
index 2ae77d6ee66c..f3a53c4165bb 100644
--- a/srcpkgs/granite/template
+++ b/srcpkgs/granite/template
@@ -1,10 +1,10 @@
# Template file for 'granite'
pkgname=granite
-version=5.5.0
+version=6.2.0
revision=1
build_style=meson
build_helper="gir"
-hostmakedepends="pkg-config vala"
+hostmakedepends="pkg-config gettext vala"
makedepends="gtk+3-devel libgee08-devel"
depends="hicolor-icon-theme"
short_desc="GTK3 widget library for elementary OS"
@@ -12,7 +12,7 @@ maintainer="Cameron Nemo <cnemo@tutanota.com>"
license="LGPL-3.0-or-later"
homepage="https://github.com/elementary/granite"
distfiles="https://github.com/elementary/granite/archive/${version}.tar.gz"
-checksum=0c376520c7d462fca05213a14970ee1075fea4a78062a33b47529e2647cd5557
+checksum=067d31445da9808a802fca523630c3e4b84d2d7c78ae547ced017cb7f3b9c6b5
granite-devel_package() {
depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
From 138fa89fa9d6df9e685a9a1d5f41f826eff69677 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 10 Mar 2022 22:08:02 +0100
Subject: [PATCH 02/82] Minder: revbump for granite 6, build translations
---
srcpkgs/Minder/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/Minder/template b/srcpkgs/Minder/template
index da4f9b751c20..8ee716a6f9f3 100644
--- a/srcpkgs/Minder/template
+++ b/srcpkgs/Minder/template
@@ -1,9 +1,9 @@
# Template file for 'Minder'
pkgname=Minder
version=1.14.0
-revision=1
+revision=2
build_style=meson
-hostmakedepends="pkg-config glib-devel vala"
+hostmakedepends="pkg-config gettext glib-devel vala"
makedepends="cairo-devel granite-devel gtk+3-devel libxml2-devel libgee08-devel
libarchive-devel discount-devel gtksourceview4-devel libhandy1-devel json-glib-devel"
short_desc="Mind-mapping application designed for Pantheon"
From 8bf1528d788a3b73f858fd6bbda6e231433c2980 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 10 Mar 2022 22:08:02 +0100
Subject: [PATCH 03/82] bookworm: revbump for granite 6, build translations
---
srcpkgs/bookworm/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/bookworm/template b/srcpkgs/bookworm/template
index 3e319fb786d9..0205a6e62427 100644
--- a/srcpkgs/bookworm/template
+++ b/srcpkgs/bookworm/template
@@ -1,9 +1,9 @@
# Template file for 'bookworm'
pkgname=bookworm
version=1.1.2
-revision=4
+revision=5
build_style=meson
-hostmakedepends="pkg-config glib-devel vala"
+hostmakedepends="pkg-config glib-devel gettext vala"
makedepends="gtk+3-devel libgee08-devel granite-devel
webkit2gtk-devel sqlite-devel poppler-glib-devel
libxml2-devel glib-devel libsoup-devel"
From 006ec63c8f9858ed28c4fdf34f97442ebc0b691a Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 10 Mar 2022 22:08:04 +0100
Subject: [PATCH 04/82] notes-up: update to 2.0.6.
---
srcpkgs/notes-up/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/notes-up/template b/srcpkgs/notes-up/template
index 481a214cfbc2..55db14d47b32 100644
--- a/srcpkgs/notes-up/template
+++ b/srcpkgs/notes-up/template
@@ -1,6 +1,6 @@
# Template file for 'notes-up'
pkgname=notes-up
-version=2.0.5
+version=2.0.6
revision=1
wrksrc=Notes-up-${version}
build_style=meson
@@ -13,7 +13,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later, BSD-3-Clause"
homepage="https://github.com/Philip-Scott/Notes-up"
distfiles="https://github.com/Philip-Scott/Notes-up/archive/${version}.tar.gz"
-checksum=56ddf5ab3468c3bbb806106c41b485b020ade3c7f48d271bda1e78ddce5e1664
+checksum=6e7b6ac4a3a917867a1555db0a6e03e40ccd9955b5d76e980a26fa8e40744f07
post_install() {
ln -s com.github.philip_scott.notes-up ${DESTDIR}/usr/bin/notes-up
From c37b4e93c369ad34292d9351a92559b66b174985 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 10 Mar 2022 22:08:04 +0100
Subject: [PATCH 05/82] nutty: revbump for granite 6, build translations
---
srcpkgs/nutty/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/nutty/template b/srcpkgs/nutty/template
index 37396577835b..eb263a89af4d 100644
--- a/srcpkgs/nutty/template
+++ b/srcpkgs/nutty/template
@@ -1,18 +1,18 @@
# Template file for 'nutty'
pkgname=nutty
version=1.1.1
-revision=1
+revision=2
build_style=meson
-hostmakedepends="pkg-config vala glib-devel"
+hostmakedepends="pkg-config gettext vala glib-devel"
makedepends="gtk+3-devel libgee08-devel libnotify-devel granite-devel
sqlite-devel"
short_desc="Network Utility"
maintainer="linarcx <linarcx@riseup.net>"
license="GPL-3.0-or-later"
homepage="https://github.com/babluboy/nutty"
-distfiles="${homepage}/archive/${version}.tar.gz"
+distfiles="https://github.com/babluboy/nutty/archive/${version}.tar.gz"
checksum=b6c9ef1966d1c60480943313f20cd66ee1b5d23ac8d6578f457fb99f0898d9ba
-python_version=2 #unverified
+python_version=2
post_install() {
vinstall data/com.github.babluboy.nutty.desktop 644 usr/share/applications
From 2c1b71d66793427d40aa3fdf9600cd7bd5496bcb Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 10 Mar 2022 22:08:04 +0100
Subject: [PATCH 06/82] pantheon-agent-polkit: update to 1.0.0.
---
srcpkgs/pantheon-agent-polkit/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/pantheon-agent-polkit/template b/srcpkgs/pantheon-agent-polkit/template
index c2ae95b313e4..4285532c67b5 100644
--- a/srcpkgs/pantheon-agent-polkit/template
+++ b/srcpkgs/pantheon-agent-polkit/template
@@ -1,13 +1,13 @@
# Template file for 'pantheon-agent-polkit'
pkgname=pantheon-agent-polkit
version=1.0.0
-revision=1
+revision=2
build_style=meson
-hostmakedepends="intltool pkg-config vala gobject-introspection"
+hostmakedepends="gettext pkg-config vala gobject-introspection"
makedepends="gtk+3-devel polkit-devel granite-devel"
short_desc="Pantheon Polkit Agent"
maintainer="Orphaned <orphan@voidlinux.org>"
license="LGPL-3.0-or-later"
-homepage="https://github.com/elementary/${pkgname}"
-distfiles="${homepage}/archive/${version}.tar.gz"
+homepage="https://github.com/elementary/pantheon-agent-polkit"
+distfiles="https://github.com/elementary/pantheon-agent-polkit/archive/${version}.tar.gz"
checksum=8e730f335545a4ca2717e1c9ccad61c329c1f19ea51f76ae4783da9e0416d484
From 337329dd3ffefb3ac1bd128897970ebefee29a2e Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 10 Mar 2022 22:08:05 +0100
Subject: [PATCH 07/82] pantheon-screenshot: update to 6.0.2.
---
srcpkgs/pantheon-screenshot/template | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/pantheon-screenshot/template b/srcpkgs/pantheon-screenshot/template
index 3492b0c0d49e..fb2ee8e7b095 100644
--- a/srcpkgs/pantheon-screenshot/template
+++ b/srcpkgs/pantheon-screenshot/template
@@ -1,18 +1,18 @@
# Template file for 'pantheon-screenshot'
pkgname=pantheon-screenshot
-version=1.7.1
+version=6.0.2
revision=1
wrksrc="screenshot-${version}"
build_style=meson
-hostmakedepends="desktop-file-utils glib-devel intltool pkgconf vala"
-makedepends="granite-devel libcanberra-devel"
-depends="desktop-file-utils gdk-pixbuf gtk+3 hicolor-icon-theme"
+hostmakedepends="desktop-file-utils glib-devel gettext pkg-config vala"
+makedepends="granite-devel libcanberra-devel libhandy1-devel"
+depends="desktop-file-utils gdk-pixbuf hicolor-icon-theme"
short_desc="Screenshot tool"
maintainer="Orphaned <orphan@voidlinux.org>"
license="LGPL-3.0-only"
homepage="https://github.com/elementary/screenshot-tool"
distfiles="https://github.com/elementary/screenshot-tool/archive/${version}.tar.gz"
-checksum=2789abf01b9b41ae62e39eea4d5765dd606898435e1723939a06301922c431e2
+checksum=af1d67b196a22af529190f593183ff2eebad51a1329be7279cddb7dc0ce406f4
post_install() {
ln -s io.elementary.screenshot-tool "$DESTDIR"/usr/bin/"$pkgname"
From dd2bcda87a07095c130ee7c3b7729a273a5d5168 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 10 Mar 2022 22:08:05 +0100
Subject: [PATCH 08/82] planner: update to 3.0.6.
---
srcpkgs/planner/template | 21 ++++-----------------
1 file changed, 4 insertions(+), 17 deletions(-)
diff --git a/srcpkgs/planner/template b/srcpkgs/planner/template
index 7be79ab4c6ba..b55a40f9306f 100644
--- a/srcpkgs/planner/template
+++ b/srcpkgs/planner/template
@@ -1,32 +1,19 @@
# Template file for 'planner'
pkgname=planner
-version=2.7
+version=3.0.6
revision=1
build_style=meson
build_helper="gir"
hostmakedepends="gettext pkg-config vala glib-devel curl"
-makedepends="evolution-data-server-devel libgee08-devel granite-devel
- webkit2gtk-devel libsoup-devel libpeas-devel libhandy1-devel"
+makedepends="libgee08-devel granite-devel webkit2gtk-devel libsoup-devel
+ libhandy1-devel json-glib-devel"
depends="io.elementary.icons io.elementary.stylesheet curl"
short_desc="Task manager with Todoist support designed for GNU/Linux"
maintainer="linarcx <linarcx@riseup.net>"
license="GPL-3.0-or-later"
homepage="https://github.com/alainm23/planner"
distfiles="https://github.com/alainm23/planner/archive/${version}.tar.gz"
-checksum=cd34953867a91b2992aa4eafddc5093a695d1e6096571ade75640dddcc425d69
-
-if [ "$CROSS_BUILD" ]; then
- hostmakedepends+=" evolution-data-server-devel"
-fi
-pre_configure() {
- if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
- # In musl libc there is no _NL_TIME_FIRST_WEEKDAY in langinfo.h
- # thus replace Posix.NLTime.FIRST_WEEKDAY.to_string ().data[0];
- # with 0; (sunday)
- vsed -i src/Services/Calendar/CalendarModel.vala \
- -e "s#\(int week_start =\) Posix.*#\1 0;#"
- fi
-}
+checksum=345a9ad2220820f08f583321e874528eee9f7e009236127efacee72d071c7ea5
post_install() {
vinstall data/com.github.alainm23.planner.desktop.in 644 \
From bd66cba132874fd107bdfb93e919239f062ff737 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 10 Mar 2022 22:08:05 +0100
Subject: [PATCH 09/82] quickDocs: revbump for granite 6
---
srcpkgs/quickDocs/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/quickDocs/template b/srcpkgs/quickDocs/template
index 940ad376d9c7..c4a22e6bbe7d 100644
--- a/srcpkgs/quickDocs/template
+++ b/srcpkgs/quickDocs/template
@@ -1,7 +1,7 @@
# Template file for 'quickDocs'
pkgname=quickDocs
version=2.2.6
-revision=1
+revision=2
build_style=meson
hostmakedepends="vala pkg-config"
makedepends="libarchive-devel gtk+3-devel devhelp-devel webkit2gtk-devel libgee08-devel granite-devel"
From db24f0b9269135cb2d4bf270f5a85a7c5025129d Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 10 Mar 2022 22:08:05 +0100
Subject: [PATCH 10/82] sequeler: revbump for granite 6
---
srcpkgs/sequeler/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/sequeler/template b/srcpkgs/sequeler/template
index a36107372bd9..32f127dc5c6e 100644
--- a/srcpkgs/sequeler/template
+++ b/srcpkgs/sequeler/template
@@ -1,7 +1,7 @@
# Template file for 'sequeler'
pkgname=sequeler
version=0.8.2
-revision=1
+revision=2
build_style=meson
hostmakedepends="gettext pkg-config glib-devel vala"
makedepends="granite-devel libglib-devel gtk+3-devel libgee08-devel
From 1a6d722a046ec0e5132ed5ea4149400fafb1a168 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 10 Mar 2022 22:08:05 +0100
Subject: [PATCH 11/82] switchboard: update to 6.0.0.
---
srcpkgs/switchboard/template | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/switchboard/template b/srcpkgs/switchboard/template
index ebb706e5d9e5..9397fea8cdeb 100644
--- a/srcpkgs/switchboard/template
+++ b/srcpkgs/switchboard/template
@@ -1,16 +1,16 @@
# Template file for 'switchboard'
pkgname=switchboard
-version=2.3.7
-revision=2
+version=6.0.0
+revision=1
build_style=meson
hostmakedepends="pkg-config vala gettext"
-makedepends="granite-devel clutter-gtk-devel gtk+3-devel"
+makedepends="granite-devel gtk+3-devel libhandy1-devel"
short_desc="Extensible System Settings app designed for elementary OS"
maintainer="Orphaned <orphan@voidlinux.org>"
license="LGPL-2.1-or-later"
homepage="https://github.com/elementary/switchboard"
-distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=373db840b254897b2a59f6f421508f8f1361adc5d4d35b7963ba024e5c8234c9
+distfiles="https://github.com/elementary/switchboard/archive/${version}.tar.gz"
+checksum=40c2fd17535cba239b7c78b62d93a3f5ef7e990b31a7c4ecf04cba0c2b60d792
switchboard-devel_package() {
short_desc+=" - development files"
From b5278a657600b47a8451ce13caf05607b42ba767 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 10 Mar 2022 22:08:06 +0100
Subject: [PATCH 12/82] switchboard-plug-bluetooth: update to 2.3.6.
---
srcpkgs/switchboard-plug-bluetooth/template | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/switchboard-plug-bluetooth/template b/srcpkgs/switchboard-plug-bluetooth/template
index 373368918159..b1b6977a5269 100644
--- a/srcpkgs/switchboard-plug-bluetooth/template
+++ b/srcpkgs/switchboard-plug-bluetooth/template
@@ -1,13 +1,13 @@
# Template file for 'switchboard-plug-bluetooth'
pkgname=switchboard-plug-bluetooth
-version=2.3.0
+version=2.3.6
revision=1
build_style=meson
-hostmakedepends="pkg-config vala"
+hostmakedepends="pkg-config vala gettext"
makedepends="switchboard-devel granite-devel gtk+3-devel"
short_desc="Switchboard Bluetooth Plug"
maintainer="Cameron Nemo <cnemo@tutanota.com>"
license="GPL-3.0-or-later"
-homepage="https://github.com/elementary/${pkgname}"
-distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=ffeb4cdb53696b241e203f4e0920bb90c05fd77b99a05bd9483cb4c8367f1000
+homepage="https://github.com/elementary/switchboard-plug-bluetooth"
+distfiles="https://github.com/elementary/switchboard-plug-bluetooth/archive/${version}.tar.gz"
+checksum=fec5d135dc17c3ab1396cbe78f255e767f1834dfc4db8ec30579ff0ef29836b9
From 0fc20b144f49c2c3db39b11d87cc01388d0bd28a Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 10 Mar 2022 22:08:06 +0100
Subject: [PATCH 13/82] switchboard-plug-network: update to 2.4.2.
* build translations
---
srcpkgs/switchboard-plug-network/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/switchboard-plug-network/template b/srcpkgs/switchboard-plug-network/template
index 31f640cf25df..5c421fde8be4 100644
--- a/srcpkgs/switchboard-plug-network/template
+++ b/srcpkgs/switchboard-plug-network/template
@@ -1,15 +1,15 @@
# Template file for 'switchboard-plug-network'
pkgname=switchboard-plug-network
-version=2.3.3
+version=2.4.2
revision=1
build_style=meson
-hostmakedepends="pkg-config vala"
+hostmakedepends="pkg-config vala gettext"
makedepends="switchboard-devel granite-devel gtk+3-devel
libnma-devel NetworkManager-devel"
short_desc="Switchboard Network Plug"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3.0-or-later"
homepage="https://github.com/elementary/switchboard-plug-network"
-distfiles="https://github.com/elementary/${pkgname}/archive/${version}.tar.gz"
-checksum=a2f29b3054c187f2be9688bb04b6800cf4c2d3dd74cdd4fa37626f0b2ac5df50
+distfiles="https://github.com/elementary/switchboard-plug-network/archive/${version}.tar.gz"
+checksum=190b1f9123bc9ee4120a624ad3de91c0e40a141cb19b8eb7ec74d3c39f008971
nocross="https://travis-ci.org/github/void-linux/void-packages/builds/733837363"
From a51626f1fc1f991d5ae63e73c74bc81a5cef66dd Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 10 Mar 2022 22:08:06 +0100
Subject: [PATCH 14/82] switchboard-plug-printers: update to 2.1.10.
---
.../patches/fix-signal_subscribe.patch | 11 ---------
.../patches/ftbfs.patch | 23 -------------------
srcpkgs/switchboard-plug-printers/template | 10 ++++----
3 files changed, 5 insertions(+), 39 deletions(-)
delete mode 100644 srcpkgs/switchboard-plug-printers/patches/fix-signal_subscribe.patch
delete mode 100644 srcpkgs/switchboard-plug-printers/patches/ftbfs.patch
diff --git a/srcpkgs/switchboard-plug-printers/patches/fix-signal_subscribe.patch b/srcpkgs/switchboard-plug-printers/patches/fix-signal_subscribe.patch
deleted file mode 100644
index 48eb8948a642..000000000000
--- a/srcpkgs/switchboard-plug-printers/patches/fix-signal_subscribe.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/CUPSNotifier.vala 2018-11-28 12:34:33.000000000 +0100
-+++ b/src/CUPSNotifier.vala 2021-01-29 19:26:11.191992396 +0100
-@@ -63,7 +63,7 @@
- Bus.get_proxy.begin<NotifierDBus> (BusType.SYSTEM, "org.cups.cupsd.Notifier", "/org/cups/cupsd/Notifier", GLib.DBusProxyFlags.NONE, null, (obj, res) => {
- try {
- dbus_notifier = Bus.get_proxy.end (res);
-- ((GLib.DBusProxy) dbus_notifier).g_connection.signal_subscribe (null, "org.cups.cupsd.Notifier", null, "/org/cups/cupsd/Notifier", null, GLib.DBusSignalFlags.NONE, subscription_callback);
-+ ((GLib.DBusProxy) dbus_notifier).g_connection.signal_subscribe (null, "org.cups.cupsd.Notifier", null, "/org/cups/cupsd/Notifier", null, GLib.DBusSignalFlags.NONE, (GLib.DBusSignalCallback)subscription_callback);
- } catch (IOError e) {
- critical (e.message);
- }
diff --git a/srcpkgs/switchboard-plug-printers/patches/ftbfs.patch b/srcpkgs/switchboard-plug-printers/patches/ftbfs.patch
deleted file mode 100644
index e8e21e2c4841..000000000000
--- a/srcpkgs/switchboard-plug-printers/patches/ftbfs.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 3175c2ebf106145a95355d2571e0a2aa4834e884 Mon Sep 17 00:00:00 2001
-From: Enerccio <admin@en-circle.com>
-Date: Tue, 17 Sep 2019 15:31:37 +0200
-Subject: [PATCH] Update cups.vapi (#118)
-
-Fixed bug with compilation
----
- vapi/cups.vapi | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/vapi/cups.vapi b/vapi/cups.vapi
-index 7f1b795..5dcdba6 100644
---- a/vapi/cups.vapi
-+++ b/vapi/cups.vapi
-@@ -605,7 +605,7 @@ namespace CUPS {
- [CCode (cname = "ippAddBooleans")]
- private unowned Attribute _add_booleans (Tag group, string name, [CCode (array_length_pos = 0.9)] char[] values);
- public unowned Attribute add_booleans (Tag group, string name, bool[] values) {
-- char[] char_values;
-+ char[] char_values = {};
- foreach (var val in values) {
- char_values += val ? 1 : 0;
- }
diff --git a/srcpkgs/switchboard-plug-printers/template b/srcpkgs/switchboard-plug-printers/template
index caecd10c886c..05f3c86abd79 100644
--- a/srcpkgs/switchboard-plug-printers/template
+++ b/srcpkgs/switchboard-plug-printers/template
@@ -1,14 +1,14 @@
# Template file for 'switchboard-plug-printers'
pkgname=switchboard-plug-printers
-version=2.1.6
+version=2.1.10
revision=1
build_style=meson
-hostmakedepends="pkg-config vala intltool"
+hostmakedepends="pkg-config vala gettext"
makedepends="switchboard-devel granite-devel gtk+3-devel cups-devel"
depends="cups-pk-helper"
short_desc="Switchboard Printers Plug"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3.0-or-later"
-homepage="https://github.com/elementary/${pkgname}"
-distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=fe2c748e3737c3304ea8613d43d5ba8596f95499a65b8d13f93c4f702901f442
+homepage="https://github.com/elementary/switchboard-plug-printers"
+distfiles="https://github.com/elementary/switchboard-plug-printers/archive/${version}.tar.gz"
+checksum=448f6ae28fc4dacc2c329532e21aacc4ec7aa4af7d93bd6d7013002253faef3d
From e6582b59c0ee121c476ec12b19809d7550f6976c Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 10 Mar 2022 21:59:08 +0100
Subject: [PATCH 15/82] io.elementary.calculator: update to 1.7.2.
---
srcpkgs/io.elementary.calculator/template | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/io.elementary.calculator/template b/srcpkgs/io.elementary.calculator/template
index 56abf698403b..35a363c7ae9a 100644
--- a/srcpkgs/io.elementary.calculator/template
+++ b/srcpkgs/io.elementary.calculator/template
@@ -1,17 +1,17 @@
# Template file for 'io.elementary.calculator'
pkgname=io.elementary.calculator
-version=1.6.0
-revision=2
+version=1.7.2
+revision=1
wrksrc="calculator-${version}"
build_style=meson
-hostmakedepends="intltool pkg-config vala desktop-file-utils AppStream"
-makedepends="granite-devel gtk+3-devel"
+hostmakedepends="gettext pkg-config vala desktop-file-utils AppStream"
+makedepends="granite-devel gtk+3-devel libhandy1-devel"
short_desc="Calculator app designed for elementary OS"
maintainer="Cameron Nemo <cnemo@tutanota.com>"
license="GPL-3.0-only"
homepage="https://github.com/elementary/calculator"
distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=c650d5ff7d2df2d122ade0cbd35be50927f22b0d260f28e374b1112114f24540
+checksum=d296d06b36a0c7dd84e7e91e9801989e83312612d6ee6f0479030c1b340d397b
pantheon-calculator_package() {
depends="io.elementary.calculator>=${version}_${revision}"
From dd27077ca653d48e26ad47699a20b9bed7df2e00 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 10 Mar 2022 22:16:06 +0100
Subject: [PATCH 16/82] io.elementary.calendar: update to 6.1.0.
---
.../patches/00-musl.patch | 45 -------------------
srcpkgs/io.elementary.calendar/template | 18 ++++----
2 files changed, 9 insertions(+), 54 deletions(-)
delete mode 100644 srcpkgs/io.elementary.calendar/patches/00-musl.patch
diff --git a/srcpkgs/io.elementary.calendar/patches/00-musl.patch b/srcpkgs/io.elementary.calendar/patches/00-musl.patch
deleted file mode 100644
index f85beca403fa..000000000000
--- a/srcpkgs/io.elementary.calendar/patches/00-musl.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-commit c9ba80af072819261a9e24a04a0859b93b5db810
-Author: Cameron Nemo <camerontnorman@gmail.com>
-Date: Thu Oct 18 11:33:15 2018 -0700
-
- Check for _NL_TIME_FIRST_WEEKDAY declaration
-
-diff --git core/Model/CalendarModel.vala core/Model/CalendarModel.vala
-index 3e3b8cbd..b33f75f8 100644
---- a/core/Model/CalendarModel.vala
-+++ b/core/Model/CalendarModel.vala
-@@ -68,7 +68,11 @@ public class Maya.Model.CalendarModel : Object {
- }
-
- private CalendarModel () {
-+#if HAVE_NL_TIME_FIRST_WEEKDAY
- int week_start = Posix.NLTime.FIRST_WEEKDAY.to_string ().data[0];
-+#else
-+ int week_start = 0;
-+#endif
- if (week_start >= 1 && week_start <= 7) {
- week_starts_on = (Maya.Settings.Weekday)week_start-1;
- }
-diff --git meson.build meson.build
-index a0cd2dd7..02b4e1d1 100644
---- a/meson.build
-+++ b/meson.build
-@@ -31,7 +31,17 @@ folks_dep = dependency('folks')
- geocode_glib_dep = dependency('geocode-glib-1.0')
- gclue_dep = dependency('libgeoclue-2.0')
-
--m_dep = meson.get_compiler('c').find_library('m', required : false)
-+cc = meson.get_compiler('c')
-+m_dep = cc.find_library('m', required : false)
-+libnotify_dep = dependency('libnotify', required: false)
-+
-+if libnotify_dep.found()
-+ add_project_arguments('--define=HAVE_LIBNOTIFY', language: 'vala')
-+endif
-+
-+if cc.has_header_symbol('langinfo.h', '_NL_TIME_FIRST_WEEKDAY')
-+ add_project_arguments('--define=HAVE_NL_TIME_FIRST_WEEKDAY', language: 'vala')
-+endif
-
- gresource_calendar = gnome.compile_resources(
- 'gresource_calendar',
diff --git a/srcpkgs/io.elementary.calendar/template b/srcpkgs/io.elementary.calendar/template
index a5ea019353a0..bf87c7599001 100644
--- a/srcpkgs/io.elementary.calendar/template
+++ b/srcpkgs/io.elementary.calendar/template
@@ -1,22 +1,21 @@
# Template file for 'io.elementary.calendar'
pkgname=io.elementary.calendar
-version=5.0
-revision=6
-_git_commit=46346e48b53e9d3d59d9f567b622532338f50f32
-wrksrc="calendar-${_git_commit}"
+version=6.1.0
+revision=1
+wrksrc="calendar-${version}"
build_style=meson
build_helper="gir"
-hostmakedepends="intltool pkg-config vala desktop-file-utils AppStream
+hostmakedepends="gettext pkg-config vala desktop-file-utils AppStream
glib-devel evolution-data-server-devel"
makedepends="granite-devel libglib-devel gtk+3-devel libgee08-devel
- libchamplain-devel clutter-devel evolution-data-server-devel
+ libchamplain-devel clutter-devel evolution-data-server-devel libhandy1-devel
folks-devel geocode-glib-devel geoclue2-devel libical-devel libnotify-devel"
short_desc="Desktop calendar app designed for elementary OS"
maintainer="Cameron Nemo <cnemo@tutanota.com>"
license="GPL-3.0-only"
homepage="https://github.com/elementary/calendar"
-distfiles="${homepage}/archive/${_git_commit}.tar.gz"
-checksum=3be3851baeed67144e5cbed209b2c1b982fe9830db13372e3051423295dee345
+distfiles="https://github.com/elementary/calendar/archive/refs/tags/${version}.tar.gz"
+checksum=3cb4ba6f4d9fa6addfbe39b58cea282c0f0c6f139c49214c05e52adf457d949d
libio.elementary.calendar_package() {
short_desc+=" - library"
@@ -28,7 +27,8 @@ libio.elementary.calendar_package() {
libio.elementary.calendar-devel_package() {
short_desc+=" - library development files"
depends="libio.elementary.calendar>=${version} evolution-data-server-devel
- granite-devel gtk+3-devel libglib-devel libical-devel libsoup-devel"
+ granite-devel gtk+3-devel libglib-devel libical-devel libsoup-devel
+ libhandy1-devel"
pkg_install() {
vmove "usr/lib/*.so"
vmove usr/lib/pkgconfig
From f3a2c1e1b5bc15323dca12c47b8e60849ca5dc52 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 10 Mar 2022 22:16:04 +0100
Subject: [PATCH 17/82] io.elementary.code: update to 6.1.0.
---
.../io.elementary.code/patches/vala050.patch | 25 -------------------
srcpkgs/io.elementary.code/template | 18 ++++++-------
2 files changed, 9 insertions(+), 34 deletions(-)
delete mode 100644 srcpkgs/io.elementary.code/patches/vala050.patch
diff --git a/srcpkgs/io.elementary.code/patches/vala050.patch b/srcpkgs/io.elementary.code/patches/vala050.patch
deleted file mode 100644
index ec3abb8fd9f0..000000000000
--- a/srcpkgs/io.elementary.code/patches/vala050.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From a185de0e7716aa2de2bf21de96e6c9af1dca81aa Mon Sep 17 00:00:00 2001
-From: Daniel Kolesa <daniel@octaforge.org>
-Date: Wed, 16 Sep 2020 20:43:07 +0200
-Subject: [PATCH] fix with vala-0.50
-
----
- plugins/outline/Vala/ValaSymbolOutline.vala | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git plugins/outline/Vala/ValaSymbolOutline.vala plugins/outline/Vala/ValaSymbolOutline.vala
-index c8db339..31386a6 100644
---- a/plugins/outline/Vala/ValaSymbolOutline.vala
-+++ b/plugins/outline/Vala/ValaSymbolOutline.vala
-@@ -61,7 +61,7 @@ public class Code.Plugins.ValaSymbolOutline : Object, Code.Plugins.SymbolOutline
-
- public void parse_symbols () {
- var context = new Vala.CodeContext ();
-- context.profile = Vala.Profile.GOBJECT;
-+ context.set_target_profile(Vala.Profile.GOBJECT);
- context.add_source_filename (doc.file.get_path ());
- context.report = new Report ();
- if (cancellable != null)
---
-2.28.0
-
diff --git a/srcpkgs/io.elementary.code/template b/srcpkgs/io.elementary.code/template
index 05d84cc39c9f..35927b238713 100644
--- a/srcpkgs/io.elementary.code/template
+++ b/srcpkgs/io.elementary.code/template
@@ -1,19 +1,19 @@
# Template file for 'io.elementary.code'
pkgname=io.elementary.code
-version=3.4.1
-revision=5
+version=6.1.0
+revision=1
wrksrc="code-${version}"
build_style=meson
-hostmakedepends="pkg-config vala intltool glib-devel"
+hostmakedepends="pkg-config vala gettext glib-devel"
makedepends="editorconfig-devel libgee08-devel granite-devel libpeas-devel
- gtksourceview-devel vte3-devel gtkspell3-devel zeitgeist-devel libsoup-devel
- webkit2gtk-devel gtk+3-devel libgit2-glib-devel"
+ gtksourceview4-devel vte3-devel gtkspell3-devel libsoup-devel
+ gtk+3-devel libgit2-glib-devel polkit-devel libhandy1-devel"
short_desc="Code editor designed for elementary OS"
maintainer="Cameron Nemo <cnemo@tutanota.com>"
license="GPL-3.0-or-later"
homepage="https://github.com/elementary/code"
-distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=d84b38193b72cd93995aae604358c83c5b6976d8472ce985027b947cfed990bf
+distfiles="https://github.com/elementary/code/archive/${version}.tar.gz"
+checksum=d44851eb827dc9a069ab81b6a9cfe255795e3319a6882ca344152781968ce3ce
libio.elementary.code_package() {
short_desc+=" - library"
@@ -25,8 +25,8 @@ libio.elementary.code_package() {
libio.elementary.code-devel_package() {
short_desc+=" - library development files"
depends="libio.elementary.code>=${version} fontconfig-devel granite-devel
- gtk+3-devel gtksourceview-devel libgee08-devel libgit2-glib-devel
- libglib-devel libpeas-devel pango-devel zeitgeist-devel"
+ gtk+3-devel gtksourceview4-devel libgee08-devel libgit2-glib-devel
+ libglib-devel libpeas-devel pango-devel polkit-devel libhandy1-devel"
pkg_install() {
vmove "usr/lib/*.so"
vmove usr/lib/pkgconfig
From 8556b40f415d951ba8e62e4712c66f925c910159 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 10 Mar 2022 22:16:07 +0100
Subject: [PATCH 18/82] io.elementary.files: update to 6.1.2.
---
common/shlibs | 4 ++--
srcpkgs/io.elementary.files/template | 12 ++++++------
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index b954a2c71843..41a339948f61 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3523,8 +3523,8 @@ libadwaita-1.so.0 libadwaita-1.0.0alpha2_1
libswitchboard-2.0.so.0 switchboard-2.3.2_1
libcodecore.so.0 libio.elementary.code-3.0_1
libio.elementary.music-core.so.0 libio.elementary.music-5.0_1
-libpantheon-files-core.so.4 libio.elementary.files-4.1.4_1
-libpantheon-files-widgets.so.4 libio.elementary.files-4.1.4_1
+libpantheon-files-core.so.6 libio.elementary.files-6.0.0_1
+libpantheon-files-widgets.so.6 libio.elementary.files-6.0.0_1
libwlroots.so.9 wlroots0.14-0.14.1_1
libwlroots.so.10 wlroots-0.15.0_1
libbaseencode.so.1 libbaseencode-1.0.9_1
diff --git a/srcpkgs/io.elementary.files/template b/srcpkgs/io.elementary.files/template
index cb0643a02449..0e8d5fb177d6 100644
--- a/srcpkgs/io.elementary.files/template
+++ b/srcpkgs/io.elementary.files/template
@@ -1,20 +1,20 @@
# Template file for 'io.elementary.files'
pkgname=io.elementary.files
-version=4.5.0
+version=6.1.2
revision=1
wrksrc="files-${version}"
build_style=meson
-configure_args="-Dwith-unity=disabled"
-hostmakedepends="vala glib-devel pkg-config intltool"
+configure_args="-Dsystemduserunitdir=no"
+hostmakedepends="vala glib-devel pkg-config gettext"
makedepends="gtk+3-devel libglib-devel libgee08-devel sqlite-devel plank-devel
libcanberra-devel granite-devel pango-devel zeitgeist-devel dbus-glib-devel
- libnotify-devel libcloudproviders-devel libgit2-glib-devel"
+ libnotify-devel libcloudproviders-devel libgit2-glib-devel libhandy1-devel"
short_desc="File browser designed for elementary OS"
maintainer="Cameron Nemo <cnemo@tutanota.com>"
license="GPL-3.0-or-later"
homepage="https://github.com/elementary/files"
distfiles="https://github.com/elementary/files/archive/${version}.tar.gz"
-checksum=987f87df2a74c97cb866b34a20ea395ae1f67d03c9517185494860653fbc065c
+checksum=2a328d8df901186bb700c835064c9a526e5694545b668df512282773cfaa7b08
CFLAGS="-fcommon"
@@ -28,7 +28,7 @@ libio.elementary.files_package() {
libio.elementary.files-devel_package() {
short_desc+=" - library development files"
depends="libio.elementary.files>=${version} libgee08-devel gtk+3-devel
- libcanberra-devel libglib-devel zeitgeist-devel"
+ libcanberra-devel libglib-devel zeitgeist-devel libhandy1-devel"
pkg_install() {
vmove "usr/lib/*.so"
vmove usr/lib/pkgconfig
From e712186117273842fa12525c47b6b3f1861c53b0 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 10 Mar 2022 22:16:04 +0100
Subject: [PATCH 19/82] io.elementary.icons: update to 6.1.0.
---
srcpkgs/io.elementary.icons/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/io.elementary.icons/template b/srcpkgs/io.elementary.icons/template
index fb3a6c06cc84..95dbc0ca3ddb 100644
--- a/srcpkgs/io.elementary.icons/template
+++ b/srcpkgs/io.elementary.icons/template
@@ -1,6 +1,6 @@
# Template file for 'io.elementary.icons'
pkgname=io.elementary.icons
-version=5.3.1
+version=6.1.0
revision=1
wrksrc="icons-${version}"
build_style=meson
@@ -11,8 +11,8 @@ short_desc="Named, vector icons for elementary OS"
maintainer="Cameron Nemo <cnemo@tutanota.com>"
license="GPL-3.0-or-later"
homepage="https://github.com/elementary/icons"
-distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=67b349453f8990e399521bb8d96f4caf4c23a27cf22cbc18ddacf0e817c59e12
+distfiles="https://github.com/elementary/icons/archive/${version}.tar.gz"
+checksum=bab0f638a60d7a28bf269f4a11346b28495a819e3f516403a7e0bb880c441c2f
post_install() {
# How did that get there?
From b47d7d6863264044ce23835c24beee77e2e54ebb Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 10 Mar 2022 22:16:07 +0100
Subject: [PATCH 20/82] io.elementary.music: update to 5.1.1.
---
.../io.elementary.music/patches/vala-array-size.patch | 11 -----------
srcpkgs/io.elementary.music/template | 11 ++++++-----
2 files changed, 6 insertions(+), 16 deletions(-)
delete mode 100644 srcpkgs/io.elementary.music/patches/vala-array-size.patch
diff --git a/srcpkgs/io.elementary.music/patches/vala-array-size.patch b/srcpkgs/io.elementary.music/patches/vala-array-size.patch
deleted file mode 100644
index 2cc268cdae64..000000000000
--- a/srcpkgs/io.elementary.music/patches/vala-array-size.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/core/GStrewamer/Equalizer.vala 2020-03-04 23:50:04.000000000 +0100
-+++ b/core/GStreamer/Equalizer.vala 2020-12-14 15:53:22.359597220 +0100
-@@ -31,7 +31,7 @@
- construct {
- element = Gst.ElementFactory.make ("equalizer-10bands", "equalizer");
-
-- int[10] freqs = {60, 170, 310, 600, 1000, 3000, 6000, 12000, 14000, 16000};
-+ int freqs[10] = {60, 170, 310, 600, 1000, 3000, 6000, 12000, 14000, 16000};
-
- float last_freq = 0;
- for (int index = 0; index < 10; index++) {
diff --git a/srcpkgs/io.elementary.music/template b/srcpkgs/io.elementary.music/template
index de6ae0f94d90..3ef8c1568630 100644
--- a/srcpkgs/io.elementary.music/template
+++ b/srcpkgs/io.elementary.music/template
@@ -1,20 +1,21 @@
# Template file for 'io.elementary.music'
pkgname=io.elementary.music
-version=5.0.5
+version=5.1.1
revision=1
wrksrc="music-${version}"
build_style=meson
configure_args="-Dbuild-plugins=true -Dplugins=audioplayer,cdrom,ipod"
-hostmakedepends="vala desktop-file-utils intltool pkg-config AppStream glib-devel"
+hostmakedepends="vala desktop-file-utils gettext pkg-config AppStream glib-devel"
makedepends="taglib-devel granite-devel vala-devel gtk+3-devel libgee08-devel
clutter-gtk-devel dbus-glib-devel libgda-devel libgpod-devel libxml2-devel
- json-glib-devel libnotify-devel libsoup-devel zeitgeist-devel libpeas-devel"
+ json-glib-devel libnotify-devel libsoup-devel zeitgeist-devel libpeas-devel
+ libhandy1-devel"
short_desc="Music player and library designed for elementary OS"
maintainer="Cameron Nemo <cnemo@tutanota.com>"
license="GPL-3.0-or-later"
homepage="https://github.com/elementary/music"
distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=ed7cba3b07189273890b321b21cda198f18b102e4466eb7207c0b5f27b31dfc9
+checksum=35e97ec496327b4eb388308168711bf9f8e976a857eb97bca21805f83abf9d15
libio.elementary.music_package() {
short_desc+=" - library"
@@ -26,7 +27,7 @@ libio.elementary.music-devel_package() {
short_desc+=" - library development files"
depends="libio.elementary.music>=${version} granite-devel
gst-plugins-base1-devel gstreamer1-devel gtk+3-devel libglib-devel
- libpeas-devel"
+ libpeas-devel libhandy1-devel"
pkg_install() {
vmove "usr/lib/*.so"
vmove usr/lib/pkgconfig
From abdcf046deacab51995cec51c85ba098d61634db Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 10 Mar 2022 22:16:05 +0100
Subject: [PATCH 21/82] io.elementary.photos: update to 2.7.4.
---
.../patches/fix-meson.patch | 95 -------------------
srcpkgs/io.elementary.photos/template | 11 +--
2 files changed, 5 insertions(+), 101 deletions(-)
delete mode 100644 srcpkgs/io.elementary.photos/patches/fix-meson.patch
diff --git a/srcpkgs/io.elementary.photos/patches/fix-meson.patch b/srcpkgs/io.elementary.photos/patches/fix-meson.patch
deleted file mode 100644
index 820e3b8ef96d..000000000000
--- a/srcpkgs/io.elementary.photos/patches/fix-meson.patch
+++ /dev/null
@@ -1,95 +0,0 @@
-From 27e529fc96da828982563e2e19a6f0cef883a29e Mon Sep 17 00:00:00 2001
-From: Rico Tzschichholz <ricotz@ubuntu.com>
-Date: Wed, 22 Jul 2020 19:35:53 +0200
-Subject: [PATCH] meson: Properly include config.vapi and config.h (#578)
-
----
- meson.build | 21 +++++++++++++++++++--
- src/meson.build | 13 -------------
- 2 files changed, 19 insertions(+), 15 deletions(-)
-
-diff --git meson.build meson.build
-index 5edb5314..9bebaca0 100644
---- a/meson.build
-+++ b/meson.build
-@@ -11,14 +11,33 @@ add_project_arguments([
- '-Wno-unused',
- '-Wl,--enable-new-dtags',
-
-+ '-include', 'config.h',
- '-DGETTEXT_PACKAGE="@0@"'.format(meson.project_name())
- ],
- language: 'c',
- )
-+add_project_arguments([
-+ '--vapidir', join_paths(meson.current_source_dir(), 'vapi'),
-+ '--pkg', 'config',
-+ ],
-+ language: 'vala',
-+)
-
- libexecdir = join_paths(get_option('prefix'), get_option('libexecdir'), meson.project_name())
- pluginsdir = join_paths(get_option('prefix'), get_option('libdir'), meson.project_name(), 'plugins')
-
-+conf_data = configuration_data()
-+conf_data.set_quoted('PROJECT_NAME', meson.project_name())
-+conf_data.set_quoted('GETTEXT_PACKAGE', meson.project_name())
-+conf_data.set_quoted('_VERSION', meson.project_version())
-+conf_data.set_quoted('_PREFIX', get_option('prefix'))
-+conf_data.set_quoted('_LIB', join_paths(get_option('prefix'), get_option('libdir')))
-+conf_data.set_quoted('_LIBEXECDIR', libexecdir)
-+config_header = configure_file(
-+ output : 'config.h',
-+ configuration : conf_data
-+)
-+
- gnome = import('gnome')
- i18n = import('i18n')
-
-@@ -52,7 +71,6 @@ gstreamer_plugins_base_vapi = meson.get_compiler('vala').find_library('gstreamer
- gstreamer_plugins_base_dep = declare_dependency(dependencies: [gstreamer_plugins_base_vapi])
- lconv_dep = meson.get_compiler('vala').find_library('LConv', dirs: join_paths(meson.current_source_dir(), 'vapi'))
- linux_dep = meson.get_compiler('vala').find_library('linux')
--config_dep = meson.get_compiler('vala').find_library('config', dirs: join_paths(meson.current_source_dir(), 'vapi'))
-
- vapi_include = include_directories('./vapi')
-
-@@ -82,7 +100,6 @@ dependencies = [
- webkit2gtk_dep,
- lconv_dep,
- linux_dep,
-- config_dep
- ]
-
- add_project_arguments(['--vapidir', join_paths(meson.current_source_dir(), 'vapi')], language: 'vala')
-diff --git src/meson.build src/meson.build
-index 45bf4c1b..1215d778 100644
---- a/src/meson.build
-+++ b/src/meson.build
-@@ -4,18 +4,6 @@ library_files = files(
- 'plugins/TransitionsInterfaces.vala'
- )
-
--conf_data = configuration_data()
--conf_data.set_quoted('PROJECT_NAME', meson.project_name())
--conf_data.set_quoted('GETTEXT_PACKAGE', meson.project_name())
--conf_data.set_quoted('_VERSION', meson.project_version())
--conf_data.set_quoted('_PREFIX', get_option('prefix'))
--conf_data.set_quoted('_LIB', join_paths(get_option('prefix'), get_option('libdir')))
--conf_data.set_quoted('_LIBEXECDIR', libexecdir)
--config_header = configure_file(
-- output : 'config.h',
-- configuration : conf_data
--)
--
- photos_files = files(
- 'AppDirs.vala',
- 'Application.vala',
-@@ -233,7 +221,6 @@ photos_exe = executable(
- meson.project_name(),
- photos_files,
- library_files,
-- config_header,
- icons_gresource,
- global_gresource,
- dependencies: dependencies,
diff --git a/srcpkgs/io.elementary.photos/template b/srcpkgs/io.elementary.photos/template
index 81c1734164ba..d0f69169be3b 100644
--- a/srcpkgs/io.elementary.photos/template
+++ b/srcpkgs/io.elementary.photos/template
@@ -1,22 +1,21 @@
# Template file for 'io.elementary.photos'
pkgname=io.elementary.photos
-version=2.7.0
-revision=2
+version=2.7.4
+revision=1
wrksrc="photos-${version}"
build_style=meson
-configure_args="-Dlibunity=false"
-hostmakedepends="desktop-file-utils intltool pkg-config vala AppStream
+hostmakedepends="desktop-file-utils gettext pkg-config vala AppStream
glib-devel python3-scour"
makedepends="libaccounts-glib-devel libexif-devel libgee08-devel
geocode-glib-devel libgexiv2-devel libglib-devel libgphoto2-devel
gst-plugins-base1-devel gstreamer1-devel gtk+3-devel libgudev-devel
json-glib-devel libraw-devel rest-devel libsoup-devel sqlite-devel
webkit2gtk-devel libwebp-devel libxml2-devel granite-devel libnotify-devel
- vte3-devel"
+ vte3-devel libhandy1-devel"
depends="desktop-file-utils gsettings-desktop-schemas"
short_desc="Photo viewer and organizer designed for elementary OS"
maintainer="Cameron Nemo <cnemo@tutanota.com>"
license="LGPL-2.1-or-later"
homepage="https://github.com/elementary/photos"
distfiles="https://github.com/elementary/photos/archive/${version}.tar.gz"
-checksum=9f6ad409d053e3239b9ec7fc59429afe9ce89e40878697a73c2c3f215556a074
+checksum=3227f498e483b150f0a1407f4cf244d69f1c7453fc9bcba164fe3ab944283315
From 4de976b8173301edcb59954b191ced3b19783ec2 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 10 Mar 2022 22:16:05 +0100
Subject: [PATCH 22/82] io.elementary.stylesheet: update to 6.1.1.
---
srcpkgs/io.elementary.stylesheet/template | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/io.elementary.stylesheet/template b/srcpkgs/io.elementary.stylesheet/template
index 791bca04709c..618ac82dda0c 100644
--- a/srcpkgs/io.elementary.stylesheet/template
+++ b/srcpkgs/io.elementary.stylesheet/template
@@ -1,12 +1,13 @@
# Template file for 'io.elementary.stylesheet'
pkgname=io.elementary.stylesheet
-version=5.4.2
-revision=2
+version=6.1.1
+revision=1
wrksrc="stylesheet-${version}"
build_style=meson
+hostmakedepends="sassc gettext"
short_desc="GTK Stylesheet for elementary OS"
maintainer="Cameron Nemo <cnemo@tutanota.com>"
license="GPL-3.0-or-later"
homepage="https://github.com/elementary/stylesheet"
distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=3bc37723daf4ce0b7c9ce4c125ef0055affe8d6654981388ec87d4a23a1ae0ec
+checksum=b8432a0a06944065a35eadf582043022a174d5ffa88bc0ee4e86b969688ed23e
From 666d9801058109b169e3969b2cd3340b340d8acf Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 10 Mar 2022 22:16:08 +0100
Subject: [PATCH 23/82] io.elementary.terminal: update to 6.0.1.
---
srcpkgs/io.elementary.terminal/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/io.elementary.terminal/template b/srcpkgs/io.elementary.terminal/template
index 2aba6a5b563f..f3e0972cdfe3 100644
--- a/srcpkgs/io.elementary.terminal/template
+++ b/srcpkgs/io.elementary.terminal/template
@@ -1,19 +1,19 @@
# Template file for 'io.elementary.terminal'
pkgname=io.elementary.terminal
-version=5.5.2
+version=6.0.1
revision=1
wrksrc="terminal-${version}"
build_style=meson
configure_args="-Dubuntu-bionic-patched-vte=false"
-hostmakedepends="desktop-file-utils intltool pkg-config vala AppStream glib-devel"
-makedepends="granite-devel libnotify-devel vte3-devel"
+hostmakedepends="desktop-file-utils gettext pkg-config vala AppStream glib-devel"
+makedepends="granite-devel libnotify-devel vte3-devel libhandy1-devel"
depends="desktop-file-utils gsettings-desktop-schemas"
short_desc="Terminal from elementary OS for the 21st century"
maintainer="Cameron Nemo <cnemo@tutanota.com>"
license="LGPL-3.0-only"
homepage="https://github.com/elementary/terminal"
distfiles="https://github.com/elementary/terminal/archive/${version}.tar.gz"
-checksum=589ad0225e3a45700d95c8ead1b646f22a22c7688f647876a5329b3b4bd923cd
+checksum=de741ad5deadb927243a7007be0f5d3bb4070f780362d59ded600692064b0eca
pantheon-terminal_package() {
depends="io.elementary.terminal>=${version}_${revision}"
From ecc4968e0e6b09521aac6640f86e4d144c87312b Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 10 Mar 2022 22:16:06 +0100
Subject: [PATCH 24/82] io.elementary.videos: update to 2.8.3.
---
srcpkgs/io.elementary.videos/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/io.elementary.videos/template b/srcpkgs/io.elementary.videos/template
index c989ccaf6954..eaca37a83723 100644
--- a/srcpkgs/io.elementary.videos/template
+++ b/srcpkgs/io.elementary.videos/template
@@ -1,15 +1,15 @@
# Template file for 'io.elementary.videos'
pkgname=io.elementary.videos
-version=2.7.2
+version=2.8.3
revision=1
wrksrc="videos-${version}"
build_style=meson
-hostmakedepends="intltool pkg-config vala AppStream"
+hostmakedepends="gettext pkg-config vala AppStream"
makedepends="granite-devel clutter-gst3-devel clutter-gtk-devel
- gstreamer1-devel gst-plugins-base1-devel"
+ gstreamer1-devel gst-plugins-base1-devel libhandy1-devel"
short_desc="Video player and library app designed for elementary OS"
maintainer="Ulf <void@uw.anonaddy.com>"
license="GPL-3.0-or-later"
homepage="https://github.com/elementary/videos"
distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=47946d6b285e2ff1eb86a654de0a6a268eebcf8dfa6ba733dd025b5d37fdad8a
+checksum=09c5db6433e4f6d570950609ff1d95a86df2179e7a65677a1e14c0549bbceba6
From fd5a7592f30adbfb46ca0afe7607a8c97b019d60 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 10 Mar 2022 22:49:31 +0100
Subject: [PATCH 25/82] giti: remove package
* doesn't build with recent vala
---
srcpkgs/giti/template | 13 -------------
srcpkgs/removed-packages/template | 1 +
2 files changed, 1 insertion(+), 13 deletions(-)
delete mode 100644 srcpkgs/giti/template
diff --git a/srcpkgs/giti/template b/srcpkgs/giti/template
deleted file mode 100644
index e3c8663fa536..000000000000
--- a/srcpkgs/giti/template
+++ /dev/null
@@ -1,13 +0,0 @@
-# Template file for 'giti'
-pkgname=giti
-version=1.0.0
-revision=1
-build_style=meson
-hostmakedepends="pkg-config vala gettext"
-makedepends="gtk+3-devel libgit2-glib-devel libgee08-devel granite-devel"
-short_desc="Permanent observer of your git directories"
-maintainer="linarcx <linarcx@riseup.net>"
-license="GPL-3.0-or-later"
-homepage="https://github.com/LinArcX/giti"
-distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=8054581f9eddf226a3e16e404ef062ebaba0ea1223255d8b0c3eeac301cf6872
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 6a744198712d..bb733734d3a0 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -80,6 +80,7 @@ replaces="
gens-gs<=2.16.7_2
geoip-data<=20171002_2
gespeaker<=0.8.6_3
+ giti<=1.0.0_1
gksu<=2.0.2_4
glibmm-doc<=2.64.2_2
gnome-doc-utils<=0.20.10_9
From 64c5de99b859059053c2e5072131fe50e6f94bf7 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 25 Jan 2022 10:11:02 +0100
Subject: [PATCH 26/82] meson: update to 0.61.2.
---
srcpkgs/meson/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/meson/template b/srcpkgs/meson/template
index 67fa3514289f..9000ad78c81c 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.2
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=0233a7f8d959079318f6052b0939c27f68a5de86ba601f25c9ee6869fb5f5889
# XXX: sanitizers aren't available on musl
if [ "$XBPS_TARGET_LIBC" = glibc ]; then
From 42e21e35eb93335c38842d434e0dfe8176cfce67 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 9 Mar 2022 12:35:01 +0100
Subject: [PATCH 27/82] Venom: remove package
* not maintained, doesn't build with recent vala versions
---
srcpkgs/Venom/template | 16 ----------------
srcpkgs/removed-packages/template | 1 +
2 files changed, 1 insertion(+), 16 deletions(-)
delete mode 100644 srcpkgs/Venom/template
diff --git a/srcpkgs/Venom/template b/srcpkgs/Venom/template
deleted file mode 100644
index deb714982db1..000000000000
--- a/srcpkgs/Venom/template
+++ /dev/null
@@ -1,16 +0,0 @@
-# Template file for 'Venom'
-pkgname=Venom
-version=0.5.5
-revision=1
-build_style=meson
-hostmakedepends="vala pkg-config glib-devel"
-makedepends="gtk+3-devel libgee08-devel gspell-devel
- libcanberra-devel sqlcipher-devel json-glib-devel
- libsoup-devel toxcore-devel libsodium-devel
- opus-devel libvpx-devel gstreamer1-devel"
-short_desc="Modern Tox client for the desktop"
-maintainer="Nathan Owens <ndowens04@gmail.com>"
-license="GPL-3.0-or-later"
-homepage="https://github.com/naxuroqa/Venom/"
-distfiles="https://github.com/naxuroqa/Venom/archive/${version}.tar.gz"
-checksum=0348e26d70b0614b6ee3d50fb6c086ae1f696ed250d8ea80eec28299bee23562
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index bb733734d3a0..6baadfccc6f0 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -12,6 +12,7 @@ replaces="
ImageMagick6<=6.9.12.12_2
MoinMoin<=1.9.11_1
Platinum9-theme<=0.0.0.20170720_3
+ Venom<=0.5.5_1
XorCurses<=0.2.2_1
acme-client<=0.1.16_5
albert<=0.16.1_4
From 5828784f5b31838cc27b61d2462d35bda340c51a Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 25 Jan 2022 10:10:58 +0100
Subject: [PATCH 28/82] 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 <bluca@debian.org>
+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 0f4814cd2ad16f1a84f1cdee34dde997e5f4caad Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 9 Mar 2022 12:37:45 +0100
Subject: [PATCH 29/82] aisleriot: update to 3.22.21.
---
srcpkgs/aisleriot/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/aisleriot/template b/srcpkgs/aisleriot/template
index 6655dbb76606..d4d178b13c9e 100644
--- a/srcpkgs/aisleriot/template
+++ b/srcpkgs/aisleriot/template
@@ -1,6 +1,6 @@
# Template file for 'aisleriot'
pkgname=aisleriot
-version=3.22.20
+version=3.22.21
revision=1
build_style=meson
# build requires assertions to be turned on -> n_debug=false
@@ -15,5 +15,5 @@ maintainer="Érico Nogueira <ericonr@disroot.org>"
license="GPL-3.0-or-later"
homepage="https://wiki.gnome.org/Apps/Aisleriot"
distfiles="https://gitlab.gnome.org/GNOME/${pkgname}/-/archive/${version}/${pkgname}-${version}.tar.gz"
-checksum=e5f4d00156060a8ecf410ed5d4e485b0f19177c554009c2b0ea6ee6579af549a
+checksum=fd7e7b58e1480dcc9d41b1ae8c9fcb1dd0e6c66eef0a5c1090784dddca9dd655
replaces="aisleriot-data>=0"
From 04b0924c7d0f9ec97450e3ea8798854879bb9d17 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 25 Jan 2022 10:10:58 +0100
Subject: [PATCH 30/82] 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 0cfbbef9ef7c3a4237600b4ad7981b93b4c18a44 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 25 Jan 2022 10:10:59 +0100
Subject: [PATCH 31/82] 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 <jon.turney@dronecode.org.uk>
+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 fd7ca7fb8fce8c75e52f57f7f2b36a47bea222d3 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 25 Jan 2022 10:10:59 +0100
Subject: [PATCH 32/82] 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 <michal@vasilek.cz>
+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 992644b49eb3e68e47b7b74a063f72629877f2a1 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 25 Jan 2022 10:10:59 +0100
Subject: [PATCH 33/82] 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 <eschwartz@archlinux.org>
+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 00fe18dea82a2518d34988aa5397a7c7ed5fc3bd Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 25 Jan 2022 10:10:59 +0100
Subject: [PATCH 34/82] 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 <michal@vasilek.cz>
+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 9b2cc2fc5f733714888071ed938e3fe43866a36b Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 25 Jan 2022 10:10:59 +0100
Subject: [PATCH 35/82] 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 <alex@linutronix.de>
+Date: Fri, 21 Jan 2022 22:22:58 +0100
+Subject: [PATCH] editor/meson.build: fix meson 0.61 errors
+
+Signed-off-by: Alexander Kanavin <alex@linutronix.de>
+---
+ 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 afc09e7c2d1d17109347f3bca8a008119bfa3e1e Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 25 Jan 2022 10:10:59 +0100
Subject: [PATCH 36/82] 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 <i@rvalue.moe>
+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 136e6ba193c36f9bb0dfacf42d15f0702512cb3a Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 25 Jan 2022 10:10:59 +0100
Subject: [PATCH 37/82] 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 <bruce.richardson@intel.com>
+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 <bruce.richardson@intel.com>
+Acked-by: Luca Boccassi <bluca@debian.org>
+---
+ 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 d9cf5d52c96af704ec68f86fd66eeac145acbf8f Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 25 Jan 2022 10:10:59 +0100
Subject: [PATCH 38/82] 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 <i@rvalue.moe>
+Date: Wed, 24 Nov 2021 04:52:42 +0000
+Subject: [PATCH] Remove incorrect args for i18n.merge_file
+
+Part-of: <https://gitlab.gnome.org/GNOME/epiphany/-/merge_requests/1031>
+---
+ 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 b9ac91462a4a2ef42394a0701f54d86016202539 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 25 Jan 2022 10:10:59 +0100
Subject: [PATCH 39/82] 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 <i@rvalue.moe>
+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 9fea09b0d0fdb38c2c1fb09709ee99e1ded6ce76 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 25 Jan 2022 10:11:00 +0100
Subject: [PATCH 40/82] 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?= <mail@3v1n0.net>
+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 <eschwartz@archlinux.org>
+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 <eschwartz@archlinux.org>
+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 c734011dc0d95d6b9e68a5f2e41958722a4eafad Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 25 Jan 2022 10:11:00 +0100
Subject: [PATCH 41/82] 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 <jplatte+git@posteo.de>
+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 1a0df66c4653265bcaa9fc9d8145a2c701a7c701 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 25 Jan 2022 10:11:00 +0100
Subject: [PATCH 42/82] 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 <jakub@jirutka.cz>
+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 1234e3c5964d043ac3caa6fcef334c22471f6161 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 25 Jan 2022 10:11:00 +0100
Subject: [PATCH 43/82] 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 <michal@vasilek.cz>
+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 8badd5edeb0b626d77e75a7618ce004569ed7c3b Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 9 Mar 2022 16:40:42 +0100
Subject: [PATCH 44/82] glade3: fix for meson 0.61
---
srcpkgs/glade3/patches/meson-0.61.patch | 57 +++++++++++++++++++++++++
1 file changed, 57 insertions(+)
create mode 100644 srcpkgs/glade3/patches/meson-0.61.patch
diff --git a/srcpkgs/glade3/patches/meson-0.61.patch b/srcpkgs/glade3/patches/meson-0.61.patch
new file mode 100644
index 000000000000..72f9c0e509ba
--- /dev/null
+++ b/srcpkgs/glade3/patches/meson-0.61.patch
@@ -0,0 +1,57 @@
+From 61304b2e8bac8ded76643cb7c3e781f73881dd2b Mon Sep 17 00:00:00 2001
+From: Mike Gilbert <floppym@gentoo.org>
+Date: Thu, 20 Jan 2022 14:18:09 -0500
+Subject: [PATCH 1/2] meson: i18n.merge_file() does not take a positional
+ argument
+
+---
+ data/meson.build | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/data/meson.build b/data/meson.build
+index 9f244566..bfbc514c 100644
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -2,7 +2,6 @@ desktop_conf = configuration_data()
+ desktop_conf.set('VERSION', glade_version)
+
+ i18n.merge_file(
+- 'desktop',
+ type: 'desktop',
+ input: configure_file(
+ input: 'org.gnome.Glade.desktop.in.in',
+@@ -18,7 +17,6 @@ i18n.merge_file(
+ appdata = glade_name + '.appdata.xml'
+
+ i18n.merge_file(
+- 'appdata',
+ input: 'org.gnome.Glade.appdata.xml.in',
+ output: '@BASENAME@',
+ po_dir: po_dir,
+--
+GitLab
+
+
+From 04ba6f969f716fbfe3c7feb7e4bab8678cc1e9eb Mon Sep 17 00:00:00 2001
+From: Mike Gilbert <floppym@gentoo.org>
+Date: Thu, 20 Jan 2022 14:19:03 -0500
+Subject: [PATCH 2/2] Remove duplicate entry for 'da' from help/LINGUAS
+
+---
+ help/LINGUAS | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/help/LINGUAS b/help/LINGUAS
+index fc3cd4c3..d67e42c8 100644
+--- a/help/LINGUAS
++++ b/help/LINGUAS
+@@ -1,6 +1,5 @@
+ # please keep this list sorted alphabetically
+ #
+-da
+ bg
+ ca
+ cs
+--
+GitLab
+
From 4a423ff123f006e7ee1a7d16e5a60caea69e9853 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 9 Mar 2022 16:44:19 +0100
Subject: [PATCH 45/82] gnome-bluetooth: fix for meson 0.61
---
.../gnome-bluetooth/patches/meson-0.61.patch | 25 +++++++++++++++++++
1 file changed, 25 insertions(+)
create mode 100644 srcpkgs/gnome-bluetooth/patches/meson-0.61.patch
diff --git a/srcpkgs/gnome-bluetooth/patches/meson-0.61.patch b/srcpkgs/gnome-bluetooth/patches/meson-0.61.patch
new file mode 100644
index 000000000000..c6962edd4f05
--- /dev/null
+++ b/srcpkgs/gnome-bluetooth/patches/meson-0.61.patch
@@ -0,0 +1,25 @@
+From 755fd758f866d3a3f7ca482942beee749f13a91e Mon Sep 17 00:00:00 2001
+From: Bastien Nocera <hadess@hadess.net>
+Date: Fri, 7 Jan 2022 12:51:22 +0100
+Subject: [PATCH] build: Fix build for newer versions of meson
+
+sendto/meson.build:24:5: ERROR: Function does not take positional arguments.
+---
+ sendto/meson.build | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/sendto/meson.build b/sendto/meson.build
+index 24a4e394..3e233a03 100644
+--- a/sendto/meson.build
++++ b/sendto/meson.build
+@@ -22,7 +22,6 @@ desktop_in = configure_file(
+ )
+
+ i18n.merge_file (
+- desktop,
+ type: 'desktop',
+ input: desktop_in,
+ output: desktop,
+--
+GitLab
+
From b09d025ca3d3499bfa79e13e242ee4b660dcba76 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 25 Jan 2022 10:11:00 +0100
Subject: [PATCH 46/82] 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 <michal@vasilek.cz>
+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 ea5fa8e267fdff1afb10269e588e35df87814582 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 25 Jan 2022 10:11:00 +0100
Subject: [PATCH 47/82] 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 a83a475a37bc9e605b1b2317a9f4bba437fb95e9 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 25 Jan 2022 10:11:00 +0100
Subject: [PATCH 48/82] 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 0fc68eb910ac7dedc5d1c7eaa3c0d77e4705e0bb Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 9 Mar 2022 17:20:40 +0100
Subject: [PATCH 49/82] glade3: fix cross builds with meson 0.61
---
srcpkgs/glade3/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/glade3/template b/srcpkgs/glade3/template
index 763632c1e712..a0235c1faef9 100644
--- a/srcpkgs/glade3/template
+++ b/srcpkgs/glade3/template
@@ -4,7 +4,7 @@ version=3.38.2
revision=1
wrksrc="glade-${version}"
build_style=meson
-build_helper="gir"
+build_helper="gir qemu"
configure_args="-Dgtk_doc=true -Dman=true $(vopt_bool gir introspection)"
hostmakedepends="glib-devel intltool itstool pkg-config
gjs-devel yelp-tools gettext-devel gtk-doc"
From 3aa686dc99ec8d26b611df3c10552e1ca7e806c4 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 9 Mar 2022 17:47:14 +0100
Subject: [PATCH 50/82] gnome-books: fix for meson 0.61
---
srcpkgs/gnome-books/patches/meson-0.61.patch | 33 ++++++++++++++++++++
1 file changed, 33 insertions(+)
create mode 100644 srcpkgs/gnome-books/patches/meson-0.61.patch
diff --git a/srcpkgs/gnome-books/patches/meson-0.61.patch b/srcpkgs/gnome-books/patches/meson-0.61.patch
new file mode 100644
index 000000000000..0e6ba9befd96
--- /dev/null
+++ b/srcpkgs/gnome-books/patches/meson-0.61.patch
@@ -0,0 +1,33 @@
+From 2663dcdaaaa71f067a4c2d0005eecc0fdf940bf5 Mon Sep 17 00:00:00 2001
+From: Michal Vasilek <michal@vasilek.cz>
+Date: Wed, 9 Mar 2022 17:46:00 +0100
+Subject: [PATCH] meson: remove positional args from i18n.merge_file
+
+This causes the build to fail with meson 0.61+
+---
+ data/meson.build | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/data/meson.build b/data/meson.build
+index bc6edfb4..5061554d 100644
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -54,7 +54,6 @@ sources += gnome.compile_resources(
+ appdata = 'org.gnome.Books.appdata.xml'
+
+ appdata_file = i18n.merge_file(
+- appdata,
+ input: appdata + '.in',
+ output: appdata,
+ po_dir: po_dir,
+@@ -74,7 +73,6 @@ if appstream_util.found()
+ desktop = 'org.gnome.Books.desktop'
+
+ desktop_file = i18n.merge_file(
+- desktop,
+ type: 'desktop',
+ input: desktop + '.in',
+ output: desktop,
+--
+2.35.1
+
From 30dbe47c584b00062692722f1382469df97a3302 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 25 Jan 2022 10:11:01 +0100
Subject: [PATCH 51/82] 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 <i@rvalue.moe>
+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 3ccc1f9fa03adb8f3d6f5eff689b1a5e06cef269 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 25 Jan 2022 10:11:01 +0100
Subject: [PATCH 52/82] 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 <i@rvalue.moe>
+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 2c6ff61a905eba772684fa7a18bfcf9dad092ba6 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 25 Jan 2022 10:11:01 +0100
Subject: [PATCH 53/82] 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 <jfelder@src.gnome.org>
+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 3ee459259ead764a46db5f1ab52f5d4fbf3c0f93 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 9 Mar 2022 18:14:37 +0100
Subject: [PATCH 54/82] gnome-mahjongg: fix for meson 0.61
---
.../gnome-mahjongg/patches/meson-0.61.patch | 37 +++++++++++++++++++
1 file changed, 37 insertions(+)
create mode 100644 srcpkgs/gnome-mahjongg/patches/meson-0.61.patch
diff --git a/srcpkgs/gnome-mahjongg/patches/meson-0.61.patch b/srcpkgs/gnome-mahjongg/patches/meson-0.61.patch
new file mode 100644
index 000000000000..2a17ad713752
--- /dev/null
+++ b/srcpkgs/gnome-mahjongg/patches/meson-0.61.patch
@@ -0,0 +1,37 @@
+From a2037b0747163601a5d5b57856d037eecf3a4db7 Mon Sep 17 00:00:00 2001
+From: Jan Beich <jbeich@FreeBSD.org>
+Date: Mon, 24 Jan 2022 11:22:48 +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.
+
+data/meson.build:24:0: ERROR: Function does not take positional arguments.
+data/meson.build:45:0: 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 8740503..edb8583 100644
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -21,7 +21,6 @@ install_data ('edu_kang_xi.png', install_dir: join_paths (pkgdatadir, 'themes'))
+ install_data ('maya.png', install_dir: join_paths (pkgdatadir, 'themes'))
+
+ desktop_file = i18n.merge_file (
+- 'desktop-file',
+ input: 'org.gnome.Mahjongg.desktop.in',
+ output: 'org.gnome.Mahjongg.desktop',
+ install: true,
+@@ -41,7 +40,7 @@ if desktop_file_validate.found()
+ )
+ endif
+
+-appdata_file = i18n.merge_file ('appdata-file',
++appdata_file = i18n.merge_file (
+ input: 'org.gnome.Mahjongg.appdata.xml.in',
+ output: 'org.gnome.Mahjongg.appdata.xml',
+ install: true,
+--
+GitLab
+
From 91eeb2580e57a0e5c529bce218997caa183131e8 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 9 Mar 2022 18:17:29 +0100
Subject: [PATCH 55/82] gnome-nibbles: fix for recent vala
---
srcpkgs/gnome-nibbles/patches/vala.patch | 178 +++++++++++++++++++++++
1 file changed, 178 insertions(+)
create mode 100644 srcpkgs/gnome-nibbles/patches/vala.patch
diff --git a/srcpkgs/gnome-nibbles/patches/vala.patch b/srcpkgs/gnome-nibbles/patches/vala.patch
new file mode 100644
index 000000000000..48c565303196
--- /dev/null
+++ b/srcpkgs/gnome-nibbles/patches/vala.patch
@@ -0,0 +1,178 @@
+From 62964e9256fcac616109af874dbb2bd8342a9853 Mon Sep 17 00:00:00 2001
+From: Rico Tzschichholz <ricotz@ubuntu.com>
+Date: Wed, 17 Mar 2021 11:25:05 +0100
+Subject: [PATCH] Reference of [GtkChild] fields is handled by GtkBuilder, type
+ must be unowned
+
+---
+ src/controls.vala | 20 ++++++++++----------
+ src/nibbles-window.vala | 26 +++++++++++++-------------
+ src/players.vala | 6 +++---
+ src/preferences-dialog.vala | 30 +++++++++++++++---------------
+ src/scoreboard.vala | 6 +++---
+ 5 files changed, 44 insertions(+), 44 deletions(-)
+
+diff --git a/src/controls.vala b/src/controls.vala
+index 584c9ff..f95d210 100644
+--- a/src/controls.vala
++++ b/src/controls.vala
+@@ -22,7 +22,7 @@ using Gtk;
+ [GtkTemplate (ui = "/org/gnome/Nibbles/ui/controls.ui")]
+ private class Controls : Box
+ {
+- [GtkChild] private Box grids_box;
++ [GtkChild] private unowned Box grids_box;
+ private Gee.LinkedList<ControlsGrid> grids = new Gee.LinkedList<ControlsGrid> ();
+
+ private Gdk.Pixbuf arrow_pixbuf;
+@@ -100,15 +100,15 @@ private class Controls : Box
+ [GtkTemplate (ui = "/org/gnome/Nibbles/ui/controls-grid.ui")]
+ private class ControlsGrid : Button
+ {
+- [GtkChild] private Label name_label;
+- [GtkChild] private Image arrow_up;
+- [GtkChild] private Image arrow_down;
+- [GtkChild] private Image arrow_left;
+- [GtkChild] private Image arrow_right;
+- [GtkChild] private Label move_up_label;
+- [GtkChild] private Label move_down_label;
+- [GtkChild] private Label move_left_label;
+- [GtkChild] private Label move_right_label;
++ [GtkChild] private unowned Label name_label;
++ [GtkChild] private unowned Image arrow_up;
++ [GtkChild] private unowned Image arrow_down;
++ [GtkChild] private unowned Image arrow_left;
++ [GtkChild] private unowned Image arrow_right;
++ [GtkChild] private unowned Label move_up_label;
++ [GtkChild] private unowned Label move_down_label;
++ [GtkChild] private unowned Label move_left_label;
++ [GtkChild] private unowned Label move_right_label;
+
+ internal WormProperties worm_props;
+ internal ulong external_handler;
+diff --git a/src/nibbles-window.vala b/src/nibbles-window.vala
+index 6961326..6bfb74a 100644
+--- a/src/nibbles-window.vala
++++ b/src/nibbles-window.vala
+@@ -40,30 +40,30 @@ private class NibblesWindow : ApplicationWindow
+ private int window_height;
+
+ /* Main widgets */
+- [GtkChild] private Stack main_stack;
+- [GtkChild] private Overlay overlay;
++ [GtkChild] private unowned Stack main_stack;
++ [GtkChild] private unowned Overlay overlay;
+
+ /* HeaderBar */
+- [GtkChild] private HeaderBar headerbar;
+- [GtkChild] private MenuButton hamburger_menu;
+- [GtkChild] private Button new_game_button;
+- [GtkChild] private Button pause_button;
++ [GtkChild] private unowned HeaderBar headerbar;
++ [GtkChild] private unowned MenuButton hamburger_menu;
++ [GtkChild] private unowned Button new_game_button;
++ [GtkChild] private unowned Button pause_button;
+
+ /* Pre-game screen widgets */
+- [GtkChild] private Players players;
+- [GtkChild] private Speed speed;
+- [GtkChild] private Controls controls;
++ [GtkChild] private unowned Players players;
++ [GtkChild] private unowned Speed speed;
++ [GtkChild] private unowned Controls controls;
+
+ /* Statusbar widgets */
+- [GtkChild] private Stack statusbar_stack;
+- [GtkChild] private Label countdown;
+- [GtkChild] private Scoreboard scoreboard;
++ [GtkChild] private unowned Stack statusbar_stack;
++ [GtkChild] private unowned Label countdown;
++ [GtkChild] private unowned Scoreboard scoreboard;
+ private Gdk.Pixbuf scoreboard_life;
+
+ /* Rendering of the game */
+ private NibblesView? view;
+
+- [GtkChild] private Box game_box;
++ [GtkChild] private unowned Box game_box;
+ private Games.GridFrame frame;
+
+ /* Game being played */
+diff --git a/src/players.vala b/src/players.vala
+index 9198412..4bde18e 100644
+--- a/src/players.vala
++++ b/src/players.vala
+@@ -21,9 +21,9 @@ using Gtk;
+ [GtkTemplate (ui = "/org/gnome/Nibbles/ui/players.ui")]
+ private class Players : Box
+ {
+- [GtkChild] private ToggleButton worms4;
+- [GtkChild] private ToggleButton worms5;
+- [GtkChild] private ToggleButton worms6;
++ [GtkChild] private unowned ToggleButton worms4;
++ [GtkChild] private unowned ToggleButton worms5;
++ [GtkChild] private unowned ToggleButton worms6;
+
+ private SimpleAction nibbles_number_action;
+ private SimpleAction players_number_action;
+diff --git a/src/preferences-dialog.vala b/src/preferences-dialog.vala
+index 216a1e2..2d3a7bf 100644
+--- a/src/preferences-dialog.vala
++++ b/src/preferences-dialog.vala
+@@ -24,21 +24,21 @@ private class PreferencesDialog : Window
+ private GLib.Settings settings;
+ private Gee.ArrayList<GLib.Settings> worm_settings;
+
+- [GtkChild] private Stack stack;
+- [GtkChild] private Stack headerbar_stack;
+- [GtkChild] private ComboBoxText worm_combobox;
+- [GtkChild] private Gtk.ListStore list_store_1;
+- [GtkChild] private Gtk.ListStore list_store_2;
+- [GtkChild] private Gtk.ListStore list_store_3;
+- [GtkChild] private Gtk.ListStore list_store_4;
+- [GtkChild] private TreeView tree_view_1;
+- [GtkChild] private TreeView tree_view_2;
+- [GtkChild] private TreeView tree_view_3;
+- [GtkChild] private TreeView tree_view_4;
+- [GtkChild] private ComboBoxText combo_box_1;
+- [GtkChild] private ComboBoxText combo_box_2;
+- [GtkChild] private ComboBoxText combo_box_3;
+- [GtkChild] private ComboBoxText combo_box_4;
++ [GtkChild] private unowned Stack stack;
++ [GtkChild] private unowned Stack headerbar_stack;
++ [GtkChild] private unowned ComboBoxText worm_combobox;
++ [GtkChild] private unowned Gtk.ListStore list_store_1;
++ [GtkChild] private unowned Gtk.ListStore list_store_2;
++ [GtkChild] private unowned Gtk.ListStore list_store_3;
++ [GtkChild] private unowned Gtk.ListStore list_store_4;
++ [GtkChild] private unowned TreeView tree_view_1;
++ [GtkChild] private unowned TreeView tree_view_2;
++ [GtkChild] private unowned TreeView tree_view_3;
++ [GtkChild] private unowned TreeView tree_view_4;
++ [GtkChild] private unowned ComboBoxText combo_box_1;
++ [GtkChild] private unowned ComboBoxText combo_box_2;
++ [GtkChild] private unowned ComboBoxText combo_box_3;
++ [GtkChild] private unowned ComboBoxText combo_box_4;
+
+ private Gee.ArrayList<Gtk.ListStore> list_stores;
+ private Gee.ArrayList<TreeView> tree_views;
+diff --git a/src/scoreboard.vala b/src/scoreboard.vala
+index a41aee1..aebc1cc 100644
+--- a/src/scoreboard.vala
++++ b/src/scoreboard.vala
+@@ -59,9 +59,9 @@ private class Scoreboard : Box
+ [GtkTemplate (ui = "/org/gnome/Nibbles/ui/player-score-box.ui")]
+ private class PlayerScoreBox : Box
+ {
+- [GtkChild] private Label name_label;
+- [GtkChild] private Label score_label;
+- [GtkChild] private Grid lives_grid;
++ [GtkChild] private unowned Label name_label;
++ [GtkChild] private unowned Label score_label;
++ [GtkChild] private unowned Grid lives_grid;
+
+ private Gee.LinkedList<Image> life_images = new Gee.LinkedList<Image> ();
+
+--
+GitLab
+
From a17d48e5f1a3fc03987218f55782502741f3de9e Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 9 Mar 2022 18:19:02 +0100
Subject: [PATCH 56/82] gnome-2048: fix for meson 0.61
---
srcpkgs/gnome-2048/patches/meson-0.61.patch | 36 +++++++++++++++++++++
1 file changed, 36 insertions(+)
create mode 100644 srcpkgs/gnome-2048/patches/meson-0.61.patch
diff --git a/srcpkgs/gnome-2048/patches/meson-0.61.patch b/srcpkgs/gnome-2048/patches/meson-0.61.patch
new file mode 100644
index 000000000000..912759654d73
--- /dev/null
+++ b/srcpkgs/gnome-2048/patches/meson-0.61.patch
@@ -0,0 +1,36 @@
+From 194e22699f7166a016cd39ba26dd719aeecfc868 Mon Sep 17 00:00:00 2001
+From: Jan Beich <jbeich@FreeBSD.org>
+Date: Sun, 23 Jan 2022 10:49:07 +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.
+
+data/meson.build:19:0: ERROR: Function does not take positional arguments.
+data/meson.build:39:0: 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 33f73ca..8974a63 100644
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -17,7 +17,6 @@ install_data(
+
+ # Desktop file
+ desktop_file = i18n.merge_file(
+- 'desktop-file',
+ input: 'org.gnome.TwentyFortyEight.desktop.in',
+ output: 'org.gnome.TwentyFortyEight.desktop',
+ install: true,
+@@ -37,7 +36,6 @@ endif
+
+ # AppData file
+ appdata_file = i18n.merge_file(
+- 'appdata-file',
+ input: 'org.gnome.TwentyFortyEight.appdata.xml.in',
+ output: 'org.gnome.TwentyFortyEight.appdata.xml',
+ install: true,
+--
+GitLab
+
From 2916395203c4910cb1801eb78852f0cfa71680b9 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 9 Mar 2022 18:23:31 +0100
Subject: [PATCH 57/82] gnome-photos: fix for meson 0.61
---
srcpkgs/gnome-photos/patches/meson-0.61.patch | 32 +++++++++++++++++++
1 file changed, 32 insertions(+)
create mode 100644 srcpkgs/gnome-photos/patches/meson-0.61.patch
diff --git a/srcpkgs/gnome-photos/patches/meson-0.61.patch b/srcpkgs/gnome-photos/patches/meson-0.61.patch
new file mode 100644
index 000000000000..f406b1c494c0
--- /dev/null
+++ b/srcpkgs/gnome-photos/patches/meson-0.61.patch
@@ -0,0 +1,32 @@
+From a0ac868a19d55dc52100e54fe4b2d29041bc6752 Mon Sep 17 00:00:00 2001
+From: rvalue <i@rvalue.moe>
+Date: Fri, 21 Jan 2022 12:36:02 +0000
+Subject: [PATCH] meson: remove incorrect args for i18n.merge_file
+
+---
+ data/meson.build | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/data/meson.build b/data/meson.build
+index 6e7192e0..94271de2 100644
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -3,7 +3,6 @@ subdir('icons')
+ appdata = photos_namespace + '.appdata.xml'
+
+ i18n.merge_file(
+- appdata,
+ input: appdata + '.in',
+ output: appdata,
+ po_dir: po_dir,
+@@ -23,7 +22,6 @@ desktop_in = configure_file(
+ )
+
+ i18n.merge_file(
+- desktop,
+ type: 'desktop',
+ input: desktop_in,
+ output: desktop,
+--
+GitLab
+
From 29ed16ca98072d878b0e62c628303b58a08f7377 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 9 Mar 2022 18:25:42 +0100
Subject: [PATCH 58/82] gnome-podcasts: fix for meson 0.61
---
.../gnome-podcasts/patches/meson-0.61.patch | 38 +++++++++++++++++++
1 file changed, 38 insertions(+)
create mode 100644 srcpkgs/gnome-podcasts/patches/meson-0.61.patch
diff --git a/srcpkgs/gnome-podcasts/patches/meson-0.61.patch b/srcpkgs/gnome-podcasts/patches/meson-0.61.patch
new file mode 100644
index 000000000000..b5ad823b70cf
--- /dev/null
+++ b/srcpkgs/gnome-podcasts/patches/meson-0.61.patch
@@ -0,0 +1,38 @@
+From 6614bb62ecbec7c3b18ea7fe44beb50fe7942b27 Mon Sep 17 00:00:00 2001
+From: Jan Beich <jbeich@FreeBSD.org>
+Date: Thu, 20 Jan 2022 01:27:48 +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.
+
+podcasts-gtk/resources/meson.build:5:0: ERROR: Function does not take positional arguments.
+podcasts-gtk/resources/meson.build:30:0: ERROR: Function does not take positional arguments.
+---
+ podcasts-gtk/resources/meson.build | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/podcasts-gtk/resources/meson.build b/podcasts-gtk/resources/meson.build
+index c1f1ee9f..87148087 100644
+--- a/podcasts-gtk/resources/meson.build
++++ b/podcasts-gtk/resources/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.Podcasts.desktop.in.in'),
+@@ -27,7 +27,7 @@ endif
+
+ 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.Podcasts.appdata.xml.in.in'),
+ output: 'org.gnome.Podcasts.appdata.xml.in',
+--
+GitLab
+
From b4ef81926dba43260eb0eaedb7eebb1ba4151419 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 9 Mar 2022 18:27:03 +0100
Subject: [PATCH 59/82] gnome-screenshot: fix for meson 0.61
---
.../gnome-screenshot/patches/meson-0.61.patch | 36 +++++++++++++++++++
1 file changed, 36 insertions(+)
create mode 100644 srcpkgs/gnome-screenshot/patches/meson-0.61.patch
diff --git a/srcpkgs/gnome-screenshot/patches/meson-0.61.patch b/srcpkgs/gnome-screenshot/patches/meson-0.61.patch
new file mode 100644
index 000000000000..b21aa0490d49
--- /dev/null
+++ b/srcpkgs/gnome-screenshot/patches/meson-0.61.patch
@@ -0,0 +1,36 @@
+From b60dad3c2536c17bd201f74ad8e40eb74385ed9f Mon Sep 17 00:00:00 2001
+From: Jack Hill <jackhill@jackhill.us>
+Date: Thu, 18 Nov 2021 00:46:58 -0500
+Subject: [PATCH] meson: remove extraneous positional argument
+
+* data/meson.build (desktop_file)
+ (metainfo_file): Remove extraneous positional argument.
+
+Closes #186
+---
+ data/meson.build | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/data/meson.build b/data/meson.build
+index fd570b3..4e2e2e8 100644
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -1,7 +1,6 @@
+ gnome = import('gnome')
+
+ desktop_file = i18n.merge_file(
+- 'desktop',
+ type: 'desktop',
+ input: 'org.gnome.Screenshot.desktop.in',
+ output: 'org.gnome.Screenshot.desktop',
+@@ -23,7 +22,6 @@ if desktop_file_validate.found()
+ endif
+
+ metainfo_file = i18n.merge_file(
+- 'appdata',
+ input: 'org.gnome.Screenshot.metainfo.xml.in',
+ output: 'org.gnome.Screenshot.metainfo.xml',
+ po_dir: join_paths(meson.current_source_dir(), '../po'),
+--
+GitLab
+
From cd7ccc062d8910d2496aeed543503883591c2a64 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 9 Mar 2022 18:28:32 +0100
Subject: [PATCH 60/82] gnome-settings-daemon: fix for meson 0.61
---
.../patches/meson-0.61.patch | 38 +++++++++++++++++++
1 file changed, 38 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..b7c03ca2da63
--- /dev/null
+++ b/srcpkgs/gnome-settings-daemon/patches/meson-0.61.patch
@@ -0,0 +1,38 @@
+From afa7e4bb9c519e2daf500a6079088669500768c0 Mon Sep 17 00:00:00 2001
+From: Marvin Schmidt <marv@exherbo.org>
+Date: Wed, 26 Jan 2022 23:08:58 +0100
+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.
+---
+ plugins/power/meson.build | 1 -
+ plugins/wacom/meson.build | 1 -
+ 2 files changed, 2 deletions(-)
+
+diff --git a/plugins/power/meson.build b/plugins/power/meson.build
+index 69e619f2..014bb6da 100644
+--- 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,
+diff --git a/plugins/wacom/meson.build b/plugins/wacom/meson.build
+index d8dd0ec7..c00323d4 100644
+--- 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,
+--
+GitLab
+
From 56683f2f8ccc080a6a34b8de0d5ca94e27bbf1dc Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 9 Mar 2022 18:30:02 +0100
Subject: [PATCH 61/82] 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?= <fmuellner@gnome.org>
+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: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/2078>
+---
+ 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 12fa30875506b9d8dacb093fc4984dcdcfc0d641 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 9 Mar 2022 18:31:24 +0100
Subject: [PATCH 62/82] gnome-sound-recorder: fix for meson 0.61
---
.../patches/meson-0.61.patch | 41 +++++++++++++++++++
1 file changed, 41 insertions(+)
create mode 100644 srcpkgs/gnome-sound-recorder/patches/meson-0.61.patch
diff --git a/srcpkgs/gnome-sound-recorder/patches/meson-0.61.patch b/srcpkgs/gnome-sound-recorder/patches/meson-0.61.patch
new file mode 100644
index 000000000000..40392e6a9fe8
--- /dev/null
+++ b/srcpkgs/gnome-sound-recorder/patches/meson-0.61.patch
@@ -0,0 +1,41 @@
+From 1335b1b1aff61167f8648f7cb3c569764031960d Mon Sep 17 00:00:00 2001
+From: Jan Beich <jbeich@FreeBSD.org>
+Date: Mon, 24 Jan 2022 11:37:06 +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.
+
+data/appdata/meson.build:5:0: ERROR: Function does not take positional arguments.
+data/meson.build:16: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 1f5744e..d2c2c3a 100644
+--- a/data/appdata/meson.build
++++ b/data/appdata/meson.build
+@@ -3,7 +3,6 @@ metainfo_conf.set('app-id', application_id)
+ metainfo_conf.set('gettext-package', gettext_package)
+
+ metainfo_file = i18n.merge_file(
+- 'metainfo-file',
+ input: configure_file(
+ input: 'org.gnome.SoundRecorder.metainfo.xml.in.in',
+ output: '@BASENAME@',
+diff --git a/data/meson.build b/data/meson.build
+index 44117ad..0ff8fa5 100644
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -14,7 +14,6 @@ install_data(
+ desktop_conf = configuration_data()
+ desktop_conf.set('app-id', application_id)
+ desktop_file = i18n.merge_file(
+- 'desktop',
+ input: configure_file(
+ input: 'org.gnome.SoundRecorder.desktop.in.in',
+ output: '@BASENAME@',
+--
+GitLab
+
From e6d9f2493de6c0646d9c13bbe0f9efb9bbd872d9 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 9 Mar 2022 18:34:03 +0100
Subject: [PATCH 63/82] gnome-dictionary: fix for meson 0.61
---
.../gnome-dictionary/patches/meson-0.61.patch | 30 +++++++++++++++++++
1 file changed, 30 insertions(+)
create mode 100644 srcpkgs/gnome-dictionary/patches/meson-0.61.patch
diff --git a/srcpkgs/gnome-dictionary/patches/meson-0.61.patch b/srcpkgs/gnome-dictionary/patches/meson-0.61.patch
new file mode 100644
index 000000000000..768494e2a8cf
--- /dev/null
+++ b/srcpkgs/gnome-dictionary/patches/meson-0.61.patch
@@ -0,0 +1,30 @@
+--- a/data/appdata/meson.build
++++ b/data/appdata/meson.build
+@@ -1,6 +1,6 @@
+ appdata_conf = configuration_data()
+ appdata_conf.set('application_id', application_id)
+-i18n.merge_file('appdata',
++i18n.merge_file(
+ input: configure_file(
+ input: 'org.gnome.Dictionary.appdata.xml.in.in',
+ output: 'org.gnome.Dictionary.appdata.xml.in',
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -3,7 +3,7 @@ subdir('appdata')
+ desktop_conf = configuration_data()
+ desktop_conf.set('icon', application_id)
+ desktop_conf.set('application_id', application_id)
+-i18n.merge_file('desktop',
++i18n.merge_file(
+ input: configure_file(
+ input: 'org.gnome.Dictionary.desktop.in.in',
+ output: 'org.gnome.Dictionary.desktop.in',
+@@ -45,7 +45,7 @@ sources = [
+ ]
+
+ foreach s: sources
+- i18n.merge_file('sources',
++ i18n.merge_file(
+ input: '@0@.in'.format(s),
+ output: s,
+ install: true,
From 90a7571f9f02bc59049f37c77ca9f9e11f8a72c2 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 9 Mar 2022 18:37:12 +0100
Subject: [PATCH 64/82] gnome-authenticator: fix for meson 0.61
---
.../patches/meson-0.61.patch | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
create mode 100644 srcpkgs/gnome-authenticator/patches/meson-0.61.patch
diff --git a/srcpkgs/gnome-authenticator/patches/meson-0.61.patch b/srcpkgs/gnome-authenticator/patches/meson-0.61.patch
new file mode 100644
index 000000000000..eade2e1241b5
--- /dev/null
+++ b/srcpkgs/gnome-authenticator/patches/meson-0.61.patch
@@ -0,0 +1,18 @@
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -63,7 +63,6 @@ configure_file(
+ desktop_conf = configuration_data()
+ desktop_conf.set('APP_ID', application_id)
+ desktop_file = i18n.merge_file(
+- 'desktop',
+ input: configure_file(
+ input: meson.project_name() + '.desktop.in.in',
+ output: '@BASENAME@',
+@@ -90,7 +89,6 @@ appdata_conf = configuration_data()
+ appdata_conf.set('APP_ID', application_id)
+ appdata_conf.set('GETTEXT_PACKAGE', gettext_package)
+ appdata_file = i18n.merge_file(
+- 'appdata',
+ input: configure_file(
+ input: meson.project_name() + '.appdata.xml.in.in',
+ output: '@BASENAME@',
From e471d952333ece17556218789f502cd6403f9477 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 9 Mar 2022 19:05:16 +0100
Subject: [PATCH 65/82] gnome-sudoku: fix for meson 0.61
---
srcpkgs/gnome-sudoku/patches/meson-0.61.patch | 38 +++++++++++++++++++
srcpkgs/gnome-sudoku/template | 2 +-
2 files changed, 39 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/gnome-sudoku/patches/meson-0.61.patch
diff --git a/srcpkgs/gnome-sudoku/patches/meson-0.61.patch b/srcpkgs/gnome-sudoku/patches/meson-0.61.patch
new file mode 100644
index 000000000000..93549d0158d5
--- /dev/null
+++ b/srcpkgs/gnome-sudoku/patches/meson-0.61.patch
@@ -0,0 +1,38 @@
+From 7c9935a02b48f332f67bad3e4ee020b75591084a Mon Sep 17 00:00:00 2001
+From: Jan Beich <jbeich@FreeBSD.org>
+Date: Mon, 24 Jan 2022 11:44:06 +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.
+
+data/meson.build:5:0: ERROR: Function does not take positional arguments.
+data/meson.build:24:0: ERROR: Function does not take positional arguments.
+---
+ data/meson.build | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/data/meson.build b/data/meson.build
+index f18f247..9c95e02 100644
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -2,7 +2,7 @@ resource_files = files('gnome-sudoku.gresource.xml')
+
+ resources = gnome.compile_resources('gnome-sudoku', resource_files)
+
+-desktop_file = i18n.merge_file('desktop',
++desktop_file = i18n.merge_file(
+ input: '@0@.desktop.in'.format(application_id),
+ output: '@0@.desktop'.format(application_id),
+ install: true,
+@@ -21,7 +21,7 @@ if desktop_file_validate.found()
+ )
+ endif
+
+-appdata_file = i18n.merge_file('appdata',
++appdata_file = i18n.merge_file(
+ input: '@0@.appdata.xml.in'.format(application_id),
+ output: '@0@.appdata.xml'.format(application_id),
+ install: true,
+--
+GitLab
+
diff --git a/srcpkgs/gnome-sudoku/template b/srcpkgs/gnome-sudoku/template
index ed1759478ab5..6e0af45248ff 100644
--- a/srcpkgs/gnome-sudoku/template
+++ b/srcpkgs/gnome-sudoku/template
@@ -5,7 +5,7 @@ revision=1
build_helper="gir"
build_style=meson
hostmakedepends="gettext glib-devel itstool pkg-config vala"
-makedepends="gtk4-devel libgee08-devel json-glib-devel qqwing-devel"
+makedepends="gtk+3-devel libgee08-devel json-glib-devel qqwing-devel"
short_desc="GNOME Sudoku Japanese logic game"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3.0-or-later"
From ded26fb114e2ac15582a505ba461fbe1820aaf8a Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 25 Jan 2022 10:11:01 +0100
Subject: [PATCH 66/82] 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 <chpe@src.gnome.org>
+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 d0f7a272881f13967031e0cc530c3d473b93f721 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 9 Mar 2022 19:27:12 +0100
Subject: [PATCH 67/82] gnome-tweaks: fix for meson 0.61
---
srcpkgs/gnome-tweaks/patches/meson-0.61.patch | 32 +++++++++++++++++++
1 file changed, 32 insertions(+)
create mode 100644 srcpkgs/gnome-tweaks/patches/meson-0.61.patch
diff --git a/srcpkgs/gnome-tweaks/patches/meson-0.61.patch b/srcpkgs/gnome-tweaks/patches/meson-0.61.patch
new file mode 100644
index 000000000000..80efde38735e
--- /dev/null
+++ b/srcpkgs/gnome-tweaks/patches/meson-0.61.patch
@@ -0,0 +1,32 @@
+From dc9701e18775c01d0b69fabaa350147f70096da8 Mon Sep 17 00:00:00 2001
+From: Mae Dartmann <hello@maedartmann.name>
+Date: Wed, 16 Feb 2022 06:08:41 +0000
+Subject: [PATCH] meson: fix invalid positional argument
+
+---
+ data/meson.build | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/data/meson.build b/data/meson.build
+index fd6d5da..74f7e82 100644
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -1,5 +1,5 @@
+ appdata_file = 'org.gnome.tweaks.appdata.xml'
+-i18n.merge_file(appdata_file,
++i18n.merge_file(
+ input: appdata_file + '.in',
+ output: appdata_file,
+ po_dir: '../po',
+@@ -8,7 +8,7 @@ i18n.merge_file(appdata_file,
+ )
+
+ desktop_file = 'org.gnome.tweaks.desktop'
+-i18n.merge_file(desktop_file,
++i18n.merge_file(
+ input: desktop_file + '.in',
+ output: desktop_file,
+ po_dir: '../po',
+--
+GitLab
+
From 6982cca261b864c4069fd55eb8dd3857dd9d28db Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 9 Mar 2022 19:30:05 +0100
Subject: [PATCH 68/82] gnome-tetravex: fix for meson 0.61
---
.../gnome-tetravex/patches/meson-0.61.patch | 38 +++++++++++++++++++
1 file changed, 38 insertions(+)
create mode 100644 srcpkgs/gnome-tetravex/patches/meson-0.61.patch
diff --git a/srcpkgs/gnome-tetravex/patches/meson-0.61.patch b/srcpkgs/gnome-tetravex/patches/meson-0.61.patch
new file mode 100644
index 000000000000..12e0eab64ef0
--- /dev/null
+++ b/srcpkgs/gnome-tetravex/patches/meson-0.61.patch
@@ -0,0 +1,38 @@
+From 80912d06f5e588f6aca966fa516103275e58d94e Mon Sep 17 00:00:00 2001
+From: Jan Beich <jbeich@FreeBSD.org>
+Date: Mon, 24 Jan 2022 11:48:22 +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.
+
+data/meson.build:37:0: ERROR: Function does not take positional arguments.
+data/meson.build:59:0: ERROR: Function does not take positional arguments.
+---
+ data/meson.build | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/data/meson.build b/data/meson.build
+index bb77248..b881e8a 100644
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -34,7 +34,7 @@ endif
+
+ # Desktop file
+ if get_option('build_gui')
+- desktop_file = i18n.merge_file ('desktop-file',
++ desktop_file = i18n.merge_file (
+ input: project_id + '.desktop.in',
+ output: project_id + '.desktop',
+ install: true,
+@@ -56,7 +56,7 @@ endif
+
+ # AppData file
+ if get_option('build_gui')
+- appdata_file = i18n.merge_file ('appdata-file',
++ appdata_file = i18n.merge_file (
+ input: project_id + '.appdata.xml.in',
+ output: project_id + '.appdata.xml',
+ install: true,
+--
+GitLab
+
From 2058e63ccf3c10f998686cbd88a1805ed022bc38 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 25 Jan 2022 10:11:01 +0100
Subject: [PATCH 69/82] 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 aff50fa882e4dcf0e6d37ceabca9a946bd73a048 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 9 Mar 2022 19:31:37 +0100
Subject: [PATCH 70/82] gnote: fix for meson 0.61
---
srcpkgs/gnote/patches/meson-0.61.patch | 36 ++++++++++++++++++++++++++
1 file changed, 36 insertions(+)
create mode 100644 srcpkgs/gnote/patches/meson-0.61.patch
diff --git a/srcpkgs/gnote/patches/meson-0.61.patch b/srcpkgs/gnote/patches/meson-0.61.patch
new file mode 100644
index 000000000000..e5575c0fa3f7
--- /dev/null
+++ b/srcpkgs/gnote/patches/meson-0.61.patch
@@ -0,0 +1,36 @@
+From 32795e53681e3ecbaaa05817d4eb5fa1c124d35b Mon Sep 17 00:00:00 2001
+From: Jan Beich <jbeich@FreeBSD.org>
+Date: Mon, 24 Jan 2022 11:53:17 +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.
+
+data/meson.build:4:0: ERROR: Function does not take positional arguments.
+data/meson.build:41:0: 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 a6138165..8d16368a 100644
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -2,7 +2,6 @@ install_man('gnote.1')
+
+ desktop_file = 'org.gnome.Gnote.desktop'
+ gnote_desktop_file = i18n.merge_file(
+- desktop_file,
+ type: 'desktop',
+ input: desktop_file + '.in',
+ output: desktop_file,
+@@ -39,7 +38,6 @@ configure_file(
+
+ gnote_appdata = 'org.gnome.Gnote.appdata.xml'
+ appdata_file = i18n.merge_file(
+- gnote_appdata,
+ input: gnote_appdata + '.in',
+ output: gnote_appdata,
+ po_dir: '../po',
+--
+GitLab
+
From 9c9de6d1e54c1e66ff96eef6ae940fdd0fda1e91 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 25 Jan 2022 10:11:01 +0100
Subject: [PATCH 71/82] 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 <ebassi@gnome.org>
+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 <ebassi@gnome.org>
+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 03c811a94396ab8e2687e449b05576eac3edeb36 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 25 Jan 2022 10:11:01 +0100
Subject: [PATCH 72/82] 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 <paobac@src.gnome.org>
+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 4f9b87b14f2e2a0e7919ca064aea462aec42019e Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 10 Mar 2022 21:45:46 +0100
Subject: [PATCH 73/82] gtranslator: fix for meson 0.61
---
srcpkgs/gtranslator/patches/meson-0.61.patch | 36 ++++++++++++++++++++
1 file changed, 36 insertions(+)
create mode 100644 srcpkgs/gtranslator/patches/meson-0.61.patch
diff --git a/srcpkgs/gtranslator/patches/meson-0.61.patch b/srcpkgs/gtranslator/patches/meson-0.61.patch
new file mode 100644
index 000000000000..54063041fe16
--- /dev/null
+++ b/srcpkgs/gtranslator/patches/meson-0.61.patch
@@ -0,0 +1,36 @@
+From 7ac572cc8c8c37ca3826ecf0d395edd3c38e8e22 Mon Sep 17 00:00:00 2001
+From: Jan Beich <jbeich@FreeBSD.org>
+Date: Mon, 24 Jan 2022 11:57:43 +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.
+
+data/meson.build:15:0: ERROR: Function does not take positional arguments.
+data/meson.build:37:0: 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 2ca0be0b..2ebbfb12 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: '@0@.desktop'.format(gtr_app_id),
+@@ -35,7 +34,6 @@ appdata_in = configure_file(
+ )
+
+ i18n.merge_file(
+- appdata,
+ input: appdata_in,
+ output: appdata,
+ po_dir: po_dir,
+--
+GitLab
+
From 778d8d5d567a867a49783bc54ae9dcd774aab5cd Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 10 Mar 2022 21:56:48 +0100
Subject: [PATCH 74/82] gnome-taquin: fix for meson 0.61
---
srcpkgs/gnome-taquin/patches/meson-0.61.patch | 134 ++++++++++++++++++
1 file changed, 134 insertions(+)
create mode 100644 srcpkgs/gnome-taquin/patches/meson-0.61.patch
diff --git a/srcpkgs/gnome-taquin/patches/meson-0.61.patch b/srcpkgs/gnome-taquin/patches/meson-0.61.patch
new file mode 100644
index 000000000000..e14267675ecb
--- /dev/null
+++ b/srcpkgs/gnome-taquin/patches/meson-0.61.patch
@@ -0,0 +1,134 @@
+From 99dea5e7863e112f33f16e59898c56a4f1a547b3 Mon Sep 17 00:00:00 2001
+From: Rico Tzschichholz <ricotz@ubuntu.com>
+Date: Sat, 16 Jan 2021 14:00:15 +0100
+Subject: [PATCH] Don't alter or try to write [GtkChild] fields
+
+See https://gitlab.gnome.org/GNOME/vala/issues/1121
+---
+ src/overlayed-list.vala | 38 +++++++++++++++++++-------------------
+ 1 file changed, 19 insertions(+), 19 deletions(-)
+
+diff --git a/src/overlayed-list.vala b/src/overlayed-list.vala
+index 3fbb1c3..eb2404a 100644
+--- a/src/overlayed-list.vala
++++ b/src/overlayed-list.vala
+@@ -89,11 +89,11 @@ private abstract class OverlayedList : Overlay, AdaptativeWidget
+ internal void set_window_size (AdaptativeWidget.WindowSize new_size)
+ {
+ if (!AdaptativeWidget.WindowSize.is_extra_thin (new_size) && AdaptativeWidget.WindowSize.is_extra_flat (new_size))
+- set_horizontal (ref main_context, ref edit_mode_box);
++ set_horizontal (ref main_context, edit_mode_box);
+ else
+- set_vertical (ref main_context, ref edit_mode_box);
++ set_vertical (ref main_context, edit_mode_box);
+ }
+- private static inline void set_horizontal (ref StyleContext main_context, ref Box edit_mode_box)
++ private static inline void set_horizontal (ref StyleContext main_context, Box edit_mode_box)
+ {
+ main_context.remove_class ("vertical");
+ edit_mode_box.halign = Align.END;
+@@ -102,7 +102,7 @@ private abstract class OverlayedList : Overlay, AdaptativeWidget
+ edit_mode_box.width_request = 160;
+ main_context.add_class ("horizontal");
+ }
+- private static inline void set_vertical (ref StyleContext main_context, ref Box edit_mode_box)
++ private static inline void set_vertical (ref StyleContext main_context, Box edit_mode_box)
+ {
+ main_context.remove_class ("horizontal");
+ edit_mode_box.halign = Align.CENTER;
+@@ -118,9 +118,9 @@ private abstract class OverlayedList : Overlay, AdaptativeWidget
+
+ internal bool next_match ()
+ {
+- return _next_match (ref main_list_box);
++ return _next_match (main_list_box);
+ }
+- private static inline bool _next_match (ref ListBox main_list_box)
++ private static inline bool _next_match (ListBox main_list_box)
+ {
+ ListBoxRow? row = main_list_box.get_selected_row (); // TODO multiple rows and focus-only lists
+ if (row == null)
+@@ -130,7 +130,7 @@ private abstract class OverlayedList : Overlay, AdaptativeWidget
+
+ if (row == null)
+ {
+- _scroll_bottom (ref main_list_box);
++ _scroll_bottom (main_list_box);
+ return false;
+ }
+ main_list_box.select_row ((!) row);
+@@ -140,9 +140,9 @@ private abstract class OverlayedList : Overlay, AdaptativeWidget
+
+ internal bool previous_match ()
+ {
+- return _previous_match (ref main_list_box);
++ return _previous_match (main_list_box);
+ }
+- private static inline bool _previous_match (ref ListBox main_list_box)
++ private static inline bool _previous_match (ListBox main_list_box)
+ {
+ uint n_items = main_list_box.get_children ().length (); // FIXME OverlayedList.n_items is unreliable
+ if (n_items == 0)
+@@ -189,9 +189,9 @@ private abstract class OverlayedList : Overlay, AdaptativeWidget
+
+ protected int [] get_selected_rows_indices ()
+ {
+- return _get_selected_rows_indices (ref main_list_box);
++ return _get_selected_rows_indices (main_list_box);
+ }
+- private static inline int [] _get_selected_rows_indices (ref ListBox main_list_box)
++ private static inline int [] _get_selected_rows_indices (ListBox main_list_box)
+ {
+ int [] indices = new int [0];
+ main_list_box.selected_foreach ((_list_box, selected_row) => {
+@@ -205,9 +205,9 @@ private abstract class OverlayedList : Overlay, AdaptativeWidget
+
+ protected void scroll_top ()
+ {
+- _scroll_top (ref main_list_box);
++ _scroll_top (main_list_box);
+ }
+- private static inline void _scroll_top (ref ListBox main_list_box)
++ private static inline void _scroll_top (ListBox main_list_box)
+ {
+ Adjustment adjustment = main_list_box.get_adjustment ();
+ adjustment.set_value (adjustment.get_lower ());
+@@ -215,9 +215,9 @@ private abstract class OverlayedList : Overlay, AdaptativeWidget
+
+ protected void scroll_bottom ()
+ {
+- _scroll_bottom (ref main_list_box);
++ _scroll_bottom (main_list_box);
+ }
+- private static inline void _scroll_bottom (ref ListBox main_list_box)
++ private static inline void _scroll_bottom (ListBox main_list_box)
+ {
+ Adjustment adjustment = main_list_box.get_adjustment ();
+ adjustment.set_value (adjustment.get_upper ());
+@@ -225,9 +225,9 @@ private abstract class OverlayedList : Overlay, AdaptativeWidget
+
+ internal bool handle_copy_text (out string copy_text)
+ {
+- return _handle_copy_text (out copy_text, ref main_list_box);
++ return _handle_copy_text (out copy_text, main_list_box);
+ }
+- private static inline bool _handle_copy_text (out string copy_text, ref ListBox main_list_box)
++ private static inline bool _handle_copy_text (out string copy_text, ListBox main_list_box)
+ {
+ List<weak ListBoxRow> selected_rows = main_list_box.get_selected_rows ();
+ OverlayedListRow row;
+@@ -283,9 +283,9 @@ private abstract class OverlayedList : Overlay, AdaptativeWidget
+
+ internal SelectionState get_selection_state ()
+ {
+- return _get_selection_state (ref main_list_box, ref main_list_store);
++ return _get_selection_state (main_list_box, ref main_list_store);
+ }
+- private static inline SelectionState _get_selection_state (ref ListBox main_list_box, ref GLib.ListStore main_list_store)
++ private static inline SelectionState _get_selection_state (ListBox main_list_box, ref GLib.ListStore main_list_store)
+ {
+ List<weak ListBoxRow> selected_rows = main_list_box.get_selected_rows ();
+ uint n_selected_rows = selected_rows.length ();
+--
+GitLab
+
From 0d548785c3daec9fcb52e337700e6905b3f89396 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 10 Mar 2022 21:57:05 +0100
Subject: [PATCH 75/82] hitori: fix for meson 0.61
---
srcpkgs/hitori/patches/meson-0.61.patch | 41 +++++++++++++++++++++++++
1 file changed, 41 insertions(+)
create mode 100644 srcpkgs/hitori/patches/meson-0.61.patch
diff --git a/srcpkgs/hitori/patches/meson-0.61.patch b/srcpkgs/hitori/patches/meson-0.61.patch
new file mode 100644
index 000000000000..37adaa0116e6
--- /dev/null
+++ b/srcpkgs/hitori/patches/meson-0.61.patch
@@ -0,0 +1,41 @@
+From d25728e122f1d7b985029a5ba96810c3e57c27f7 Mon Sep 17 00:00:00 2001
+From: Philip Withnall <pwithnall@endlessos.org>
+Date: Tue, 2 Nov 2021 12:04:29 +0000
+Subject: [PATCH] build: Drop positional arguments from i18n.merge_file() calls
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Meson never took positional arguments in this function, but didn’t warn
+about it until Meson 0.60. Drop the unnecessary arguments to fix the
+warning.
+
+Signed-off-by: Philip Withnall <pwithnall@endlessos.org>
+---
+ data/meson.build | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/data/meson.build b/data/meson.build
+index 97b8e68..c66a233 100644
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -1,6 +1,6 @@
+ subdir('icons')
+
+-desktop_file = i18n.merge_file('desktop-file',
++desktop_file = i18n.merge_file(
+ type: 'desktop',
+ input: '@0@.desktop.in'.format(application_id),
+ output: '@0@.desktop'.format(application_id),
+@@ -20,7 +20,7 @@ if desktop_file_validate.found()
+ )
+ endif
+
+-appdata_file = i18n.merge_file('appdata-file',
++appdata_file = i18n.merge_file(
+ input: '@0@.appdata.xml.in'.format(application_id),
+ output: '@0@.appdata.xml'.format(application_id),
+ po_dir: join_paths(meson.source_root(), 'po'),
+--
+GitLab
+
From bb5b67fe83ace89dbd5073684592d52452bed545 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 10 Mar 2022 21:57:19 +0100
Subject: [PATCH 76/82] gvfs: fix for meson 0.61
---
srcpkgs/gvfs/patches/meson-0.61.patch | 10 ++++++++++
1 file changed, 10 insertions(+)
create mode 100644 srcpkgs/gvfs/patches/meson-0.61.patch
diff --git a/srcpkgs/gvfs/patches/meson-0.61.patch b/srcpkgs/gvfs/patches/meson-0.61.patch
new file mode 100644
index 000000000000..38f04b2e894c
--- /dev/null
+++ b/srcpkgs/gvfs/patches/meson-0.61.patch
@@ -0,0 +1,10 @@
+--- a/daemon/meson.build
++++ b/daemon/meson.build
+@@ -366,7 +366,6 @@ if enable_admin
+ )
+
+ i18n.merge_file(
+- policy,
+ input: policy_in,
+ output: '@BASENAME@',
+ po_dir: po_dir,
From c1773e7cd6bb74f938bbbf95f1c929b53c2e763f Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 12 Mar 2022 17:07:09 +0100
Subject: [PATCH 77/82] libaccounts-glib: update to 1.24.
---
srcpkgs/libaccounts-glib/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/libaccounts-glib/template b/srcpkgs/libaccounts-glib/template
index ad3a6e0621a9..9b86ed45ed91 100644
--- a/srcpkgs/libaccounts-glib/template
+++ b/srcpkgs/libaccounts-glib/template
@@ -17,9 +17,9 @@ checksum=eebb1c6debfcf929efb388a0f28d8cc8ec9b32f273e4abe4224a33e5d299cd73
if [ "$CROSS_BUILD" ]; then
# Remove docs. During install of package, it will try
# to run target binary with host, which causes exec error
- pre_build() {
- vsed -e '/docs/d' -i meson.build
- }
+ post_patch() {
+ vsed -e '/docs/d' -i meson.build
+ }
fi
libaccounts-glib-devel_package() {
From b4541e5f326ea896bda2fc62500763f3803cd6bf Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 12 Mar 2022 17:37:09 +0100
Subject: [PATCH 78/82] nautilus-sendto: remove package
---
srcpkgs/nautilus-sendto/template | 14 --------------
srcpkgs/removed-packages/template | 1 +
2 files changed, 1 insertion(+), 14 deletions(-)
delete mode 100644 srcpkgs/nautilus-sendto/template
diff --git a/srcpkgs/nautilus-sendto/template b/srcpkgs/nautilus-sendto/template
deleted file mode 100644
index c357b9efae65..000000000000
--- a/srcpkgs/nautilus-sendto/template
+++ /dev/null
@@ -1,14 +0,0 @@
-# Template file for 'nautilus-sendto'
-pkgname=nautilus-sendto
-version=3.8.6
-revision=2
-build_style=meson
-# XXX: add pidgin and gajim depends for plugins to work.
-hostmakedepends="pkg-config intltool"
-makedepends="evolution-data-server-devel nautilus-devel gupnp-devel appstream-glib-devel"
-short_desc="Nautilus context menu for sending files"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2.0-or-later"
-homepage="http://download.gnome.org/sources/nautilus-sendto/"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=164d7c6e8bae29c4579bcc67a7bf50d783662b1545b62f3008e7ea3c0410e04d
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 6baadfccc6f0..70cc2c2f7cca 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -243,6 +243,7 @@ replaces="
mongroup<=0.4.1_2
mozjs68<=68.11.0_1
mutagen<=1.43.0_3
+ nautilus-sendto<=3.8.6_2
ncdns<=0.0.2_12
newt-python<=0.52.21_5
nodejs-lts-10<=10.24.0_2
From af15f16d2e9ef10a9ec5cb49f724af0c75ffbbe7 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 12 Mar 2022 18:44:04 +0100
Subject: [PATCH 79/82] network-manager-applet: fix for meson 0.61
---
.../patches/meson-0.61.patch | 33 +++++++++++++++++++
1 file changed, 33 insertions(+)
create mode 100644 srcpkgs/network-manager-applet/patches/meson-0.61.patch
diff --git a/srcpkgs/network-manager-applet/patches/meson-0.61.patch b/srcpkgs/network-manager-applet/patches/meson-0.61.patch
new file mode 100644
index 000000000000..1060e15b364a
--- /dev/null
+++ b/srcpkgs/network-manager-applet/patches/meson-0.61.patch
@@ -0,0 +1,33 @@
+From 30f91940819bf48a8b61599732c6b1ecea8fedf1 Mon Sep 17 00:00:00 2001
+From: Alexander Kanavin <alex@linutronix.de>
+Date: Fri, 21 Jan 2022 22:34:09 +0100
+Subject: [PATCH] meson.build: address meson 0.61 failures
+
+https://gitlab.gnome.org/GNOME/network-manager-applet/-/merge_requests/107
+---
+ meson.build | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/meson.build b/meson.build
+index 33adb632..6178c0eb 100644
+--- a/meson.build
++++ b/meson.build
+@@ -254,7 +254,6 @@ desktop_file_validate = find_program('desktop-file-validate', required: false)
+
+ foreach desktop: desktop_files
+ i18n.merge_file(
+- desktop + '-desktop',
+ input: desktop + '.desktop.in',
+ output: desktop + '.desktop',
+ install: true,
+@@ -275,7 +274,6 @@ endforeach
+ appdata = 'nm-connection-editor.appdata.xml'
+
+ i18n.merge_file(
+- 'desktop',
+ input: appdata + '.in',
+ output: appdata,
+ install: true,
+--
+GitLab
+
From d50e9c5a9d9d477e3875102eff5391cd26d2a9ce Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 12 Mar 2022 21:07:42 +0100
Subject: [PATCH 80/82] io.elementary.code: fix for meson 0.61
---
.../patches/meson-0.61.patch | 22 +++++++++++++++++++
1 file changed, 22 insertions(+)
create mode 100644 srcpkgs/io.elementary.code/patches/meson-0.61.patch
diff --git a/srcpkgs/io.elementary.code/patches/meson-0.61.patch b/srcpkgs/io.elementary.code/patches/meson-0.61.patch
new file mode 100644
index 000000000000..87a88aabff47
--- /dev/null
+++ b/srcpkgs/io.elementary.code/patches/meson-0.61.patch
@@ -0,0 +1,22 @@
+From a2607cce3a6b1bb62d02456456d3cbc3c6530bb0 Mon Sep 17 00:00:00 2001
+From: Xeonacid <h.dwwwwww@gmail.com>
+Date: Sat, 8 Jan 2022 02:00:25 +0800
+Subject: [PATCH] Meson: remove positional arguments from i18n.merge_file
+ (#1165)
+
+---
+ data/meson.build | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/data/meson.build b/data/meson.build
+index c2ff0c2881..1f3940d481 100644
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -64,7 +64,6 @@ if get_option ('have_pkexec')
+ )
+
+ i18n.merge_file(
+- 'policy',
+ input: policy_in,
+ output: meson.project_name() + '.policy',
+ po_dir: join_paths(meson.source_root (), 'po', 'extra'),
From fe99c97712a0ae11f43e1192de05637956f4729d Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 15 Mar 2022 20:24:34 +0100
Subject: [PATCH 81/82] io.elementary.terminal: fix for meson 0.61
---
.../patches/meson-0.61.patch | 38 +++++++++++++++++++
1 file changed, 38 insertions(+)
create mode 100644 srcpkgs/io.elementary.terminal/patches/meson-0.61.patch
diff --git a/srcpkgs/io.elementary.terminal/patches/meson-0.61.patch b/srcpkgs/io.elementary.terminal/patches/meson-0.61.patch
new file mode 100644
index 000000000000..7fd1fb455335
--- /dev/null
+++ b/srcpkgs/io.elementary.terminal/patches/meson-0.61.patch
@@ -0,0 +1,38 @@
+From 15e3ace08cb25e53941249fa1ee680a1e2f871b4 Mon Sep 17 00:00:00 2001
+From: Xeonacid <h.dwwwwww@gmail.com>
+Date: Sat, 8 Jan 2022 02:00:28 +0800
+Subject: [PATCH] Meson: remove positional arguments from i18n.merge_file
+ (#649)
+
+---
+ data/meson.build | 3 ---
+ 1 file changed, 3 deletions(-)
+
+diff --git a/data/meson.build b/data/meson.build
+index 435b84172..a64fc120e 100644
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -4,7 +4,6 @@ install_data(
+ )
+
+ i18n.merge_file (
+- 'desktop',
+ input: meson.project_name() + '.desktop.in',
+ output: meson.project_name() + '.desktop',
+ install: true,
+@@ -14,7 +13,6 @@ i18n.merge_file (
+ )
+
+ i18n.merge_file (
+- 'desktop',
+ input: 'open-pantheon-terminal-here.desktop.in',
+ output: 'open-pantheon-terminal-here.desktop',
+ install: true,
+@@ -24,7 +22,6 @@ i18n.merge_file (
+ )
+
+ i18n.merge_file (
+- 'appdata',
+ input: meson.project_name() + '.appdata.xml.in',
+ output: meson.project_name() + '.appdata.xml',
+ install: true,
From 058465e9f0c2ac7ee7b5833b30eaa3683bc25d71 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 12 Mar 2022 18:05:48 +0100
Subject: [PATCH 82/82] NetworkManager: update to 1.36.2.
---
srcpkgs/NetworkManager/template | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/NetworkManager/template b/srcpkgs/NetworkManager/template
index 5483f5c8b35b..5502f41159d3 100644
--- a/srcpkgs/NetworkManager/template
+++ b/srcpkgs/NetworkManager/template
@@ -1,6 +1,6 @@
# Template file for 'NetworkManager'
pkgname=NetworkManager
-version=1.34.0
+version=1.36.2
revision=1
build_style=meson
build_helper="gir qemu"
@@ -19,7 +19,7 @@ configure_args="-Dsystemd_journal=false
-Dsuspend_resume=$(vopt_if elogind elogind upower)
-Dconfig_dhcp_default=internal"
hostmakedepends="gettext-devel glib-devel libxslt-devel pkg-config
- intltool dbus-glib-devel jansson-devel docbook-xsl gtk-doc
+ intltool dbus-glib-devel docbook-xsl gtk-doc
$(vopt_if gir 'vala python3-gobject')"
makedepends="libuuid-devel nss-devel dbus-glib-devel libgudev-devel
libnl3-devel polkit-devel ppp-devel iptables-devel libcurl-devel
@@ -33,8 +33,9 @@ short_desc="Network Management daemon"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Projects/NetworkManager"
+changelog="https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/raw/nm-1-36/NEWS"
distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=819795d0899076204f5672421a58f1b1d9e393536ee87bb844b911e6243bf0bd
+checksum=ab855cbe3b41832e9a3b003810e7c7313dfe19e630d29806d14d87fdd1470cab
# TODO: Some tests require network namespaces to run.
make_check=extended
lib32disabled=yes
@@ -58,6 +59,9 @@ post_patch() {
-e "s|@XBPS_CROSS_BASE@|${XBPS_CROSS_BASE}|g" \
-e "s|@XBPS_TARGET_QEMU_MACHINE@|${XBPS_TARGET_QEMU_MACHINE}|" \
src/libnm-client-impl/meson.build
+ # https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/issues/955
+ vsed -e "s#jansson_dep.get_pkgconfig_variable('libdir')#'${XBPS_CROSS_BASE}/usr/lib'#" \
+ -i meson.build
fi
}
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PR PATCH] [Updated] meson 0.61
2022-01-25 9:13 [PR PATCH] meson 0.61 paper42
2022-03-15 21:28 ` [PR PATCH] [Updated] " paper42
@ 2022-03-16 23:16 ` paper42
2022-03-26 0:54 ` paper42
` (2 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: paper42 @ 2022-03-16 23:16 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1248 bytes --]
There is an updated pull request by paper42 against master on the void-packages repository
https://github.com/paper42/void-packages meson-0.61
https://github.com/void-linux/void-packages/pull/35226
meson 0.61
WIP, many packages still need to be fixed
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration)
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/35226.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-meson-0.61-35226.patch --]
[-- Type: text/x-diff, Size: 189157 bytes --]
From e9c7607a68869cea75332498508020f223c9f179 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 10 Mar 2022 22:09:02 +0100
Subject: [PATCH 01/93] granite: update to 6.2.0.
---
common/shlibs | 2 +-
srcpkgs/granite/template | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 83b5783cb026..5a2bb82a4cb2 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1190,7 +1190,7 @@ libconfig.so.11 libconfig-1.7.1_1
libopusfile.so.0 opusfile-0.12_2
libopusurl.so.0 opusfile-0.12_2
libopusenc.so.0 libopusenc-0.2_1
-libgranite.so.5 granite-0.5.0_1
+libgranite.so.6 granite-6.2.0_1
libprotobuf-vala.so.0 libprotobuf-vala-0.1.0_1
librlog.so.5 librlog-1.4_1
libtinyxml.so.0 tinyxml-2.6.2_1
diff --git a/srcpkgs/granite/template b/srcpkgs/granite/template
index 2ae77d6ee66c..f3a53c4165bb 100644
--- a/srcpkgs/granite/template
+++ b/srcpkgs/granite/template
@@ -1,10 +1,10 @@
# Template file for 'granite'
pkgname=granite
-version=5.5.0
+version=6.2.0
revision=1
build_style=meson
build_helper="gir"
-hostmakedepends="pkg-config vala"
+hostmakedepends="pkg-config gettext vala"
makedepends="gtk+3-devel libgee08-devel"
depends="hicolor-icon-theme"
short_desc="GTK3 widget library for elementary OS"
@@ -12,7 +12,7 @@ maintainer="Cameron Nemo <cnemo@tutanota.com>"
license="LGPL-3.0-or-later"
homepage="https://github.com/elementary/granite"
distfiles="https://github.com/elementary/granite/archive/${version}.tar.gz"
-checksum=0c376520c7d462fca05213a14970ee1075fea4a78062a33b47529e2647cd5557
+checksum=067d31445da9808a802fca523630c3e4b84d2d7c78ae547ced017cb7f3b9c6b5
granite-devel_package() {
depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
From a3ed0697d165e98b18862a48a836ced32ff9e2ac Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 10 Mar 2022 22:08:02 +0100
Subject: [PATCH 02/93] Minder: revbump for granite 6, build translations
---
srcpkgs/Minder/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/Minder/template b/srcpkgs/Minder/template
index da4f9b751c20..8ee716a6f9f3 100644
--- a/srcpkgs/Minder/template
+++ b/srcpkgs/Minder/template
@@ -1,9 +1,9 @@
# Template file for 'Minder'
pkgname=Minder
version=1.14.0
-revision=1
+revision=2
build_style=meson
-hostmakedepends="pkg-config glib-devel vala"
+hostmakedepends="pkg-config gettext glib-devel vala"
makedepends="cairo-devel granite-devel gtk+3-devel libxml2-devel libgee08-devel
libarchive-devel discount-devel gtksourceview4-devel libhandy1-devel json-glib-devel"
short_desc="Mind-mapping application designed for Pantheon"
From 4d13ccc58213e5c25047fa6a7b8818dd340fddda Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 10 Mar 2022 22:08:02 +0100
Subject: [PATCH 03/93] bookworm: revbump for granite 6, build translations
---
srcpkgs/bookworm/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/bookworm/template b/srcpkgs/bookworm/template
index 3e319fb786d9..0205a6e62427 100644
--- a/srcpkgs/bookworm/template
+++ b/srcpkgs/bookworm/template
@@ -1,9 +1,9 @@
# Template file for 'bookworm'
pkgname=bookworm
version=1.1.2
-revision=4
+revision=5
build_style=meson
-hostmakedepends="pkg-config glib-devel vala"
+hostmakedepends="pkg-config glib-devel gettext vala"
makedepends="gtk+3-devel libgee08-devel granite-devel
webkit2gtk-devel sqlite-devel poppler-glib-devel
libxml2-devel glib-devel libsoup-devel"
From f014171c0b9da906e41774c939c5575937918744 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 10 Mar 2022 22:08:04 +0100
Subject: [PATCH 04/93] notes-up: update to 2.0.6.
---
srcpkgs/notes-up/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/notes-up/template b/srcpkgs/notes-up/template
index 481a214cfbc2..55db14d47b32 100644
--- a/srcpkgs/notes-up/template
+++ b/srcpkgs/notes-up/template
@@ -1,6 +1,6 @@
# Template file for 'notes-up'
pkgname=notes-up
-version=2.0.5
+version=2.0.6
revision=1
wrksrc=Notes-up-${version}
build_style=meson
@@ -13,7 +13,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later, BSD-3-Clause"
homepage="https://github.com/Philip-Scott/Notes-up"
distfiles="https://github.com/Philip-Scott/Notes-up/archive/${version}.tar.gz"
-checksum=56ddf5ab3468c3bbb806106c41b485b020ade3c7f48d271bda1e78ddce5e1664
+checksum=6e7b6ac4a3a917867a1555db0a6e03e40ccd9955b5d76e980a26fa8e40744f07
post_install() {
ln -s com.github.philip_scott.notes-up ${DESTDIR}/usr/bin/notes-up
From 4308044ce5354908ccb032d3370fc2c07174c2aa Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 10 Mar 2022 22:08:04 +0100
Subject: [PATCH 05/93] nutty: revbump for granite 6, build translations
---
srcpkgs/nutty/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/nutty/template b/srcpkgs/nutty/template
index 37396577835b..eb263a89af4d 100644
--- a/srcpkgs/nutty/template
+++ b/srcpkgs/nutty/template
@@ -1,18 +1,18 @@
# Template file for 'nutty'
pkgname=nutty
version=1.1.1
-revision=1
+revision=2
build_style=meson
-hostmakedepends="pkg-config vala glib-devel"
+hostmakedepends="pkg-config gettext vala glib-devel"
makedepends="gtk+3-devel libgee08-devel libnotify-devel granite-devel
sqlite-devel"
short_desc="Network Utility"
maintainer="linarcx <linarcx@riseup.net>"
license="GPL-3.0-or-later"
homepage="https://github.com/babluboy/nutty"
-distfiles="${homepage}/archive/${version}.tar.gz"
+distfiles="https://github.com/babluboy/nutty/archive/${version}.tar.gz"
checksum=b6c9ef1966d1c60480943313f20cd66ee1b5d23ac8d6578f457fb99f0898d9ba
-python_version=2 #unverified
+python_version=2
post_install() {
vinstall data/com.github.babluboy.nutty.desktop 644 usr/share/applications
From fd3d33a5b6396f4583468c40c77a70f5143955a2 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 10 Mar 2022 22:08:04 +0100
Subject: [PATCH 06/93] pantheon-agent-polkit: update to 1.0.0.
---
srcpkgs/pantheon-agent-polkit/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/pantheon-agent-polkit/template b/srcpkgs/pantheon-agent-polkit/template
index c2ae95b313e4..4285532c67b5 100644
--- a/srcpkgs/pantheon-agent-polkit/template
+++ b/srcpkgs/pantheon-agent-polkit/template
@@ -1,13 +1,13 @@
# Template file for 'pantheon-agent-polkit'
pkgname=pantheon-agent-polkit
version=1.0.0
-revision=1
+revision=2
build_style=meson
-hostmakedepends="intltool pkg-config vala gobject-introspection"
+hostmakedepends="gettext pkg-config vala gobject-introspection"
makedepends="gtk+3-devel polkit-devel granite-devel"
short_desc="Pantheon Polkit Agent"
maintainer="Orphaned <orphan@voidlinux.org>"
license="LGPL-3.0-or-later"
-homepage="https://github.com/elementary/${pkgname}"
-distfiles="${homepage}/archive/${version}.tar.gz"
+homepage="https://github.com/elementary/pantheon-agent-polkit"
+distfiles="https://github.com/elementary/pantheon-agent-polkit/archive/${version}.tar.gz"
checksum=8e730f335545a4ca2717e1c9ccad61c329c1f19ea51f76ae4783da9e0416d484
From 621f29a63a489e481a6c984c43f4500ff8b627bd Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 10 Mar 2022 22:08:05 +0100
Subject: [PATCH 07/93] pantheon-screenshot: update to 6.0.2.
---
srcpkgs/pantheon-screenshot/template | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/pantheon-screenshot/template b/srcpkgs/pantheon-screenshot/template
index 3492b0c0d49e..fb2ee8e7b095 100644
--- a/srcpkgs/pantheon-screenshot/template
+++ b/srcpkgs/pantheon-screenshot/template
@@ -1,18 +1,18 @@
# Template file for 'pantheon-screenshot'
pkgname=pantheon-screenshot
-version=1.7.1
+version=6.0.2
revision=1
wrksrc="screenshot-${version}"
build_style=meson
-hostmakedepends="desktop-file-utils glib-devel intltool pkgconf vala"
-makedepends="granite-devel libcanberra-devel"
-depends="desktop-file-utils gdk-pixbuf gtk+3 hicolor-icon-theme"
+hostmakedepends="desktop-file-utils glib-devel gettext pkg-config vala"
+makedepends="granite-devel libcanberra-devel libhandy1-devel"
+depends="desktop-file-utils gdk-pixbuf hicolor-icon-theme"
short_desc="Screenshot tool"
maintainer="Orphaned <orphan@voidlinux.org>"
license="LGPL-3.0-only"
homepage="https://github.com/elementary/screenshot-tool"
distfiles="https://github.com/elementary/screenshot-tool/archive/${version}.tar.gz"
-checksum=2789abf01b9b41ae62e39eea4d5765dd606898435e1723939a06301922c431e2
+checksum=af1d67b196a22af529190f593183ff2eebad51a1329be7279cddb7dc0ce406f4
post_install() {
ln -s io.elementary.screenshot-tool "$DESTDIR"/usr/bin/"$pkgname"
From 5b8c6c8a99a96bc1b53b28e5ecccabb75e49b33a Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 10 Mar 2022 22:08:05 +0100
Subject: [PATCH 08/93] planner: update to 3.0.6.
---
srcpkgs/planner/template | 21 ++++-----------------
1 file changed, 4 insertions(+), 17 deletions(-)
diff --git a/srcpkgs/planner/template b/srcpkgs/planner/template
index 7be79ab4c6ba..b55a40f9306f 100644
--- a/srcpkgs/planner/template
+++ b/srcpkgs/planner/template
@@ -1,32 +1,19 @@
# Template file for 'planner'
pkgname=planner
-version=2.7
+version=3.0.6
revision=1
build_style=meson
build_helper="gir"
hostmakedepends="gettext pkg-config vala glib-devel curl"
-makedepends="evolution-data-server-devel libgee08-devel granite-devel
- webkit2gtk-devel libsoup-devel libpeas-devel libhandy1-devel"
+makedepends="libgee08-devel granite-devel webkit2gtk-devel libsoup-devel
+ libhandy1-devel json-glib-devel"
depends="io.elementary.icons io.elementary.stylesheet curl"
short_desc="Task manager with Todoist support designed for GNU/Linux"
maintainer="linarcx <linarcx@riseup.net>"
license="GPL-3.0-or-later"
homepage="https://github.com/alainm23/planner"
distfiles="https://github.com/alainm23/planner/archive/${version}.tar.gz"
-checksum=cd34953867a91b2992aa4eafddc5093a695d1e6096571ade75640dddcc425d69
-
-if [ "$CROSS_BUILD" ]; then
- hostmakedepends+=" evolution-data-server-devel"
-fi
-pre_configure() {
- if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
- # In musl libc there is no _NL_TIME_FIRST_WEEKDAY in langinfo.h
- # thus replace Posix.NLTime.FIRST_WEEKDAY.to_string ().data[0];
- # with 0; (sunday)
- vsed -i src/Services/Calendar/CalendarModel.vala \
- -e "s#\(int week_start =\) Posix.*#\1 0;#"
- fi
-}
+checksum=345a9ad2220820f08f583321e874528eee9f7e009236127efacee72d071c7ea5
post_install() {
vinstall data/com.github.alainm23.planner.desktop.in 644 \
From 53d5cbb5970de3140b19f8846a37cc5784a87fa4 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 10 Mar 2022 22:08:05 +0100
Subject: [PATCH 09/93] quickDocs: revbump for granite 6
---
srcpkgs/quickDocs/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/quickDocs/template b/srcpkgs/quickDocs/template
index 940ad376d9c7..c4a22e6bbe7d 100644
--- a/srcpkgs/quickDocs/template
+++ b/srcpkgs/quickDocs/template
@@ -1,7 +1,7 @@
# Template file for 'quickDocs'
pkgname=quickDocs
version=2.2.6
-revision=1
+revision=2
build_style=meson
hostmakedepends="vala pkg-config"
makedepends="libarchive-devel gtk+3-devel devhelp-devel webkit2gtk-devel libgee08-devel granite-devel"
From c7c68eb7408ac3c88840856e33b4ddb7f06b4575 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 10 Mar 2022 22:08:05 +0100
Subject: [PATCH 10/93] sequeler: revbump for granite 6
---
srcpkgs/sequeler/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/sequeler/template b/srcpkgs/sequeler/template
index a36107372bd9..32f127dc5c6e 100644
--- a/srcpkgs/sequeler/template
+++ b/srcpkgs/sequeler/template
@@ -1,7 +1,7 @@
# Template file for 'sequeler'
pkgname=sequeler
version=0.8.2
-revision=1
+revision=2
build_style=meson
hostmakedepends="gettext pkg-config glib-devel vala"
makedepends="granite-devel libglib-devel gtk+3-devel libgee08-devel
From 7a07232e17f8b31c79428f11ca80c448804adace Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 10 Mar 2022 22:08:05 +0100
Subject: [PATCH 11/93] switchboard: update to 6.0.0.
---
srcpkgs/switchboard/template | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/switchboard/template b/srcpkgs/switchboard/template
index ebb706e5d9e5..9397fea8cdeb 100644
--- a/srcpkgs/switchboard/template
+++ b/srcpkgs/switchboard/template
@@ -1,16 +1,16 @@
# Template file for 'switchboard'
pkgname=switchboard
-version=2.3.7
-revision=2
+version=6.0.0
+revision=1
build_style=meson
hostmakedepends="pkg-config vala gettext"
-makedepends="granite-devel clutter-gtk-devel gtk+3-devel"
+makedepends="granite-devel gtk+3-devel libhandy1-devel"
short_desc="Extensible System Settings app designed for elementary OS"
maintainer="Orphaned <orphan@voidlinux.org>"
license="LGPL-2.1-or-later"
homepage="https://github.com/elementary/switchboard"
-distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=373db840b254897b2a59f6f421508f8f1361adc5d4d35b7963ba024e5c8234c9
+distfiles="https://github.com/elementary/switchboard/archive/${version}.tar.gz"
+checksum=40c2fd17535cba239b7c78b62d93a3f5ef7e990b31a7c4ecf04cba0c2b60d792
switchboard-devel_package() {
short_desc+=" - development files"
From 49fecd5d1e69fc157d46f4a086c0ad9006e2793d Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 10 Mar 2022 22:08:06 +0100
Subject: [PATCH 12/93] switchboard-plug-bluetooth: update to 2.3.6.
---
srcpkgs/switchboard-plug-bluetooth/template | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/switchboard-plug-bluetooth/template b/srcpkgs/switchboard-plug-bluetooth/template
index 373368918159..b1b6977a5269 100644
--- a/srcpkgs/switchboard-plug-bluetooth/template
+++ b/srcpkgs/switchboard-plug-bluetooth/template
@@ -1,13 +1,13 @@
# Template file for 'switchboard-plug-bluetooth'
pkgname=switchboard-plug-bluetooth
-version=2.3.0
+version=2.3.6
revision=1
build_style=meson
-hostmakedepends="pkg-config vala"
+hostmakedepends="pkg-config vala gettext"
makedepends="switchboard-devel granite-devel gtk+3-devel"
short_desc="Switchboard Bluetooth Plug"
maintainer="Cameron Nemo <cnemo@tutanota.com>"
license="GPL-3.0-or-later"
-homepage="https://github.com/elementary/${pkgname}"
-distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=ffeb4cdb53696b241e203f4e0920bb90c05fd77b99a05bd9483cb4c8367f1000
+homepage="https://github.com/elementary/switchboard-plug-bluetooth"
+distfiles="https://github.com/elementary/switchboard-plug-bluetooth/archive/${version}.tar.gz"
+checksum=fec5d135dc17c3ab1396cbe78f255e767f1834dfc4db8ec30579ff0ef29836b9
From f36308cb599b40e8e6c5787e66ba06c2ca33f556 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 10 Mar 2022 22:08:06 +0100
Subject: [PATCH 13/93] switchboard-plug-network: update to 2.4.2.
* build translations
---
srcpkgs/switchboard-plug-network/template | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/switchboard-plug-network/template b/srcpkgs/switchboard-plug-network/template
index 31f640cf25df..382aea7559a0 100644
--- a/srcpkgs/switchboard-plug-network/template
+++ b/srcpkgs/switchboard-plug-network/template
@@ -1,15 +1,14 @@
# Template file for 'switchboard-plug-network'
pkgname=switchboard-plug-network
-version=2.3.3
+version=2.4.2
revision=1
build_style=meson
-hostmakedepends="pkg-config vala"
+hostmakedepends="pkg-config vala gettext"
makedepends="switchboard-devel granite-devel gtk+3-devel
libnma-devel NetworkManager-devel"
short_desc="Switchboard Network Plug"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3.0-or-later"
homepage="https://github.com/elementary/switchboard-plug-network"
-distfiles="https://github.com/elementary/${pkgname}/archive/${version}.tar.gz"
-checksum=a2f29b3054c187f2be9688bb04b6800cf4c2d3dd74cdd4fa37626f0b2ac5df50
-nocross="https://travis-ci.org/github/void-linux/void-packages/builds/733837363"
+distfiles="https://github.com/elementary/switchboard-plug-network/archive/${version}.tar.gz"
+checksum=190b1f9123bc9ee4120a624ad3de91c0e40a141cb19b8eb7ec74d3c39f008971
From 96b15f798909532f895e23a2c1eac83c8304d8f2 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 10 Mar 2022 22:08:06 +0100
Subject: [PATCH 14/93] switchboard-plug-printers: update to 2.1.10.
---
.../patches/fix-signal_subscribe.patch | 11 ---------
.../patches/ftbfs.patch | 23 -------------------
srcpkgs/switchboard-plug-printers/template | 10 ++++----
3 files changed, 5 insertions(+), 39 deletions(-)
delete mode 100644 srcpkgs/switchboard-plug-printers/patches/fix-signal_subscribe.patch
delete mode 100644 srcpkgs/switchboard-plug-printers/patches/ftbfs.patch
diff --git a/srcpkgs/switchboard-plug-printers/patches/fix-signal_subscribe.patch b/srcpkgs/switchboard-plug-printers/patches/fix-signal_subscribe.patch
deleted file mode 100644
index 48eb8948a642..000000000000
--- a/srcpkgs/switchboard-plug-printers/patches/fix-signal_subscribe.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/CUPSNotifier.vala 2018-11-28 12:34:33.000000000 +0100
-+++ b/src/CUPSNotifier.vala 2021-01-29 19:26:11.191992396 +0100
-@@ -63,7 +63,7 @@
- Bus.get_proxy.begin<NotifierDBus> (BusType.SYSTEM, "org.cups.cupsd.Notifier", "/org/cups/cupsd/Notifier", GLib.DBusProxyFlags.NONE, null, (obj, res) => {
- try {
- dbus_notifier = Bus.get_proxy.end (res);
-- ((GLib.DBusProxy) dbus_notifier).g_connection.signal_subscribe (null, "org.cups.cupsd.Notifier", null, "/org/cups/cupsd/Notifier", null, GLib.DBusSignalFlags.NONE, subscription_callback);
-+ ((GLib.DBusProxy) dbus_notifier).g_connection.signal_subscribe (null, "org.cups.cupsd.Notifier", null, "/org/cups/cupsd/Notifier", null, GLib.DBusSignalFlags.NONE, (GLib.DBusSignalCallback)subscription_callback);
- } catch (IOError e) {
- critical (e.message);
- }
diff --git a/srcpkgs/switchboard-plug-printers/patches/ftbfs.patch b/srcpkgs/switchboard-plug-printers/patches/ftbfs.patch
deleted file mode 100644
index e8e21e2c4841..000000000000
--- a/srcpkgs/switchboard-plug-printers/patches/ftbfs.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 3175c2ebf106145a95355d2571e0a2aa4834e884 Mon Sep 17 00:00:00 2001
-From: Enerccio <admin@en-circle.com>
-Date: Tue, 17 Sep 2019 15:31:37 +0200
-Subject: [PATCH] Update cups.vapi (#118)
-
-Fixed bug with compilation
----
- vapi/cups.vapi | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/vapi/cups.vapi b/vapi/cups.vapi
-index 7f1b795..5dcdba6 100644
---- a/vapi/cups.vapi
-+++ b/vapi/cups.vapi
-@@ -605,7 +605,7 @@ namespace CUPS {
- [CCode (cname = "ippAddBooleans")]
- private unowned Attribute _add_booleans (Tag group, string name, [CCode (array_length_pos = 0.9)] char[] values);
- public unowned Attribute add_booleans (Tag group, string name, bool[] values) {
-- char[] char_values;
-+ char[] char_values = {};
- foreach (var val in values) {
- char_values += val ? 1 : 0;
- }
diff --git a/srcpkgs/switchboard-plug-printers/template b/srcpkgs/switchboard-plug-printers/template
index caecd10c886c..05f3c86abd79 100644
--- a/srcpkgs/switchboard-plug-printers/template
+++ b/srcpkgs/switchboard-plug-printers/template
@@ -1,14 +1,14 @@
# Template file for 'switchboard-plug-printers'
pkgname=switchboard-plug-printers
-version=2.1.6
+version=2.1.10
revision=1
build_style=meson
-hostmakedepends="pkg-config vala intltool"
+hostmakedepends="pkg-config vala gettext"
makedepends="switchboard-devel granite-devel gtk+3-devel cups-devel"
depends="cups-pk-helper"
short_desc="Switchboard Printers Plug"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3.0-or-later"
-homepage="https://github.com/elementary/${pkgname}"
-distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=fe2c748e3737c3304ea8613d43d5ba8596f95499a65b8d13f93c4f702901f442
+homepage="https://github.com/elementary/switchboard-plug-printers"
+distfiles="https://github.com/elementary/switchboard-plug-printers/archive/${version}.tar.gz"
+checksum=448f6ae28fc4dacc2c329532e21aacc4ec7aa4af7d93bd6d7013002253faef3d
From 78003a45857a11290df5075c89dd25c57e49660d Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 10 Mar 2022 21:59:08 +0100
Subject: [PATCH 15/93] io.elementary.calculator: update to 1.7.2.
---
srcpkgs/io.elementary.calculator/template | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/io.elementary.calculator/template b/srcpkgs/io.elementary.calculator/template
index 56abf698403b..35a363c7ae9a 100644
--- a/srcpkgs/io.elementary.calculator/template
+++ b/srcpkgs/io.elementary.calculator/template
@@ -1,17 +1,17 @@
# Template file for 'io.elementary.calculator'
pkgname=io.elementary.calculator
-version=1.6.0
-revision=2
+version=1.7.2
+revision=1
wrksrc="calculator-${version}"
build_style=meson
-hostmakedepends="intltool pkg-config vala desktop-file-utils AppStream"
-makedepends="granite-devel gtk+3-devel"
+hostmakedepends="gettext pkg-config vala desktop-file-utils AppStream"
+makedepends="granite-devel gtk+3-devel libhandy1-devel"
short_desc="Calculator app designed for elementary OS"
maintainer="Cameron Nemo <cnemo@tutanota.com>"
license="GPL-3.0-only"
homepage="https://github.com/elementary/calculator"
distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=c650d5ff7d2df2d122ade0cbd35be50927f22b0d260f28e374b1112114f24540
+checksum=d296d06b36a0c7dd84e7e91e9801989e83312612d6ee6f0479030c1b340d397b
pantheon-calculator_package() {
depends="io.elementary.calculator>=${version}_${revision}"
From 4b23fa077eb643fc641338a2060ad8dec64682d0 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 10 Mar 2022 22:16:06 +0100
Subject: [PATCH 16/93] io.elementary.calendar: update to 6.1.0.
---
.../patches/00-musl.patch | 45 -------------------
srcpkgs/io.elementary.calendar/template | 18 ++++----
2 files changed, 9 insertions(+), 54 deletions(-)
delete mode 100644 srcpkgs/io.elementary.calendar/patches/00-musl.patch
diff --git a/srcpkgs/io.elementary.calendar/patches/00-musl.patch b/srcpkgs/io.elementary.calendar/patches/00-musl.patch
deleted file mode 100644
index f85beca403fa..000000000000
--- a/srcpkgs/io.elementary.calendar/patches/00-musl.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-commit c9ba80af072819261a9e24a04a0859b93b5db810
-Author: Cameron Nemo <camerontnorman@gmail.com>
-Date: Thu Oct 18 11:33:15 2018 -0700
-
- Check for _NL_TIME_FIRST_WEEKDAY declaration
-
-diff --git core/Model/CalendarModel.vala core/Model/CalendarModel.vala
-index 3e3b8cbd..b33f75f8 100644
---- a/core/Model/CalendarModel.vala
-+++ b/core/Model/CalendarModel.vala
-@@ -68,7 +68,11 @@ public class Maya.Model.CalendarModel : Object {
- }
-
- private CalendarModel () {
-+#if HAVE_NL_TIME_FIRST_WEEKDAY
- int week_start = Posix.NLTime.FIRST_WEEKDAY.to_string ().data[0];
-+#else
-+ int week_start = 0;
-+#endif
- if (week_start >= 1 && week_start <= 7) {
- week_starts_on = (Maya.Settings.Weekday)week_start-1;
- }
-diff --git meson.build meson.build
-index a0cd2dd7..02b4e1d1 100644
---- a/meson.build
-+++ b/meson.build
-@@ -31,7 +31,17 @@ folks_dep = dependency('folks')
- geocode_glib_dep = dependency('geocode-glib-1.0')
- gclue_dep = dependency('libgeoclue-2.0')
-
--m_dep = meson.get_compiler('c').find_library('m', required : false)
-+cc = meson.get_compiler('c')
-+m_dep = cc.find_library('m', required : false)
-+libnotify_dep = dependency('libnotify', required: false)
-+
-+if libnotify_dep.found()
-+ add_project_arguments('--define=HAVE_LIBNOTIFY', language: 'vala')
-+endif
-+
-+if cc.has_header_symbol('langinfo.h', '_NL_TIME_FIRST_WEEKDAY')
-+ add_project_arguments('--define=HAVE_NL_TIME_FIRST_WEEKDAY', language: 'vala')
-+endif
-
- gresource_calendar = gnome.compile_resources(
- 'gresource_calendar',
diff --git a/srcpkgs/io.elementary.calendar/template b/srcpkgs/io.elementary.calendar/template
index a5ea019353a0..bf87c7599001 100644
--- a/srcpkgs/io.elementary.calendar/template
+++ b/srcpkgs/io.elementary.calendar/template
@@ -1,22 +1,21 @@
# Template file for 'io.elementary.calendar'
pkgname=io.elementary.calendar
-version=5.0
-revision=6
-_git_commit=46346e48b53e9d3d59d9f567b622532338f50f32
-wrksrc="calendar-${_git_commit}"
+version=6.1.0
+revision=1
+wrksrc="calendar-${version}"
build_style=meson
build_helper="gir"
-hostmakedepends="intltool pkg-config vala desktop-file-utils AppStream
+hostmakedepends="gettext pkg-config vala desktop-file-utils AppStream
glib-devel evolution-data-server-devel"
makedepends="granite-devel libglib-devel gtk+3-devel libgee08-devel
- libchamplain-devel clutter-devel evolution-data-server-devel
+ libchamplain-devel clutter-devel evolution-data-server-devel libhandy1-devel
folks-devel geocode-glib-devel geoclue2-devel libical-devel libnotify-devel"
short_desc="Desktop calendar app designed for elementary OS"
maintainer="Cameron Nemo <cnemo@tutanota.com>"
license="GPL-3.0-only"
homepage="https://github.com/elementary/calendar"
-distfiles="${homepage}/archive/${_git_commit}.tar.gz"
-checksum=3be3851baeed67144e5cbed209b2c1b982fe9830db13372e3051423295dee345
+distfiles="https://github.com/elementary/calendar/archive/refs/tags/${version}.tar.gz"
+checksum=3cb4ba6f4d9fa6addfbe39b58cea282c0f0c6f139c49214c05e52adf457d949d
libio.elementary.calendar_package() {
short_desc+=" - library"
@@ -28,7 +27,8 @@ libio.elementary.calendar_package() {
libio.elementary.calendar-devel_package() {
short_desc+=" - library development files"
depends="libio.elementary.calendar>=${version} evolution-data-server-devel
- granite-devel gtk+3-devel libglib-devel libical-devel libsoup-devel"
+ granite-devel gtk+3-devel libglib-devel libical-devel libsoup-devel
+ libhandy1-devel"
pkg_install() {
vmove "usr/lib/*.so"
vmove usr/lib/pkgconfig
From a6bea21b40f4f1630206d8e1653e674c9c43c46b Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 10 Mar 2022 22:16:04 +0100
Subject: [PATCH 17/93] io.elementary.code: update to 6.1.0.
---
.../io.elementary.code/patches/vala050.patch | 25 -------------------
srcpkgs/io.elementary.code/template | 18 ++++++-------
2 files changed, 9 insertions(+), 34 deletions(-)
delete mode 100644 srcpkgs/io.elementary.code/patches/vala050.patch
diff --git a/srcpkgs/io.elementary.code/patches/vala050.patch b/srcpkgs/io.elementary.code/patches/vala050.patch
deleted file mode 100644
index ec3abb8fd9f0..000000000000
--- a/srcpkgs/io.elementary.code/patches/vala050.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From a185de0e7716aa2de2bf21de96e6c9af1dca81aa Mon Sep 17 00:00:00 2001
-From: Daniel Kolesa <daniel@octaforge.org>
-Date: Wed, 16 Sep 2020 20:43:07 +0200
-Subject: [PATCH] fix with vala-0.50
-
----
- plugins/outline/Vala/ValaSymbolOutline.vala | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git plugins/outline/Vala/ValaSymbolOutline.vala plugins/outline/Vala/ValaSymbolOutline.vala
-index c8db339..31386a6 100644
---- a/plugins/outline/Vala/ValaSymbolOutline.vala
-+++ b/plugins/outline/Vala/ValaSymbolOutline.vala
-@@ -61,7 +61,7 @@ public class Code.Plugins.ValaSymbolOutline : Object, Code.Plugins.SymbolOutline
-
- public void parse_symbols () {
- var context = new Vala.CodeContext ();
-- context.profile = Vala.Profile.GOBJECT;
-+ context.set_target_profile(Vala.Profile.GOBJECT);
- context.add_source_filename (doc.file.get_path ());
- context.report = new Report ();
- if (cancellable != null)
---
-2.28.0
-
diff --git a/srcpkgs/io.elementary.code/template b/srcpkgs/io.elementary.code/template
index 05d84cc39c9f..35927b238713 100644
--- a/srcpkgs/io.elementary.code/template
+++ b/srcpkgs/io.elementary.code/template
@@ -1,19 +1,19 @@
# Template file for 'io.elementary.code'
pkgname=io.elementary.code
-version=3.4.1
-revision=5
+version=6.1.0
+revision=1
wrksrc="code-${version}"
build_style=meson
-hostmakedepends="pkg-config vala intltool glib-devel"
+hostmakedepends="pkg-config vala gettext glib-devel"
makedepends="editorconfig-devel libgee08-devel granite-devel libpeas-devel
- gtksourceview-devel vte3-devel gtkspell3-devel zeitgeist-devel libsoup-devel
- webkit2gtk-devel gtk+3-devel libgit2-glib-devel"
+ gtksourceview4-devel vte3-devel gtkspell3-devel libsoup-devel
+ gtk+3-devel libgit2-glib-devel polkit-devel libhandy1-devel"
short_desc="Code editor designed for elementary OS"
maintainer="Cameron Nemo <cnemo@tutanota.com>"
license="GPL-3.0-or-later"
homepage="https://github.com/elementary/code"
-distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=d84b38193b72cd93995aae604358c83c5b6976d8472ce985027b947cfed990bf
+distfiles="https://github.com/elementary/code/archive/${version}.tar.gz"
+checksum=d44851eb827dc9a069ab81b6a9cfe255795e3319a6882ca344152781968ce3ce
libio.elementary.code_package() {
short_desc+=" - library"
@@ -25,8 +25,8 @@ libio.elementary.code_package() {
libio.elementary.code-devel_package() {
short_desc+=" - library development files"
depends="libio.elementary.code>=${version} fontconfig-devel granite-devel
- gtk+3-devel gtksourceview-devel libgee08-devel libgit2-glib-devel
- libglib-devel libpeas-devel pango-devel zeitgeist-devel"
+ gtk+3-devel gtksourceview4-devel libgee08-devel libgit2-glib-devel
+ libglib-devel libpeas-devel pango-devel polkit-devel libhandy1-devel"
pkg_install() {
vmove "usr/lib/*.so"
vmove usr/lib/pkgconfig
From c288951e7fab66355c5ca26f849af0da3c89e78f Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 10 Mar 2022 22:16:07 +0100
Subject: [PATCH 18/93] io.elementary.files: update to 6.1.2.
---
common/shlibs | 4 ++--
srcpkgs/io.elementary.files/template | 12 ++++++------
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 5a2bb82a4cb2..447b14677754 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3524,8 +3524,8 @@ libadwaita-1.so.0 libadwaita-1.0.0alpha2_1
libswitchboard-2.0.so.0 switchboard-2.3.2_1
libcodecore.so.0 libio.elementary.code-3.0_1
libio.elementary.music-core.so.0 libio.elementary.music-5.0_1
-libpantheon-files-core.so.4 libio.elementary.files-4.1.4_1
-libpantheon-files-widgets.so.4 libio.elementary.files-4.1.4_1
+libpantheon-files-core.so.6 libio.elementary.files-6.0.0_1
+libpantheon-files-widgets.so.6 libio.elementary.files-6.0.0_1
libwlroots.so.9 wlroots0.14-0.14.1_1
libwlroots.so.10 wlroots-0.15.0_1
libbaseencode.so.1 libbaseencode-1.0.9_1
diff --git a/srcpkgs/io.elementary.files/template b/srcpkgs/io.elementary.files/template
index cb0643a02449..0e8d5fb177d6 100644
--- a/srcpkgs/io.elementary.files/template
+++ b/srcpkgs/io.elementary.files/template
@@ -1,20 +1,20 @@
# Template file for 'io.elementary.files'
pkgname=io.elementary.files
-version=4.5.0
+version=6.1.2
revision=1
wrksrc="files-${version}"
build_style=meson
-configure_args="-Dwith-unity=disabled"
-hostmakedepends="vala glib-devel pkg-config intltool"
+configure_args="-Dsystemduserunitdir=no"
+hostmakedepends="vala glib-devel pkg-config gettext"
makedepends="gtk+3-devel libglib-devel libgee08-devel sqlite-devel plank-devel
libcanberra-devel granite-devel pango-devel zeitgeist-devel dbus-glib-devel
- libnotify-devel libcloudproviders-devel libgit2-glib-devel"
+ libnotify-devel libcloudproviders-devel libgit2-glib-devel libhandy1-devel"
short_desc="File browser designed for elementary OS"
maintainer="Cameron Nemo <cnemo@tutanota.com>"
license="GPL-3.0-or-later"
homepage="https://github.com/elementary/files"
distfiles="https://github.com/elementary/files/archive/${version}.tar.gz"
-checksum=987f87df2a74c97cb866b34a20ea395ae1f67d03c9517185494860653fbc065c
+checksum=2a328d8df901186bb700c835064c9a526e5694545b668df512282773cfaa7b08
CFLAGS="-fcommon"
@@ -28,7 +28,7 @@ libio.elementary.files_package() {
libio.elementary.files-devel_package() {
short_desc+=" - library development files"
depends="libio.elementary.files>=${version} libgee08-devel gtk+3-devel
- libcanberra-devel libglib-devel zeitgeist-devel"
+ libcanberra-devel libglib-devel zeitgeist-devel libhandy1-devel"
pkg_install() {
vmove "usr/lib/*.so"
vmove usr/lib/pkgconfig
From 94c1aa3e015df75d54f822c99c9c1d2323149c61 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 10 Mar 2022 22:16:04 +0100
Subject: [PATCH 19/93] io.elementary.icons: update to 6.1.0.
---
srcpkgs/io.elementary.icons/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/io.elementary.icons/template b/srcpkgs/io.elementary.icons/template
index fb3a6c06cc84..95dbc0ca3ddb 100644
--- a/srcpkgs/io.elementary.icons/template
+++ b/srcpkgs/io.elementary.icons/template
@@ -1,6 +1,6 @@
# Template file for 'io.elementary.icons'
pkgname=io.elementary.icons
-version=5.3.1
+version=6.1.0
revision=1
wrksrc="icons-${version}"
build_style=meson
@@ -11,8 +11,8 @@ short_desc="Named, vector icons for elementary OS"
maintainer="Cameron Nemo <cnemo@tutanota.com>"
license="GPL-3.0-or-later"
homepage="https://github.com/elementary/icons"
-distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=67b349453f8990e399521bb8d96f4caf4c23a27cf22cbc18ddacf0e817c59e12
+distfiles="https://github.com/elementary/icons/archive/${version}.tar.gz"
+checksum=bab0f638a60d7a28bf269f4a11346b28495a819e3f516403a7e0bb880c441c2f
post_install() {
# How did that get there?
From 5a9ef9a048072b850096777d2acd574c8fe6b5ac Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 10 Mar 2022 22:16:07 +0100
Subject: [PATCH 20/93] io.elementary.music: update to 5.1.1.
---
.../io.elementary.music/patches/vala-array-size.patch | 11 -----------
srcpkgs/io.elementary.music/template | 11 ++++++-----
2 files changed, 6 insertions(+), 16 deletions(-)
delete mode 100644 srcpkgs/io.elementary.music/patches/vala-array-size.patch
diff --git a/srcpkgs/io.elementary.music/patches/vala-array-size.patch b/srcpkgs/io.elementary.music/patches/vala-array-size.patch
deleted file mode 100644
index 2cc268cdae64..000000000000
--- a/srcpkgs/io.elementary.music/patches/vala-array-size.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/core/GStrewamer/Equalizer.vala 2020-03-04 23:50:04.000000000 +0100
-+++ b/core/GStreamer/Equalizer.vala 2020-12-14 15:53:22.359597220 +0100
-@@ -31,7 +31,7 @@
- construct {
- element = Gst.ElementFactory.make ("equalizer-10bands", "equalizer");
-
-- int[10] freqs = {60, 170, 310, 600, 1000, 3000, 6000, 12000, 14000, 16000};
-+ int freqs[10] = {60, 170, 310, 600, 1000, 3000, 6000, 12000, 14000, 16000};
-
- float last_freq = 0;
- for (int index = 0; index < 10; index++) {
diff --git a/srcpkgs/io.elementary.music/template b/srcpkgs/io.elementary.music/template
index de6ae0f94d90..3ef8c1568630 100644
--- a/srcpkgs/io.elementary.music/template
+++ b/srcpkgs/io.elementary.music/template
@@ -1,20 +1,21 @@
# Template file for 'io.elementary.music'
pkgname=io.elementary.music
-version=5.0.5
+version=5.1.1
revision=1
wrksrc="music-${version}"
build_style=meson
configure_args="-Dbuild-plugins=true -Dplugins=audioplayer,cdrom,ipod"
-hostmakedepends="vala desktop-file-utils intltool pkg-config AppStream glib-devel"
+hostmakedepends="vala desktop-file-utils gettext pkg-config AppStream glib-devel"
makedepends="taglib-devel granite-devel vala-devel gtk+3-devel libgee08-devel
clutter-gtk-devel dbus-glib-devel libgda-devel libgpod-devel libxml2-devel
- json-glib-devel libnotify-devel libsoup-devel zeitgeist-devel libpeas-devel"
+ json-glib-devel libnotify-devel libsoup-devel zeitgeist-devel libpeas-devel
+ libhandy1-devel"
short_desc="Music player and library designed for elementary OS"
maintainer="Cameron Nemo <cnemo@tutanota.com>"
license="GPL-3.0-or-later"
homepage="https://github.com/elementary/music"
distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=ed7cba3b07189273890b321b21cda198f18b102e4466eb7207c0b5f27b31dfc9
+checksum=35e97ec496327b4eb388308168711bf9f8e976a857eb97bca21805f83abf9d15
libio.elementary.music_package() {
short_desc+=" - library"
@@ -26,7 +27,7 @@ libio.elementary.music-devel_package() {
short_desc+=" - library development files"
depends="libio.elementary.music>=${version} granite-devel
gst-plugins-base1-devel gstreamer1-devel gtk+3-devel libglib-devel
- libpeas-devel"
+ libpeas-devel libhandy1-devel"
pkg_install() {
vmove "usr/lib/*.so"
vmove usr/lib/pkgconfig
From 8b5f2d89cf3662a835ae726c55c59861d4e9bf27 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 10 Mar 2022 22:16:05 +0100
Subject: [PATCH 21/93] io.elementary.photos: update to 2.7.4.
---
.../patches/fix-meson.patch | 95 -------------------
srcpkgs/io.elementary.photos/template | 11 +--
2 files changed, 5 insertions(+), 101 deletions(-)
delete mode 100644 srcpkgs/io.elementary.photos/patches/fix-meson.patch
diff --git a/srcpkgs/io.elementary.photos/patches/fix-meson.patch b/srcpkgs/io.elementary.photos/patches/fix-meson.patch
deleted file mode 100644
index 820e3b8ef96d..000000000000
--- a/srcpkgs/io.elementary.photos/patches/fix-meson.patch
+++ /dev/null
@@ -1,95 +0,0 @@
-From 27e529fc96da828982563e2e19a6f0cef883a29e Mon Sep 17 00:00:00 2001
-From: Rico Tzschichholz <ricotz@ubuntu.com>
-Date: Wed, 22 Jul 2020 19:35:53 +0200
-Subject: [PATCH] meson: Properly include config.vapi and config.h (#578)
-
----
- meson.build | 21 +++++++++++++++++++--
- src/meson.build | 13 -------------
- 2 files changed, 19 insertions(+), 15 deletions(-)
-
-diff --git meson.build meson.build
-index 5edb5314..9bebaca0 100644
---- a/meson.build
-+++ b/meson.build
-@@ -11,14 +11,33 @@ add_project_arguments([
- '-Wno-unused',
- '-Wl,--enable-new-dtags',
-
-+ '-include', 'config.h',
- '-DGETTEXT_PACKAGE="@0@"'.format(meson.project_name())
- ],
- language: 'c',
- )
-+add_project_arguments([
-+ '--vapidir', join_paths(meson.current_source_dir(), 'vapi'),
-+ '--pkg', 'config',
-+ ],
-+ language: 'vala',
-+)
-
- libexecdir = join_paths(get_option('prefix'), get_option('libexecdir'), meson.project_name())
- pluginsdir = join_paths(get_option('prefix'), get_option('libdir'), meson.project_name(), 'plugins')
-
-+conf_data = configuration_data()
-+conf_data.set_quoted('PROJECT_NAME', meson.project_name())
-+conf_data.set_quoted('GETTEXT_PACKAGE', meson.project_name())
-+conf_data.set_quoted('_VERSION', meson.project_version())
-+conf_data.set_quoted('_PREFIX', get_option('prefix'))
-+conf_data.set_quoted('_LIB', join_paths(get_option('prefix'), get_option('libdir')))
-+conf_data.set_quoted('_LIBEXECDIR', libexecdir)
-+config_header = configure_file(
-+ output : 'config.h',
-+ configuration : conf_data
-+)
-+
- gnome = import('gnome')
- i18n = import('i18n')
-
-@@ -52,7 +71,6 @@ gstreamer_plugins_base_vapi = meson.get_compiler('vala').find_library('gstreamer
- gstreamer_plugins_base_dep = declare_dependency(dependencies: [gstreamer_plugins_base_vapi])
- lconv_dep = meson.get_compiler('vala').find_library('LConv', dirs: join_paths(meson.current_source_dir(), 'vapi'))
- linux_dep = meson.get_compiler('vala').find_library('linux')
--config_dep = meson.get_compiler('vala').find_library('config', dirs: join_paths(meson.current_source_dir(), 'vapi'))
-
- vapi_include = include_directories('./vapi')
-
-@@ -82,7 +100,6 @@ dependencies = [
- webkit2gtk_dep,
- lconv_dep,
- linux_dep,
-- config_dep
- ]
-
- add_project_arguments(['--vapidir', join_paths(meson.current_source_dir(), 'vapi')], language: 'vala')
-diff --git src/meson.build src/meson.build
-index 45bf4c1b..1215d778 100644
---- a/src/meson.build
-+++ b/src/meson.build
-@@ -4,18 +4,6 @@ library_files = files(
- 'plugins/TransitionsInterfaces.vala'
- )
-
--conf_data = configuration_data()
--conf_data.set_quoted('PROJECT_NAME', meson.project_name())
--conf_data.set_quoted('GETTEXT_PACKAGE', meson.project_name())
--conf_data.set_quoted('_VERSION', meson.project_version())
--conf_data.set_quoted('_PREFIX', get_option('prefix'))
--conf_data.set_quoted('_LIB', join_paths(get_option('prefix'), get_option('libdir')))
--conf_data.set_quoted('_LIBEXECDIR', libexecdir)
--config_header = configure_file(
-- output : 'config.h',
-- configuration : conf_data
--)
--
- photos_files = files(
- 'AppDirs.vala',
- 'Application.vala',
-@@ -233,7 +221,6 @@ photos_exe = executable(
- meson.project_name(),
- photos_files,
- library_files,
-- config_header,
- icons_gresource,
- global_gresource,
- dependencies: dependencies,
diff --git a/srcpkgs/io.elementary.photos/template b/srcpkgs/io.elementary.photos/template
index 81c1734164ba..d0f69169be3b 100644
--- a/srcpkgs/io.elementary.photos/template
+++ b/srcpkgs/io.elementary.photos/template
@@ -1,22 +1,21 @@
# Template file for 'io.elementary.photos'
pkgname=io.elementary.photos
-version=2.7.0
-revision=2
+version=2.7.4
+revision=1
wrksrc="photos-${version}"
build_style=meson
-configure_args="-Dlibunity=false"
-hostmakedepends="desktop-file-utils intltool pkg-config vala AppStream
+hostmakedepends="desktop-file-utils gettext pkg-config vala AppStream
glib-devel python3-scour"
makedepends="libaccounts-glib-devel libexif-devel libgee08-devel
geocode-glib-devel libgexiv2-devel libglib-devel libgphoto2-devel
gst-plugins-base1-devel gstreamer1-devel gtk+3-devel libgudev-devel
json-glib-devel libraw-devel rest-devel libsoup-devel sqlite-devel
webkit2gtk-devel libwebp-devel libxml2-devel granite-devel libnotify-devel
- vte3-devel"
+ vte3-devel libhandy1-devel"
depends="desktop-file-utils gsettings-desktop-schemas"
short_desc="Photo viewer and organizer designed for elementary OS"
maintainer="Cameron Nemo <cnemo@tutanota.com>"
license="LGPL-2.1-or-later"
homepage="https://github.com/elementary/photos"
distfiles="https://github.com/elementary/photos/archive/${version}.tar.gz"
-checksum=9f6ad409d053e3239b9ec7fc59429afe9ce89e40878697a73c2c3f215556a074
+checksum=3227f498e483b150f0a1407f4cf244d69f1c7453fc9bcba164fe3ab944283315
From 1e05992295dcf6a60abbc6e344cd571433703cc8 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 10 Mar 2022 22:16:05 +0100
Subject: [PATCH 22/93] io.elementary.stylesheet: update to 6.1.1.
---
srcpkgs/io.elementary.stylesheet/template | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/io.elementary.stylesheet/template b/srcpkgs/io.elementary.stylesheet/template
index 791bca04709c..618ac82dda0c 100644
--- a/srcpkgs/io.elementary.stylesheet/template
+++ b/srcpkgs/io.elementary.stylesheet/template
@@ -1,12 +1,13 @@
# Template file for 'io.elementary.stylesheet'
pkgname=io.elementary.stylesheet
-version=5.4.2
-revision=2
+version=6.1.1
+revision=1
wrksrc="stylesheet-${version}"
build_style=meson
+hostmakedepends="sassc gettext"
short_desc="GTK Stylesheet for elementary OS"
maintainer="Cameron Nemo <cnemo@tutanota.com>"
license="GPL-3.0-or-later"
homepage="https://github.com/elementary/stylesheet"
distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=3bc37723daf4ce0b7c9ce4c125ef0055affe8d6654981388ec87d4a23a1ae0ec
+checksum=b8432a0a06944065a35eadf582043022a174d5ffa88bc0ee4e86b969688ed23e
From f9d72e5709a891f72b5b65b05c77cd7e0f2b14ca Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 10 Mar 2022 22:16:08 +0100
Subject: [PATCH 23/93] io.elementary.terminal: update to 6.0.1.
---
srcpkgs/io.elementary.terminal/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/io.elementary.terminal/template b/srcpkgs/io.elementary.terminal/template
index 2aba6a5b563f..f3e0972cdfe3 100644
--- a/srcpkgs/io.elementary.terminal/template
+++ b/srcpkgs/io.elementary.terminal/template
@@ -1,19 +1,19 @@
# Template file for 'io.elementary.terminal'
pkgname=io.elementary.terminal
-version=5.5.2
+version=6.0.1
revision=1
wrksrc="terminal-${version}"
build_style=meson
configure_args="-Dubuntu-bionic-patched-vte=false"
-hostmakedepends="desktop-file-utils intltool pkg-config vala AppStream glib-devel"
-makedepends="granite-devel libnotify-devel vte3-devel"
+hostmakedepends="desktop-file-utils gettext pkg-config vala AppStream glib-devel"
+makedepends="granite-devel libnotify-devel vte3-devel libhandy1-devel"
depends="desktop-file-utils gsettings-desktop-schemas"
short_desc="Terminal from elementary OS for the 21st century"
maintainer="Cameron Nemo <cnemo@tutanota.com>"
license="LGPL-3.0-only"
homepage="https://github.com/elementary/terminal"
distfiles="https://github.com/elementary/terminal/archive/${version}.tar.gz"
-checksum=589ad0225e3a45700d95c8ead1b646f22a22c7688f647876a5329b3b4bd923cd
+checksum=de741ad5deadb927243a7007be0f5d3bb4070f780362d59ded600692064b0eca
pantheon-terminal_package() {
depends="io.elementary.terminal>=${version}_${revision}"
From bfb7233d018f8c27873d548ed90d6e0d006c76b3 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 10 Mar 2022 22:16:06 +0100
Subject: [PATCH 24/93] io.elementary.videos: update to 2.8.3.
---
srcpkgs/io.elementary.videos/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/io.elementary.videos/template b/srcpkgs/io.elementary.videos/template
index c989ccaf6954..eaca37a83723 100644
--- a/srcpkgs/io.elementary.videos/template
+++ b/srcpkgs/io.elementary.videos/template
@@ -1,15 +1,15 @@
# Template file for 'io.elementary.videos'
pkgname=io.elementary.videos
-version=2.7.2
+version=2.8.3
revision=1
wrksrc="videos-${version}"
build_style=meson
-hostmakedepends="intltool pkg-config vala AppStream"
+hostmakedepends="gettext pkg-config vala AppStream"
makedepends="granite-devel clutter-gst3-devel clutter-gtk-devel
- gstreamer1-devel gst-plugins-base1-devel"
+ gstreamer1-devel gst-plugins-base1-devel libhandy1-devel"
short_desc="Video player and library app designed for elementary OS"
maintainer="Ulf <void@uw.anonaddy.com>"
license="GPL-3.0-or-later"
homepage="https://github.com/elementary/videos"
distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=47946d6b285e2ff1eb86a654de0a6a268eebcf8dfa6ba733dd025b5d37fdad8a
+checksum=09c5db6433e4f6d570950609ff1d95a86df2179e7a65677a1e14c0549bbceba6
From 381bab7edc4074bf2471229c38a9c40fe9fa7496 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 10 Mar 2022 22:49:31 +0100
Subject: [PATCH 25/93] giti: remove package
* doesn't build with recent vala
---
srcpkgs/giti/template | 13 -------------
srcpkgs/removed-packages/template | 1 +
2 files changed, 1 insertion(+), 13 deletions(-)
delete mode 100644 srcpkgs/giti/template
diff --git a/srcpkgs/giti/template b/srcpkgs/giti/template
deleted file mode 100644
index e3c8663fa536..000000000000
--- a/srcpkgs/giti/template
+++ /dev/null
@@ -1,13 +0,0 @@
-# Template file for 'giti'
-pkgname=giti
-version=1.0.0
-revision=1
-build_style=meson
-hostmakedepends="pkg-config vala gettext"
-makedepends="gtk+3-devel libgit2-glib-devel libgee08-devel granite-devel"
-short_desc="Permanent observer of your git directories"
-maintainer="linarcx <linarcx@riseup.net>"
-license="GPL-3.0-or-later"
-homepage="https://github.com/LinArcX/giti"
-distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=8054581f9eddf226a3e16e404ef062ebaba0ea1223255d8b0c3eeac301cf6872
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 6a744198712d..bb733734d3a0 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -80,6 +80,7 @@ replaces="
gens-gs<=2.16.7_2
geoip-data<=20171002_2
gespeaker<=0.8.6_3
+ giti<=1.0.0_1
gksu<=2.0.2_4
glibmm-doc<=2.64.2_2
gnome-doc-utils<=0.20.10_9
From c3c8c0a0d9afce286152c14a4447bb289d24c666 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 25 Jan 2022 10:11:02 +0100
Subject: [PATCH 26/93] meson: update to 0.61.3.
---
srcpkgs/meson/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/meson/template b/srcpkgs/meson/template
index 67fa3514289f..36f17b539823 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.3
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=9c884434469471f3fe0cbbceb9b9ea0c8047f19e792940e1df6595741aae251b
# XXX: sanitizers aren't available on musl
if [ "$XBPS_TARGET_LIBC" = glibc ]; then
From 60af4eb6ca03709bbb16439e5e4968bd842bba15 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 9 Mar 2022 12:35:01 +0100
Subject: [PATCH 27/93] Venom: remove package
* not maintained, doesn't build with recent vala versions
---
srcpkgs/Venom/template | 16 ----------------
srcpkgs/removed-packages/template | 1 +
2 files changed, 1 insertion(+), 16 deletions(-)
delete mode 100644 srcpkgs/Venom/template
diff --git a/srcpkgs/Venom/template b/srcpkgs/Venom/template
deleted file mode 100644
index deb714982db1..000000000000
--- a/srcpkgs/Venom/template
+++ /dev/null
@@ -1,16 +0,0 @@
-# Template file for 'Venom'
-pkgname=Venom
-version=0.5.5
-revision=1
-build_style=meson
-hostmakedepends="vala pkg-config glib-devel"
-makedepends="gtk+3-devel libgee08-devel gspell-devel
- libcanberra-devel sqlcipher-devel json-glib-devel
- libsoup-devel toxcore-devel libsodium-devel
- opus-devel libvpx-devel gstreamer1-devel"
-short_desc="Modern Tox client for the desktop"
-maintainer="Nathan Owens <ndowens04@gmail.com>"
-license="GPL-3.0-or-later"
-homepage="https://github.com/naxuroqa/Venom/"
-distfiles="https://github.com/naxuroqa/Venom/archive/${version}.tar.gz"
-checksum=0348e26d70b0614b6ee3d50fb6c086ae1f696ed250d8ea80eec28299bee23562
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index bb733734d3a0..6baadfccc6f0 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -12,6 +12,7 @@ replaces="
ImageMagick6<=6.9.12.12_2
MoinMoin<=1.9.11_1
Platinum9-theme<=0.0.0.20170720_3
+ Venom<=0.5.5_1
XorCurses<=0.2.2_1
acme-client<=0.1.16_5
albert<=0.16.1_4
From 92a574face564138e26d01b624b2321c42950360 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 25 Jan 2022 10:10:58 +0100
Subject: [PATCH 28/93] 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 <bluca@debian.org>
+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 f0a758dd0d2b634a8223e3433889f019a0005f4b Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 9 Mar 2022 12:37:45 +0100
Subject: [PATCH 29/93] aisleriot: update to 3.22.21.
---
srcpkgs/aisleriot/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/aisleriot/template b/srcpkgs/aisleriot/template
index 6655dbb76606..d4d178b13c9e 100644
--- a/srcpkgs/aisleriot/template
+++ b/srcpkgs/aisleriot/template
@@ -1,6 +1,6 @@
# Template file for 'aisleriot'
pkgname=aisleriot
-version=3.22.20
+version=3.22.21
revision=1
build_style=meson
# build requires assertions to be turned on -> n_debug=false
@@ -15,5 +15,5 @@ maintainer="Érico Nogueira <ericonr@disroot.org>"
license="GPL-3.0-or-later"
homepage="https://wiki.gnome.org/Apps/Aisleriot"
distfiles="https://gitlab.gnome.org/GNOME/${pkgname}/-/archive/${version}/${pkgname}-${version}.tar.gz"
-checksum=e5f4d00156060a8ecf410ed5d4e485b0f19177c554009c2b0ea6ee6579af549a
+checksum=fd7e7b58e1480dcc9d41b1ae8c9fcb1dd0e6c66eef0a5c1090784dddca9dd655
replaces="aisleriot-data>=0"
From adcfacbad5400f2d185acab9f7b892ad42bbc25d Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 25 Jan 2022 10:10:58 +0100
Subject: [PATCH 30/93] 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 91e3284370ea245198c7f02e06902cff07dff4d3 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 25 Jan 2022 10:10:59 +0100
Subject: [PATCH 31/93] 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 <jon.turney@dronecode.org.uk>
+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 4aa9d2c5a0afaa670f7e79bce08820a059934378 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 25 Jan 2022 10:10:59 +0100
Subject: [PATCH 32/93] 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 <michal@vasilek.cz>
+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 e7623ca6e0d0badcc70745315fd58d394c3db1a1 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 25 Jan 2022 10:10:59 +0100
Subject: [PATCH 33/93] 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 <eschwartz@archlinux.org>
+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 389e4d264940aa61399bd154391bbf6437e8c7cc Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 25 Jan 2022 10:10:59 +0100
Subject: [PATCH 34/93] 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 <michal@vasilek.cz>
+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 760c98a984abbfe59ed735c6f4e47542ef1a4684 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 25 Jan 2022 10:10:59 +0100
Subject: [PATCH 35/93] 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 <alex@linutronix.de>
+Date: Fri, 21 Jan 2022 22:22:58 +0100
+Subject: [PATCH] editor/meson.build: fix meson 0.61 errors
+
+Signed-off-by: Alexander Kanavin <alex@linutronix.de>
+---
+ 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 6c39c36afa8de06fac2ab75ecaccb5a8c097d55a Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 25 Jan 2022 10:10:59 +0100
Subject: [PATCH 36/93] 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 <i@rvalue.moe>
+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 0cb7e3b49f10b830a1e586b00b4f192b98469285 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 25 Jan 2022 10:10:59 +0100
Subject: [PATCH 37/93] 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 <bruce.richardson@intel.com>
+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 <bruce.richardson@intel.com>
+Acked-by: Luca Boccassi <bluca@debian.org>
+---
+ 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 923842d28b293cd8b2cef219e22cb8051869286e Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 25 Jan 2022 10:10:59 +0100
Subject: [PATCH 38/93] 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 <i@rvalue.moe>
+Date: Wed, 24 Nov 2021 04:52:42 +0000
+Subject: [PATCH] Remove incorrect args for i18n.merge_file
+
+Part-of: <https://gitlab.gnome.org/GNOME/epiphany/-/merge_requests/1031>
+---
+ 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 7fcc1f396d69a8efac1a88266764096272ddf63c Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 25 Jan 2022 10:10:59 +0100
Subject: [PATCH 39/93] 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 <i@rvalue.moe>
+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 4615c8b62d7d7c7a11b3e1ddd08f2b06955ad170 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 25 Jan 2022 10:11:00 +0100
Subject: [PATCH 40/93] 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?= <mail@3v1n0.net>
+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 <eschwartz@archlinux.org>
+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 <eschwartz@archlinux.org>
+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 156321a641f09189914420a5452939b4883e98b0 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 25 Jan 2022 10:11:00 +0100
Subject: [PATCH 41/93] 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 <jplatte+git@posteo.de>
+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 4c2bb918891eed86457960744761cd3aaf507949 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 25 Jan 2022 10:11:00 +0100
Subject: [PATCH 42/93] 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 <jakub@jirutka.cz>
+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 4aab111a775ec7cd276026d1ec3b36e81feb1f35 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 25 Jan 2022 10:11:00 +0100
Subject: [PATCH 43/93] 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 <michal@vasilek.cz>
+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 c16b50c0425ce548cf3105e04db948044b83162a Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 9 Mar 2022 16:40:42 +0100
Subject: [PATCH 44/93] glade3: fix for meson 0.61
---
srcpkgs/glade3/patches/meson-0.61.patch | 57 +++++++++++++++++++++++++
1 file changed, 57 insertions(+)
create mode 100644 srcpkgs/glade3/patches/meson-0.61.patch
diff --git a/srcpkgs/glade3/patches/meson-0.61.patch b/srcpkgs/glade3/patches/meson-0.61.patch
new file mode 100644
index 000000000000..72f9c0e509ba
--- /dev/null
+++ b/srcpkgs/glade3/patches/meson-0.61.patch
@@ -0,0 +1,57 @@
+From 61304b2e8bac8ded76643cb7c3e781f73881dd2b Mon Sep 17 00:00:00 2001
+From: Mike Gilbert <floppym@gentoo.org>
+Date: Thu, 20 Jan 2022 14:18:09 -0500
+Subject: [PATCH 1/2] meson: i18n.merge_file() does not take a positional
+ argument
+
+---
+ data/meson.build | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/data/meson.build b/data/meson.build
+index 9f244566..bfbc514c 100644
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -2,7 +2,6 @@ desktop_conf = configuration_data()
+ desktop_conf.set('VERSION', glade_version)
+
+ i18n.merge_file(
+- 'desktop',
+ type: 'desktop',
+ input: configure_file(
+ input: 'org.gnome.Glade.desktop.in.in',
+@@ -18,7 +17,6 @@ i18n.merge_file(
+ appdata = glade_name + '.appdata.xml'
+
+ i18n.merge_file(
+- 'appdata',
+ input: 'org.gnome.Glade.appdata.xml.in',
+ output: '@BASENAME@',
+ po_dir: po_dir,
+--
+GitLab
+
+
+From 04ba6f969f716fbfe3c7feb7e4bab8678cc1e9eb Mon Sep 17 00:00:00 2001
+From: Mike Gilbert <floppym@gentoo.org>
+Date: Thu, 20 Jan 2022 14:19:03 -0500
+Subject: [PATCH 2/2] Remove duplicate entry for 'da' from help/LINGUAS
+
+---
+ help/LINGUAS | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/help/LINGUAS b/help/LINGUAS
+index fc3cd4c3..d67e42c8 100644
+--- a/help/LINGUAS
++++ b/help/LINGUAS
+@@ -1,6 +1,5 @@
+ # please keep this list sorted alphabetically
+ #
+-da
+ bg
+ ca
+ cs
+--
+GitLab
+
From 3bbd81571cd5675f52ef814054552c18434383bd Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 9 Mar 2022 16:44:19 +0100
Subject: [PATCH 45/93] gnome-bluetooth: fix for meson 0.61
---
.../gnome-bluetooth/patches/meson-0.61.patch | 25 +++++++++++++++++++
1 file changed, 25 insertions(+)
create mode 100644 srcpkgs/gnome-bluetooth/patches/meson-0.61.patch
diff --git a/srcpkgs/gnome-bluetooth/patches/meson-0.61.patch b/srcpkgs/gnome-bluetooth/patches/meson-0.61.patch
new file mode 100644
index 000000000000..c6962edd4f05
--- /dev/null
+++ b/srcpkgs/gnome-bluetooth/patches/meson-0.61.patch
@@ -0,0 +1,25 @@
+From 755fd758f866d3a3f7ca482942beee749f13a91e Mon Sep 17 00:00:00 2001
+From: Bastien Nocera <hadess@hadess.net>
+Date: Fri, 7 Jan 2022 12:51:22 +0100
+Subject: [PATCH] build: Fix build for newer versions of meson
+
+sendto/meson.build:24:5: ERROR: Function does not take positional arguments.
+---
+ sendto/meson.build | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/sendto/meson.build b/sendto/meson.build
+index 24a4e394..3e233a03 100644
+--- a/sendto/meson.build
++++ b/sendto/meson.build
+@@ -22,7 +22,6 @@ desktop_in = configure_file(
+ )
+
+ i18n.merge_file (
+- desktop,
+ type: 'desktop',
+ input: desktop_in,
+ output: desktop,
+--
+GitLab
+
From 2e9beb57af0f2ff7f5de17fb2a5cc896eb2e84d2 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 25 Jan 2022 10:11:00 +0100
Subject: [PATCH 46/93] 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 <michal@vasilek.cz>
+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 aef2e54eedcc819254817a8ddb9f29234756355d Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 25 Jan 2022 10:11:00 +0100
Subject: [PATCH 47/93] 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 a089ac6718fa0889f4850e3f42a4084312800aa4 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 25 Jan 2022 10:11:00 +0100
Subject: [PATCH 48/93] 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 62ec7c61a595543e4e731642bb57aa98e94a74c3 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 9 Mar 2022 17:20:40 +0100
Subject: [PATCH 49/93] glade3: fix cross builds with meson 0.61
---
srcpkgs/glade3/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/glade3/template b/srcpkgs/glade3/template
index 763632c1e712..a0235c1faef9 100644
--- a/srcpkgs/glade3/template
+++ b/srcpkgs/glade3/template
@@ -4,7 +4,7 @@ version=3.38.2
revision=1
wrksrc="glade-${version}"
build_style=meson
-build_helper="gir"
+build_helper="gir qemu"
configure_args="-Dgtk_doc=true -Dman=true $(vopt_bool gir introspection)"
hostmakedepends="glib-devel intltool itstool pkg-config
gjs-devel yelp-tools gettext-devel gtk-doc"
From 5b043023b462d11cfd862eeb7fe8b7ff28e4745c Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 9 Mar 2022 17:47:14 +0100
Subject: [PATCH 50/93] gnome-books: fix for meson 0.61
---
srcpkgs/gnome-books/patches/meson-0.61.patch | 33 ++++++++++++++++++++
1 file changed, 33 insertions(+)
create mode 100644 srcpkgs/gnome-books/patches/meson-0.61.patch
diff --git a/srcpkgs/gnome-books/patches/meson-0.61.patch b/srcpkgs/gnome-books/patches/meson-0.61.patch
new file mode 100644
index 000000000000..0e6ba9befd96
--- /dev/null
+++ b/srcpkgs/gnome-books/patches/meson-0.61.patch
@@ -0,0 +1,33 @@
+From 2663dcdaaaa71f067a4c2d0005eecc0fdf940bf5 Mon Sep 17 00:00:00 2001
+From: Michal Vasilek <michal@vasilek.cz>
+Date: Wed, 9 Mar 2022 17:46:00 +0100
+Subject: [PATCH] meson: remove positional args from i18n.merge_file
+
+This causes the build to fail with meson 0.61+
+---
+ data/meson.build | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/data/meson.build b/data/meson.build
+index bc6edfb4..5061554d 100644
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -54,7 +54,6 @@ sources += gnome.compile_resources(
+ appdata = 'org.gnome.Books.appdata.xml'
+
+ appdata_file = i18n.merge_file(
+- appdata,
+ input: appdata + '.in',
+ output: appdata,
+ po_dir: po_dir,
+@@ -74,7 +73,6 @@ if appstream_util.found()
+ desktop = 'org.gnome.Books.desktop'
+
+ desktop_file = i18n.merge_file(
+- desktop,
+ type: 'desktop',
+ input: desktop + '.in',
+ output: desktop,
+--
+2.35.1
+
From a1cb2d2153e2621b99d010f6a1e472997f1f39c6 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 25 Jan 2022 10:11:01 +0100
Subject: [PATCH 51/93] 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 <i@rvalue.moe>
+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 8d5e0c7375c8d6730c1a786f16b49a990ca190bb Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 25 Jan 2022 10:11:01 +0100
Subject: [PATCH 52/93] 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 <i@rvalue.moe>
+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 817b184383c4d7450e64c8d264049663f912607c Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 25 Jan 2022 10:11:01 +0100
Subject: [PATCH 53/93] 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 <jfelder@src.gnome.org>
+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 915b677e07d116b328db8534fdd555476b702912 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 9 Mar 2022 18:14:37 +0100
Subject: [PATCH 54/93] gnome-mahjongg: fix for meson 0.61
---
.../gnome-mahjongg/patches/meson-0.61.patch | 37 +++++++++++++++++++
1 file changed, 37 insertions(+)
create mode 100644 srcpkgs/gnome-mahjongg/patches/meson-0.61.patch
diff --git a/srcpkgs/gnome-mahjongg/patches/meson-0.61.patch b/srcpkgs/gnome-mahjongg/patches/meson-0.61.patch
new file mode 100644
index 000000000000..2a17ad713752
--- /dev/null
+++ b/srcpkgs/gnome-mahjongg/patches/meson-0.61.patch
@@ -0,0 +1,37 @@
+From a2037b0747163601a5d5b57856d037eecf3a4db7 Mon Sep 17 00:00:00 2001
+From: Jan Beich <jbeich@FreeBSD.org>
+Date: Mon, 24 Jan 2022 11:22:48 +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.
+
+data/meson.build:24:0: ERROR: Function does not take positional arguments.
+data/meson.build:45:0: 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 8740503..edb8583 100644
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -21,7 +21,6 @@ install_data ('edu_kang_xi.png', install_dir: join_paths (pkgdatadir, 'themes'))
+ install_data ('maya.png', install_dir: join_paths (pkgdatadir, 'themes'))
+
+ desktop_file = i18n.merge_file (
+- 'desktop-file',
+ input: 'org.gnome.Mahjongg.desktop.in',
+ output: 'org.gnome.Mahjongg.desktop',
+ install: true,
+@@ -41,7 +40,7 @@ if desktop_file_validate.found()
+ )
+ endif
+
+-appdata_file = i18n.merge_file ('appdata-file',
++appdata_file = i18n.merge_file (
+ input: 'org.gnome.Mahjongg.appdata.xml.in',
+ output: 'org.gnome.Mahjongg.appdata.xml',
+ install: true,
+--
+GitLab
+
From 51093f367743e570b31857b56cba944cfe93e0dd Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 9 Mar 2022 18:17:29 +0100
Subject: [PATCH 55/93] gnome-nibbles: fix for recent vala
---
srcpkgs/gnome-nibbles/patches/vala.patch | 178 +++++++++++++++++++++++
1 file changed, 178 insertions(+)
create mode 100644 srcpkgs/gnome-nibbles/patches/vala.patch
diff --git a/srcpkgs/gnome-nibbles/patches/vala.patch b/srcpkgs/gnome-nibbles/patches/vala.patch
new file mode 100644
index 000000000000..48c565303196
--- /dev/null
+++ b/srcpkgs/gnome-nibbles/patches/vala.patch
@@ -0,0 +1,178 @@
+From 62964e9256fcac616109af874dbb2bd8342a9853 Mon Sep 17 00:00:00 2001
+From: Rico Tzschichholz <ricotz@ubuntu.com>
+Date: Wed, 17 Mar 2021 11:25:05 +0100
+Subject: [PATCH] Reference of [GtkChild] fields is handled by GtkBuilder, type
+ must be unowned
+
+---
+ src/controls.vala | 20 ++++++++++----------
+ src/nibbles-window.vala | 26 +++++++++++++-------------
+ src/players.vala | 6 +++---
+ src/preferences-dialog.vala | 30 +++++++++++++++---------------
+ src/scoreboard.vala | 6 +++---
+ 5 files changed, 44 insertions(+), 44 deletions(-)
+
+diff --git a/src/controls.vala b/src/controls.vala
+index 584c9ff..f95d210 100644
+--- a/src/controls.vala
++++ b/src/controls.vala
+@@ -22,7 +22,7 @@ using Gtk;
+ [GtkTemplate (ui = "/org/gnome/Nibbles/ui/controls.ui")]
+ private class Controls : Box
+ {
+- [GtkChild] private Box grids_box;
++ [GtkChild] private unowned Box grids_box;
+ private Gee.LinkedList<ControlsGrid> grids = new Gee.LinkedList<ControlsGrid> ();
+
+ private Gdk.Pixbuf arrow_pixbuf;
+@@ -100,15 +100,15 @@ private class Controls : Box
+ [GtkTemplate (ui = "/org/gnome/Nibbles/ui/controls-grid.ui")]
+ private class ControlsGrid : Button
+ {
+- [GtkChild] private Label name_label;
+- [GtkChild] private Image arrow_up;
+- [GtkChild] private Image arrow_down;
+- [GtkChild] private Image arrow_left;
+- [GtkChild] private Image arrow_right;
+- [GtkChild] private Label move_up_label;
+- [GtkChild] private Label move_down_label;
+- [GtkChild] private Label move_left_label;
+- [GtkChild] private Label move_right_label;
++ [GtkChild] private unowned Label name_label;
++ [GtkChild] private unowned Image arrow_up;
++ [GtkChild] private unowned Image arrow_down;
++ [GtkChild] private unowned Image arrow_left;
++ [GtkChild] private unowned Image arrow_right;
++ [GtkChild] private unowned Label move_up_label;
++ [GtkChild] private unowned Label move_down_label;
++ [GtkChild] private unowned Label move_left_label;
++ [GtkChild] private unowned Label move_right_label;
+
+ internal WormProperties worm_props;
+ internal ulong external_handler;
+diff --git a/src/nibbles-window.vala b/src/nibbles-window.vala
+index 6961326..6bfb74a 100644
+--- a/src/nibbles-window.vala
++++ b/src/nibbles-window.vala
+@@ -40,30 +40,30 @@ private class NibblesWindow : ApplicationWindow
+ private int window_height;
+
+ /* Main widgets */
+- [GtkChild] private Stack main_stack;
+- [GtkChild] private Overlay overlay;
++ [GtkChild] private unowned Stack main_stack;
++ [GtkChild] private unowned Overlay overlay;
+
+ /* HeaderBar */
+- [GtkChild] private HeaderBar headerbar;
+- [GtkChild] private MenuButton hamburger_menu;
+- [GtkChild] private Button new_game_button;
+- [GtkChild] private Button pause_button;
++ [GtkChild] private unowned HeaderBar headerbar;
++ [GtkChild] private unowned MenuButton hamburger_menu;
++ [GtkChild] private unowned Button new_game_button;
++ [GtkChild] private unowned Button pause_button;
+
+ /* Pre-game screen widgets */
+- [GtkChild] private Players players;
+- [GtkChild] private Speed speed;
+- [GtkChild] private Controls controls;
++ [GtkChild] private unowned Players players;
++ [GtkChild] private unowned Speed speed;
++ [GtkChild] private unowned Controls controls;
+
+ /* Statusbar widgets */
+- [GtkChild] private Stack statusbar_stack;
+- [GtkChild] private Label countdown;
+- [GtkChild] private Scoreboard scoreboard;
++ [GtkChild] private unowned Stack statusbar_stack;
++ [GtkChild] private unowned Label countdown;
++ [GtkChild] private unowned Scoreboard scoreboard;
+ private Gdk.Pixbuf scoreboard_life;
+
+ /* Rendering of the game */
+ private NibblesView? view;
+
+- [GtkChild] private Box game_box;
++ [GtkChild] private unowned Box game_box;
+ private Games.GridFrame frame;
+
+ /* Game being played */
+diff --git a/src/players.vala b/src/players.vala
+index 9198412..4bde18e 100644
+--- a/src/players.vala
++++ b/src/players.vala
+@@ -21,9 +21,9 @@ using Gtk;
+ [GtkTemplate (ui = "/org/gnome/Nibbles/ui/players.ui")]
+ private class Players : Box
+ {
+- [GtkChild] private ToggleButton worms4;
+- [GtkChild] private ToggleButton worms5;
+- [GtkChild] private ToggleButton worms6;
++ [GtkChild] private unowned ToggleButton worms4;
++ [GtkChild] private unowned ToggleButton worms5;
++ [GtkChild] private unowned ToggleButton worms6;
+
+ private SimpleAction nibbles_number_action;
+ private SimpleAction players_number_action;
+diff --git a/src/preferences-dialog.vala b/src/preferences-dialog.vala
+index 216a1e2..2d3a7bf 100644
+--- a/src/preferences-dialog.vala
++++ b/src/preferences-dialog.vala
+@@ -24,21 +24,21 @@ private class PreferencesDialog : Window
+ private GLib.Settings settings;
+ private Gee.ArrayList<GLib.Settings> worm_settings;
+
+- [GtkChild] private Stack stack;
+- [GtkChild] private Stack headerbar_stack;
+- [GtkChild] private ComboBoxText worm_combobox;
+- [GtkChild] private Gtk.ListStore list_store_1;
+- [GtkChild] private Gtk.ListStore list_store_2;
+- [GtkChild] private Gtk.ListStore list_store_3;
+- [GtkChild] private Gtk.ListStore list_store_4;
+- [GtkChild] private TreeView tree_view_1;
+- [GtkChild] private TreeView tree_view_2;
+- [GtkChild] private TreeView tree_view_3;
+- [GtkChild] private TreeView tree_view_4;
+- [GtkChild] private ComboBoxText combo_box_1;
+- [GtkChild] private ComboBoxText combo_box_2;
+- [GtkChild] private ComboBoxText combo_box_3;
+- [GtkChild] private ComboBoxText combo_box_4;
++ [GtkChild] private unowned Stack stack;
++ [GtkChild] private unowned Stack headerbar_stack;
++ [GtkChild] private unowned ComboBoxText worm_combobox;
++ [GtkChild] private unowned Gtk.ListStore list_store_1;
++ [GtkChild] private unowned Gtk.ListStore list_store_2;
++ [GtkChild] private unowned Gtk.ListStore list_store_3;
++ [GtkChild] private unowned Gtk.ListStore list_store_4;
++ [GtkChild] private unowned TreeView tree_view_1;
++ [GtkChild] private unowned TreeView tree_view_2;
++ [GtkChild] private unowned TreeView tree_view_3;
++ [GtkChild] private unowned TreeView tree_view_4;
++ [GtkChild] private unowned ComboBoxText combo_box_1;
++ [GtkChild] private unowned ComboBoxText combo_box_2;
++ [GtkChild] private unowned ComboBoxText combo_box_3;
++ [GtkChild] private unowned ComboBoxText combo_box_4;
+
+ private Gee.ArrayList<Gtk.ListStore> list_stores;
+ private Gee.ArrayList<TreeView> tree_views;
+diff --git a/src/scoreboard.vala b/src/scoreboard.vala
+index a41aee1..aebc1cc 100644
+--- a/src/scoreboard.vala
++++ b/src/scoreboard.vala
+@@ -59,9 +59,9 @@ private class Scoreboard : Box
+ [GtkTemplate (ui = "/org/gnome/Nibbles/ui/player-score-box.ui")]
+ private class PlayerScoreBox : Box
+ {
+- [GtkChild] private Label name_label;
+- [GtkChild] private Label score_label;
+- [GtkChild] private Grid lives_grid;
++ [GtkChild] private unowned Label name_label;
++ [GtkChild] private unowned Label score_label;
++ [GtkChild] private unowned Grid lives_grid;
+
+ private Gee.LinkedList<Image> life_images = new Gee.LinkedList<Image> ();
+
+--
+GitLab
+
From a3c9f2ebfe3edc0c006dbdcd6fafe128ba45622d Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 9 Mar 2022 18:19:02 +0100
Subject: [PATCH 56/93] gnome-2048: fix for meson 0.61
---
srcpkgs/gnome-2048/patches/meson-0.61.patch | 36 +++++++++++++++++++++
1 file changed, 36 insertions(+)
create mode 100644 srcpkgs/gnome-2048/patches/meson-0.61.patch
diff --git a/srcpkgs/gnome-2048/patches/meson-0.61.patch b/srcpkgs/gnome-2048/patches/meson-0.61.patch
new file mode 100644
index 000000000000..912759654d73
--- /dev/null
+++ b/srcpkgs/gnome-2048/patches/meson-0.61.patch
@@ -0,0 +1,36 @@
+From 194e22699f7166a016cd39ba26dd719aeecfc868 Mon Sep 17 00:00:00 2001
+From: Jan Beich <jbeich@FreeBSD.org>
+Date: Sun, 23 Jan 2022 10:49:07 +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.
+
+data/meson.build:19:0: ERROR: Function does not take positional arguments.
+data/meson.build:39:0: 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 33f73ca..8974a63 100644
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -17,7 +17,6 @@ install_data(
+
+ # Desktop file
+ desktop_file = i18n.merge_file(
+- 'desktop-file',
+ input: 'org.gnome.TwentyFortyEight.desktop.in',
+ output: 'org.gnome.TwentyFortyEight.desktop',
+ install: true,
+@@ -37,7 +36,6 @@ endif
+
+ # AppData file
+ appdata_file = i18n.merge_file(
+- 'appdata-file',
+ input: 'org.gnome.TwentyFortyEight.appdata.xml.in',
+ output: 'org.gnome.TwentyFortyEight.appdata.xml',
+ install: true,
+--
+GitLab
+
From 0e9fa37b32537c57a87f01027a5c16344a8cba40 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 9 Mar 2022 18:23:31 +0100
Subject: [PATCH 57/93] gnome-photos: fix for meson 0.61
---
srcpkgs/gnome-photos/patches/meson-0.61.patch | 32 +++++++++++++++++++
1 file changed, 32 insertions(+)
create mode 100644 srcpkgs/gnome-photos/patches/meson-0.61.patch
diff --git a/srcpkgs/gnome-photos/patches/meson-0.61.patch b/srcpkgs/gnome-photos/patches/meson-0.61.patch
new file mode 100644
index 000000000000..f406b1c494c0
--- /dev/null
+++ b/srcpkgs/gnome-photos/patches/meson-0.61.patch
@@ -0,0 +1,32 @@
+From a0ac868a19d55dc52100e54fe4b2d29041bc6752 Mon Sep 17 00:00:00 2001
+From: rvalue <i@rvalue.moe>
+Date: Fri, 21 Jan 2022 12:36:02 +0000
+Subject: [PATCH] meson: remove incorrect args for i18n.merge_file
+
+---
+ data/meson.build | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/data/meson.build b/data/meson.build
+index 6e7192e0..94271de2 100644
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -3,7 +3,6 @@ subdir('icons')
+ appdata = photos_namespace + '.appdata.xml'
+
+ i18n.merge_file(
+- appdata,
+ input: appdata + '.in',
+ output: appdata,
+ po_dir: po_dir,
+@@ -23,7 +22,6 @@ desktop_in = configure_file(
+ )
+
+ i18n.merge_file(
+- desktop,
+ type: 'desktop',
+ input: desktop_in,
+ output: desktop,
+--
+GitLab
+
From 15fb79f548e5aaadad6ed1155e8dce29e9b670dc Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 9 Mar 2022 18:25:42 +0100
Subject: [PATCH 58/93] gnome-podcasts: fix for meson 0.61
---
.../gnome-podcasts/patches/meson-0.61.patch | 38 +++++++++++++++++++
1 file changed, 38 insertions(+)
create mode 100644 srcpkgs/gnome-podcasts/patches/meson-0.61.patch
diff --git a/srcpkgs/gnome-podcasts/patches/meson-0.61.patch b/srcpkgs/gnome-podcasts/patches/meson-0.61.patch
new file mode 100644
index 000000000000..b5ad823b70cf
--- /dev/null
+++ b/srcpkgs/gnome-podcasts/patches/meson-0.61.patch
@@ -0,0 +1,38 @@
+From 6614bb62ecbec7c3b18ea7fe44beb50fe7942b27 Mon Sep 17 00:00:00 2001
+From: Jan Beich <jbeich@FreeBSD.org>
+Date: Thu, 20 Jan 2022 01:27:48 +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.
+
+podcasts-gtk/resources/meson.build:5:0: ERROR: Function does not take positional arguments.
+podcasts-gtk/resources/meson.build:30:0: ERROR: Function does not take positional arguments.
+---
+ podcasts-gtk/resources/meson.build | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/podcasts-gtk/resources/meson.build b/podcasts-gtk/resources/meson.build
+index c1f1ee9f..87148087 100644
+--- a/podcasts-gtk/resources/meson.build
++++ b/podcasts-gtk/resources/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.Podcasts.desktop.in.in'),
+@@ -27,7 +27,7 @@ endif
+
+ 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.Podcasts.appdata.xml.in.in'),
+ output: 'org.gnome.Podcasts.appdata.xml.in',
+--
+GitLab
+
From 7078f0d064f045af7bb71d55858b6a1d29e8dc54 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 9 Mar 2022 18:27:03 +0100
Subject: [PATCH 59/93] gnome-screenshot: fix for meson 0.61
---
.../gnome-screenshot/patches/meson-0.61.patch | 36 +++++++++++++++++++
1 file changed, 36 insertions(+)
create mode 100644 srcpkgs/gnome-screenshot/patches/meson-0.61.patch
diff --git a/srcpkgs/gnome-screenshot/patches/meson-0.61.patch b/srcpkgs/gnome-screenshot/patches/meson-0.61.patch
new file mode 100644
index 000000000000..b21aa0490d49
--- /dev/null
+++ b/srcpkgs/gnome-screenshot/patches/meson-0.61.patch
@@ -0,0 +1,36 @@
+From b60dad3c2536c17bd201f74ad8e40eb74385ed9f Mon Sep 17 00:00:00 2001
+From: Jack Hill <jackhill@jackhill.us>
+Date: Thu, 18 Nov 2021 00:46:58 -0500
+Subject: [PATCH] meson: remove extraneous positional argument
+
+* data/meson.build (desktop_file)
+ (metainfo_file): Remove extraneous positional argument.
+
+Closes #186
+---
+ data/meson.build | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/data/meson.build b/data/meson.build
+index fd570b3..4e2e2e8 100644
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -1,7 +1,6 @@
+ gnome = import('gnome')
+
+ desktop_file = i18n.merge_file(
+- 'desktop',
+ type: 'desktop',
+ input: 'org.gnome.Screenshot.desktop.in',
+ output: 'org.gnome.Screenshot.desktop',
+@@ -23,7 +22,6 @@ if desktop_file_validate.found()
+ endif
+
+ metainfo_file = i18n.merge_file(
+- 'appdata',
+ input: 'org.gnome.Screenshot.metainfo.xml.in',
+ output: 'org.gnome.Screenshot.metainfo.xml',
+ po_dir: join_paths(meson.current_source_dir(), '../po'),
+--
+GitLab
+
From e6a49ce0c38116ee7ba35666dc7cb9d90e907f5c Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 9 Mar 2022 18:28:32 +0100
Subject: [PATCH 60/93] gnome-settings-daemon: fix for meson 0.61
---
.../patches/meson-0.61.patch | 38 +++++++++++++++++++
1 file changed, 38 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..b7c03ca2da63
--- /dev/null
+++ b/srcpkgs/gnome-settings-daemon/patches/meson-0.61.patch
@@ -0,0 +1,38 @@
+From afa7e4bb9c519e2daf500a6079088669500768c0 Mon Sep 17 00:00:00 2001
+From: Marvin Schmidt <marv@exherbo.org>
+Date: Wed, 26 Jan 2022 23:08:58 +0100
+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.
+---
+ plugins/power/meson.build | 1 -
+ plugins/wacom/meson.build | 1 -
+ 2 files changed, 2 deletions(-)
+
+diff --git a/plugins/power/meson.build b/plugins/power/meson.build
+index 69e619f2..014bb6da 100644
+--- 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,
+diff --git a/plugins/wacom/meson.build b/plugins/wacom/meson.build
+index d8dd0ec7..c00323d4 100644
+--- 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,
+--
+GitLab
+
From 41f0604b01bb6bcb2b06b00b4591608d187802e4 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 9 Mar 2022 18:30:02 +0100
Subject: [PATCH 61/93] 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?= <fmuellner@gnome.org>
+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: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/2078>
+---
+ 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 80d0cc7dc097a3d73aec0a702654d2109938b764 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 9 Mar 2022 18:31:24 +0100
Subject: [PATCH 62/93] gnome-sound-recorder: fix for meson 0.61
---
.../patches/meson-0.61.patch | 41 +++++++++++++++++++
1 file changed, 41 insertions(+)
create mode 100644 srcpkgs/gnome-sound-recorder/patches/meson-0.61.patch
diff --git a/srcpkgs/gnome-sound-recorder/patches/meson-0.61.patch b/srcpkgs/gnome-sound-recorder/patches/meson-0.61.patch
new file mode 100644
index 000000000000..40392e6a9fe8
--- /dev/null
+++ b/srcpkgs/gnome-sound-recorder/patches/meson-0.61.patch
@@ -0,0 +1,41 @@
+From 1335b1b1aff61167f8648f7cb3c569764031960d Mon Sep 17 00:00:00 2001
+From: Jan Beich <jbeich@FreeBSD.org>
+Date: Mon, 24 Jan 2022 11:37:06 +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.
+
+data/appdata/meson.build:5:0: ERROR: Function does not take positional arguments.
+data/meson.build:16: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 1f5744e..d2c2c3a 100644
+--- a/data/appdata/meson.build
++++ b/data/appdata/meson.build
+@@ -3,7 +3,6 @@ metainfo_conf.set('app-id', application_id)
+ metainfo_conf.set('gettext-package', gettext_package)
+
+ metainfo_file = i18n.merge_file(
+- 'metainfo-file',
+ input: configure_file(
+ input: 'org.gnome.SoundRecorder.metainfo.xml.in.in',
+ output: '@BASENAME@',
+diff --git a/data/meson.build b/data/meson.build
+index 44117ad..0ff8fa5 100644
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -14,7 +14,6 @@ install_data(
+ desktop_conf = configuration_data()
+ desktop_conf.set('app-id', application_id)
+ desktop_file = i18n.merge_file(
+- 'desktop',
+ input: configure_file(
+ input: 'org.gnome.SoundRecorder.desktop.in.in',
+ output: '@BASENAME@',
+--
+GitLab
+
From 5f313ac0a43b648e6ce92c69aa8c7d955b7949a6 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 9 Mar 2022 18:34:03 +0100
Subject: [PATCH 63/93] gnome-dictionary: fix for meson 0.61
---
.../gnome-dictionary/patches/meson-0.61.patch | 30 +++++++++++++++++++
1 file changed, 30 insertions(+)
create mode 100644 srcpkgs/gnome-dictionary/patches/meson-0.61.patch
diff --git a/srcpkgs/gnome-dictionary/patches/meson-0.61.patch b/srcpkgs/gnome-dictionary/patches/meson-0.61.patch
new file mode 100644
index 000000000000..768494e2a8cf
--- /dev/null
+++ b/srcpkgs/gnome-dictionary/patches/meson-0.61.patch
@@ -0,0 +1,30 @@
+--- a/data/appdata/meson.build
++++ b/data/appdata/meson.build
+@@ -1,6 +1,6 @@
+ appdata_conf = configuration_data()
+ appdata_conf.set('application_id', application_id)
+-i18n.merge_file('appdata',
++i18n.merge_file(
+ input: configure_file(
+ input: 'org.gnome.Dictionary.appdata.xml.in.in',
+ output: 'org.gnome.Dictionary.appdata.xml.in',
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -3,7 +3,7 @@ subdir('appdata')
+ desktop_conf = configuration_data()
+ desktop_conf.set('icon', application_id)
+ desktop_conf.set('application_id', application_id)
+-i18n.merge_file('desktop',
++i18n.merge_file(
+ input: configure_file(
+ input: 'org.gnome.Dictionary.desktop.in.in',
+ output: 'org.gnome.Dictionary.desktop.in',
+@@ -45,7 +45,7 @@ sources = [
+ ]
+
+ foreach s: sources
+- i18n.merge_file('sources',
++ i18n.merge_file(
+ input: '@0@.in'.format(s),
+ output: s,
+ install: true,
From 9b15471e31502e6fc2d92eeda21bef17ff169bc1 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 9 Mar 2022 18:37:12 +0100
Subject: [PATCH 64/93] gnome-authenticator: fix for meson 0.61
---
.../patches/meson-0.61.patch | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
create mode 100644 srcpkgs/gnome-authenticator/patches/meson-0.61.patch
diff --git a/srcpkgs/gnome-authenticator/patches/meson-0.61.patch b/srcpkgs/gnome-authenticator/patches/meson-0.61.patch
new file mode 100644
index 000000000000..eade2e1241b5
--- /dev/null
+++ b/srcpkgs/gnome-authenticator/patches/meson-0.61.patch
@@ -0,0 +1,18 @@
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -63,7 +63,6 @@ configure_file(
+ desktop_conf = configuration_data()
+ desktop_conf.set('APP_ID', application_id)
+ desktop_file = i18n.merge_file(
+- 'desktop',
+ input: configure_file(
+ input: meson.project_name() + '.desktop.in.in',
+ output: '@BASENAME@',
+@@ -90,7 +89,6 @@ appdata_conf = configuration_data()
+ appdata_conf.set('APP_ID', application_id)
+ appdata_conf.set('GETTEXT_PACKAGE', gettext_package)
+ appdata_file = i18n.merge_file(
+- 'appdata',
+ input: configure_file(
+ input: meson.project_name() + '.appdata.xml.in.in',
+ output: '@BASENAME@',
From 9ef2ac5cb01dceb75a533a59b08dd23c93aea9a2 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 9 Mar 2022 19:05:16 +0100
Subject: [PATCH 65/93] gnome-sudoku: fix for meson 0.61
---
srcpkgs/gnome-sudoku/patches/meson-0.61.patch | 38 +++++++++++++++++++
srcpkgs/gnome-sudoku/template | 2 +-
2 files changed, 39 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/gnome-sudoku/patches/meson-0.61.patch
diff --git a/srcpkgs/gnome-sudoku/patches/meson-0.61.patch b/srcpkgs/gnome-sudoku/patches/meson-0.61.patch
new file mode 100644
index 000000000000..93549d0158d5
--- /dev/null
+++ b/srcpkgs/gnome-sudoku/patches/meson-0.61.patch
@@ -0,0 +1,38 @@
+From 7c9935a02b48f332f67bad3e4ee020b75591084a Mon Sep 17 00:00:00 2001
+From: Jan Beich <jbeich@FreeBSD.org>
+Date: Mon, 24 Jan 2022 11:44:06 +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.
+
+data/meson.build:5:0: ERROR: Function does not take positional arguments.
+data/meson.build:24:0: ERROR: Function does not take positional arguments.
+---
+ data/meson.build | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/data/meson.build b/data/meson.build
+index f18f247..9c95e02 100644
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -2,7 +2,7 @@ resource_files = files('gnome-sudoku.gresource.xml')
+
+ resources = gnome.compile_resources('gnome-sudoku', resource_files)
+
+-desktop_file = i18n.merge_file('desktop',
++desktop_file = i18n.merge_file(
+ input: '@0@.desktop.in'.format(application_id),
+ output: '@0@.desktop'.format(application_id),
+ install: true,
+@@ -21,7 +21,7 @@ if desktop_file_validate.found()
+ )
+ endif
+
+-appdata_file = i18n.merge_file('appdata',
++appdata_file = i18n.merge_file(
+ input: '@0@.appdata.xml.in'.format(application_id),
+ output: '@0@.appdata.xml'.format(application_id),
+ install: true,
+--
+GitLab
+
diff --git a/srcpkgs/gnome-sudoku/template b/srcpkgs/gnome-sudoku/template
index ed1759478ab5..6e0af45248ff 100644
--- a/srcpkgs/gnome-sudoku/template
+++ b/srcpkgs/gnome-sudoku/template
@@ -5,7 +5,7 @@ revision=1
build_helper="gir"
build_style=meson
hostmakedepends="gettext glib-devel itstool pkg-config vala"
-makedepends="gtk4-devel libgee08-devel json-glib-devel qqwing-devel"
+makedepends="gtk+3-devel libgee08-devel json-glib-devel qqwing-devel"
short_desc="GNOME Sudoku Japanese logic game"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3.0-or-later"
From 13c75c64d74b2c086a301ba6fc4e83f49ca576c7 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 25 Jan 2022 10:11:01 +0100
Subject: [PATCH 66/93] 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 <chpe@src.gnome.org>
+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 8b6fa12cc09c6516264285f14386eaad6a6e61a0 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 9 Mar 2022 19:27:12 +0100
Subject: [PATCH 67/93] gnome-tweaks: fix for meson 0.61
---
srcpkgs/gnome-tweaks/patches/meson-0.61.patch | 32 +++++++++++++++++++
1 file changed, 32 insertions(+)
create mode 100644 srcpkgs/gnome-tweaks/patches/meson-0.61.patch
diff --git a/srcpkgs/gnome-tweaks/patches/meson-0.61.patch b/srcpkgs/gnome-tweaks/patches/meson-0.61.patch
new file mode 100644
index 000000000000..80efde38735e
--- /dev/null
+++ b/srcpkgs/gnome-tweaks/patches/meson-0.61.patch
@@ -0,0 +1,32 @@
+From dc9701e18775c01d0b69fabaa350147f70096da8 Mon Sep 17 00:00:00 2001
+From: Mae Dartmann <hello@maedartmann.name>
+Date: Wed, 16 Feb 2022 06:08:41 +0000
+Subject: [PATCH] meson: fix invalid positional argument
+
+---
+ data/meson.build | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/data/meson.build b/data/meson.build
+index fd6d5da..74f7e82 100644
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -1,5 +1,5 @@
+ appdata_file = 'org.gnome.tweaks.appdata.xml'
+-i18n.merge_file(appdata_file,
++i18n.merge_file(
+ input: appdata_file + '.in',
+ output: appdata_file,
+ po_dir: '../po',
+@@ -8,7 +8,7 @@ i18n.merge_file(appdata_file,
+ )
+
+ desktop_file = 'org.gnome.tweaks.desktop'
+-i18n.merge_file(desktop_file,
++i18n.merge_file(
+ input: desktop_file + '.in',
+ output: desktop_file,
+ po_dir: '../po',
+--
+GitLab
+
From 9f38029bb76ba4307de6c9991b972d1fa8c5c0f8 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 9 Mar 2022 19:30:05 +0100
Subject: [PATCH 68/93] gnome-tetravex: fix for meson 0.61
---
.../gnome-tetravex/patches/meson-0.61.patch | 38 +++++++++++++++++++
1 file changed, 38 insertions(+)
create mode 100644 srcpkgs/gnome-tetravex/patches/meson-0.61.patch
diff --git a/srcpkgs/gnome-tetravex/patches/meson-0.61.patch b/srcpkgs/gnome-tetravex/patches/meson-0.61.patch
new file mode 100644
index 000000000000..12e0eab64ef0
--- /dev/null
+++ b/srcpkgs/gnome-tetravex/patches/meson-0.61.patch
@@ -0,0 +1,38 @@
+From 80912d06f5e588f6aca966fa516103275e58d94e Mon Sep 17 00:00:00 2001
+From: Jan Beich <jbeich@FreeBSD.org>
+Date: Mon, 24 Jan 2022 11:48:22 +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.
+
+data/meson.build:37:0: ERROR: Function does not take positional arguments.
+data/meson.build:59:0: ERROR: Function does not take positional arguments.
+---
+ data/meson.build | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/data/meson.build b/data/meson.build
+index bb77248..b881e8a 100644
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -34,7 +34,7 @@ endif
+
+ # Desktop file
+ if get_option('build_gui')
+- desktop_file = i18n.merge_file ('desktop-file',
++ desktop_file = i18n.merge_file (
+ input: project_id + '.desktop.in',
+ output: project_id + '.desktop',
+ install: true,
+@@ -56,7 +56,7 @@ endif
+
+ # AppData file
+ if get_option('build_gui')
+- appdata_file = i18n.merge_file ('appdata-file',
++ appdata_file = i18n.merge_file (
+ input: project_id + '.appdata.xml.in',
+ output: project_id + '.appdata.xml',
+ install: true,
+--
+GitLab
+
From 7c03e2513b052661184e4fa7c0d795dfe262d2ea Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 25 Jan 2022 10:11:01 +0100
Subject: [PATCH 69/93] 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 5ff5b574c6eb7d2d219c9587e5b6ec46880394a2 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 9 Mar 2022 19:31:37 +0100
Subject: [PATCH 70/93] gnote: fix for meson 0.61
---
srcpkgs/gnote/patches/meson-0.61.patch | 36 ++++++++++++++++++++++++++
1 file changed, 36 insertions(+)
create mode 100644 srcpkgs/gnote/patches/meson-0.61.patch
diff --git a/srcpkgs/gnote/patches/meson-0.61.patch b/srcpkgs/gnote/patches/meson-0.61.patch
new file mode 100644
index 000000000000..e5575c0fa3f7
--- /dev/null
+++ b/srcpkgs/gnote/patches/meson-0.61.patch
@@ -0,0 +1,36 @@
+From 32795e53681e3ecbaaa05817d4eb5fa1c124d35b Mon Sep 17 00:00:00 2001
+From: Jan Beich <jbeich@FreeBSD.org>
+Date: Mon, 24 Jan 2022 11:53:17 +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.
+
+data/meson.build:4:0: ERROR: Function does not take positional arguments.
+data/meson.build:41:0: 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 a6138165..8d16368a 100644
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -2,7 +2,6 @@ install_man('gnote.1')
+
+ desktop_file = 'org.gnome.Gnote.desktop'
+ gnote_desktop_file = i18n.merge_file(
+- desktop_file,
+ type: 'desktop',
+ input: desktop_file + '.in',
+ output: desktop_file,
+@@ -39,7 +38,6 @@ configure_file(
+
+ gnote_appdata = 'org.gnome.Gnote.appdata.xml'
+ appdata_file = i18n.merge_file(
+- gnote_appdata,
+ input: gnote_appdata + '.in',
+ output: gnote_appdata,
+ po_dir: '../po',
+--
+GitLab
+
From 84fdea0813bb99a9f159219b769706a4c0390fc1 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 25 Jan 2022 10:11:01 +0100
Subject: [PATCH 71/93] 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 <ebassi@gnome.org>
+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 <ebassi@gnome.org>
+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 c4ef0ed610718c3143d86192a086605324eb4faa Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 25 Jan 2022 10:11:01 +0100
Subject: [PATCH 72/93] 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 <paobac@src.gnome.org>
+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 3360fb8265dbfe65ddde0dcc7de816c84e1f5af0 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 10 Mar 2022 21:45:46 +0100
Subject: [PATCH 73/93] gtranslator: fix for meson 0.61
---
srcpkgs/gtranslator/patches/meson-0.61.patch | 36 ++++++++++++++++++++
1 file changed, 36 insertions(+)
create mode 100644 srcpkgs/gtranslator/patches/meson-0.61.patch
diff --git a/srcpkgs/gtranslator/patches/meson-0.61.patch b/srcpkgs/gtranslator/patches/meson-0.61.patch
new file mode 100644
index 000000000000..54063041fe16
--- /dev/null
+++ b/srcpkgs/gtranslator/patches/meson-0.61.patch
@@ -0,0 +1,36 @@
+From 7ac572cc8c8c37ca3826ecf0d395edd3c38e8e22 Mon Sep 17 00:00:00 2001
+From: Jan Beich <jbeich@FreeBSD.org>
+Date: Mon, 24 Jan 2022 11:57:43 +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.
+
+data/meson.build:15:0: ERROR: Function does not take positional arguments.
+data/meson.build:37:0: 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 2ca0be0b..2ebbfb12 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: '@0@.desktop'.format(gtr_app_id),
+@@ -35,7 +34,6 @@ appdata_in = configure_file(
+ )
+
+ i18n.merge_file(
+- appdata,
+ input: appdata_in,
+ output: appdata,
+ po_dir: po_dir,
+--
+GitLab
+
From 430985129d8320318db3f413515f1a4ab42a2cd4 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 10 Mar 2022 21:56:48 +0100
Subject: [PATCH 74/93] gnome-taquin: fix for meson 0.61
---
srcpkgs/gnome-taquin/patches/meson-0.61.patch | 134 ++++++++++++++++++
1 file changed, 134 insertions(+)
create mode 100644 srcpkgs/gnome-taquin/patches/meson-0.61.patch
diff --git a/srcpkgs/gnome-taquin/patches/meson-0.61.patch b/srcpkgs/gnome-taquin/patches/meson-0.61.patch
new file mode 100644
index 000000000000..e14267675ecb
--- /dev/null
+++ b/srcpkgs/gnome-taquin/patches/meson-0.61.patch
@@ -0,0 +1,134 @@
+From 99dea5e7863e112f33f16e59898c56a4f1a547b3 Mon Sep 17 00:00:00 2001
+From: Rico Tzschichholz <ricotz@ubuntu.com>
+Date: Sat, 16 Jan 2021 14:00:15 +0100
+Subject: [PATCH] Don't alter or try to write [GtkChild] fields
+
+See https://gitlab.gnome.org/GNOME/vala/issues/1121
+---
+ src/overlayed-list.vala | 38 +++++++++++++++++++-------------------
+ 1 file changed, 19 insertions(+), 19 deletions(-)
+
+diff --git a/src/overlayed-list.vala b/src/overlayed-list.vala
+index 3fbb1c3..eb2404a 100644
+--- a/src/overlayed-list.vala
++++ b/src/overlayed-list.vala
+@@ -89,11 +89,11 @@ private abstract class OverlayedList : Overlay, AdaptativeWidget
+ internal void set_window_size (AdaptativeWidget.WindowSize new_size)
+ {
+ if (!AdaptativeWidget.WindowSize.is_extra_thin (new_size) && AdaptativeWidget.WindowSize.is_extra_flat (new_size))
+- set_horizontal (ref main_context, ref edit_mode_box);
++ set_horizontal (ref main_context, edit_mode_box);
+ else
+- set_vertical (ref main_context, ref edit_mode_box);
++ set_vertical (ref main_context, edit_mode_box);
+ }
+- private static inline void set_horizontal (ref StyleContext main_context, ref Box edit_mode_box)
++ private static inline void set_horizontal (ref StyleContext main_context, Box edit_mode_box)
+ {
+ main_context.remove_class ("vertical");
+ edit_mode_box.halign = Align.END;
+@@ -102,7 +102,7 @@ private abstract class OverlayedList : Overlay, AdaptativeWidget
+ edit_mode_box.width_request = 160;
+ main_context.add_class ("horizontal");
+ }
+- private static inline void set_vertical (ref StyleContext main_context, ref Box edit_mode_box)
++ private static inline void set_vertical (ref StyleContext main_context, Box edit_mode_box)
+ {
+ main_context.remove_class ("horizontal");
+ edit_mode_box.halign = Align.CENTER;
+@@ -118,9 +118,9 @@ private abstract class OverlayedList : Overlay, AdaptativeWidget
+
+ internal bool next_match ()
+ {
+- return _next_match (ref main_list_box);
++ return _next_match (main_list_box);
+ }
+- private static inline bool _next_match (ref ListBox main_list_box)
++ private static inline bool _next_match (ListBox main_list_box)
+ {
+ ListBoxRow? row = main_list_box.get_selected_row (); // TODO multiple rows and focus-only lists
+ if (row == null)
+@@ -130,7 +130,7 @@ private abstract class OverlayedList : Overlay, AdaptativeWidget
+
+ if (row == null)
+ {
+- _scroll_bottom (ref main_list_box);
++ _scroll_bottom (main_list_box);
+ return false;
+ }
+ main_list_box.select_row ((!) row);
+@@ -140,9 +140,9 @@ private abstract class OverlayedList : Overlay, AdaptativeWidget
+
+ internal bool previous_match ()
+ {
+- return _previous_match (ref main_list_box);
++ return _previous_match (main_list_box);
+ }
+- private static inline bool _previous_match (ref ListBox main_list_box)
++ private static inline bool _previous_match (ListBox main_list_box)
+ {
+ uint n_items = main_list_box.get_children ().length (); // FIXME OverlayedList.n_items is unreliable
+ if (n_items == 0)
+@@ -189,9 +189,9 @@ private abstract class OverlayedList : Overlay, AdaptativeWidget
+
+ protected int [] get_selected_rows_indices ()
+ {
+- return _get_selected_rows_indices (ref main_list_box);
++ return _get_selected_rows_indices (main_list_box);
+ }
+- private static inline int [] _get_selected_rows_indices (ref ListBox main_list_box)
++ private static inline int [] _get_selected_rows_indices (ListBox main_list_box)
+ {
+ int [] indices = new int [0];
+ main_list_box.selected_foreach ((_list_box, selected_row) => {
+@@ -205,9 +205,9 @@ private abstract class OverlayedList : Overlay, AdaptativeWidget
+
+ protected void scroll_top ()
+ {
+- _scroll_top (ref main_list_box);
++ _scroll_top (main_list_box);
+ }
+- private static inline void _scroll_top (ref ListBox main_list_box)
++ private static inline void _scroll_top (ListBox main_list_box)
+ {
+ Adjustment adjustment = main_list_box.get_adjustment ();
+ adjustment.set_value (adjustment.get_lower ());
+@@ -215,9 +215,9 @@ private abstract class OverlayedList : Overlay, AdaptativeWidget
+
+ protected void scroll_bottom ()
+ {
+- _scroll_bottom (ref main_list_box);
++ _scroll_bottom (main_list_box);
+ }
+- private static inline void _scroll_bottom (ref ListBox main_list_box)
++ private static inline void _scroll_bottom (ListBox main_list_box)
+ {
+ Adjustment adjustment = main_list_box.get_adjustment ();
+ adjustment.set_value (adjustment.get_upper ());
+@@ -225,9 +225,9 @@ private abstract class OverlayedList : Overlay, AdaptativeWidget
+
+ internal bool handle_copy_text (out string copy_text)
+ {
+- return _handle_copy_text (out copy_text, ref main_list_box);
++ return _handle_copy_text (out copy_text, main_list_box);
+ }
+- private static inline bool _handle_copy_text (out string copy_text, ref ListBox main_list_box)
++ private static inline bool _handle_copy_text (out string copy_text, ListBox main_list_box)
+ {
+ List<weak ListBoxRow> selected_rows = main_list_box.get_selected_rows ();
+ OverlayedListRow row;
+@@ -283,9 +283,9 @@ private abstract class OverlayedList : Overlay, AdaptativeWidget
+
+ internal SelectionState get_selection_state ()
+ {
+- return _get_selection_state (ref main_list_box, ref main_list_store);
++ return _get_selection_state (main_list_box, ref main_list_store);
+ }
+- private static inline SelectionState _get_selection_state (ref ListBox main_list_box, ref GLib.ListStore main_list_store)
++ private static inline SelectionState _get_selection_state (ListBox main_list_box, ref GLib.ListStore main_list_store)
+ {
+ List<weak ListBoxRow> selected_rows = main_list_box.get_selected_rows ();
+ uint n_selected_rows = selected_rows.length ();
+--
+GitLab
+
From 0f15fce552868f46b8e7f1362dd2c862c2d507bd Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 10 Mar 2022 21:57:05 +0100
Subject: [PATCH 75/93] hitori: fix for meson 0.61
---
srcpkgs/hitori/patches/meson-0.61.patch | 41 +++++++++++++++++++++++++
1 file changed, 41 insertions(+)
create mode 100644 srcpkgs/hitori/patches/meson-0.61.patch
diff --git a/srcpkgs/hitori/patches/meson-0.61.patch b/srcpkgs/hitori/patches/meson-0.61.patch
new file mode 100644
index 000000000000..37adaa0116e6
--- /dev/null
+++ b/srcpkgs/hitori/patches/meson-0.61.patch
@@ -0,0 +1,41 @@
+From d25728e122f1d7b985029a5ba96810c3e57c27f7 Mon Sep 17 00:00:00 2001
+From: Philip Withnall <pwithnall@endlessos.org>
+Date: Tue, 2 Nov 2021 12:04:29 +0000
+Subject: [PATCH] build: Drop positional arguments from i18n.merge_file() calls
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Meson never took positional arguments in this function, but didn’t warn
+about it until Meson 0.60. Drop the unnecessary arguments to fix the
+warning.
+
+Signed-off-by: Philip Withnall <pwithnall@endlessos.org>
+---
+ data/meson.build | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/data/meson.build b/data/meson.build
+index 97b8e68..c66a233 100644
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -1,6 +1,6 @@
+ subdir('icons')
+
+-desktop_file = i18n.merge_file('desktop-file',
++desktop_file = i18n.merge_file(
+ type: 'desktop',
+ input: '@0@.desktop.in'.format(application_id),
+ output: '@0@.desktop'.format(application_id),
+@@ -20,7 +20,7 @@ if desktop_file_validate.found()
+ )
+ endif
+
+-appdata_file = i18n.merge_file('appdata-file',
++appdata_file = i18n.merge_file(
+ input: '@0@.appdata.xml.in'.format(application_id),
+ output: '@0@.appdata.xml'.format(application_id),
+ po_dir: join_paths(meson.source_root(), 'po'),
+--
+GitLab
+
From 509df3de57ac3170fc33b2d64be1eda24b16f877 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 10 Mar 2022 21:57:19 +0100
Subject: [PATCH 76/93] gvfs: fix for meson 0.61
---
srcpkgs/gvfs/patches/meson-0.61.patch | 10 ++++++++++
1 file changed, 10 insertions(+)
create mode 100644 srcpkgs/gvfs/patches/meson-0.61.patch
diff --git a/srcpkgs/gvfs/patches/meson-0.61.patch b/srcpkgs/gvfs/patches/meson-0.61.patch
new file mode 100644
index 000000000000..38f04b2e894c
--- /dev/null
+++ b/srcpkgs/gvfs/patches/meson-0.61.patch
@@ -0,0 +1,10 @@
+--- a/daemon/meson.build
++++ b/daemon/meson.build
+@@ -366,7 +366,6 @@ if enable_admin
+ )
+
+ i18n.merge_file(
+- policy,
+ input: policy_in,
+ output: '@BASENAME@',
+ po_dir: po_dir,
From 5a02dd4038849d9f109adc9722ff6c46a8572d95 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 12 Mar 2022 17:07:09 +0100
Subject: [PATCH 77/93] libaccounts-glib: fix cross with meson 0.61
---
srcpkgs/libaccounts-glib/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/libaccounts-glib/template b/srcpkgs/libaccounts-glib/template
index ad3a6e0621a9..9b86ed45ed91 100644
--- a/srcpkgs/libaccounts-glib/template
+++ b/srcpkgs/libaccounts-glib/template
@@ -17,9 +17,9 @@ checksum=eebb1c6debfcf929efb388a0f28d8cc8ec9b32f273e4abe4224a33e5d299cd73
if [ "$CROSS_BUILD" ]; then
# Remove docs. During install of package, it will try
# to run target binary with host, which causes exec error
- pre_build() {
- vsed -e '/docs/d' -i meson.build
- }
+ post_patch() {
+ vsed -e '/docs/d' -i meson.build
+ }
fi
libaccounts-glib-devel_package() {
From 91844bb1d679f661c1c57bb610b7a4d45caa97e6 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 12 Mar 2022 17:37:09 +0100
Subject: [PATCH 78/93] nautilus-sendto: remove package
---
srcpkgs/nautilus-sendto/template | 14 --------------
srcpkgs/removed-packages/template | 1 +
2 files changed, 1 insertion(+), 14 deletions(-)
delete mode 100644 srcpkgs/nautilus-sendto/template
diff --git a/srcpkgs/nautilus-sendto/template b/srcpkgs/nautilus-sendto/template
deleted file mode 100644
index c357b9efae65..000000000000
--- a/srcpkgs/nautilus-sendto/template
+++ /dev/null
@@ -1,14 +0,0 @@
-# Template file for 'nautilus-sendto'
-pkgname=nautilus-sendto
-version=3.8.6
-revision=2
-build_style=meson
-# XXX: add pidgin and gajim depends for plugins to work.
-hostmakedepends="pkg-config intltool"
-makedepends="evolution-data-server-devel nautilus-devel gupnp-devel appstream-glib-devel"
-short_desc="Nautilus context menu for sending files"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2.0-or-later"
-homepage="http://download.gnome.org/sources/nautilus-sendto/"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=164d7c6e8bae29c4579bcc67a7bf50d783662b1545b62f3008e7ea3c0410e04d
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 6baadfccc6f0..70cc2c2f7cca 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -243,6 +243,7 @@ replaces="
mongroup<=0.4.1_2
mozjs68<=68.11.0_1
mutagen<=1.43.0_3
+ nautilus-sendto<=3.8.6_2
ncdns<=0.0.2_12
newt-python<=0.52.21_5
nodejs-lts-10<=10.24.0_2
From 9ed8d4cf9225495b878ccb50924420fd995d1ee9 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 12 Mar 2022 18:44:04 +0100
Subject: [PATCH 79/93] network-manager-applet: fix for meson 0.61
---
.../patches/meson-0.61.patch | 33 +++++++++++++++++++
1 file changed, 33 insertions(+)
create mode 100644 srcpkgs/network-manager-applet/patches/meson-0.61.patch
diff --git a/srcpkgs/network-manager-applet/patches/meson-0.61.patch b/srcpkgs/network-manager-applet/patches/meson-0.61.patch
new file mode 100644
index 000000000000..1060e15b364a
--- /dev/null
+++ b/srcpkgs/network-manager-applet/patches/meson-0.61.patch
@@ -0,0 +1,33 @@
+From 30f91940819bf48a8b61599732c6b1ecea8fedf1 Mon Sep 17 00:00:00 2001
+From: Alexander Kanavin <alex@linutronix.de>
+Date: Fri, 21 Jan 2022 22:34:09 +0100
+Subject: [PATCH] meson.build: address meson 0.61 failures
+
+https://gitlab.gnome.org/GNOME/network-manager-applet/-/merge_requests/107
+---
+ meson.build | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/meson.build b/meson.build
+index 33adb632..6178c0eb 100644
+--- a/meson.build
++++ b/meson.build
+@@ -254,7 +254,6 @@ desktop_file_validate = find_program('desktop-file-validate', required: false)
+
+ foreach desktop: desktop_files
+ i18n.merge_file(
+- desktop + '-desktop',
+ input: desktop + '.desktop.in',
+ output: desktop + '.desktop',
+ install: true,
+@@ -275,7 +274,6 @@ endforeach
+ appdata = 'nm-connection-editor.appdata.xml'
+
+ i18n.merge_file(
+- 'desktop',
+ input: appdata + '.in',
+ output: appdata,
+ install: true,
+--
+GitLab
+
From adba24193c159fb3322f67abf93c3b40bc9c5595 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 12 Mar 2022 21:07:42 +0100
Subject: [PATCH 80/93] io.elementary.code: fix for meson 0.61
---
.../patches/meson-0.61.patch | 22 +++++++++++++++++++
1 file changed, 22 insertions(+)
create mode 100644 srcpkgs/io.elementary.code/patches/meson-0.61.patch
diff --git a/srcpkgs/io.elementary.code/patches/meson-0.61.patch b/srcpkgs/io.elementary.code/patches/meson-0.61.patch
new file mode 100644
index 000000000000..87a88aabff47
--- /dev/null
+++ b/srcpkgs/io.elementary.code/patches/meson-0.61.patch
@@ -0,0 +1,22 @@
+From a2607cce3a6b1bb62d02456456d3cbc3c6530bb0 Mon Sep 17 00:00:00 2001
+From: Xeonacid <h.dwwwwww@gmail.com>
+Date: Sat, 8 Jan 2022 02:00:25 +0800
+Subject: [PATCH] Meson: remove positional arguments from i18n.merge_file
+ (#1165)
+
+---
+ data/meson.build | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/data/meson.build b/data/meson.build
+index c2ff0c2881..1f3940d481 100644
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -64,7 +64,6 @@ if get_option ('have_pkexec')
+ )
+
+ i18n.merge_file(
+- 'policy',
+ input: policy_in,
+ output: meson.project_name() + '.policy',
+ po_dir: join_paths(meson.source_root (), 'po', 'extra'),
From 087f312f02704cd63d087f14d2b4a3c7f5b3c1b7 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 15 Mar 2022 20:24:34 +0100
Subject: [PATCH 81/93] io.elementary.terminal: fix for meson 0.61
---
.../patches/meson-0.61.patch | 38 +++++++++++++++++++
1 file changed, 38 insertions(+)
create mode 100644 srcpkgs/io.elementary.terminal/patches/meson-0.61.patch
diff --git a/srcpkgs/io.elementary.terminal/patches/meson-0.61.patch b/srcpkgs/io.elementary.terminal/patches/meson-0.61.patch
new file mode 100644
index 000000000000..7fd1fb455335
--- /dev/null
+++ b/srcpkgs/io.elementary.terminal/patches/meson-0.61.patch
@@ -0,0 +1,38 @@
+From 15e3ace08cb25e53941249fa1ee680a1e2f871b4 Mon Sep 17 00:00:00 2001
+From: Xeonacid <h.dwwwwww@gmail.com>
+Date: Sat, 8 Jan 2022 02:00:28 +0800
+Subject: [PATCH] Meson: remove positional arguments from i18n.merge_file
+ (#649)
+
+---
+ data/meson.build | 3 ---
+ 1 file changed, 3 deletions(-)
+
+diff --git a/data/meson.build b/data/meson.build
+index 435b84172..a64fc120e 100644
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -4,7 +4,6 @@ install_data(
+ )
+
+ i18n.merge_file (
+- 'desktop',
+ input: meson.project_name() + '.desktop.in',
+ output: meson.project_name() + '.desktop',
+ install: true,
+@@ -14,7 +13,6 @@ i18n.merge_file (
+ )
+
+ i18n.merge_file (
+- 'desktop',
+ input: 'open-pantheon-terminal-here.desktop.in',
+ output: 'open-pantheon-terminal-here.desktop',
+ install: true,
+@@ -24,7 +22,6 @@ i18n.merge_file (
+ )
+
+ i18n.merge_file (
+- 'appdata',
+ input: meson.project_name() + '.appdata.xml.in',
+ output: meson.project_name() + '.appdata.xml',
+ install: true,
From a3ed100a1a7b0be96de36d93aa8142e1f146f649 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 16 Mar 2022 22:54:07 +0100
Subject: [PATCH 82/93] io.elementary.music: fix for meson 0.61
---
.../patches/meson-0.61.patch | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
create mode 100644 srcpkgs/io.elementary.music/patches/meson-0.61.patch
diff --git a/srcpkgs/io.elementary.music/patches/meson-0.61.patch b/srcpkgs/io.elementary.music/patches/meson-0.61.patch
new file mode 100644
index 000000000000..17393cc5aa07
--- /dev/null
+++ b/srcpkgs/io.elementary.music/patches/meson-0.61.patch
@@ -0,0 +1,18 @@
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -27,7 +27,6 @@ install_data(
+
+ i18n = import('i18n')
+ desktop_file = i18n.merge_file(
+- 'desktop',
+ input: meson.project_name() + '.desktop.in',
+ output: meson.project_name() + '.desktop',
+ install: true,
+@@ -37,7 +36,6 @@ desktop_file = i18n.merge_file(
+ )
+
+ appdata_file = i18n.merge_file(
+- 'appdata',
+ input: meson.project_name() + '.appdata.xml.in',
+ output: meson.project_name() + '.appdata.xml',
+ install: true,
From 81137a653e7b827402959b94627896550913058e Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 16 Mar 2022 23:06:25 +0100
Subject: [PATCH 83/93] p11-kit: fix for meson 0.61
---
srcpkgs/p11-kit/patches/meson-0.61.patch | 42 ++++++++++++++++++++++++
srcpkgs/p11-kit/template | 10 +++++-
2 files changed, 51 insertions(+), 1 deletion(-)
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..43e75620c40e
--- /dev/null
+++ b/srcpkgs/p11-kit/patches/meson-0.61.patch
@@ -0,0 +1,42 @@
+From 9f01a8a45ba913a9b65894cef9369b6010005096 Mon Sep 17 00:00:00 2001
+From: Eli Schwartz <eschwartz@archlinux.org>
+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',
diff --git a/srcpkgs/p11-kit/template b/srcpkgs/p11-kit/template
index cc0b11eb720f..67681fb020f5 100644
--- a/srcpkgs/p11-kit/template
+++ b/srcpkgs/p11-kit/template
@@ -3,8 +3,9 @@ pkgname=p11-kit
version=0.23.22
revision=3
build_style=meson
+build_helper="qemu"
configure_args="-Dlibffi=enabled -Dsystemd=disabled -Dbash_completion=disabled
- -Dgtk_doc=true -Dman=true -Dnls=true -Dtrust_module=enabled
+ -Dman=true $(vopt_bool gtk_doc gtk_doc) -Dnls=true -Dtrust_module=enabled
-Dtrust_paths=/etc/ssl/certs/ca-certificates.crt"
hostmakedepends="pkg-config gettext gtk-doc libxslt libtasn1-tools"
makedepends="libtasn1-devel libffi-devel"
@@ -22,6 +23,13 @@ else
configure_args+=" -Dtest=false"
fi
+build_options="gtk_doc"
+build_options_default=""
+
+if [ -z "$CROSS_BUILD" ]; then
+ build_options_default+=" gtk_doc"
+fi
+
post_install() {
mv ${DESTDIR}/etc/pkcs11/pkcs11.conf.example \
${DESTDIR}/etc/pkcs11/pkcs11.conf
From 708544241fc3ce4a9ea0a8fafa17bc57daf9282b Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 16 Mar 2022 23:20:44 +0100
Subject: [PATCH 84/93] pangomm2.48: update to 2.50.0.
---
srcpkgs/pangomm2.48/template | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/pangomm2.48/template b/srcpkgs/pangomm2.48/template
index 291837c42612..d46d232ea53f 100644
--- a/srcpkgs/pangomm2.48/template
+++ b/srcpkgs/pangomm2.48/template
@@ -1,6 +1,6 @@
# Template file for 'pangomm2.48'
pkgname=pangomm2.48
-version=2.48.1
+version=2.50.0
revision=1
wrksrc="pangomm-$version"
build_style=meson
@@ -10,8 +10,9 @@ short_desc="C++ bindings for the pango library"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="LGPL-2.1-or-later"
homepage="https://gtkmm.org"
+changelog="https://gitlab.gnome.org/GNOME/pangomm/-/raw/master/NEWS"
distfiles="${GNOME_SITE}/pangomm/${version%.*}/pangomm-${version}.tar.xz"
-checksum=776ad53e791e43106b7f40ff0834bee6e4eb1c6ad7cb6d215546f7a3df0edc4d
+checksum=a27aa77e017b9afce9e751d85bd1cf890abbb3a58bf59d0fac917eef82db3b5b
pangomm2.48-devel_package() {
depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
From 33400565ae1548be3341be488649ced07e899db1 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 16 Mar 2022 23:30:51 +0100
Subject: [PATCH 85/93] pantheon-screenshot: fix for meson 0.61
---
.../patches/meson-0.61.patch | 29 +++++++++++++++++++
1 file changed, 29 insertions(+)
create mode 100644 srcpkgs/pantheon-screenshot/patches/meson-0.61.patch
diff --git a/srcpkgs/pantheon-screenshot/patches/meson-0.61.patch b/srcpkgs/pantheon-screenshot/patches/meson-0.61.patch
new file mode 100644
index 000000000000..8a64e9f14a5f
--- /dev/null
+++ b/srcpkgs/pantheon-screenshot/patches/meson-0.61.patch
@@ -0,0 +1,29 @@
+From 80a5d942e813dd098e1ef0f6629b81d2ccef05ae Mon Sep 17 00:00:00 2001
+From: Bobby Rong <rjl931189261@126.com>
+Date: Thu, 13 Jan 2022 13:51:48 +0800
+Subject: [PATCH] Fix data/meson.build (#241)
+
+---
+ data/meson.build | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/data/meson.build b/data/meson.build
+index cb2adc80..76dad525 100644
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -20,7 +20,6 @@ install_data(
+ )
+
+ i18n.merge_file (
+- 'desktop',
+ input: 'screenshot.desktop.in',
+ output: meson.project_name() + '.desktop',
+ install: true,
+@@ -30,7 +29,6 @@ i18n.merge_file (
+ )
+
+ i18n.merge_file (
+- 'appdata',
+ input: 'screenshot.appdata.xml.in',
+ output: meson.project_name() + '.appdata.xml',
+ install: true,
From 7c63fbe85d1e4b4bfff21105101197878bbc26c4 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 16 Mar 2022 23:33:07 +0100
Subject: [PATCH 86/93] polari: fix for meson 0.61
---
srcpkgs/polari/patches/meson-0.61.patch | 43 +++++++++++++++++++++++++
srcpkgs/polari/template | 1 +
2 files changed, 44 insertions(+)
create mode 100644 srcpkgs/polari/patches/meson-0.61.patch
diff --git a/srcpkgs/polari/patches/meson-0.61.patch b/srcpkgs/polari/patches/meson-0.61.patch
new file mode 100644
index 000000000000..a9ed3bc58032
--- /dev/null
+++ b/srcpkgs/polari/patches/meson-0.61.patch
@@ -0,0 +1,43 @@
+From 0f0a4b54142d8b424969f0b6ace6fc8b53b1d05d Mon Sep 17 00:00:00 2001
+From: Jan Beich <jbeich@FreeBSD.org>
+Date: Mon, 24 Jan 2022 12:32:00 +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.
+
+data/appdata/meson.build:2:0: ERROR: Function does not take positional arguments.
+data/meson.build:5:0: ERROR: Function does not take positional arguments.
+
+Part-of: <https://gitlab.gnome.org/GNOME/polari/-/merge_requests/242>
+---
+ data/appdata/meson.build | 2 +-
+ data/meson.build | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/data/appdata/meson.build b/data/appdata/meson.build
+index 88b4a0be..781ba22f 100644
+--- a/data/appdata/meson.build
++++ b/data/appdata/meson.build
+@@ -1,5 +1,5 @@
+ appdata_name = app_id + '.appdata.xml'
+-appdata = i18n.merge_file(appdata_name,
++appdata = i18n.merge_file(
+ input: appdata_name + '.in',
+ output: appdata_name,
+ po_dir: '../../po',
+diff --git a/data/meson.build b/data/meson.build
+index cedfd57b..655ae700 100644
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -2,7 +2,7 @@ subdir('appdata')
+ subdir('icons')
+
+ desktop_filename = app_id + '.desktop'
+-desktop_file = i18n.merge_file(desktop_filename,
++desktop_file = i18n.merge_file(
+ input: desktop_filename + '.in',
+ output: desktop_filename,
+ po_dir: '../po',
+--
+GitLab
+
diff --git a/srcpkgs/polari/template b/srcpkgs/polari/template
index fda5f1945375..eb7c9d2dd3df 100644
--- a/srcpkgs/polari/template
+++ b/srcpkgs/polari/template
@@ -12,6 +12,7 @@ short_desc="GNOME IRC client"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Apps/Polari"
+changelog="https://gitlab.gnome.org/GNOME/polari/-/raw/main/NEWS"
distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
checksum=a3b05f81660370c67c942b6f44b298c7b78816feb38c926ec2212bde22ea40eb
From 8ac442ce296f4a3b0e306140b8cf582e4df13fb5 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 16 Mar 2022 23:35:12 +0100
Subject: [PATCH 87/93] shotwell: fix for meson 0.61
---
srcpkgs/shotwell/patches/meson-0.61.patch | 27 +++++++++++++++++++++++
srcpkgs/shotwell/template | 1 +
2 files changed, 28 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 <eschwartz@archlinux.org>
+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
+
diff --git a/srcpkgs/shotwell/template b/srcpkgs/shotwell/template
index b0c1878e31bb..386644d4939e 100644
--- a/srcpkgs/shotwell/template
+++ b/srcpkgs/shotwell/template
@@ -14,6 +14,7 @@ short_desc="Open source photo manager for GNOME"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="LGPL-2.1-or-later, CC-BY-SA-3.0"
homepage="https://wiki.gnome.org/Apps/Shotwell"
+changelog="https://gitlab.gnome.org/GNOME/shotwell/-/raw/master/NEWS"
distfiles="${GNOME_SITE}/shotwell/${version%.*}/shotwell-${version}.tar.xz"
checksum=8de36f20488f4fb7d090194c8af46cd3661bcc81a3d65f980cb17667ed826af2
lib32disabled=yes
From 71e44eba28973dea443c85a3db532d912e8e8d76 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 16 Mar 2022 23:36:48 +0100
Subject: [PATCH 88/93] simple-scan: fix for meson 0.61
---
srcpkgs/simple-scan/patches/meson-0.61.patch | 37 ++++++++++++++++++++
1 file changed, 37 insertions(+)
create mode 100644 srcpkgs/simple-scan/patches/meson-0.61.patch
diff --git a/srcpkgs/simple-scan/patches/meson-0.61.patch b/srcpkgs/simple-scan/patches/meson-0.61.patch
new file mode 100644
index 000000000000..e193747322c0
--- /dev/null
+++ b/srcpkgs/simple-scan/patches/meson-0.61.patch
@@ -0,0 +1,37 @@
+From da6626debe00be1a0660f30cf2bf7629186c01d5 Mon Sep 17 00:00:00 2001
+From: r-value <i@rvalue.moe>
+Date: Tue, 16 Nov 2021 02:43:11 +0800
+Subject: [PATCH] Remove incorrect i18n.merge_file argument
+
+The positional argument was being silently ignored until meson 0.60.0 where
+it fails with "ERROR: Function does not take positional arguments".
+---
+ data/meson.build | 6 ++----
+ 1 file changed, 2 insertions(+), 4 deletions(-)
+
+diff --git a/data/meson.build b/data/meson.build
+index 2b5a0ee3..cf6e4ae1 100644
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -8,16 +8,14 @@ install_data ('org.gnome.SimpleScan.gschema.xml',
+ install_dir: join_paths (datadir, 'glib-2.0', 'schemas'))
+ meson.add_install_script ('meson_compile_gschema.py')
+
+-i18n.merge_file ('desktop-file',
+- input: 'simple-scan.desktop.in',
++i18n.merge_file (input: 'simple-scan.desktop.in',
+ output: 'simple-scan.desktop',
+ install: true,
+ install_dir: join_paths (datadir, 'applications'),
+ po_dir: '../po',
+ type: 'desktop')
+
+-i18n.merge_file ('appdata-file',
+- input: 'simple-scan.appdata.xml.in',
++i18n.merge_file (input: 'simple-scan.appdata.xml.in',
+ output: 'simple-scan.appdata.xml',
+ install: true,
+ install_dir: join_paths (datadir, 'metainfo'),
+--
+GitLab
+
From 873d1245c167bda1e535d2421b2ebabf21491255 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 16 Mar 2022 23:39:25 +0100
Subject: [PATCH 89/93] sound-juicer: fix for meson 0.61
---
srcpkgs/sound-juicer/patches/meson-0.61.patch | 35 +++++++++++++++++++
1 file changed, 35 insertions(+)
create mode 100644 srcpkgs/sound-juicer/patches/meson-0.61.patch
diff --git a/srcpkgs/sound-juicer/patches/meson-0.61.patch b/srcpkgs/sound-juicer/patches/meson-0.61.patch
new file mode 100644
index 000000000000..662b7d631f61
--- /dev/null
+++ b/srcpkgs/sound-juicer/patches/meson-0.61.patch
@@ -0,0 +1,35 @@
+From 9f97ca1faca396099f52264a9729aa355f8d122e Mon Sep 17 00:00:00 2001
+From: Jan Beich <jbeich@FreeBSD.org>
+Date: Tue, 25 Jan 2022 12:15:31 +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.
+
+data/meson.build:2:0: ERROR: Function does not take positional arguments.
+data/meson.build:31:0: 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 ccff2d80..4dac8166 100644
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -1,6 +1,5 @@
+ # Desktop file
+ i18n.merge_file(
+- 'desktop',
+ input: configure_file(
+ input: 'org.gnome.SoundJuicer.desktop.in.in',
+ output: 'org.gnome.SoundJuicer.desktop.in',
+@@ -29,7 +28,6 @@ configure_file(
+
+ # Metainfo
+ metainfo_file = i18n.merge_file(
+- 'metainfo',
+ input: files(join_paths('metainfo', 'org.gnome.SoundJuicer.metainfo.xml.in')),
+ output: 'org.gnome.SoundJuicer.metainfo.xml',
+ po_dir: po_dir,
+--
+GitLab
+
From d5f8c1aae0752d1bef90ba39d3f684ef366a2924 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 16 Mar 2022 23:40:28 +0100
Subject: [PATCH 90/93] switchboard: fix for meson 0.61
---
srcpkgs/switchboard/patches/meson-0.61.patch | 30 ++++++++++++++++++++
1 file changed, 30 insertions(+)
create mode 100644 srcpkgs/switchboard/patches/meson-0.61.patch
diff --git a/srcpkgs/switchboard/patches/meson-0.61.patch b/srcpkgs/switchboard/patches/meson-0.61.patch
new file mode 100644
index 000000000000..cf29004ec332
--- /dev/null
+++ b/srcpkgs/switchboard/patches/meson-0.61.patch
@@ -0,0 +1,30 @@
+From ecf2a6c42122946cc84150f6927ef69c1f67c909 Mon Sep 17 00:00:00 2001
+From: Xeonacid <h.dwwwwww@gmail.com>
+Date: Sat, 8 Jan 2022 01:58:44 +0800
+Subject: [PATCH] Meson: remove positional arguments from i18n.merge_file
+ (#226)
+
+---
+ data/meson.build | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/data/meson.build b/data/meson.build
+index c456813..109554d 100644
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -1,5 +1,5 @@
+ po_extra_dir = join_paths(meson.source_root(), 'po', 'extra')
+-i18n.merge_file('desktop',
++i18n.merge_file(
+ input: 'io.elementary.switchboard.desktop.in',
+ output: 'io.elementary.switchboard.desktop',
+ install: true,
+@@ -8,7 +8,7 @@ i18n.merge_file('desktop',
+ type: 'desktop'
+ )
+
+-i18n.merge_file('appdata',
++i18n.merge_file(
+ input: 'io.elementary.switchboard.appdata.xml.in',
+ output: 'io.elementary.switchboard.appdata.xml',
+ install: true,
From 11fd8ecaf8681082ea047535d42fb447756a0fc2 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 17 Mar 2022 00:05:03 +0100
Subject: [PATCH 91/93] tau: fix for meson 0.61
---
srcpkgs/tau/patches/meson-0.61.patch | 17 +++++++++++++++++
1 file changed, 17 insertions(+)
create mode 100644 srcpkgs/tau/patches/meson-0.61.patch
diff --git a/srcpkgs/tau/patches/meson-0.61.patch b/srcpkgs/tau/patches/meson-0.61.patch
new file mode 100644
index 000000000000..d7ec3e3365bb
--- /dev/null
+++ b/srcpkgs/tau/patches/meson-0.61.patch
@@ -0,0 +1,17 @@
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -1,4 +1,4 @@
+-desktop_file = i18n.merge_file ('desktop-file',
++desktop_file = i18n.merge_file (
+ type: 'desktop',
+ input: configure_file(
+ input: files('org.gnome.Tau.desktop.in.in'),
+@@ -22,7 +22,7 @@ if desktop_file_validate.found()
+ )
+ endif
+
+-appdata_file = i18n.merge_file ('appdata-file',
++appdata_file = i18n.merge_file (
+ input: configure_file(
+ input: files('org.gnome.Tau.appdata.xml.in.in'),
+ output: 'org.gnome.Tau.appdata.xml.in',
From 0580d9185b2913fd37b1f1eae660a8097397fb71 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 17 Mar 2022 00:09:00 +0100
Subject: [PATCH 92/93] 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 <hadess@hadess.net>
+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 2bcf7a77e6ba4cfecfe87d508412b055a2ffbb1f Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 17 Mar 2022 00:14:03 +0100
Subject: [PATCH 93/93] virt-viewer: fix for meson 0.61
---
srcpkgs/virt-viewer/patches/meson-0.61.patch | 26 ++++++++++++++++++++
1 file changed, 26 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..0b900e1f2128
--- /dev/null
+++ b/srcpkgs/virt-viewer/patches/meson-0.61.patch
@@ -0,0 +1,26 @@
+--- 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,
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PR PATCH] [Updated] meson 0.61
2022-01-25 9:13 [PR PATCH] meson 0.61 paper42
2022-03-15 21:28 ` [PR PATCH] [Updated] " paper42
2022-03-16 23:16 ` paper42
@ 2022-03-26 0:54 ` paper42
2022-03-26 13:41 ` paper42
2022-03-26 14:51 ` [PR PATCH] [Merged]: " paper42
4 siblings, 0 replies; 6+ messages in thread
From: paper42 @ 2022-03-26 0:54 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1248 bytes --]
There is an updated pull request by paper42 against master on the void-packages repository
https://github.com/paper42/void-packages meson-0.61
https://github.com/void-linux/void-packages/pull/35226
meson 0.61
WIP, many packages still need to be fixed
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration)
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/35226.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-meson-0.61-35226.patch --]
[-- Type: text/x-diff, Size: 132968 bytes --]
From c04956971e1a68ff2804597b81cc4d2b76ffbbb8 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 25 Jan 2022 10:11:02 +0100
Subject: [PATCH 01/69] meson: update to 0.61.4.
---
srcpkgs/meson/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/meson/template b/srcpkgs/meson/template
index 67fa3514289f..2f9ccaaa4691 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.4
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=4e3733ddc66bac38e38c63b739c9b8b8fc5a866de5333396b0c85c2b144ddee9
# XXX: sanitizers aren't available on musl
if [ "$XBPS_TARGET_LIBC" = glibc ]; then
From 4b032270f24cea560a222dad96ab3e26b6bdea6f Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 9 Mar 2022 17:20:40 +0100
Subject: [PATCH 02/69] glade3: fix cross builds with meson 0.61
---
srcpkgs/glade3/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/glade3/template b/srcpkgs/glade3/template
index 763632c1e712..a0235c1faef9 100644
--- a/srcpkgs/glade3/template
+++ b/srcpkgs/glade3/template
@@ -4,7 +4,7 @@ version=3.38.2
revision=1
wrksrc="glade-${version}"
build_style=meson
-build_helper="gir"
+build_helper="gir qemu"
configure_args="-Dgtk_doc=true -Dman=true $(vopt_bool gir introspection)"
hostmakedepends="glib-devel intltool itstool pkg-config
gjs-devel yelp-tools gettext-devel gtk-doc"
From 1a432ee691d67e117da7ac5f4ba2741811a81408 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 12 Mar 2022 17:07:09 +0100
Subject: [PATCH 03/69] libaccounts-glib: fix cross with meson 0.61
---
srcpkgs/libaccounts-glib/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/libaccounts-glib/template b/srcpkgs/libaccounts-glib/template
index ad3a6e0621a9..9b86ed45ed91 100644
--- a/srcpkgs/libaccounts-glib/template
+++ b/srcpkgs/libaccounts-glib/template
@@ -17,9 +17,9 @@ checksum=eebb1c6debfcf929efb388a0f28d8cc8ec9b32f273e4abe4224a33e5d299cd73
if [ "$CROSS_BUILD" ]; then
# Remove docs. During install of package, it will try
# to run target binary with host, which causes exec error
- pre_build() {
- vsed -e '/docs/d' -i meson.build
- }
+ post_patch() {
+ vsed -e '/docs/d' -i meson.build
+ }
fi
libaccounts-glib-devel_package() {
From 2fca32f0959ab30bb02971b7d897fad585825f33 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 25 Jan 2022 10:10:58 +0100
Subject: [PATCH 04/69] 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 33a32e95bc18040297dee14d505dd86312daf280 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 25 Jan 2022 10:10:58 +0100
Subject: [PATCH 05/69] 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 <bluca@debian.org>
+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 caa88467ecc07463aedac47ca26f9c730f79712e Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 25 Jan 2022 10:10:59 +0100
Subject: [PATCH 06/69] 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 <michal@vasilek.cz>
+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 f11fafc11650d6efd1631726792d99d6d7fe06e8 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 25 Jan 2022 10:10:59 +0100
Subject: [PATCH 07/69] 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 <eschwartz@archlinux.org>
+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 0e8302d6bd1c53f3bb3610ea47ab085c5f88911a Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 25 Jan 2022 10:10:59 +0100
Subject: [PATCH 08/69] 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 <michal@vasilek.cz>
+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 7bb258ddaa657340fe6ffeedc86fb799a2328b88 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 25 Jan 2022 10:10:59 +0100
Subject: [PATCH 09/69] 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 <alex@linutronix.de>
+Date: Fri, 21 Jan 2022 22:22:58 +0100
+Subject: [PATCH] editor/meson.build: fix meson 0.61 errors
+
+Signed-off-by: Alexander Kanavin <alex@linutronix.de>
+---
+ 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 a6882716b3a652c2ba4599c990d3d8d9fd9283ec Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 25 Jan 2022 10:10:59 +0100
Subject: [PATCH 10/69] 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 <i@rvalue.moe>
+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 0cdc6131777a802cebe5016b9ce7b4c99b198ff9 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 25 Jan 2022 10:10:59 +0100
Subject: [PATCH 11/69] 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 <bruce.richardson@intel.com>
+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 <bruce.richardson@intel.com>
+Acked-by: Luca Boccassi <bluca@debian.org>
+---
+ 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 62cd98b0ffb9a5b965c8833878403aca041f5eef Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 25 Jan 2022 10:10:59 +0100
Subject: [PATCH 12/69] 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 <i@rvalue.moe>
+Date: Wed, 24 Nov 2021 04:52:42 +0000
+Subject: [PATCH] Remove incorrect args for i18n.merge_file
+
+Part-of: <https://gitlab.gnome.org/GNOME/epiphany/-/merge_requests/1031>
+---
+ 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 21fa83094f2d305ac3be95229a6dc87c1c8ff717 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 25 Jan 2022 10:10:59 +0100
Subject: [PATCH 13/69] 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 <i@rvalue.moe>
+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 4aba21df1b7aa2a9a4f917c104d9a992b59afd83 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 25 Jan 2022 10:11:00 +0100
Subject: [PATCH 14/69] 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?= <mail@3v1n0.net>
+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 <eschwartz@archlinux.org>
+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 <eschwartz@archlinux.org>
+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 4d98c5c8510bd2e267a92eb0e5995e0ff2014966 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 25 Jan 2022 10:11:00 +0100
Subject: [PATCH 15/69] 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 <jplatte+git@posteo.de>
+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 1d8cf273fb446d495c556e773c7b509b1d95ca21 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 25 Jan 2022 10:11:00 +0100
Subject: [PATCH 16/69] 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 <jakub@jirutka.cz>
+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 a7a2be67e404acc45bc3258db389092fb8288e96 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 25 Jan 2022 10:11:00 +0100
Subject: [PATCH 17/69] 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 <michal@vasilek.cz>
+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 7ca98435655f0b3ea9414e5ef7971bab76ed8679 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 9 Mar 2022 16:40:42 +0100
Subject: [PATCH 18/69] glade3: fix for meson 0.61
---
srcpkgs/glade3/patches/meson-0.61.patch | 57 +++++++++++++++++++++++++
1 file changed, 57 insertions(+)
create mode 100644 srcpkgs/glade3/patches/meson-0.61.patch
diff --git a/srcpkgs/glade3/patches/meson-0.61.patch b/srcpkgs/glade3/patches/meson-0.61.patch
new file mode 100644
index 000000000000..72f9c0e509ba
--- /dev/null
+++ b/srcpkgs/glade3/patches/meson-0.61.patch
@@ -0,0 +1,57 @@
+From 61304b2e8bac8ded76643cb7c3e781f73881dd2b Mon Sep 17 00:00:00 2001
+From: Mike Gilbert <floppym@gentoo.org>
+Date: Thu, 20 Jan 2022 14:18:09 -0500
+Subject: [PATCH 1/2] meson: i18n.merge_file() does not take a positional
+ argument
+
+---
+ data/meson.build | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/data/meson.build b/data/meson.build
+index 9f244566..bfbc514c 100644
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -2,7 +2,6 @@ desktop_conf = configuration_data()
+ desktop_conf.set('VERSION', glade_version)
+
+ i18n.merge_file(
+- 'desktop',
+ type: 'desktop',
+ input: configure_file(
+ input: 'org.gnome.Glade.desktop.in.in',
+@@ -18,7 +17,6 @@ i18n.merge_file(
+ appdata = glade_name + '.appdata.xml'
+
+ i18n.merge_file(
+- 'appdata',
+ input: 'org.gnome.Glade.appdata.xml.in',
+ output: '@BASENAME@',
+ po_dir: po_dir,
+--
+GitLab
+
+
+From 04ba6f969f716fbfe3c7feb7e4bab8678cc1e9eb Mon Sep 17 00:00:00 2001
+From: Mike Gilbert <floppym@gentoo.org>
+Date: Thu, 20 Jan 2022 14:19:03 -0500
+Subject: [PATCH 2/2] Remove duplicate entry for 'da' from help/LINGUAS
+
+---
+ help/LINGUAS | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/help/LINGUAS b/help/LINGUAS
+index fc3cd4c3..d67e42c8 100644
+--- a/help/LINGUAS
++++ b/help/LINGUAS
+@@ -1,6 +1,5 @@
+ # please keep this list sorted alphabetically
+ #
+-da
+ bg
+ ca
+ cs
+--
+GitLab
+
From 65e6489529e3edb9094af75f358d1fdc6c42922a Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 9 Mar 2022 18:19:02 +0100
Subject: [PATCH 19/69] gnome-2048: fix for meson 0.61
---
srcpkgs/gnome-2048/patches/meson-0.61.patch | 36 +++++++++++++++++++++
1 file changed, 36 insertions(+)
create mode 100644 srcpkgs/gnome-2048/patches/meson-0.61.patch
diff --git a/srcpkgs/gnome-2048/patches/meson-0.61.patch b/srcpkgs/gnome-2048/patches/meson-0.61.patch
new file mode 100644
index 000000000000..912759654d73
--- /dev/null
+++ b/srcpkgs/gnome-2048/patches/meson-0.61.patch
@@ -0,0 +1,36 @@
+From 194e22699f7166a016cd39ba26dd719aeecfc868 Mon Sep 17 00:00:00 2001
+From: Jan Beich <jbeich@FreeBSD.org>
+Date: Sun, 23 Jan 2022 10:49:07 +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.
+
+data/meson.build:19:0: ERROR: Function does not take positional arguments.
+data/meson.build:39:0: 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 33f73ca..8974a63 100644
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -17,7 +17,6 @@ install_data(
+
+ # Desktop file
+ desktop_file = i18n.merge_file(
+- 'desktop-file',
+ input: 'org.gnome.TwentyFortyEight.desktop.in',
+ output: 'org.gnome.TwentyFortyEight.desktop',
+ install: true,
+@@ -37,7 +36,6 @@ endif
+
+ # AppData file
+ appdata_file = i18n.merge_file(
+- 'appdata-file',
+ input: 'org.gnome.TwentyFortyEight.appdata.xml.in',
+ output: 'org.gnome.TwentyFortyEight.appdata.xml',
+ install: true,
+--
+GitLab
+
From d4a8678b5059072e769f2dfe2dccd81776362380 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 9 Mar 2022 18:37:12 +0100
Subject: [PATCH 20/69] gnome-authenticator: fix for meson 0.61
---
.../patches/meson-0.61.patch | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
create mode 100644 srcpkgs/gnome-authenticator/patches/meson-0.61.patch
diff --git a/srcpkgs/gnome-authenticator/patches/meson-0.61.patch b/srcpkgs/gnome-authenticator/patches/meson-0.61.patch
new file mode 100644
index 000000000000..eade2e1241b5
--- /dev/null
+++ b/srcpkgs/gnome-authenticator/patches/meson-0.61.patch
@@ -0,0 +1,18 @@
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -63,7 +63,6 @@ configure_file(
+ desktop_conf = configuration_data()
+ desktop_conf.set('APP_ID', application_id)
+ desktop_file = i18n.merge_file(
+- 'desktop',
+ input: configure_file(
+ input: meson.project_name() + '.desktop.in.in',
+ output: '@BASENAME@',
+@@ -90,7 +89,6 @@ appdata_conf = configuration_data()
+ appdata_conf.set('APP_ID', application_id)
+ appdata_conf.set('GETTEXT_PACKAGE', gettext_package)
+ appdata_file = i18n.merge_file(
+- 'appdata',
+ input: configure_file(
+ input: meson.project_name() + '.appdata.xml.in.in',
+ output: '@BASENAME@',
From a1ca12c7f17de0f2722a2e64769e37cf3f878e6c Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 9 Mar 2022 16:44:19 +0100
Subject: [PATCH 21/69] gnome-bluetooth: fix for meson 0.61
---
.../gnome-bluetooth/patches/meson-0.61.patch | 25 +++++++++++++++++++
1 file changed, 25 insertions(+)
create mode 100644 srcpkgs/gnome-bluetooth/patches/meson-0.61.patch
diff --git a/srcpkgs/gnome-bluetooth/patches/meson-0.61.patch b/srcpkgs/gnome-bluetooth/patches/meson-0.61.patch
new file mode 100644
index 000000000000..c6962edd4f05
--- /dev/null
+++ b/srcpkgs/gnome-bluetooth/patches/meson-0.61.patch
@@ -0,0 +1,25 @@
+From 755fd758f866d3a3f7ca482942beee749f13a91e Mon Sep 17 00:00:00 2001
+From: Bastien Nocera <hadess@hadess.net>
+Date: Fri, 7 Jan 2022 12:51:22 +0100
+Subject: [PATCH] build: Fix build for newer versions of meson
+
+sendto/meson.build:24:5: ERROR: Function does not take positional arguments.
+---
+ sendto/meson.build | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/sendto/meson.build b/sendto/meson.build
+index 24a4e394..3e233a03 100644
+--- a/sendto/meson.build
++++ b/sendto/meson.build
+@@ -22,7 +22,6 @@ desktop_in = configure_file(
+ )
+
+ i18n.merge_file (
+- desktop,
+ type: 'desktop',
+ input: desktop_in,
+ output: desktop,
+--
+GitLab
+
From b653d2ccf96d67b2a34aad0cfb73bb6cccde3116 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 9 Mar 2022 17:47:14 +0100
Subject: [PATCH 22/69] gnome-books: fix for meson 0.61
---
srcpkgs/gnome-books/patches/meson-0.61.patch | 33 ++++++++++++++++++++
1 file changed, 33 insertions(+)
create mode 100644 srcpkgs/gnome-books/patches/meson-0.61.patch
diff --git a/srcpkgs/gnome-books/patches/meson-0.61.patch b/srcpkgs/gnome-books/patches/meson-0.61.patch
new file mode 100644
index 000000000000..0e6ba9befd96
--- /dev/null
+++ b/srcpkgs/gnome-books/patches/meson-0.61.patch
@@ -0,0 +1,33 @@
+From 2663dcdaaaa71f067a4c2d0005eecc0fdf940bf5 Mon Sep 17 00:00:00 2001
+From: Michal Vasilek <michal@vasilek.cz>
+Date: Wed, 9 Mar 2022 17:46:00 +0100
+Subject: [PATCH] meson: remove positional args from i18n.merge_file
+
+This causes the build to fail with meson 0.61+
+---
+ data/meson.build | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/data/meson.build b/data/meson.build
+index bc6edfb4..5061554d 100644
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -54,7 +54,6 @@ sources += gnome.compile_resources(
+ appdata = 'org.gnome.Books.appdata.xml'
+
+ appdata_file = i18n.merge_file(
+- appdata,
+ input: appdata + '.in',
+ output: appdata,
+ po_dir: po_dir,
+@@ -74,7 +73,6 @@ if appstream_util.found()
+ desktop = 'org.gnome.Books.desktop'
+
+ desktop_file = i18n.merge_file(
+- desktop,
+ type: 'desktop',
+ input: desktop + '.in',
+ output: desktop,
+--
+2.35.1
+
From 5a2cdb6b97ac917ec58707dd930d4ec63cd65cb1 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 25 Jan 2022 10:11:00 +0100
Subject: [PATCH 23/69] 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 <michal@vasilek.cz>
+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 678eade5e103187ca3d24daf9c0fea08acbc0c01 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 25 Jan 2022 10:11:00 +0100
Subject: [PATCH 24/69] 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 08c548b37e6b6d851ad8bb3e3807d74276fa7479 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 25 Jan 2022 10:11:00 +0100
Subject: [PATCH 25/69] 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 5eaedac5448ff43e4049cf63abfb042d3eb63ad5 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 9 Mar 2022 18:34:03 +0100
Subject: [PATCH 26/69] gnome-dictionary: fix for meson 0.61
---
.../gnome-dictionary/patches/meson-0.61.patch | 30 +++++++++++++++++++
1 file changed, 30 insertions(+)
create mode 100644 srcpkgs/gnome-dictionary/patches/meson-0.61.patch
diff --git a/srcpkgs/gnome-dictionary/patches/meson-0.61.patch b/srcpkgs/gnome-dictionary/patches/meson-0.61.patch
new file mode 100644
index 000000000000..768494e2a8cf
--- /dev/null
+++ b/srcpkgs/gnome-dictionary/patches/meson-0.61.patch
@@ -0,0 +1,30 @@
+--- a/data/appdata/meson.build
++++ b/data/appdata/meson.build
+@@ -1,6 +1,6 @@
+ appdata_conf = configuration_data()
+ appdata_conf.set('application_id', application_id)
+-i18n.merge_file('appdata',
++i18n.merge_file(
+ input: configure_file(
+ input: 'org.gnome.Dictionary.appdata.xml.in.in',
+ output: 'org.gnome.Dictionary.appdata.xml.in',
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -3,7 +3,7 @@ subdir('appdata')
+ desktop_conf = configuration_data()
+ desktop_conf.set('icon', application_id)
+ desktop_conf.set('application_id', application_id)
+-i18n.merge_file('desktop',
++i18n.merge_file(
+ input: configure_file(
+ input: 'org.gnome.Dictionary.desktop.in.in',
+ output: 'org.gnome.Dictionary.desktop.in',
+@@ -45,7 +45,7 @@ sources = [
+ ]
+
+ foreach s: sources
+- i18n.merge_file('sources',
++ i18n.merge_file(
+ input: '@0@.in'.format(s),
+ output: s,
+ install: true,
From 9cf78d93dc838f36d5bc5fad1c8b66643193026a Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 25 Jan 2022 10:11:01 +0100
Subject: [PATCH 27/69] 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 <i@rvalue.moe>
+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 3a947cda1473bd4dc26a915ae4090a0c5405d1a3 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 25 Jan 2022 10:11:01 +0100
Subject: [PATCH 28/69] 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 <i@rvalue.moe>
+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 778bd2f690864cb9f5e755608ccfdae8362369af Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 9 Mar 2022 18:14:37 +0100
Subject: [PATCH 29/69] gnome-mahjongg: fix for meson 0.61
---
.../gnome-mahjongg/patches/meson-0.61.patch | 37 +++++++++++++++++++
1 file changed, 37 insertions(+)
create mode 100644 srcpkgs/gnome-mahjongg/patches/meson-0.61.patch
diff --git a/srcpkgs/gnome-mahjongg/patches/meson-0.61.patch b/srcpkgs/gnome-mahjongg/patches/meson-0.61.patch
new file mode 100644
index 000000000000..2a17ad713752
--- /dev/null
+++ b/srcpkgs/gnome-mahjongg/patches/meson-0.61.patch
@@ -0,0 +1,37 @@
+From a2037b0747163601a5d5b57856d037eecf3a4db7 Mon Sep 17 00:00:00 2001
+From: Jan Beich <jbeich@FreeBSD.org>
+Date: Mon, 24 Jan 2022 11:22:48 +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.
+
+data/meson.build:24:0: ERROR: Function does not take positional arguments.
+data/meson.build:45:0: 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 8740503..edb8583 100644
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -21,7 +21,6 @@ install_data ('edu_kang_xi.png', install_dir: join_paths (pkgdatadir, 'themes'))
+ install_data ('maya.png', install_dir: join_paths (pkgdatadir, 'themes'))
+
+ desktop_file = i18n.merge_file (
+- 'desktop-file',
+ input: 'org.gnome.Mahjongg.desktop.in',
+ output: 'org.gnome.Mahjongg.desktop',
+ install: true,
+@@ -41,7 +40,7 @@ if desktop_file_validate.found()
+ )
+ endif
+
+-appdata_file = i18n.merge_file ('appdata-file',
++appdata_file = i18n.merge_file (
+ input: 'org.gnome.Mahjongg.appdata.xml.in',
+ output: 'org.gnome.Mahjongg.appdata.xml',
+ install: true,
+--
+GitLab
+
From 801f3146653d1a3878838e0e0a5dbfc6b6a1468f Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 25 Jan 2022 10:11:01 +0100
Subject: [PATCH 30/69] 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 <jfelder@src.gnome.org>
+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 a7ffa7d4c2b5d08eedbe91c30191a07e72d60822 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 9 Mar 2022 18:23:31 +0100
Subject: [PATCH 31/69] gnome-photos: fix for meson 0.61
---
srcpkgs/gnome-photos/patches/meson-0.61.patch | 32 +++++++++++++++++++
1 file changed, 32 insertions(+)
create mode 100644 srcpkgs/gnome-photos/patches/meson-0.61.patch
diff --git a/srcpkgs/gnome-photos/patches/meson-0.61.patch b/srcpkgs/gnome-photos/patches/meson-0.61.patch
new file mode 100644
index 000000000000..f406b1c494c0
--- /dev/null
+++ b/srcpkgs/gnome-photos/patches/meson-0.61.patch
@@ -0,0 +1,32 @@
+From a0ac868a19d55dc52100e54fe4b2d29041bc6752 Mon Sep 17 00:00:00 2001
+From: rvalue <i@rvalue.moe>
+Date: Fri, 21 Jan 2022 12:36:02 +0000
+Subject: [PATCH] meson: remove incorrect args for i18n.merge_file
+
+---
+ data/meson.build | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/data/meson.build b/data/meson.build
+index 6e7192e0..94271de2 100644
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -3,7 +3,6 @@ subdir('icons')
+ appdata = photos_namespace + '.appdata.xml'
+
+ i18n.merge_file(
+- appdata,
+ input: appdata + '.in',
+ output: appdata,
+ po_dir: po_dir,
+@@ -23,7 +22,6 @@ desktop_in = configure_file(
+ )
+
+ i18n.merge_file(
+- desktop,
+ type: 'desktop',
+ input: desktop_in,
+ output: desktop,
+--
+GitLab
+
From aad5fcfe682b142df2080166abc2c4185a0cf1f4 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 9 Mar 2022 18:25:42 +0100
Subject: [PATCH 32/69] gnome-podcasts: fix for meson 0.61
---
.../gnome-podcasts/patches/meson-0.61.patch | 38 +++++++++++++++++++
1 file changed, 38 insertions(+)
create mode 100644 srcpkgs/gnome-podcasts/patches/meson-0.61.patch
diff --git a/srcpkgs/gnome-podcasts/patches/meson-0.61.patch b/srcpkgs/gnome-podcasts/patches/meson-0.61.patch
new file mode 100644
index 000000000000..b5ad823b70cf
--- /dev/null
+++ b/srcpkgs/gnome-podcasts/patches/meson-0.61.patch
@@ -0,0 +1,38 @@
+From 6614bb62ecbec7c3b18ea7fe44beb50fe7942b27 Mon Sep 17 00:00:00 2001
+From: Jan Beich <jbeich@FreeBSD.org>
+Date: Thu, 20 Jan 2022 01:27:48 +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.
+
+podcasts-gtk/resources/meson.build:5:0: ERROR: Function does not take positional arguments.
+podcasts-gtk/resources/meson.build:30:0: ERROR: Function does not take positional arguments.
+---
+ podcasts-gtk/resources/meson.build | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/podcasts-gtk/resources/meson.build b/podcasts-gtk/resources/meson.build
+index c1f1ee9f..87148087 100644
+--- a/podcasts-gtk/resources/meson.build
++++ b/podcasts-gtk/resources/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.Podcasts.desktop.in.in'),
+@@ -27,7 +27,7 @@ endif
+
+ 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.Podcasts.appdata.xml.in.in'),
+ output: 'org.gnome.Podcasts.appdata.xml.in',
+--
+GitLab
+
From d4983a643e05cedf26fdc2d94bf82e121488e59a Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 9 Mar 2022 18:27:03 +0100
Subject: [PATCH 33/69] gnome-screenshot: fix for meson 0.61
---
.../gnome-screenshot/patches/meson-0.61.patch | 36 +++++++++++++++++++
1 file changed, 36 insertions(+)
create mode 100644 srcpkgs/gnome-screenshot/patches/meson-0.61.patch
diff --git a/srcpkgs/gnome-screenshot/patches/meson-0.61.patch b/srcpkgs/gnome-screenshot/patches/meson-0.61.patch
new file mode 100644
index 000000000000..b21aa0490d49
--- /dev/null
+++ b/srcpkgs/gnome-screenshot/patches/meson-0.61.patch
@@ -0,0 +1,36 @@
+From b60dad3c2536c17bd201f74ad8e40eb74385ed9f Mon Sep 17 00:00:00 2001
+From: Jack Hill <jackhill@jackhill.us>
+Date: Thu, 18 Nov 2021 00:46:58 -0500
+Subject: [PATCH] meson: remove extraneous positional argument
+
+* data/meson.build (desktop_file)
+ (metainfo_file): Remove extraneous positional argument.
+
+Closes #186
+---
+ data/meson.build | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/data/meson.build b/data/meson.build
+index fd570b3..4e2e2e8 100644
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -1,7 +1,6 @@
+ gnome = import('gnome')
+
+ desktop_file = i18n.merge_file(
+- 'desktop',
+ type: 'desktop',
+ input: 'org.gnome.Screenshot.desktop.in',
+ output: 'org.gnome.Screenshot.desktop',
+@@ -23,7 +22,6 @@ if desktop_file_validate.found()
+ endif
+
+ metainfo_file = i18n.merge_file(
+- 'appdata',
+ input: 'org.gnome.Screenshot.metainfo.xml.in',
+ output: 'org.gnome.Screenshot.metainfo.xml',
+ po_dir: join_paths(meson.current_source_dir(), '../po'),
+--
+GitLab
+
From 60767edbf282ba05d67441058c5ee48c96641884 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 9 Mar 2022 18:28:32 +0100
Subject: [PATCH 34/69] gnome-settings-daemon: fix for meson 0.61
---
.../patches/meson-0.61.patch | 38 +++++++++++++++++++
1 file changed, 38 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..b7c03ca2da63
--- /dev/null
+++ b/srcpkgs/gnome-settings-daemon/patches/meson-0.61.patch
@@ -0,0 +1,38 @@
+From afa7e4bb9c519e2daf500a6079088669500768c0 Mon Sep 17 00:00:00 2001
+From: Marvin Schmidt <marv@exherbo.org>
+Date: Wed, 26 Jan 2022 23:08:58 +0100
+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.
+---
+ plugins/power/meson.build | 1 -
+ plugins/wacom/meson.build | 1 -
+ 2 files changed, 2 deletions(-)
+
+diff --git a/plugins/power/meson.build b/plugins/power/meson.build
+index 69e619f2..014bb6da 100644
+--- 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,
+diff --git a/plugins/wacom/meson.build b/plugins/wacom/meson.build
+index d8dd0ec7..c00323d4 100644
+--- 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,
+--
+GitLab
+
From 8ffa5fe54cdc854dc097e36f020d1a093b9a3826 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 9 Mar 2022 18:30:02 +0100
Subject: [PATCH 35/69] 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?= <fmuellner@gnome.org>
+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: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/2078>
+---
+ 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 fce2d9d80ae1624fcb5ee45588c5b62d412f7b37 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 9 Mar 2022 18:31:24 +0100
Subject: [PATCH 36/69] gnome-sound-recorder: fix for meson 0.61
---
.../patches/meson-0.61.patch | 41 +++++++++++++++++++
1 file changed, 41 insertions(+)
create mode 100644 srcpkgs/gnome-sound-recorder/patches/meson-0.61.patch
diff --git a/srcpkgs/gnome-sound-recorder/patches/meson-0.61.patch b/srcpkgs/gnome-sound-recorder/patches/meson-0.61.patch
new file mode 100644
index 000000000000..40392e6a9fe8
--- /dev/null
+++ b/srcpkgs/gnome-sound-recorder/patches/meson-0.61.patch
@@ -0,0 +1,41 @@
+From 1335b1b1aff61167f8648f7cb3c569764031960d Mon Sep 17 00:00:00 2001
+From: Jan Beich <jbeich@FreeBSD.org>
+Date: Mon, 24 Jan 2022 11:37:06 +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.
+
+data/appdata/meson.build:5:0: ERROR: Function does not take positional arguments.
+data/meson.build:16: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 1f5744e..d2c2c3a 100644
+--- a/data/appdata/meson.build
++++ b/data/appdata/meson.build
+@@ -3,7 +3,6 @@ metainfo_conf.set('app-id', application_id)
+ metainfo_conf.set('gettext-package', gettext_package)
+
+ metainfo_file = i18n.merge_file(
+- 'metainfo-file',
+ input: configure_file(
+ input: 'org.gnome.SoundRecorder.metainfo.xml.in.in',
+ output: '@BASENAME@',
+diff --git a/data/meson.build b/data/meson.build
+index 44117ad..0ff8fa5 100644
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -14,7 +14,6 @@ install_data(
+ desktop_conf = configuration_data()
+ desktop_conf.set('app-id', application_id)
+ desktop_file = i18n.merge_file(
+- 'desktop',
+ input: configure_file(
+ input: 'org.gnome.SoundRecorder.desktop.in.in',
+ output: '@BASENAME@',
+--
+GitLab
+
From 70f2fc92625f2d0ab0216cf64a1170695602b47a Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 9 Mar 2022 19:05:16 +0100
Subject: [PATCH 37/69] gnome-sudoku: fix for meson 0.61
---
srcpkgs/gnome-sudoku/patches/meson-0.61.patch | 38 +++++++++++++++++++
srcpkgs/gnome-sudoku/template | 2 +-
2 files changed, 39 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/gnome-sudoku/patches/meson-0.61.patch
diff --git a/srcpkgs/gnome-sudoku/patches/meson-0.61.patch b/srcpkgs/gnome-sudoku/patches/meson-0.61.patch
new file mode 100644
index 000000000000..93549d0158d5
--- /dev/null
+++ b/srcpkgs/gnome-sudoku/patches/meson-0.61.patch
@@ -0,0 +1,38 @@
+From 7c9935a02b48f332f67bad3e4ee020b75591084a Mon Sep 17 00:00:00 2001
+From: Jan Beich <jbeich@FreeBSD.org>
+Date: Mon, 24 Jan 2022 11:44:06 +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.
+
+data/meson.build:5:0: ERROR: Function does not take positional arguments.
+data/meson.build:24:0: ERROR: Function does not take positional arguments.
+---
+ data/meson.build | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/data/meson.build b/data/meson.build
+index f18f247..9c95e02 100644
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -2,7 +2,7 @@ resource_files = files('gnome-sudoku.gresource.xml')
+
+ resources = gnome.compile_resources('gnome-sudoku', resource_files)
+
+-desktop_file = i18n.merge_file('desktop',
++desktop_file = i18n.merge_file(
+ input: '@0@.desktop.in'.format(application_id),
+ output: '@0@.desktop'.format(application_id),
+ install: true,
+@@ -21,7 +21,7 @@ if desktop_file_validate.found()
+ )
+ endif
+
+-appdata_file = i18n.merge_file('appdata',
++appdata_file = i18n.merge_file(
+ input: '@0@.appdata.xml.in'.format(application_id),
+ output: '@0@.appdata.xml'.format(application_id),
+ install: true,
+--
+GitLab
+
diff --git a/srcpkgs/gnome-sudoku/template b/srcpkgs/gnome-sudoku/template
index ed1759478ab5..6e0af45248ff 100644
--- a/srcpkgs/gnome-sudoku/template
+++ b/srcpkgs/gnome-sudoku/template
@@ -5,7 +5,7 @@ revision=1
build_helper="gir"
build_style=meson
hostmakedepends="gettext glib-devel itstool pkg-config vala"
-makedepends="gtk4-devel libgee08-devel json-glib-devel qqwing-devel"
+makedepends="gtk+3-devel libgee08-devel json-glib-devel qqwing-devel"
short_desc="GNOME Sudoku Japanese logic game"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3.0-or-later"
From bb0926ba116d52136ffdbb13f2b5772e5885a001 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 10 Mar 2022 21:56:48 +0100
Subject: [PATCH 38/69] gnome-taquin: fix for meson 0.61
---
srcpkgs/gnome-taquin/patches/meson-0.61.patch | 134 ++++++++++++++++++
1 file changed, 134 insertions(+)
create mode 100644 srcpkgs/gnome-taquin/patches/meson-0.61.patch
diff --git a/srcpkgs/gnome-taquin/patches/meson-0.61.patch b/srcpkgs/gnome-taquin/patches/meson-0.61.patch
new file mode 100644
index 000000000000..e14267675ecb
--- /dev/null
+++ b/srcpkgs/gnome-taquin/patches/meson-0.61.patch
@@ -0,0 +1,134 @@
+From 99dea5e7863e112f33f16e59898c56a4f1a547b3 Mon Sep 17 00:00:00 2001
+From: Rico Tzschichholz <ricotz@ubuntu.com>
+Date: Sat, 16 Jan 2021 14:00:15 +0100
+Subject: [PATCH] Don't alter or try to write [GtkChild] fields
+
+See https://gitlab.gnome.org/GNOME/vala/issues/1121
+---
+ src/overlayed-list.vala | 38 +++++++++++++++++++-------------------
+ 1 file changed, 19 insertions(+), 19 deletions(-)
+
+diff --git a/src/overlayed-list.vala b/src/overlayed-list.vala
+index 3fbb1c3..eb2404a 100644
+--- a/src/overlayed-list.vala
++++ b/src/overlayed-list.vala
+@@ -89,11 +89,11 @@ private abstract class OverlayedList : Overlay, AdaptativeWidget
+ internal void set_window_size (AdaptativeWidget.WindowSize new_size)
+ {
+ if (!AdaptativeWidget.WindowSize.is_extra_thin (new_size) && AdaptativeWidget.WindowSize.is_extra_flat (new_size))
+- set_horizontal (ref main_context, ref edit_mode_box);
++ set_horizontal (ref main_context, edit_mode_box);
+ else
+- set_vertical (ref main_context, ref edit_mode_box);
++ set_vertical (ref main_context, edit_mode_box);
+ }
+- private static inline void set_horizontal (ref StyleContext main_context, ref Box edit_mode_box)
++ private static inline void set_horizontal (ref StyleContext main_context, Box edit_mode_box)
+ {
+ main_context.remove_class ("vertical");
+ edit_mode_box.halign = Align.END;
+@@ -102,7 +102,7 @@ private abstract class OverlayedList : Overlay, AdaptativeWidget
+ edit_mode_box.width_request = 160;
+ main_context.add_class ("horizontal");
+ }
+- private static inline void set_vertical (ref StyleContext main_context, ref Box edit_mode_box)
++ private static inline void set_vertical (ref StyleContext main_context, Box edit_mode_box)
+ {
+ main_context.remove_class ("horizontal");
+ edit_mode_box.halign = Align.CENTER;
+@@ -118,9 +118,9 @@ private abstract class OverlayedList : Overlay, AdaptativeWidget
+
+ internal bool next_match ()
+ {
+- return _next_match (ref main_list_box);
++ return _next_match (main_list_box);
+ }
+- private static inline bool _next_match (ref ListBox main_list_box)
++ private static inline bool _next_match (ListBox main_list_box)
+ {
+ ListBoxRow? row = main_list_box.get_selected_row (); // TODO multiple rows and focus-only lists
+ if (row == null)
+@@ -130,7 +130,7 @@ private abstract class OverlayedList : Overlay, AdaptativeWidget
+
+ if (row == null)
+ {
+- _scroll_bottom (ref main_list_box);
++ _scroll_bottom (main_list_box);
+ return false;
+ }
+ main_list_box.select_row ((!) row);
+@@ -140,9 +140,9 @@ private abstract class OverlayedList : Overlay, AdaptativeWidget
+
+ internal bool previous_match ()
+ {
+- return _previous_match (ref main_list_box);
++ return _previous_match (main_list_box);
+ }
+- private static inline bool _previous_match (ref ListBox main_list_box)
++ private static inline bool _previous_match (ListBox main_list_box)
+ {
+ uint n_items = main_list_box.get_children ().length (); // FIXME OverlayedList.n_items is unreliable
+ if (n_items == 0)
+@@ -189,9 +189,9 @@ private abstract class OverlayedList : Overlay, AdaptativeWidget
+
+ protected int [] get_selected_rows_indices ()
+ {
+- return _get_selected_rows_indices (ref main_list_box);
++ return _get_selected_rows_indices (main_list_box);
+ }
+- private static inline int [] _get_selected_rows_indices (ref ListBox main_list_box)
++ private static inline int [] _get_selected_rows_indices (ListBox main_list_box)
+ {
+ int [] indices = new int [0];
+ main_list_box.selected_foreach ((_list_box, selected_row) => {
+@@ -205,9 +205,9 @@ private abstract class OverlayedList : Overlay, AdaptativeWidget
+
+ protected void scroll_top ()
+ {
+- _scroll_top (ref main_list_box);
++ _scroll_top (main_list_box);
+ }
+- private static inline void _scroll_top (ref ListBox main_list_box)
++ private static inline void _scroll_top (ListBox main_list_box)
+ {
+ Adjustment adjustment = main_list_box.get_adjustment ();
+ adjustment.set_value (adjustment.get_lower ());
+@@ -215,9 +215,9 @@ private abstract class OverlayedList : Overlay, AdaptativeWidget
+
+ protected void scroll_bottom ()
+ {
+- _scroll_bottom (ref main_list_box);
++ _scroll_bottom (main_list_box);
+ }
+- private static inline void _scroll_bottom (ref ListBox main_list_box)
++ private static inline void _scroll_bottom (ListBox main_list_box)
+ {
+ Adjustment adjustment = main_list_box.get_adjustment ();
+ adjustment.set_value (adjustment.get_upper ());
+@@ -225,9 +225,9 @@ private abstract class OverlayedList : Overlay, AdaptativeWidget
+
+ internal bool handle_copy_text (out string copy_text)
+ {
+- return _handle_copy_text (out copy_text, ref main_list_box);
++ return _handle_copy_text (out copy_text, main_list_box);
+ }
+- private static inline bool _handle_copy_text (out string copy_text, ref ListBox main_list_box)
++ private static inline bool _handle_copy_text (out string copy_text, ListBox main_list_box)
+ {
+ List<weak ListBoxRow> selected_rows = main_list_box.get_selected_rows ();
+ OverlayedListRow row;
+@@ -283,9 +283,9 @@ private abstract class OverlayedList : Overlay, AdaptativeWidget
+
+ internal SelectionState get_selection_state ()
+ {
+- return _get_selection_state (ref main_list_box, ref main_list_store);
++ return _get_selection_state (main_list_box, ref main_list_store);
+ }
+- private static inline SelectionState _get_selection_state (ref ListBox main_list_box, ref GLib.ListStore main_list_store)
++ private static inline SelectionState _get_selection_state (ListBox main_list_box, ref GLib.ListStore main_list_store)
+ {
+ List<weak ListBoxRow> selected_rows = main_list_box.get_selected_rows ();
+ uint n_selected_rows = selected_rows.length ();
+--
+GitLab
+
From 0d7d4e9cc7764f3e1312cbf5dd0541881fc122b3 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 25 Jan 2022 10:11:01 +0100
Subject: [PATCH 39/69] 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 <chpe@src.gnome.org>
+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 282c4829ca26015ba4fe731dd0edf49e8ce8f074 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 9 Mar 2022 19:30:05 +0100
Subject: [PATCH 40/69] gnome-tetravex: fix for meson 0.61
---
.../gnome-tetravex/patches/meson-0.61.patch | 38 +++++++++++++++++++
1 file changed, 38 insertions(+)
create mode 100644 srcpkgs/gnome-tetravex/patches/meson-0.61.patch
diff --git a/srcpkgs/gnome-tetravex/patches/meson-0.61.patch b/srcpkgs/gnome-tetravex/patches/meson-0.61.patch
new file mode 100644
index 000000000000..12e0eab64ef0
--- /dev/null
+++ b/srcpkgs/gnome-tetravex/patches/meson-0.61.patch
@@ -0,0 +1,38 @@
+From 80912d06f5e588f6aca966fa516103275e58d94e Mon Sep 17 00:00:00 2001
+From: Jan Beich <jbeich@FreeBSD.org>
+Date: Mon, 24 Jan 2022 11:48:22 +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.
+
+data/meson.build:37:0: ERROR: Function does not take positional arguments.
+data/meson.build:59:0: ERROR: Function does not take positional arguments.
+---
+ data/meson.build | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/data/meson.build b/data/meson.build
+index bb77248..b881e8a 100644
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -34,7 +34,7 @@ endif
+
+ # Desktop file
+ if get_option('build_gui')
+- desktop_file = i18n.merge_file ('desktop-file',
++ desktop_file = i18n.merge_file (
+ input: project_id + '.desktop.in',
+ output: project_id + '.desktop',
+ install: true,
+@@ -56,7 +56,7 @@ endif
+
+ # AppData file
+ if get_option('build_gui')
+- appdata_file = i18n.merge_file ('appdata-file',
++ appdata_file = i18n.merge_file (
+ input: project_id + '.appdata.xml.in',
+ output: project_id + '.appdata.xml',
+ install: true,
+--
+GitLab
+
From 88dba060a4e1269318e27da166b702b3a8f120d3 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 9 Mar 2022 19:27:12 +0100
Subject: [PATCH 41/69] gnome-tweaks: fix for meson 0.61
---
srcpkgs/gnome-tweaks/patches/meson-0.61.patch | 32 +++++++++++++++++++
1 file changed, 32 insertions(+)
create mode 100644 srcpkgs/gnome-tweaks/patches/meson-0.61.patch
diff --git a/srcpkgs/gnome-tweaks/patches/meson-0.61.patch b/srcpkgs/gnome-tweaks/patches/meson-0.61.patch
new file mode 100644
index 000000000000..80efde38735e
--- /dev/null
+++ b/srcpkgs/gnome-tweaks/patches/meson-0.61.patch
@@ -0,0 +1,32 @@
+From dc9701e18775c01d0b69fabaa350147f70096da8 Mon Sep 17 00:00:00 2001
+From: Mae Dartmann <hello@maedartmann.name>
+Date: Wed, 16 Feb 2022 06:08:41 +0000
+Subject: [PATCH] meson: fix invalid positional argument
+
+---
+ data/meson.build | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/data/meson.build b/data/meson.build
+index fd6d5da..74f7e82 100644
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -1,5 +1,5 @@
+ appdata_file = 'org.gnome.tweaks.appdata.xml'
+-i18n.merge_file(appdata_file,
++i18n.merge_file(
+ input: appdata_file + '.in',
+ output: appdata_file,
+ po_dir: '../po',
+@@ -8,7 +8,7 @@ i18n.merge_file(appdata_file,
+ )
+
+ desktop_file = 'org.gnome.tweaks.desktop'
+-i18n.merge_file(desktop_file,
++i18n.merge_file(
+ input: desktop_file + '.in',
+ output: desktop_file,
+ po_dir: '../po',
+--
+GitLab
+
From f35120eaf623bea4e1313ccfb7bd818ee6ea6b2a Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 25 Jan 2022 10:11:01 +0100
Subject: [PATCH 42/69] 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 9d3abee44cb85f6512626e808d99ed14921e96b3 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 9 Mar 2022 19:31:37 +0100
Subject: [PATCH 43/69] gnote: fix for meson 0.61
---
srcpkgs/gnote/patches/meson-0.61.patch | 36 ++++++++++++++++++++++++++
1 file changed, 36 insertions(+)
create mode 100644 srcpkgs/gnote/patches/meson-0.61.patch
diff --git a/srcpkgs/gnote/patches/meson-0.61.patch b/srcpkgs/gnote/patches/meson-0.61.patch
new file mode 100644
index 000000000000..e5575c0fa3f7
--- /dev/null
+++ b/srcpkgs/gnote/patches/meson-0.61.patch
@@ -0,0 +1,36 @@
+From 32795e53681e3ecbaaa05817d4eb5fa1c124d35b Mon Sep 17 00:00:00 2001
+From: Jan Beich <jbeich@FreeBSD.org>
+Date: Mon, 24 Jan 2022 11:53:17 +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.
+
+data/meson.build:4:0: ERROR: Function does not take positional arguments.
+data/meson.build:41:0: 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 a6138165..8d16368a 100644
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -2,7 +2,6 @@ install_man('gnote.1')
+
+ desktop_file = 'org.gnome.Gnote.desktop'
+ gnote_desktop_file = i18n.merge_file(
+- desktop_file,
+ type: 'desktop',
+ input: desktop_file + '.in',
+ output: desktop_file,
+@@ -39,7 +38,6 @@ configure_file(
+
+ gnote_appdata = 'org.gnome.Gnote.appdata.xml'
+ appdata_file = i18n.merge_file(
+- gnote_appdata,
+ input: gnote_appdata + '.in',
+ output: gnote_appdata,
+ po_dir: '../po',
+--
+GitLab
+
From cc1adeda1e282d5bf35f07adebb53d7f8a17919b Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 25 Jan 2022 10:11:01 +0100
Subject: [PATCH 44/69] 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 <ebassi@gnome.org>
+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 <ebassi@gnome.org>
+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 51a1e86a658f7ad6e3e1b45b7eacdce31793c5d1 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 25 Jan 2022 10:11:01 +0100
Subject: [PATCH 45/69] 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 <paobac@src.gnome.org>
+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 90159348b7c69bb67e03211027594dca921d1188 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 10 Mar 2022 21:45:46 +0100
Subject: [PATCH 46/69] gtranslator: fix for meson 0.61
---
srcpkgs/gtranslator/patches/meson-0.61.patch | 36 ++++++++++++++++++++
1 file changed, 36 insertions(+)
create mode 100644 srcpkgs/gtranslator/patches/meson-0.61.patch
diff --git a/srcpkgs/gtranslator/patches/meson-0.61.patch b/srcpkgs/gtranslator/patches/meson-0.61.patch
new file mode 100644
index 000000000000..54063041fe16
--- /dev/null
+++ b/srcpkgs/gtranslator/patches/meson-0.61.patch
@@ -0,0 +1,36 @@
+From 7ac572cc8c8c37ca3826ecf0d395edd3c38e8e22 Mon Sep 17 00:00:00 2001
+From: Jan Beich <jbeich@FreeBSD.org>
+Date: Mon, 24 Jan 2022 11:57:43 +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.
+
+data/meson.build:15:0: ERROR: Function does not take positional arguments.
+data/meson.build:37:0: 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 2ca0be0b..2ebbfb12 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: '@0@.desktop'.format(gtr_app_id),
+@@ -35,7 +34,6 @@ appdata_in = configure_file(
+ )
+
+ i18n.merge_file(
+- appdata,
+ input: appdata_in,
+ output: appdata,
+ po_dir: po_dir,
+--
+GitLab
+
From 1b158ad2508c4c6c593e7d6bd08ca49a369e7db6 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 10 Mar 2022 21:57:19 +0100
Subject: [PATCH 47/69] gvfs: fix for meson 0.61
---
srcpkgs/gvfs/patches/meson-0.61.patch | 10 ++++++++++
1 file changed, 10 insertions(+)
create mode 100644 srcpkgs/gvfs/patches/meson-0.61.patch
diff --git a/srcpkgs/gvfs/patches/meson-0.61.patch b/srcpkgs/gvfs/patches/meson-0.61.patch
new file mode 100644
index 000000000000..38f04b2e894c
--- /dev/null
+++ b/srcpkgs/gvfs/patches/meson-0.61.patch
@@ -0,0 +1,10 @@
+--- a/daemon/meson.build
++++ b/daemon/meson.build
+@@ -366,7 +366,6 @@ if enable_admin
+ )
+
+ i18n.merge_file(
+- policy,
+ input: policy_in,
+ output: '@BASENAME@',
+ po_dir: po_dir,
From e35d37ff895c65e500de974f0e8632f760c8541c Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 22 Mar 2022 22:42:58 +0100
Subject: [PATCH 48/69] harfbuzz: fix for meson 0.61
---
srcpkgs/harfbuzz/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/harfbuzz/template b/srcpkgs/harfbuzz/template
index 894a1b7bf9fe..d5c501aa5413 100644
--- a/srcpkgs/harfbuzz/template
+++ b/srcpkgs/harfbuzz/template
@@ -3,7 +3,7 @@ pkgname=harfbuzz
version=3.3.1
revision=1
build_style=meson
-build_helper=gir
+build_helper="gir qemu"
configure_args="-Dglib=enabled -Dfreetype=enabled -Dcairo=enabled -Dicu=enabled
-Dgraphite=enabled -Dintrospection=enabled"
hostmakedepends="glib-devel pkg-config gtk-doc"
From 424f33c864ad982ccac8f06ee1f89d7dbfdf5ef8 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 10 Mar 2022 21:57:05 +0100
Subject: [PATCH 49/69] hitori: fix for meson 0.61
---
srcpkgs/hitori/patches/meson-0.61.patch | 41 +++++++++++++++++++++++++
1 file changed, 41 insertions(+)
create mode 100644 srcpkgs/hitori/patches/meson-0.61.patch
diff --git a/srcpkgs/hitori/patches/meson-0.61.patch b/srcpkgs/hitori/patches/meson-0.61.patch
new file mode 100644
index 000000000000..37adaa0116e6
--- /dev/null
+++ b/srcpkgs/hitori/patches/meson-0.61.patch
@@ -0,0 +1,41 @@
+From d25728e122f1d7b985029a5ba96810c3e57c27f7 Mon Sep 17 00:00:00 2001
+From: Philip Withnall <pwithnall@endlessos.org>
+Date: Tue, 2 Nov 2021 12:04:29 +0000
+Subject: [PATCH] build: Drop positional arguments from i18n.merge_file() calls
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Meson never took positional arguments in this function, but didn’t warn
+about it until Meson 0.60. Drop the unnecessary arguments to fix the
+warning.
+
+Signed-off-by: Philip Withnall <pwithnall@endlessos.org>
+---
+ data/meson.build | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/data/meson.build b/data/meson.build
+index 97b8e68..c66a233 100644
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -1,6 +1,6 @@
+ subdir('icons')
+
+-desktop_file = i18n.merge_file('desktop-file',
++desktop_file = i18n.merge_file(
+ type: 'desktop',
+ input: '@0@.desktop.in'.format(application_id),
+ output: '@0@.desktop'.format(application_id),
+@@ -20,7 +20,7 @@ if desktop_file_validate.found()
+ )
+ endif
+
+-appdata_file = i18n.merge_file('appdata-file',
++appdata_file = i18n.merge_file(
+ input: '@0@.appdata.xml.in'.format(application_id),
+ output: '@0@.appdata.xml'.format(application_id),
+ po_dir: join_paths(meson.source_root(), 'po'),
+--
+GitLab
+
From 16bdd3ef077ec7af724d9bae6088a8336160d50b Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 12 Mar 2022 21:07:42 +0100
Subject: [PATCH 50/69] io.elementary.code: fix for meson 0.61
---
.../patches/meson-0.61.patch | 22 +++++++++++++++++++
1 file changed, 22 insertions(+)
create mode 100644 srcpkgs/io.elementary.code/patches/meson-0.61.patch
diff --git a/srcpkgs/io.elementary.code/patches/meson-0.61.patch b/srcpkgs/io.elementary.code/patches/meson-0.61.patch
new file mode 100644
index 000000000000..87a88aabff47
--- /dev/null
+++ b/srcpkgs/io.elementary.code/patches/meson-0.61.patch
@@ -0,0 +1,22 @@
+From a2607cce3a6b1bb62d02456456d3cbc3c6530bb0 Mon Sep 17 00:00:00 2001
+From: Xeonacid <h.dwwwwww@gmail.com>
+Date: Sat, 8 Jan 2022 02:00:25 +0800
+Subject: [PATCH] Meson: remove positional arguments from i18n.merge_file
+ (#1165)
+
+---
+ data/meson.build | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/data/meson.build b/data/meson.build
+index c2ff0c2881..1f3940d481 100644
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -64,7 +64,6 @@ if get_option ('have_pkexec')
+ )
+
+ i18n.merge_file(
+- 'policy',
+ input: policy_in,
+ output: meson.project_name() + '.policy',
+ po_dir: join_paths(meson.source_root (), 'po', 'extra'),
From bd6a4271720aae3ae95e8549192daf2588320a81 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 16 Mar 2022 22:54:07 +0100
Subject: [PATCH 51/69] io.elementary.music: fix for meson 0.61
---
.../patches/meson-0.61.patch | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
create mode 100644 srcpkgs/io.elementary.music/patches/meson-0.61.patch
diff --git a/srcpkgs/io.elementary.music/patches/meson-0.61.patch b/srcpkgs/io.elementary.music/patches/meson-0.61.patch
new file mode 100644
index 000000000000..17393cc5aa07
--- /dev/null
+++ b/srcpkgs/io.elementary.music/patches/meson-0.61.patch
@@ -0,0 +1,18 @@
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -27,7 +27,6 @@ install_data(
+
+ i18n = import('i18n')
+ desktop_file = i18n.merge_file(
+- 'desktop',
+ input: meson.project_name() + '.desktop.in',
+ output: meson.project_name() + '.desktop',
+ install: true,
+@@ -37,7 +36,6 @@ desktop_file = i18n.merge_file(
+ )
+
+ appdata_file = i18n.merge_file(
+- 'appdata',
+ input: meson.project_name() + '.appdata.xml.in',
+ output: meson.project_name() + '.appdata.xml',
+ install: true,
From 093b0ac8be6cc64e725487ba18843e3f6e8fd994 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 15 Mar 2022 20:24:34 +0100
Subject: [PATCH 52/69] io.elementary.terminal: fix for meson 0.61
---
.../patches/meson-0.61.patch | 38 +++++++++++++++++++
1 file changed, 38 insertions(+)
create mode 100644 srcpkgs/io.elementary.terminal/patches/meson-0.61.patch
diff --git a/srcpkgs/io.elementary.terminal/patches/meson-0.61.patch b/srcpkgs/io.elementary.terminal/patches/meson-0.61.patch
new file mode 100644
index 000000000000..7fd1fb455335
--- /dev/null
+++ b/srcpkgs/io.elementary.terminal/patches/meson-0.61.patch
@@ -0,0 +1,38 @@
+From 15e3ace08cb25e53941249fa1ee680a1e2f871b4 Mon Sep 17 00:00:00 2001
+From: Xeonacid <h.dwwwwww@gmail.com>
+Date: Sat, 8 Jan 2022 02:00:28 +0800
+Subject: [PATCH] Meson: remove positional arguments from i18n.merge_file
+ (#649)
+
+---
+ data/meson.build | 3 ---
+ 1 file changed, 3 deletions(-)
+
+diff --git a/data/meson.build b/data/meson.build
+index 435b84172..a64fc120e 100644
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -4,7 +4,6 @@ install_data(
+ )
+
+ i18n.merge_file (
+- 'desktop',
+ input: meson.project_name() + '.desktop.in',
+ output: meson.project_name() + '.desktop',
+ install: true,
+@@ -14,7 +13,6 @@ i18n.merge_file (
+ )
+
+ i18n.merge_file (
+- 'desktop',
+ input: 'open-pantheon-terminal-here.desktop.in',
+ output: 'open-pantheon-terminal-here.desktop',
+ install: true,
+@@ -24,7 +22,6 @@ i18n.merge_file (
+ )
+
+ i18n.merge_file (
+- 'appdata',
+ input: meson.project_name() + '.appdata.xml.in',
+ output: meson.project_name() + '.appdata.xml',
+ install: true,
From 95032f8c905e49dd1cf0bab12e2ef763068fe880 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 12 Mar 2022 18:44:04 +0100
Subject: [PATCH 53/69] network-manager-applet: fix for meson 0.61
---
.../patches/meson-0.61.patch | 33 +++++++++++++++++++
1 file changed, 33 insertions(+)
create mode 100644 srcpkgs/network-manager-applet/patches/meson-0.61.patch
diff --git a/srcpkgs/network-manager-applet/patches/meson-0.61.patch b/srcpkgs/network-manager-applet/patches/meson-0.61.patch
new file mode 100644
index 000000000000..1060e15b364a
--- /dev/null
+++ b/srcpkgs/network-manager-applet/patches/meson-0.61.patch
@@ -0,0 +1,33 @@
+From 30f91940819bf48a8b61599732c6b1ecea8fedf1 Mon Sep 17 00:00:00 2001
+From: Alexander Kanavin <alex@linutronix.de>
+Date: Fri, 21 Jan 2022 22:34:09 +0100
+Subject: [PATCH] meson.build: address meson 0.61 failures
+
+https://gitlab.gnome.org/GNOME/network-manager-applet/-/merge_requests/107
+---
+ meson.build | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/meson.build b/meson.build
+index 33adb632..6178c0eb 100644
+--- a/meson.build
++++ b/meson.build
+@@ -254,7 +254,6 @@ desktop_file_validate = find_program('desktop-file-validate', required: false)
+
+ foreach desktop: desktop_files
+ i18n.merge_file(
+- desktop + '-desktop',
+ input: desktop + '.desktop.in',
+ output: desktop + '.desktop',
+ install: true,
+@@ -275,7 +274,6 @@ endforeach
+ appdata = 'nm-connection-editor.appdata.xml'
+
+ i18n.merge_file(
+- 'desktop',
+ input: appdata + '.in',
+ output: appdata,
+ install: true,
+--
+GitLab
+
From a8b4a923bfa1b06120067891ce817e183e2ba6d8 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Fri, 25 Mar 2022 11:35:35 +0100
Subject: [PATCH 54/69] orc: fix for meson 0.61
---
srcpkgs/orc/template | 15 ++++++++++++---
1 file changed, 12 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/orc/template b/srcpkgs/orc/template
index 36311464556b..10f306289ddf 100644
--- a/srcpkgs/orc/template
+++ b/srcpkgs/orc/template
@@ -3,8 +3,9 @@ pkgname=orc
version=0.4.32
revision=1
build_style=meson
-configure_args="-Dexamples=disabled -Dtests=disabled"
-hostmakedepends="pkg-config gtk-doc"
+build_helper="gir"
+configure_args="-Dexamples=disabled -Dtests=disabled -Dgtk_doc=$(vopt_if gtk_doc enabled disabled)"
+hostmakedepends="pkg-config $(vopt_if gtk_doc gtk-doc)"
short_desc="Oild Runtime Compiler"
maintainer="Orphaned <orphan@voidlinux.org>"
license="BSD-2-Clause"
@@ -12,6 +13,12 @@ homepage="https://cgit.freedesktop.org/gstreamer/orc"
distfiles="http://gstreamer.freedesktop.org/src/orc/orc-${version}.tar.xz"
checksum=a66e3d8f2b7e65178d786a01ef61f2a0a0b4d0b8370de7ce134ba73da4af18f0
+build_options="gtk_doc"
+
+if [ -z "$CROSS_BUILD" ]; then
+ build_options_default+=" gtk_doc"
+fi
+
post_install() {
vlicense COPYING
}
@@ -25,6 +32,8 @@ orc-devel_package() {
vmove "usr/lib/*.a"
vmove "usr/lib/*.so"
vmove usr/share/aclocal
- vmove usr/share/gtk-doc
+ if [ "$build_option_gtk_doc" ]; then
+ vmove usr/share/gtk-doc
+ fi
}
}
From 96fff48fd11ab7c620432d6df82841b246e7df29 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 16 Mar 2022 23:06:25 +0100
Subject: [PATCH 55/69] p11-kit: fix for meson 0.61
---
srcpkgs/p11-kit/patches/meson-0.61.patch | 42 ++++++++++++++++++++++++
srcpkgs/p11-kit/template | 10 +++++-
2 files changed, 51 insertions(+), 1 deletion(-)
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..43e75620c40e
--- /dev/null
+++ b/srcpkgs/p11-kit/patches/meson-0.61.patch
@@ -0,0 +1,42 @@
+From 9f01a8a45ba913a9b65894cef9369b6010005096 Mon Sep 17 00:00:00 2001
+From: Eli Schwartz <eschwartz@archlinux.org>
+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',
diff --git a/srcpkgs/p11-kit/template b/srcpkgs/p11-kit/template
index cc0b11eb720f..67681fb020f5 100644
--- a/srcpkgs/p11-kit/template
+++ b/srcpkgs/p11-kit/template
@@ -3,8 +3,9 @@ pkgname=p11-kit
version=0.23.22
revision=3
build_style=meson
+build_helper="qemu"
configure_args="-Dlibffi=enabled -Dsystemd=disabled -Dbash_completion=disabled
- -Dgtk_doc=true -Dman=true -Dnls=true -Dtrust_module=enabled
+ -Dman=true $(vopt_bool gtk_doc gtk_doc) -Dnls=true -Dtrust_module=enabled
-Dtrust_paths=/etc/ssl/certs/ca-certificates.crt"
hostmakedepends="pkg-config gettext gtk-doc libxslt libtasn1-tools"
makedepends="libtasn1-devel libffi-devel"
@@ -22,6 +23,13 @@ else
configure_args+=" -Dtest=false"
fi
+build_options="gtk_doc"
+build_options_default=""
+
+if [ -z "$CROSS_BUILD" ]; then
+ build_options_default+=" gtk_doc"
+fi
+
post_install() {
mv ${DESTDIR}/etc/pkcs11/pkcs11.conf.example \
${DESTDIR}/etc/pkcs11/pkcs11.conf
From 6fe100a32e55d6f5441476902a6a2d87f83da10d Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 17 Mar 2022 11:12:28 +0100
Subject: [PATCH 56/69] p11-kit: fix for meson 0.61
---
srcpkgs/p11-kit/template | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/p11-kit/template b/srcpkgs/p11-kit/template
index 67681fb020f5..63cdebc7563f 100644
--- a/srcpkgs/p11-kit/template
+++ b/srcpkgs/p11-kit/template
@@ -46,6 +46,8 @@ p11-kit-devel_package() {
vmove usr/include
vmove "usr/lib/*.so"
vmove usr/lib/pkgconfig
- vmove usr/share/gtk-doc
+ if [ "$build_option_gtk_doc" ]; then
+ vmove usr/share/gtk-doc
+ fi
}
}
From 6c5543649b1a6c4ee3d826cdb585334966ee9012 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 16 Mar 2022 23:30:51 +0100
Subject: [PATCH 57/69] pantheon-screenshot: fix for meson 0.61
---
.../patches/meson-0.61.patch | 29 +++++++++++++++++++
1 file changed, 29 insertions(+)
create mode 100644 srcpkgs/pantheon-screenshot/patches/meson-0.61.patch
diff --git a/srcpkgs/pantheon-screenshot/patches/meson-0.61.patch b/srcpkgs/pantheon-screenshot/patches/meson-0.61.patch
new file mode 100644
index 000000000000..8a64e9f14a5f
--- /dev/null
+++ b/srcpkgs/pantheon-screenshot/patches/meson-0.61.patch
@@ -0,0 +1,29 @@
+From 80a5d942e813dd098e1ef0f6629b81d2ccef05ae Mon Sep 17 00:00:00 2001
+From: Bobby Rong <rjl931189261@126.com>
+Date: Thu, 13 Jan 2022 13:51:48 +0800
+Subject: [PATCH] Fix data/meson.build (#241)
+
+---
+ data/meson.build | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/data/meson.build b/data/meson.build
+index cb2adc80..76dad525 100644
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -20,7 +20,6 @@ install_data(
+ )
+
+ i18n.merge_file (
+- 'desktop',
+ input: 'screenshot.desktop.in',
+ output: meson.project_name() + '.desktop',
+ install: true,
+@@ -30,7 +29,6 @@ i18n.merge_file (
+ )
+
+ i18n.merge_file (
+- 'appdata',
+ input: 'screenshot.appdata.xml.in',
+ output: meson.project_name() + '.appdata.xml',
+ install: true,
From 5d34d08cc1f5b2013080114a10a39f1d7d598290 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 16 Mar 2022 23:33:07 +0100
Subject: [PATCH 58/69] polari: fix for meson 0.61
---
srcpkgs/polari/patches/meson-0.61.patch | 43 +++++++++++++++++++++++++
srcpkgs/polari/template | 1 +
2 files changed, 44 insertions(+)
create mode 100644 srcpkgs/polari/patches/meson-0.61.patch
diff --git a/srcpkgs/polari/patches/meson-0.61.patch b/srcpkgs/polari/patches/meson-0.61.patch
new file mode 100644
index 000000000000..a9ed3bc58032
--- /dev/null
+++ b/srcpkgs/polari/patches/meson-0.61.patch
@@ -0,0 +1,43 @@
+From 0f0a4b54142d8b424969f0b6ace6fc8b53b1d05d Mon Sep 17 00:00:00 2001
+From: Jan Beich <jbeich@FreeBSD.org>
+Date: Mon, 24 Jan 2022 12:32:00 +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.
+
+data/appdata/meson.build:2:0: ERROR: Function does not take positional arguments.
+data/meson.build:5:0: ERROR: Function does not take positional arguments.
+
+Part-of: <https://gitlab.gnome.org/GNOME/polari/-/merge_requests/242>
+---
+ data/appdata/meson.build | 2 +-
+ data/meson.build | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/data/appdata/meson.build b/data/appdata/meson.build
+index 88b4a0be..781ba22f 100644
+--- a/data/appdata/meson.build
++++ b/data/appdata/meson.build
+@@ -1,5 +1,5 @@
+ appdata_name = app_id + '.appdata.xml'
+-appdata = i18n.merge_file(appdata_name,
++appdata = i18n.merge_file(
+ input: appdata_name + '.in',
+ output: appdata_name,
+ po_dir: '../../po',
+diff --git a/data/meson.build b/data/meson.build
+index cedfd57b..655ae700 100644
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -2,7 +2,7 @@ subdir('appdata')
+ subdir('icons')
+
+ desktop_filename = app_id + '.desktop'
+-desktop_file = i18n.merge_file(desktop_filename,
++desktop_file = i18n.merge_file(
+ input: desktop_filename + '.in',
+ output: desktop_filename,
+ po_dir: '../po',
+--
+GitLab
+
diff --git a/srcpkgs/polari/template b/srcpkgs/polari/template
index fda5f1945375..eb7c9d2dd3df 100644
--- a/srcpkgs/polari/template
+++ b/srcpkgs/polari/template
@@ -12,6 +12,7 @@ short_desc="GNOME IRC client"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Apps/Polari"
+changelog="https://gitlab.gnome.org/GNOME/polari/-/raw/main/NEWS"
distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
checksum=a3b05f81660370c67c942b6f44b298c7b78816feb38c926ec2212bde22ea40eb
From ea51bb0dbf320ded93b99984bd1e8f1a61e52bb6 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 16 Mar 2022 23:35:12 +0100
Subject: [PATCH 59/69] shotwell: fix for meson 0.61
---
srcpkgs/shotwell/patches/meson-0.61.patch | 27 +++++++++++++++++++++++
srcpkgs/shotwell/template | 1 +
2 files changed, 28 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 <eschwartz@archlinux.org>
+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
+
diff --git a/srcpkgs/shotwell/template b/srcpkgs/shotwell/template
index b0c1878e31bb..386644d4939e 100644
--- a/srcpkgs/shotwell/template
+++ b/srcpkgs/shotwell/template
@@ -14,6 +14,7 @@ short_desc="Open source photo manager for GNOME"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="LGPL-2.1-or-later, CC-BY-SA-3.0"
homepage="https://wiki.gnome.org/Apps/Shotwell"
+changelog="https://gitlab.gnome.org/GNOME/shotwell/-/raw/master/NEWS"
distfiles="${GNOME_SITE}/shotwell/${version%.*}/shotwell-${version}.tar.xz"
checksum=8de36f20488f4fb7d090194c8af46cd3661bcc81a3d65f980cb17667ed826af2
lib32disabled=yes
From 1c16eceb581cc3d302c9ace998c31b3ab9a15d5f Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 16 Mar 2022 23:36:48 +0100
Subject: [PATCH 60/69] simple-scan: fix for meson 0.61
---
srcpkgs/simple-scan/patches/meson-0.61.patch | 37 ++++++++++++++++++++
1 file changed, 37 insertions(+)
create mode 100644 srcpkgs/simple-scan/patches/meson-0.61.patch
diff --git a/srcpkgs/simple-scan/patches/meson-0.61.patch b/srcpkgs/simple-scan/patches/meson-0.61.patch
new file mode 100644
index 000000000000..e193747322c0
--- /dev/null
+++ b/srcpkgs/simple-scan/patches/meson-0.61.patch
@@ -0,0 +1,37 @@
+From da6626debe00be1a0660f30cf2bf7629186c01d5 Mon Sep 17 00:00:00 2001
+From: r-value <i@rvalue.moe>
+Date: Tue, 16 Nov 2021 02:43:11 +0800
+Subject: [PATCH] Remove incorrect i18n.merge_file argument
+
+The positional argument was being silently ignored until meson 0.60.0 where
+it fails with "ERROR: Function does not take positional arguments".
+---
+ data/meson.build | 6 ++----
+ 1 file changed, 2 insertions(+), 4 deletions(-)
+
+diff --git a/data/meson.build b/data/meson.build
+index 2b5a0ee3..cf6e4ae1 100644
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -8,16 +8,14 @@ install_data ('org.gnome.SimpleScan.gschema.xml',
+ install_dir: join_paths (datadir, 'glib-2.0', 'schemas'))
+ meson.add_install_script ('meson_compile_gschema.py')
+
+-i18n.merge_file ('desktop-file',
+- input: 'simple-scan.desktop.in',
++i18n.merge_file (input: 'simple-scan.desktop.in',
+ output: 'simple-scan.desktop',
+ install: true,
+ install_dir: join_paths (datadir, 'applications'),
+ po_dir: '../po',
+ type: 'desktop')
+
+-i18n.merge_file ('appdata-file',
+- input: 'simple-scan.appdata.xml.in',
++i18n.merge_file (input: 'simple-scan.appdata.xml.in',
+ output: 'simple-scan.appdata.xml',
+ install: true,
+ install_dir: join_paths (datadir, 'metainfo'),
+--
+GitLab
+
From c1bac5856f5bfa57cdadf7fa0f081efa0038bc7d Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 16 Mar 2022 23:39:25 +0100
Subject: [PATCH 61/69] sound-juicer: fix for meson 0.61
---
srcpkgs/sound-juicer/patches/meson-0.61.patch | 35 +++++++++++++++++++
1 file changed, 35 insertions(+)
create mode 100644 srcpkgs/sound-juicer/patches/meson-0.61.patch
diff --git a/srcpkgs/sound-juicer/patches/meson-0.61.patch b/srcpkgs/sound-juicer/patches/meson-0.61.patch
new file mode 100644
index 000000000000..662b7d631f61
--- /dev/null
+++ b/srcpkgs/sound-juicer/patches/meson-0.61.patch
@@ -0,0 +1,35 @@
+From 9f97ca1faca396099f52264a9729aa355f8d122e Mon Sep 17 00:00:00 2001
+From: Jan Beich <jbeich@FreeBSD.org>
+Date: Tue, 25 Jan 2022 12:15:31 +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.
+
+data/meson.build:2:0: ERROR: Function does not take positional arguments.
+data/meson.build:31:0: 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 ccff2d80..4dac8166 100644
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -1,6 +1,5 @@
+ # Desktop file
+ i18n.merge_file(
+- 'desktop',
+ input: configure_file(
+ input: 'org.gnome.SoundJuicer.desktop.in.in',
+ output: 'org.gnome.SoundJuicer.desktop.in',
+@@ -29,7 +28,6 @@ configure_file(
+
+ # Metainfo
+ metainfo_file = i18n.merge_file(
+- 'metainfo',
+ input: files(join_paths('metainfo', 'org.gnome.SoundJuicer.metainfo.xml.in')),
+ output: 'org.gnome.SoundJuicer.metainfo.xml',
+ po_dir: po_dir,
+--
+GitLab
+
From d41f2d33f259fcf1d7258f545b6bdc01c4997f2c Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 16 Mar 2022 23:40:28 +0100
Subject: [PATCH 62/69] switchboard: fix for meson 0.61
---
srcpkgs/switchboard/patches/meson-0.61.patch | 30 ++++++++++++++++++++
1 file changed, 30 insertions(+)
create mode 100644 srcpkgs/switchboard/patches/meson-0.61.patch
diff --git a/srcpkgs/switchboard/patches/meson-0.61.patch b/srcpkgs/switchboard/patches/meson-0.61.patch
new file mode 100644
index 000000000000..cf29004ec332
--- /dev/null
+++ b/srcpkgs/switchboard/patches/meson-0.61.patch
@@ -0,0 +1,30 @@
+From ecf2a6c42122946cc84150f6927ef69c1f67c909 Mon Sep 17 00:00:00 2001
+From: Xeonacid <h.dwwwwww@gmail.com>
+Date: Sat, 8 Jan 2022 01:58:44 +0800
+Subject: [PATCH] Meson: remove positional arguments from i18n.merge_file
+ (#226)
+
+---
+ data/meson.build | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/data/meson.build b/data/meson.build
+index c456813..109554d 100644
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -1,5 +1,5 @@
+ po_extra_dir = join_paths(meson.source_root(), 'po', 'extra')
+-i18n.merge_file('desktop',
++i18n.merge_file(
+ input: 'io.elementary.switchboard.desktop.in',
+ output: 'io.elementary.switchboard.desktop',
+ install: true,
+@@ -8,7 +8,7 @@ i18n.merge_file('desktop',
+ type: 'desktop'
+ )
+
+-i18n.merge_file('appdata',
++i18n.merge_file(
+ input: 'io.elementary.switchboard.appdata.xml.in',
+ output: 'io.elementary.switchboard.appdata.xml',
+ install: true,
From e82b9f6d9b34516d0fcfa9c8370796bdfc3c0512 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 17 Mar 2022 00:05:03 +0100
Subject: [PATCH 63/69] tau: fix for meson 0.61
---
srcpkgs/tau/patches/meson-0.61.patch | 17 +++++++++++++++++
1 file changed, 17 insertions(+)
create mode 100644 srcpkgs/tau/patches/meson-0.61.patch
diff --git a/srcpkgs/tau/patches/meson-0.61.patch b/srcpkgs/tau/patches/meson-0.61.patch
new file mode 100644
index 000000000000..d7ec3e3365bb
--- /dev/null
+++ b/srcpkgs/tau/patches/meson-0.61.patch
@@ -0,0 +1,17 @@
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -1,4 +1,4 @@
+-desktop_file = i18n.merge_file ('desktop-file',
++desktop_file = i18n.merge_file (
+ type: 'desktop',
+ input: configure_file(
+ input: files('org.gnome.Tau.desktop.in.in'),
+@@ -22,7 +22,7 @@ if desktop_file_validate.found()
+ )
+ endif
+
+-appdata_file = i18n.merge_file ('appdata-file',
++appdata_file = i18n.merge_file (
+ input: configure_file(
+ input: files('org.gnome.Tau.appdata.xml.in.in'),
+ output: 'org.gnome.Tau.appdata.xml.in',
From 42560b6b8770de466f6197ebefe1d61309b858f0 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 17 Mar 2022 00:09:00 +0100
Subject: [PATCH 64/69] 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 <hadess@hadess.net>
+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 3ec9a75910e834a344987a4e1710e02a12def7ce Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 17 Mar 2022 00:14:03 +0100
Subject: [PATCH 65/69] virt-viewer: fix for meson 0.61
---
srcpkgs/virt-viewer/patches/meson-0.61.patch | 26 ++++++++++++++++++++
1 file changed, 26 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..0b900e1f2128
--- /dev/null
+++ b/srcpkgs/virt-viewer/patches/meson-0.61.patch
@@ -0,0 +1,26 @@
+--- 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,
From 05fe6c06aa6e2a44fb48852be9e49b97e119fd14 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Fri, 25 Mar 2022 23:45:53 +0100
Subject: [PATCH 66/69] gnome-documents: fix for meson 0.61
---
.../gnome-documents/patches/meson-0.61.patch | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
create mode 100644 srcpkgs/gnome-documents/patches/meson-0.61.patch
diff --git a/srcpkgs/gnome-documents/patches/meson-0.61.patch b/srcpkgs/gnome-documents/patches/meson-0.61.patch
new file mode 100644
index 000000000000..131d34509406
--- /dev/null
+++ b/srcpkgs/gnome-documents/patches/meson-0.61.patch
@@ -0,0 +1,18 @@
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -56,7 +56,6 @@ foreach app: documents_apps
+ appdata = app + '.appdata.xml'
+
+ appdata_file = i18n.merge_file(
+- appdata,
+ input: appdata + '.in',
+ output: appdata,
+ po_dir: po_dir,
+@@ -76,7 +75,6 @@ foreach app: documents_apps
+ desktop = app + '.desktop'
+
+ desktop_file = i18n.merge_file(
+- desktop,
+ type: 'desktop',
+ input: desktop + '.in',
+ output: desktop,
From 45928afa0dc74f939a104f387928b0252c33361b Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Fri, 25 Mar 2022 23:45:56 +0100
Subject: [PATCH 67/69] gnome-games: fix for meson 0.61
---
srcpkgs/gnome-games/patches/meson-0.61.patch | 20 ++++++++++++++++++++
1 file changed, 20 insertions(+)
create mode 100644 srcpkgs/gnome-games/patches/meson-0.61.patch
diff --git a/srcpkgs/gnome-games/patches/meson-0.61.patch b/srcpkgs/gnome-games/patches/meson-0.61.patch
new file mode 100644
index 000000000000..0a3b006b227b
--- /dev/null
+++ b/srcpkgs/gnome-games/patches/meson-0.61.patch
@@ -0,0 +1,20 @@
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -44,7 +44,7 @@ mime_types = [
+ desktop_conf = configuration_data()
+ desktop_conf.set('icon', application_id)
+ desktop_conf.set('mimetypes', ';'.join(mime_types) + ';')
+-desktop_file = i18n.merge_file ('desktop-file',
++desktop_file = i18n.merge_file (
+ type: 'desktop',
+ input: configure_file(
+ input: files('org.gnome.Games.desktop.in.in'),
+@@ -70,7 +70,7 @@ endif
+
+ 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.Games.appdata.xml.in.in'),
+ output: 'org.gnome.Games.appdata.xml.in',
From ba9162d2a9ac4886657228430e8e769ae75ac215 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Fri, 25 Mar 2022 23:46:01 +0100
Subject: [PATCH 68/69] newsflash: fix for meson 0.61
---
srcpkgs/newsflash/patches/meson-0.61.patch | 20 ++++++++++++++++++++
1 file changed, 20 insertions(+)
create mode 100644 srcpkgs/newsflash/patches/meson-0.61.patch
diff --git a/srcpkgs/newsflash/patches/meson-0.61.patch b/srcpkgs/newsflash/patches/meson-0.61.patch
new file mode 100644
index 000000000000..bfc8a67d0aa8
--- /dev/null
+++ b/srcpkgs/newsflash/patches/meson-0.61.patch
@@ -0,0 +1,20 @@
+--- a/data/meson.build
++++ b/data/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('com.gitlab.newsflash.desktop.in.in'),
+@@ -27,7 +27,7 @@ endif
+
+ 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('com.gitlab.newsflash.appdata.xml.in.in'),
+ output: '@BASENAME@',
From a61338cfde18a1f9a3825fabb3b4f07faa80ac10 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 26 Mar 2022 00:52:47 +0100
Subject: [PATCH 69/69] apostrophe: update to 2.6.1.
---
srcpkgs/apostrophe/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/apostrophe/template b/srcpkgs/apostrophe/template
index 127919d611a3..d130b8694cd4 100644
--- a/srcpkgs/apostrophe/template
+++ b/srcpkgs/apostrophe/template
@@ -1,7 +1,7 @@
# Template file for 'apostrophe'
pkgname=apostrophe
-version=2.5
-revision=2
+version=2.6.1
+revision=1
wrksrc="$pkgname-v$version"
build_style=meson
build_helper=gir
@@ -14,4 +14,4 @@ maintainer="Michal Vasilek <michal@vasilek.cz>"
license="GPL-3.0-only"
homepage="https://gitlab.gnome.org/World/apostrophe"
distfiles="https://gitlab.gnome.org/World/apostrophe/-/archive/v$version/apostrophe-v$version.tar.gz"
-checksum=366b239ea7bb720c11fc7344827b6739e4983132c9932aa4705a3b88533d75e4
+checksum=f1c38d97cc5413a21017b95c16f0e869fd0d316ec1a3c54ec5607534562cee5c
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PR PATCH] [Updated] meson 0.61
2022-01-25 9:13 [PR PATCH] meson 0.61 paper42
` (2 preceding siblings ...)
2022-03-26 0:54 ` paper42
@ 2022-03-26 13:41 ` paper42
2022-03-26 14:51 ` [PR PATCH] [Merged]: " paper42
4 siblings, 0 replies; 6+ messages in thread
From: paper42 @ 2022-03-26 13:41 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1248 bytes --]
There is an updated pull request by paper42 against master on the void-packages repository
https://github.com/paper42/void-packages meson-0.61
https://github.com/void-linux/void-packages/pull/35226
meson 0.61
WIP, many packages still need to be fixed
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration)
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/35226.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-meson-0.61-35226.patch --]
[-- Type: text/x-diff, Size: 130095 bytes --]
From d322e0c18821139e6615427f7f66ab7132e40972 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 25 Jan 2022 10:11:02 +0100
Subject: [PATCH 01/66] meson: update to 0.61.4.
---
srcpkgs/meson/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/meson/template b/srcpkgs/meson/template
index 67fa3514289f..2f9ccaaa4691 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.4
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=4e3733ddc66bac38e38c63b739c9b8b8fc5a866de5333396b0c85c2b144ddee9
# XXX: sanitizers aren't available on musl
if [ "$XBPS_TARGET_LIBC" = glibc ]; then
From ca53da124771ea5b040abd3a1b49ddff499461e3 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 25 Jan 2022 10:10:58 +0100
Subject: [PATCH 02/66] 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 cb553aae52560ad9d1f784bc269f52ad91284bf6 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 25 Jan 2022 10:10:58 +0100
Subject: [PATCH 03/66] 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 <bluca@debian.org>
+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 b9d18ff3c4cd9683eea9621095d5175266eb0268 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 25 Jan 2022 10:10:59 +0100
Subject: [PATCH 04/66] 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 <michal@vasilek.cz>
+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 c6d92cff309d1d15a287d6704bb6af537cae99e1 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 25 Jan 2022 10:10:59 +0100
Subject: [PATCH 05/66] 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 <eschwartz@archlinux.org>
+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 0b054f94f2e694937d1484abb022ee9e58d24d3a Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 25 Jan 2022 10:10:59 +0100
Subject: [PATCH 06/66] 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 <michal@vasilek.cz>
+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 8692d29c67e3a76c828cb6e8622d3741529cbc21 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 25 Jan 2022 10:10:59 +0100
Subject: [PATCH 07/66] 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 <alex@linutronix.de>
+Date: Fri, 21 Jan 2022 22:22:58 +0100
+Subject: [PATCH] editor/meson.build: fix meson 0.61 errors
+
+Signed-off-by: Alexander Kanavin <alex@linutronix.de>
+---
+ 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 4658e30a9bed3d043bb923b6409815f87259372b Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 25 Jan 2022 10:10:59 +0100
Subject: [PATCH 08/66] 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 <i@rvalue.moe>
+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 db2e8db70a7d33d76bf66af5628a2ffe25ad0872 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 25 Jan 2022 10:10:59 +0100
Subject: [PATCH 09/66] 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 <i@rvalue.moe>
+Date: Wed, 24 Nov 2021 04:52:42 +0000
+Subject: [PATCH] Remove incorrect args for i18n.merge_file
+
+Part-of: <https://gitlab.gnome.org/GNOME/epiphany/-/merge_requests/1031>
+---
+ 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 ed3648cf4cad442df554d893a487fd329130b5be Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 25 Jan 2022 10:10:59 +0100
Subject: [PATCH 10/66] 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 <i@rvalue.moe>
+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 a2d07997261c64e00a1fb1b3dbf4e756dcdcf7e0 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 25 Jan 2022 10:11:00 +0100
Subject: [PATCH 11/66] 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?= <mail@3v1n0.net>
+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 <eschwartz@archlinux.org>
+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 <eschwartz@archlinux.org>
+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 22666b40cc5597e4c7ff4823aea1cb57acd98189 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 25 Jan 2022 10:11:00 +0100
Subject: [PATCH 12/66] 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 <jplatte+git@posteo.de>
+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 edbf36a293d6031c14f46df946d6c516b290b34d Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 25 Jan 2022 10:11:00 +0100
Subject: [PATCH 13/66] 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 <jakub@jirutka.cz>
+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 f07a0061643ede8ff299bc07d837463cbdd7b41e Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 25 Jan 2022 10:11:00 +0100
Subject: [PATCH 14/66] 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 <michal@vasilek.cz>
+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 a8b3e99f17f57918bc5a3160229e2b54272d37f3 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 9 Mar 2022 17:20:40 +0100
Subject: [PATCH 15/66] glade3: fix for meson 0.61
---
srcpkgs/glade3/patches/meson-0.61.patch | 57 +++++++++++++++++++++++++
srcpkgs/glade3/template | 2 +-
2 files changed, 58 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/glade3/patches/meson-0.61.patch
diff --git a/srcpkgs/glade3/patches/meson-0.61.patch b/srcpkgs/glade3/patches/meson-0.61.patch
new file mode 100644
index 000000000000..72f9c0e509ba
--- /dev/null
+++ b/srcpkgs/glade3/patches/meson-0.61.patch
@@ -0,0 +1,57 @@
+From 61304b2e8bac8ded76643cb7c3e781f73881dd2b Mon Sep 17 00:00:00 2001
+From: Mike Gilbert <floppym@gentoo.org>
+Date: Thu, 20 Jan 2022 14:18:09 -0500
+Subject: [PATCH 1/2] meson: i18n.merge_file() does not take a positional
+ argument
+
+---
+ data/meson.build | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/data/meson.build b/data/meson.build
+index 9f244566..bfbc514c 100644
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -2,7 +2,6 @@ desktop_conf = configuration_data()
+ desktop_conf.set('VERSION', glade_version)
+
+ i18n.merge_file(
+- 'desktop',
+ type: 'desktop',
+ input: configure_file(
+ input: 'org.gnome.Glade.desktop.in.in',
+@@ -18,7 +17,6 @@ i18n.merge_file(
+ appdata = glade_name + '.appdata.xml'
+
+ i18n.merge_file(
+- 'appdata',
+ input: 'org.gnome.Glade.appdata.xml.in',
+ output: '@BASENAME@',
+ po_dir: po_dir,
+--
+GitLab
+
+
+From 04ba6f969f716fbfe3c7feb7e4bab8678cc1e9eb Mon Sep 17 00:00:00 2001
+From: Mike Gilbert <floppym@gentoo.org>
+Date: Thu, 20 Jan 2022 14:19:03 -0500
+Subject: [PATCH 2/2] Remove duplicate entry for 'da' from help/LINGUAS
+
+---
+ help/LINGUAS | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/help/LINGUAS b/help/LINGUAS
+index fc3cd4c3..d67e42c8 100644
+--- a/help/LINGUAS
++++ b/help/LINGUAS
+@@ -1,6 +1,5 @@
+ # please keep this list sorted alphabetically
+ #
+-da
+ bg
+ ca
+ cs
+--
+GitLab
+
diff --git a/srcpkgs/glade3/template b/srcpkgs/glade3/template
index 763632c1e712..a0235c1faef9 100644
--- a/srcpkgs/glade3/template
+++ b/srcpkgs/glade3/template
@@ -4,7 +4,7 @@ version=3.38.2
revision=1
wrksrc="glade-${version}"
build_style=meson
-build_helper="gir"
+build_helper="gir qemu"
configure_args="-Dgtk_doc=true -Dman=true $(vopt_bool gir introspection)"
hostmakedepends="glib-devel intltool itstool pkg-config
gjs-devel yelp-tools gettext-devel gtk-doc"
From c4f09bc97b9bf35d6f50c6d4af087ea24711c091 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 9 Mar 2022 18:19:02 +0100
Subject: [PATCH 16/66] gnome-2048: fix for meson 0.61
---
srcpkgs/gnome-2048/patches/meson-0.61.patch | 36 +++++++++++++++++++++
1 file changed, 36 insertions(+)
create mode 100644 srcpkgs/gnome-2048/patches/meson-0.61.patch
diff --git a/srcpkgs/gnome-2048/patches/meson-0.61.patch b/srcpkgs/gnome-2048/patches/meson-0.61.patch
new file mode 100644
index 000000000000..912759654d73
--- /dev/null
+++ b/srcpkgs/gnome-2048/patches/meson-0.61.patch
@@ -0,0 +1,36 @@
+From 194e22699f7166a016cd39ba26dd719aeecfc868 Mon Sep 17 00:00:00 2001
+From: Jan Beich <jbeich@FreeBSD.org>
+Date: Sun, 23 Jan 2022 10:49:07 +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.
+
+data/meson.build:19:0: ERROR: Function does not take positional arguments.
+data/meson.build:39:0: 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 33f73ca..8974a63 100644
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -17,7 +17,6 @@ install_data(
+
+ # Desktop file
+ desktop_file = i18n.merge_file(
+- 'desktop-file',
+ input: 'org.gnome.TwentyFortyEight.desktop.in',
+ output: 'org.gnome.TwentyFortyEight.desktop',
+ install: true,
+@@ -37,7 +36,6 @@ endif
+
+ # AppData file
+ appdata_file = i18n.merge_file(
+- 'appdata-file',
+ input: 'org.gnome.TwentyFortyEight.appdata.xml.in',
+ output: 'org.gnome.TwentyFortyEight.appdata.xml',
+ install: true,
+--
+GitLab
+
From 694fd66a44313e381ee5871f44d4f08a4f4ca5b9 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 9 Mar 2022 18:37:12 +0100
Subject: [PATCH 17/66] gnome-authenticator: fix for meson 0.61
---
.../patches/meson-0.61.patch | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
create mode 100644 srcpkgs/gnome-authenticator/patches/meson-0.61.patch
diff --git a/srcpkgs/gnome-authenticator/patches/meson-0.61.patch b/srcpkgs/gnome-authenticator/patches/meson-0.61.patch
new file mode 100644
index 000000000000..eade2e1241b5
--- /dev/null
+++ b/srcpkgs/gnome-authenticator/patches/meson-0.61.patch
@@ -0,0 +1,18 @@
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -63,7 +63,6 @@ configure_file(
+ desktop_conf = configuration_data()
+ desktop_conf.set('APP_ID', application_id)
+ desktop_file = i18n.merge_file(
+- 'desktop',
+ input: configure_file(
+ input: meson.project_name() + '.desktop.in.in',
+ output: '@BASENAME@',
+@@ -90,7 +89,6 @@ appdata_conf = configuration_data()
+ appdata_conf.set('APP_ID', application_id)
+ appdata_conf.set('GETTEXT_PACKAGE', gettext_package)
+ appdata_file = i18n.merge_file(
+- 'appdata',
+ input: configure_file(
+ input: meson.project_name() + '.appdata.xml.in.in',
+ output: '@BASENAME@',
From ed6be8c3d2089fb7c033aec048963a3b92be95a3 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 9 Mar 2022 16:44:19 +0100
Subject: [PATCH 18/66] gnome-bluetooth: fix for meson 0.61
---
.../gnome-bluetooth/patches/meson-0.61.patch | 25 +++++++++++++++++++
1 file changed, 25 insertions(+)
create mode 100644 srcpkgs/gnome-bluetooth/patches/meson-0.61.patch
diff --git a/srcpkgs/gnome-bluetooth/patches/meson-0.61.patch b/srcpkgs/gnome-bluetooth/patches/meson-0.61.patch
new file mode 100644
index 000000000000..c6962edd4f05
--- /dev/null
+++ b/srcpkgs/gnome-bluetooth/patches/meson-0.61.patch
@@ -0,0 +1,25 @@
+From 755fd758f866d3a3f7ca482942beee749f13a91e Mon Sep 17 00:00:00 2001
+From: Bastien Nocera <hadess@hadess.net>
+Date: Fri, 7 Jan 2022 12:51:22 +0100
+Subject: [PATCH] build: Fix build for newer versions of meson
+
+sendto/meson.build:24:5: ERROR: Function does not take positional arguments.
+---
+ sendto/meson.build | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/sendto/meson.build b/sendto/meson.build
+index 24a4e394..3e233a03 100644
+--- a/sendto/meson.build
++++ b/sendto/meson.build
+@@ -22,7 +22,6 @@ desktop_in = configure_file(
+ )
+
+ i18n.merge_file (
+- desktop,
+ type: 'desktop',
+ input: desktop_in,
+ output: desktop,
+--
+GitLab
+
From 44a175a79da4ff41d4bb8032dd1835329b4962fb Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 9 Mar 2022 17:47:14 +0100
Subject: [PATCH 19/66] gnome-books: fix for meson 0.61
---
srcpkgs/gnome-books/patches/meson-0.61.patch | 33 ++++++++++++++++++++
1 file changed, 33 insertions(+)
create mode 100644 srcpkgs/gnome-books/patches/meson-0.61.patch
diff --git a/srcpkgs/gnome-books/patches/meson-0.61.patch b/srcpkgs/gnome-books/patches/meson-0.61.patch
new file mode 100644
index 000000000000..0e6ba9befd96
--- /dev/null
+++ b/srcpkgs/gnome-books/patches/meson-0.61.patch
@@ -0,0 +1,33 @@
+From 2663dcdaaaa71f067a4c2d0005eecc0fdf940bf5 Mon Sep 17 00:00:00 2001
+From: Michal Vasilek <michal@vasilek.cz>
+Date: Wed, 9 Mar 2022 17:46:00 +0100
+Subject: [PATCH] meson: remove positional args from i18n.merge_file
+
+This causes the build to fail with meson 0.61+
+---
+ data/meson.build | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/data/meson.build b/data/meson.build
+index bc6edfb4..5061554d 100644
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -54,7 +54,6 @@ sources += gnome.compile_resources(
+ appdata = 'org.gnome.Books.appdata.xml'
+
+ appdata_file = i18n.merge_file(
+- appdata,
+ input: appdata + '.in',
+ output: appdata,
+ po_dir: po_dir,
+@@ -74,7 +73,6 @@ if appstream_util.found()
+ desktop = 'org.gnome.Books.desktop'
+
+ desktop_file = i18n.merge_file(
+- desktop,
+ type: 'desktop',
+ input: desktop + '.in',
+ output: desktop,
+--
+2.35.1
+
From af273b00909611655eeb27bbf8ede88ffe96224b Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 25 Jan 2022 10:11:00 +0100
Subject: [PATCH 20/66] 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 <michal@vasilek.cz>
+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 13702dcd49b88168afe687b5a56055db3fe78bca Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 25 Jan 2022 10:11:00 +0100
Subject: [PATCH 21/66] 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 8fc8f10a0fcbed11ec2a717603ef1954df06a11c Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 25 Jan 2022 10:11:00 +0100
Subject: [PATCH 22/66] 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 a279b1e1ef3fdc31164e419a45858da1873f4ab6 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 9 Mar 2022 18:34:03 +0100
Subject: [PATCH 23/66] gnome-dictionary: fix for meson 0.61
---
.../gnome-dictionary/patches/meson-0.61.patch | 30 +++++++++++++++++++
1 file changed, 30 insertions(+)
create mode 100644 srcpkgs/gnome-dictionary/patches/meson-0.61.patch
diff --git a/srcpkgs/gnome-dictionary/patches/meson-0.61.patch b/srcpkgs/gnome-dictionary/patches/meson-0.61.patch
new file mode 100644
index 000000000000..768494e2a8cf
--- /dev/null
+++ b/srcpkgs/gnome-dictionary/patches/meson-0.61.patch
@@ -0,0 +1,30 @@
+--- a/data/appdata/meson.build
++++ b/data/appdata/meson.build
+@@ -1,6 +1,6 @@
+ appdata_conf = configuration_data()
+ appdata_conf.set('application_id', application_id)
+-i18n.merge_file('appdata',
++i18n.merge_file(
+ input: configure_file(
+ input: 'org.gnome.Dictionary.appdata.xml.in.in',
+ output: 'org.gnome.Dictionary.appdata.xml.in',
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -3,7 +3,7 @@ subdir('appdata')
+ desktop_conf = configuration_data()
+ desktop_conf.set('icon', application_id)
+ desktop_conf.set('application_id', application_id)
+-i18n.merge_file('desktop',
++i18n.merge_file(
+ input: configure_file(
+ input: 'org.gnome.Dictionary.desktop.in.in',
+ output: 'org.gnome.Dictionary.desktop.in',
+@@ -45,7 +45,7 @@ sources = [
+ ]
+
+ foreach s: sources
+- i18n.merge_file('sources',
++ i18n.merge_file(
+ input: '@0@.in'.format(s),
+ output: s,
+ install: true,
From 55b1a53325866c1e2f662538b5d2e1bf821c89d1 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 25 Jan 2022 10:11:01 +0100
Subject: [PATCH 24/66] 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 <i@rvalue.moe>
+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 2843885583d81f510d7711a224b3d508976b636d Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Fri, 25 Mar 2022 23:45:53 +0100
Subject: [PATCH 25/66] gnome-documents: fix for meson 0.61
---
.../gnome-documents/patches/meson-0.61.patch | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
create mode 100644 srcpkgs/gnome-documents/patches/meson-0.61.patch
diff --git a/srcpkgs/gnome-documents/patches/meson-0.61.patch b/srcpkgs/gnome-documents/patches/meson-0.61.patch
new file mode 100644
index 000000000000..131d34509406
--- /dev/null
+++ b/srcpkgs/gnome-documents/patches/meson-0.61.patch
@@ -0,0 +1,18 @@
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -56,7 +56,6 @@ foreach app: documents_apps
+ appdata = app + '.appdata.xml'
+
+ appdata_file = i18n.merge_file(
+- appdata,
+ input: appdata + '.in',
+ output: appdata,
+ po_dir: po_dir,
+@@ -76,7 +75,6 @@ foreach app: documents_apps
+ desktop = app + '.desktop'
+
+ desktop_file = i18n.merge_file(
+- desktop,
+ type: 'desktop',
+ input: desktop + '.in',
+ output: desktop,
From e8a61f665e3395289c875bec40637ec5623633b6 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 25 Jan 2022 10:11:01 +0100
Subject: [PATCH 26/66] 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 <i@rvalue.moe>
+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 9c3c534ec8a043fab13ba9f26d94144b2aaa6f1d Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Fri, 25 Mar 2022 23:45:56 +0100
Subject: [PATCH 27/66] gnome-games: fix for meson 0.61
---
srcpkgs/gnome-games/patches/meson-0.61.patch | 20 ++++++++++++++++++++
1 file changed, 20 insertions(+)
create mode 100644 srcpkgs/gnome-games/patches/meson-0.61.patch
diff --git a/srcpkgs/gnome-games/patches/meson-0.61.patch b/srcpkgs/gnome-games/patches/meson-0.61.patch
new file mode 100644
index 000000000000..0a3b006b227b
--- /dev/null
+++ b/srcpkgs/gnome-games/patches/meson-0.61.patch
@@ -0,0 +1,20 @@
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -44,7 +44,7 @@ mime_types = [
+ desktop_conf = configuration_data()
+ desktop_conf.set('icon', application_id)
+ desktop_conf.set('mimetypes', ';'.join(mime_types) + ';')
+-desktop_file = i18n.merge_file ('desktop-file',
++desktop_file = i18n.merge_file (
+ type: 'desktop',
+ input: configure_file(
+ input: files('org.gnome.Games.desktop.in.in'),
+@@ -70,7 +70,7 @@ endif
+
+ 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.Games.appdata.xml.in.in'),
+ output: 'org.gnome.Games.appdata.xml.in',
From 4352a8fce72842459bd033cbca6c63ffe678b446 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 9 Mar 2022 18:14:37 +0100
Subject: [PATCH 28/66] gnome-mahjongg: fix for meson 0.61
---
.../gnome-mahjongg/patches/meson-0.61.patch | 37 +++++++++++++++++++
1 file changed, 37 insertions(+)
create mode 100644 srcpkgs/gnome-mahjongg/patches/meson-0.61.patch
diff --git a/srcpkgs/gnome-mahjongg/patches/meson-0.61.patch b/srcpkgs/gnome-mahjongg/patches/meson-0.61.patch
new file mode 100644
index 000000000000..2a17ad713752
--- /dev/null
+++ b/srcpkgs/gnome-mahjongg/patches/meson-0.61.patch
@@ -0,0 +1,37 @@
+From a2037b0747163601a5d5b57856d037eecf3a4db7 Mon Sep 17 00:00:00 2001
+From: Jan Beich <jbeich@FreeBSD.org>
+Date: Mon, 24 Jan 2022 11:22:48 +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.
+
+data/meson.build:24:0: ERROR: Function does not take positional arguments.
+data/meson.build:45:0: 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 8740503..edb8583 100644
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -21,7 +21,6 @@ install_data ('edu_kang_xi.png', install_dir: join_paths (pkgdatadir, 'themes'))
+ install_data ('maya.png', install_dir: join_paths (pkgdatadir, 'themes'))
+
+ desktop_file = i18n.merge_file (
+- 'desktop-file',
+ input: 'org.gnome.Mahjongg.desktop.in',
+ output: 'org.gnome.Mahjongg.desktop',
+ install: true,
+@@ -41,7 +40,7 @@ if desktop_file_validate.found()
+ )
+ endif
+
+-appdata_file = i18n.merge_file ('appdata-file',
++appdata_file = i18n.merge_file (
+ input: 'org.gnome.Mahjongg.appdata.xml.in',
+ output: 'org.gnome.Mahjongg.appdata.xml',
+ install: true,
+--
+GitLab
+
From 3e4d5c21090b4de3a67822f38143e19f1a375503 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 25 Jan 2022 10:11:01 +0100
Subject: [PATCH 29/66] 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 <jfelder@src.gnome.org>
+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 e9d3facb45616e06bc1f14eadcad9eb738466f73 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 9 Mar 2022 18:23:31 +0100
Subject: [PATCH 30/66] gnome-photos: fix for meson 0.61
---
srcpkgs/gnome-photos/patches/meson-0.61.patch | 32 +++++++++++++++++++
1 file changed, 32 insertions(+)
create mode 100644 srcpkgs/gnome-photos/patches/meson-0.61.patch
diff --git a/srcpkgs/gnome-photos/patches/meson-0.61.patch b/srcpkgs/gnome-photos/patches/meson-0.61.patch
new file mode 100644
index 000000000000..f406b1c494c0
--- /dev/null
+++ b/srcpkgs/gnome-photos/patches/meson-0.61.patch
@@ -0,0 +1,32 @@
+From a0ac868a19d55dc52100e54fe4b2d29041bc6752 Mon Sep 17 00:00:00 2001
+From: rvalue <i@rvalue.moe>
+Date: Fri, 21 Jan 2022 12:36:02 +0000
+Subject: [PATCH] meson: remove incorrect args for i18n.merge_file
+
+---
+ data/meson.build | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/data/meson.build b/data/meson.build
+index 6e7192e0..94271de2 100644
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -3,7 +3,6 @@ subdir('icons')
+ appdata = photos_namespace + '.appdata.xml'
+
+ i18n.merge_file(
+- appdata,
+ input: appdata + '.in',
+ output: appdata,
+ po_dir: po_dir,
+@@ -23,7 +22,6 @@ desktop_in = configure_file(
+ )
+
+ i18n.merge_file(
+- desktop,
+ type: 'desktop',
+ input: desktop_in,
+ output: desktop,
+--
+GitLab
+
From a025f4e0b6b59c79abd9089fb99f49a55d19e270 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 9 Mar 2022 18:25:42 +0100
Subject: [PATCH 31/66] gnome-podcasts: fix for meson 0.61
---
.../gnome-podcasts/patches/meson-0.61.patch | 38 +++++++++++++++++++
1 file changed, 38 insertions(+)
create mode 100644 srcpkgs/gnome-podcasts/patches/meson-0.61.patch
diff --git a/srcpkgs/gnome-podcasts/patches/meson-0.61.patch b/srcpkgs/gnome-podcasts/patches/meson-0.61.patch
new file mode 100644
index 000000000000..b5ad823b70cf
--- /dev/null
+++ b/srcpkgs/gnome-podcasts/patches/meson-0.61.patch
@@ -0,0 +1,38 @@
+From 6614bb62ecbec7c3b18ea7fe44beb50fe7942b27 Mon Sep 17 00:00:00 2001
+From: Jan Beich <jbeich@FreeBSD.org>
+Date: Thu, 20 Jan 2022 01:27:48 +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.
+
+podcasts-gtk/resources/meson.build:5:0: ERROR: Function does not take positional arguments.
+podcasts-gtk/resources/meson.build:30:0: ERROR: Function does not take positional arguments.
+---
+ podcasts-gtk/resources/meson.build | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/podcasts-gtk/resources/meson.build b/podcasts-gtk/resources/meson.build
+index c1f1ee9f..87148087 100644
+--- a/podcasts-gtk/resources/meson.build
++++ b/podcasts-gtk/resources/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.Podcasts.desktop.in.in'),
+@@ -27,7 +27,7 @@ endif
+
+ 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.Podcasts.appdata.xml.in.in'),
+ output: 'org.gnome.Podcasts.appdata.xml.in',
+--
+GitLab
+
From 3a126d53ffe4df70f74d831b07a7bc0f6b05e5fb Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 9 Mar 2022 18:27:03 +0100
Subject: [PATCH 32/66] gnome-screenshot: fix for meson 0.61
---
.../gnome-screenshot/patches/meson-0.61.patch | 36 +++++++++++++++++++
1 file changed, 36 insertions(+)
create mode 100644 srcpkgs/gnome-screenshot/patches/meson-0.61.patch
diff --git a/srcpkgs/gnome-screenshot/patches/meson-0.61.patch b/srcpkgs/gnome-screenshot/patches/meson-0.61.patch
new file mode 100644
index 000000000000..b21aa0490d49
--- /dev/null
+++ b/srcpkgs/gnome-screenshot/patches/meson-0.61.patch
@@ -0,0 +1,36 @@
+From b60dad3c2536c17bd201f74ad8e40eb74385ed9f Mon Sep 17 00:00:00 2001
+From: Jack Hill <jackhill@jackhill.us>
+Date: Thu, 18 Nov 2021 00:46:58 -0500
+Subject: [PATCH] meson: remove extraneous positional argument
+
+* data/meson.build (desktop_file)
+ (metainfo_file): Remove extraneous positional argument.
+
+Closes #186
+---
+ data/meson.build | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/data/meson.build b/data/meson.build
+index fd570b3..4e2e2e8 100644
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -1,7 +1,6 @@
+ gnome = import('gnome')
+
+ desktop_file = i18n.merge_file(
+- 'desktop',
+ type: 'desktop',
+ input: 'org.gnome.Screenshot.desktop.in',
+ output: 'org.gnome.Screenshot.desktop',
+@@ -23,7 +22,6 @@ if desktop_file_validate.found()
+ endif
+
+ metainfo_file = i18n.merge_file(
+- 'appdata',
+ input: 'org.gnome.Screenshot.metainfo.xml.in',
+ output: 'org.gnome.Screenshot.metainfo.xml',
+ po_dir: join_paths(meson.current_source_dir(), '../po'),
+--
+GitLab
+
From 51d11b34aa15d69db2c3c98ed5d461860bdb2a38 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 9 Mar 2022 18:28:32 +0100
Subject: [PATCH 33/66] gnome-settings-daemon: fix for meson 0.61
---
.../patches/meson-0.61.patch | 38 +++++++++++++++++++
1 file changed, 38 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..b7c03ca2da63
--- /dev/null
+++ b/srcpkgs/gnome-settings-daemon/patches/meson-0.61.patch
@@ -0,0 +1,38 @@
+From afa7e4bb9c519e2daf500a6079088669500768c0 Mon Sep 17 00:00:00 2001
+From: Marvin Schmidt <marv@exherbo.org>
+Date: Wed, 26 Jan 2022 23:08:58 +0100
+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.
+---
+ plugins/power/meson.build | 1 -
+ plugins/wacom/meson.build | 1 -
+ 2 files changed, 2 deletions(-)
+
+diff --git a/plugins/power/meson.build b/plugins/power/meson.build
+index 69e619f2..014bb6da 100644
+--- 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,
+diff --git a/plugins/wacom/meson.build b/plugins/wacom/meson.build
+index d8dd0ec7..c00323d4 100644
+--- 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,
+--
+GitLab
+
From b68f09780e73f18469195d17676b0c126ca525e0 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 9 Mar 2022 18:30:02 +0100
Subject: [PATCH 34/66] 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?= <fmuellner@gnome.org>
+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: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/2078>
+---
+ 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 313bb1a30404a1c7e5ade3e6efbbd3581f51f1e1 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 9 Mar 2022 18:31:24 +0100
Subject: [PATCH 35/66] gnome-sound-recorder: fix for meson 0.61
---
.../patches/meson-0.61.patch | 41 +++++++++++++++++++
1 file changed, 41 insertions(+)
create mode 100644 srcpkgs/gnome-sound-recorder/patches/meson-0.61.patch
diff --git a/srcpkgs/gnome-sound-recorder/patches/meson-0.61.patch b/srcpkgs/gnome-sound-recorder/patches/meson-0.61.patch
new file mode 100644
index 000000000000..40392e6a9fe8
--- /dev/null
+++ b/srcpkgs/gnome-sound-recorder/patches/meson-0.61.patch
@@ -0,0 +1,41 @@
+From 1335b1b1aff61167f8648f7cb3c569764031960d Mon Sep 17 00:00:00 2001
+From: Jan Beich <jbeich@FreeBSD.org>
+Date: Mon, 24 Jan 2022 11:37:06 +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.
+
+data/appdata/meson.build:5:0: ERROR: Function does not take positional arguments.
+data/meson.build:16: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 1f5744e..d2c2c3a 100644
+--- a/data/appdata/meson.build
++++ b/data/appdata/meson.build
+@@ -3,7 +3,6 @@ metainfo_conf.set('app-id', application_id)
+ metainfo_conf.set('gettext-package', gettext_package)
+
+ metainfo_file = i18n.merge_file(
+- 'metainfo-file',
+ input: configure_file(
+ input: 'org.gnome.SoundRecorder.metainfo.xml.in.in',
+ output: '@BASENAME@',
+diff --git a/data/meson.build b/data/meson.build
+index 44117ad..0ff8fa5 100644
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -14,7 +14,6 @@ install_data(
+ desktop_conf = configuration_data()
+ desktop_conf.set('app-id', application_id)
+ desktop_file = i18n.merge_file(
+- 'desktop',
+ input: configure_file(
+ input: 'org.gnome.SoundRecorder.desktop.in.in',
+ output: '@BASENAME@',
+--
+GitLab
+
From 4b7d11291c1593b185e299e914328a624f50bb5e Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 9 Mar 2022 19:05:16 +0100
Subject: [PATCH 36/66] gnome-sudoku: fix for meson 0.61
---
srcpkgs/gnome-sudoku/patches/meson-0.61.patch | 38 +++++++++++++++++++
srcpkgs/gnome-sudoku/template | 2 +-
2 files changed, 39 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/gnome-sudoku/patches/meson-0.61.patch
diff --git a/srcpkgs/gnome-sudoku/patches/meson-0.61.patch b/srcpkgs/gnome-sudoku/patches/meson-0.61.patch
new file mode 100644
index 000000000000..93549d0158d5
--- /dev/null
+++ b/srcpkgs/gnome-sudoku/patches/meson-0.61.patch
@@ -0,0 +1,38 @@
+From 7c9935a02b48f332f67bad3e4ee020b75591084a Mon Sep 17 00:00:00 2001
+From: Jan Beich <jbeich@FreeBSD.org>
+Date: Mon, 24 Jan 2022 11:44:06 +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.
+
+data/meson.build:5:0: ERROR: Function does not take positional arguments.
+data/meson.build:24:0: ERROR: Function does not take positional arguments.
+---
+ data/meson.build | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/data/meson.build b/data/meson.build
+index f18f247..9c95e02 100644
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -2,7 +2,7 @@ resource_files = files('gnome-sudoku.gresource.xml')
+
+ resources = gnome.compile_resources('gnome-sudoku', resource_files)
+
+-desktop_file = i18n.merge_file('desktop',
++desktop_file = i18n.merge_file(
+ input: '@0@.desktop.in'.format(application_id),
+ output: '@0@.desktop'.format(application_id),
+ install: true,
+@@ -21,7 +21,7 @@ if desktop_file_validate.found()
+ )
+ endif
+
+-appdata_file = i18n.merge_file('appdata',
++appdata_file = i18n.merge_file(
+ input: '@0@.appdata.xml.in'.format(application_id),
+ output: '@0@.appdata.xml'.format(application_id),
+ install: true,
+--
+GitLab
+
diff --git a/srcpkgs/gnome-sudoku/template b/srcpkgs/gnome-sudoku/template
index ed1759478ab5..6e0af45248ff 100644
--- a/srcpkgs/gnome-sudoku/template
+++ b/srcpkgs/gnome-sudoku/template
@@ -5,7 +5,7 @@ revision=1
build_helper="gir"
build_style=meson
hostmakedepends="gettext glib-devel itstool pkg-config vala"
-makedepends="gtk4-devel libgee08-devel json-glib-devel qqwing-devel"
+makedepends="gtk+3-devel libgee08-devel json-glib-devel qqwing-devel"
short_desc="GNOME Sudoku Japanese logic game"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3.0-or-later"
From 8dfc7a60c72529368c94e55bc3b6512734102bbc Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 10 Mar 2022 21:56:48 +0100
Subject: [PATCH 37/66] gnome-taquin: fix for meson 0.61
---
srcpkgs/gnome-taquin/patches/meson-0.61.patch | 134 ++++++++++++++++++
1 file changed, 134 insertions(+)
create mode 100644 srcpkgs/gnome-taquin/patches/meson-0.61.patch
diff --git a/srcpkgs/gnome-taquin/patches/meson-0.61.patch b/srcpkgs/gnome-taquin/patches/meson-0.61.patch
new file mode 100644
index 000000000000..e14267675ecb
--- /dev/null
+++ b/srcpkgs/gnome-taquin/patches/meson-0.61.patch
@@ -0,0 +1,134 @@
+From 99dea5e7863e112f33f16e59898c56a4f1a547b3 Mon Sep 17 00:00:00 2001
+From: Rico Tzschichholz <ricotz@ubuntu.com>
+Date: Sat, 16 Jan 2021 14:00:15 +0100
+Subject: [PATCH] Don't alter or try to write [GtkChild] fields
+
+See https://gitlab.gnome.org/GNOME/vala/issues/1121
+---
+ src/overlayed-list.vala | 38 +++++++++++++++++++-------------------
+ 1 file changed, 19 insertions(+), 19 deletions(-)
+
+diff --git a/src/overlayed-list.vala b/src/overlayed-list.vala
+index 3fbb1c3..eb2404a 100644
+--- a/src/overlayed-list.vala
++++ b/src/overlayed-list.vala
+@@ -89,11 +89,11 @@ private abstract class OverlayedList : Overlay, AdaptativeWidget
+ internal void set_window_size (AdaptativeWidget.WindowSize new_size)
+ {
+ if (!AdaptativeWidget.WindowSize.is_extra_thin (new_size) && AdaptativeWidget.WindowSize.is_extra_flat (new_size))
+- set_horizontal (ref main_context, ref edit_mode_box);
++ set_horizontal (ref main_context, edit_mode_box);
+ else
+- set_vertical (ref main_context, ref edit_mode_box);
++ set_vertical (ref main_context, edit_mode_box);
+ }
+- private static inline void set_horizontal (ref StyleContext main_context, ref Box edit_mode_box)
++ private static inline void set_horizontal (ref StyleContext main_context, Box edit_mode_box)
+ {
+ main_context.remove_class ("vertical");
+ edit_mode_box.halign = Align.END;
+@@ -102,7 +102,7 @@ private abstract class OverlayedList : Overlay, AdaptativeWidget
+ edit_mode_box.width_request = 160;
+ main_context.add_class ("horizontal");
+ }
+- private static inline void set_vertical (ref StyleContext main_context, ref Box edit_mode_box)
++ private static inline void set_vertical (ref StyleContext main_context, Box edit_mode_box)
+ {
+ main_context.remove_class ("horizontal");
+ edit_mode_box.halign = Align.CENTER;
+@@ -118,9 +118,9 @@ private abstract class OverlayedList : Overlay, AdaptativeWidget
+
+ internal bool next_match ()
+ {
+- return _next_match (ref main_list_box);
++ return _next_match (main_list_box);
+ }
+- private static inline bool _next_match (ref ListBox main_list_box)
++ private static inline bool _next_match (ListBox main_list_box)
+ {
+ ListBoxRow? row = main_list_box.get_selected_row (); // TODO multiple rows and focus-only lists
+ if (row == null)
+@@ -130,7 +130,7 @@ private abstract class OverlayedList : Overlay, AdaptativeWidget
+
+ if (row == null)
+ {
+- _scroll_bottom (ref main_list_box);
++ _scroll_bottom (main_list_box);
+ return false;
+ }
+ main_list_box.select_row ((!) row);
+@@ -140,9 +140,9 @@ private abstract class OverlayedList : Overlay, AdaptativeWidget
+
+ internal bool previous_match ()
+ {
+- return _previous_match (ref main_list_box);
++ return _previous_match (main_list_box);
+ }
+- private static inline bool _previous_match (ref ListBox main_list_box)
++ private static inline bool _previous_match (ListBox main_list_box)
+ {
+ uint n_items = main_list_box.get_children ().length (); // FIXME OverlayedList.n_items is unreliable
+ if (n_items == 0)
+@@ -189,9 +189,9 @@ private abstract class OverlayedList : Overlay, AdaptativeWidget
+
+ protected int [] get_selected_rows_indices ()
+ {
+- return _get_selected_rows_indices (ref main_list_box);
++ return _get_selected_rows_indices (main_list_box);
+ }
+- private static inline int [] _get_selected_rows_indices (ref ListBox main_list_box)
++ private static inline int [] _get_selected_rows_indices (ListBox main_list_box)
+ {
+ int [] indices = new int [0];
+ main_list_box.selected_foreach ((_list_box, selected_row) => {
+@@ -205,9 +205,9 @@ private abstract class OverlayedList : Overlay, AdaptativeWidget
+
+ protected void scroll_top ()
+ {
+- _scroll_top (ref main_list_box);
++ _scroll_top (main_list_box);
+ }
+- private static inline void _scroll_top (ref ListBox main_list_box)
++ private static inline void _scroll_top (ListBox main_list_box)
+ {
+ Adjustment adjustment = main_list_box.get_adjustment ();
+ adjustment.set_value (adjustment.get_lower ());
+@@ -215,9 +215,9 @@ private abstract class OverlayedList : Overlay, AdaptativeWidget
+
+ protected void scroll_bottom ()
+ {
+- _scroll_bottom (ref main_list_box);
++ _scroll_bottom (main_list_box);
+ }
+- private static inline void _scroll_bottom (ref ListBox main_list_box)
++ private static inline void _scroll_bottom (ListBox main_list_box)
+ {
+ Adjustment adjustment = main_list_box.get_adjustment ();
+ adjustment.set_value (adjustment.get_upper ());
+@@ -225,9 +225,9 @@ private abstract class OverlayedList : Overlay, AdaptativeWidget
+
+ internal bool handle_copy_text (out string copy_text)
+ {
+- return _handle_copy_text (out copy_text, ref main_list_box);
++ return _handle_copy_text (out copy_text, main_list_box);
+ }
+- private static inline bool _handle_copy_text (out string copy_text, ref ListBox main_list_box)
++ private static inline bool _handle_copy_text (out string copy_text, ListBox main_list_box)
+ {
+ List<weak ListBoxRow> selected_rows = main_list_box.get_selected_rows ();
+ OverlayedListRow row;
+@@ -283,9 +283,9 @@ private abstract class OverlayedList : Overlay, AdaptativeWidget
+
+ internal SelectionState get_selection_state ()
+ {
+- return _get_selection_state (ref main_list_box, ref main_list_store);
++ return _get_selection_state (main_list_box, ref main_list_store);
+ }
+- private static inline SelectionState _get_selection_state (ref ListBox main_list_box, ref GLib.ListStore main_list_store)
++ private static inline SelectionState _get_selection_state (ListBox main_list_box, ref GLib.ListStore main_list_store)
+ {
+ List<weak ListBoxRow> selected_rows = main_list_box.get_selected_rows ();
+ uint n_selected_rows = selected_rows.length ();
+--
+GitLab
+
From cd190e6f1e9e87f0ea784d267ab86027c1841f14 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 25 Jan 2022 10:11:01 +0100
Subject: [PATCH 38/66] 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 <chpe@src.gnome.org>
+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 01e999ecb14955e94a1f56542d5f9a47d6a69497 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 9 Mar 2022 19:30:05 +0100
Subject: [PATCH 39/66] gnome-tetravex: fix for meson 0.61
---
.../gnome-tetravex/patches/meson-0.61.patch | 38 +++++++++++++++++++
1 file changed, 38 insertions(+)
create mode 100644 srcpkgs/gnome-tetravex/patches/meson-0.61.patch
diff --git a/srcpkgs/gnome-tetravex/patches/meson-0.61.patch b/srcpkgs/gnome-tetravex/patches/meson-0.61.patch
new file mode 100644
index 000000000000..12e0eab64ef0
--- /dev/null
+++ b/srcpkgs/gnome-tetravex/patches/meson-0.61.patch
@@ -0,0 +1,38 @@
+From 80912d06f5e588f6aca966fa516103275e58d94e Mon Sep 17 00:00:00 2001
+From: Jan Beich <jbeich@FreeBSD.org>
+Date: Mon, 24 Jan 2022 11:48:22 +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.
+
+data/meson.build:37:0: ERROR: Function does not take positional arguments.
+data/meson.build:59:0: ERROR: Function does not take positional arguments.
+---
+ data/meson.build | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/data/meson.build b/data/meson.build
+index bb77248..b881e8a 100644
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -34,7 +34,7 @@ endif
+
+ # Desktop file
+ if get_option('build_gui')
+- desktop_file = i18n.merge_file ('desktop-file',
++ desktop_file = i18n.merge_file (
+ input: project_id + '.desktop.in',
+ output: project_id + '.desktop',
+ install: true,
+@@ -56,7 +56,7 @@ endif
+
+ # AppData file
+ if get_option('build_gui')
+- appdata_file = i18n.merge_file ('appdata-file',
++ appdata_file = i18n.merge_file (
+ input: project_id + '.appdata.xml.in',
+ output: project_id + '.appdata.xml',
+ install: true,
+--
+GitLab
+
From ad0529237289663ec0dc4c511a41218c0c1cef66 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 9 Mar 2022 19:27:12 +0100
Subject: [PATCH 40/66] gnome-tweaks: fix for meson 0.61
---
srcpkgs/gnome-tweaks/patches/meson-0.61.patch | 32 +++++++++++++++++++
1 file changed, 32 insertions(+)
create mode 100644 srcpkgs/gnome-tweaks/patches/meson-0.61.patch
diff --git a/srcpkgs/gnome-tweaks/patches/meson-0.61.patch b/srcpkgs/gnome-tweaks/patches/meson-0.61.patch
new file mode 100644
index 000000000000..80efde38735e
--- /dev/null
+++ b/srcpkgs/gnome-tweaks/patches/meson-0.61.patch
@@ -0,0 +1,32 @@
+From dc9701e18775c01d0b69fabaa350147f70096da8 Mon Sep 17 00:00:00 2001
+From: Mae Dartmann <hello@maedartmann.name>
+Date: Wed, 16 Feb 2022 06:08:41 +0000
+Subject: [PATCH] meson: fix invalid positional argument
+
+---
+ data/meson.build | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/data/meson.build b/data/meson.build
+index fd6d5da..74f7e82 100644
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -1,5 +1,5 @@
+ appdata_file = 'org.gnome.tweaks.appdata.xml'
+-i18n.merge_file(appdata_file,
++i18n.merge_file(
+ input: appdata_file + '.in',
+ output: appdata_file,
+ po_dir: '../po',
+@@ -8,7 +8,7 @@ i18n.merge_file(appdata_file,
+ )
+
+ desktop_file = 'org.gnome.tweaks.desktop'
+-i18n.merge_file(desktop_file,
++i18n.merge_file(
+ input: desktop_file + '.in',
+ output: desktop_file,
+ po_dir: '../po',
+--
+GitLab
+
From 608494985a0016f56a0bda87a05d4ce47295ed19 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 25 Jan 2022 10:11:01 +0100
Subject: [PATCH 41/66] 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 19e8cc8b389251242dc5ab5e47f4517189e8fa0d Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 9 Mar 2022 19:31:37 +0100
Subject: [PATCH 42/66] gnote: fix for meson 0.61
---
srcpkgs/gnote/patches/meson-0.61.patch | 36 ++++++++++++++++++++++++++
1 file changed, 36 insertions(+)
create mode 100644 srcpkgs/gnote/patches/meson-0.61.patch
diff --git a/srcpkgs/gnote/patches/meson-0.61.patch b/srcpkgs/gnote/patches/meson-0.61.patch
new file mode 100644
index 000000000000..e5575c0fa3f7
--- /dev/null
+++ b/srcpkgs/gnote/patches/meson-0.61.patch
@@ -0,0 +1,36 @@
+From 32795e53681e3ecbaaa05817d4eb5fa1c124d35b Mon Sep 17 00:00:00 2001
+From: Jan Beich <jbeich@FreeBSD.org>
+Date: Mon, 24 Jan 2022 11:53:17 +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.
+
+data/meson.build:4:0: ERROR: Function does not take positional arguments.
+data/meson.build:41:0: 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 a6138165..8d16368a 100644
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -2,7 +2,6 @@ install_man('gnote.1')
+
+ desktop_file = 'org.gnome.Gnote.desktop'
+ gnote_desktop_file = i18n.merge_file(
+- desktop_file,
+ type: 'desktop',
+ input: desktop_file + '.in',
+ output: desktop_file,
+@@ -39,7 +38,6 @@ configure_file(
+
+ gnote_appdata = 'org.gnome.Gnote.appdata.xml'
+ appdata_file = i18n.merge_file(
+- gnote_appdata,
+ input: gnote_appdata + '.in',
+ output: gnote_appdata,
+ po_dir: '../po',
+--
+GitLab
+
From 6edad91dd9657bbfe43be16781f9c3bd00c2e5e2 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 25 Jan 2022 10:11:01 +0100
Subject: [PATCH 43/66] 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 <ebassi@gnome.org>
+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 <ebassi@gnome.org>
+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 94f6f5c9425bf241a779cec9720bd9b01bd5766a Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 25 Jan 2022 10:11:01 +0100
Subject: [PATCH 44/66] 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 <paobac@src.gnome.org>
+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 2b5612e499c0659fb6dc55dfae8fe083e2cc2504 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 10 Mar 2022 21:45:46 +0100
Subject: [PATCH 45/66] gtranslator: fix for meson 0.61
---
srcpkgs/gtranslator/patches/meson-0.61.patch | 36 ++++++++++++++++++++
1 file changed, 36 insertions(+)
create mode 100644 srcpkgs/gtranslator/patches/meson-0.61.patch
diff --git a/srcpkgs/gtranslator/patches/meson-0.61.patch b/srcpkgs/gtranslator/patches/meson-0.61.patch
new file mode 100644
index 000000000000..54063041fe16
--- /dev/null
+++ b/srcpkgs/gtranslator/patches/meson-0.61.patch
@@ -0,0 +1,36 @@
+From 7ac572cc8c8c37ca3826ecf0d395edd3c38e8e22 Mon Sep 17 00:00:00 2001
+From: Jan Beich <jbeich@FreeBSD.org>
+Date: Mon, 24 Jan 2022 11:57:43 +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.
+
+data/meson.build:15:0: ERROR: Function does not take positional arguments.
+data/meson.build:37:0: 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 2ca0be0b..2ebbfb12 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: '@0@.desktop'.format(gtr_app_id),
+@@ -35,7 +34,6 @@ appdata_in = configure_file(
+ )
+
+ i18n.merge_file(
+- appdata,
+ input: appdata_in,
+ output: appdata,
+ po_dir: po_dir,
+--
+GitLab
+
From ac7dcb8f1b8a87c9f0f78c33682630dd07ff5c39 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 10 Mar 2022 21:57:19 +0100
Subject: [PATCH 46/66] gvfs: fix for meson 0.61
---
srcpkgs/gvfs/patches/meson-0.61.patch | 10 ++++++++++
1 file changed, 10 insertions(+)
create mode 100644 srcpkgs/gvfs/patches/meson-0.61.patch
diff --git a/srcpkgs/gvfs/patches/meson-0.61.patch b/srcpkgs/gvfs/patches/meson-0.61.patch
new file mode 100644
index 000000000000..38f04b2e894c
--- /dev/null
+++ b/srcpkgs/gvfs/patches/meson-0.61.patch
@@ -0,0 +1,10 @@
+--- a/daemon/meson.build
++++ b/daemon/meson.build
+@@ -366,7 +366,6 @@ if enable_admin
+ )
+
+ i18n.merge_file(
+- policy,
+ input: policy_in,
+ output: '@BASENAME@',
+ po_dir: po_dir,
From dbd6d7a716da134cf0cd8599db17ab0e1e0d6f45 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 22 Mar 2022 22:42:58 +0100
Subject: [PATCH 47/66] harfbuzz: fix for meson 0.61
---
srcpkgs/harfbuzz/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/harfbuzz/template b/srcpkgs/harfbuzz/template
index 894a1b7bf9fe..d5c501aa5413 100644
--- a/srcpkgs/harfbuzz/template
+++ b/srcpkgs/harfbuzz/template
@@ -3,7 +3,7 @@ pkgname=harfbuzz
version=3.3.1
revision=1
build_style=meson
-build_helper=gir
+build_helper="gir qemu"
configure_args="-Dglib=enabled -Dfreetype=enabled -Dcairo=enabled -Dicu=enabled
-Dgraphite=enabled -Dintrospection=enabled"
hostmakedepends="glib-devel pkg-config gtk-doc"
From 46bbb5787fee06b37a1f1c5bfeab3d6cc69d8222 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 10 Mar 2022 21:57:05 +0100
Subject: [PATCH 48/66] hitori: fix for meson 0.61
---
srcpkgs/hitori/patches/meson-0.61.patch | 41 +++++++++++++++++++++++++
1 file changed, 41 insertions(+)
create mode 100644 srcpkgs/hitori/patches/meson-0.61.patch
diff --git a/srcpkgs/hitori/patches/meson-0.61.patch b/srcpkgs/hitori/patches/meson-0.61.patch
new file mode 100644
index 000000000000..37adaa0116e6
--- /dev/null
+++ b/srcpkgs/hitori/patches/meson-0.61.patch
@@ -0,0 +1,41 @@
+From d25728e122f1d7b985029a5ba96810c3e57c27f7 Mon Sep 17 00:00:00 2001
+From: Philip Withnall <pwithnall@endlessos.org>
+Date: Tue, 2 Nov 2021 12:04:29 +0000
+Subject: [PATCH] build: Drop positional arguments from i18n.merge_file() calls
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Meson never took positional arguments in this function, but didn’t warn
+about it until Meson 0.60. Drop the unnecessary arguments to fix the
+warning.
+
+Signed-off-by: Philip Withnall <pwithnall@endlessos.org>
+---
+ data/meson.build | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/data/meson.build b/data/meson.build
+index 97b8e68..c66a233 100644
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -1,6 +1,6 @@
+ subdir('icons')
+
+-desktop_file = i18n.merge_file('desktop-file',
++desktop_file = i18n.merge_file(
+ type: 'desktop',
+ input: '@0@.desktop.in'.format(application_id),
+ output: '@0@.desktop'.format(application_id),
+@@ -20,7 +20,7 @@ if desktop_file_validate.found()
+ )
+ endif
+
+-appdata_file = i18n.merge_file('appdata-file',
++appdata_file = i18n.merge_file(
+ input: '@0@.appdata.xml.in'.format(application_id),
+ output: '@0@.appdata.xml'.format(application_id),
+ po_dir: join_paths(meson.source_root(), 'po'),
+--
+GitLab
+
From 17f769b8076aaa1c0fe9e69396384063640115a5 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 12 Mar 2022 21:07:42 +0100
Subject: [PATCH 49/66] io.elementary.code: fix for meson 0.61
---
.../patches/meson-0.61.patch | 22 +++++++++++++++++++
1 file changed, 22 insertions(+)
create mode 100644 srcpkgs/io.elementary.code/patches/meson-0.61.patch
diff --git a/srcpkgs/io.elementary.code/patches/meson-0.61.patch b/srcpkgs/io.elementary.code/patches/meson-0.61.patch
new file mode 100644
index 000000000000..87a88aabff47
--- /dev/null
+++ b/srcpkgs/io.elementary.code/patches/meson-0.61.patch
@@ -0,0 +1,22 @@
+From a2607cce3a6b1bb62d02456456d3cbc3c6530bb0 Mon Sep 17 00:00:00 2001
+From: Xeonacid <h.dwwwwww@gmail.com>
+Date: Sat, 8 Jan 2022 02:00:25 +0800
+Subject: [PATCH] Meson: remove positional arguments from i18n.merge_file
+ (#1165)
+
+---
+ data/meson.build | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/data/meson.build b/data/meson.build
+index c2ff0c2881..1f3940d481 100644
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -64,7 +64,6 @@ if get_option ('have_pkexec')
+ )
+
+ i18n.merge_file(
+- 'policy',
+ input: policy_in,
+ output: meson.project_name() + '.policy',
+ po_dir: join_paths(meson.source_root (), 'po', 'extra'),
From 6fc7109729dda7f4955f635f9f129104e79c9350 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 16 Mar 2022 22:54:07 +0100
Subject: [PATCH 50/66] io.elementary.music: fix for meson 0.61
---
.../patches/meson-0.61.patch | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
create mode 100644 srcpkgs/io.elementary.music/patches/meson-0.61.patch
diff --git a/srcpkgs/io.elementary.music/patches/meson-0.61.patch b/srcpkgs/io.elementary.music/patches/meson-0.61.patch
new file mode 100644
index 000000000000..17393cc5aa07
--- /dev/null
+++ b/srcpkgs/io.elementary.music/patches/meson-0.61.patch
@@ -0,0 +1,18 @@
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -27,7 +27,6 @@ install_data(
+
+ i18n = import('i18n')
+ desktop_file = i18n.merge_file(
+- 'desktop',
+ input: meson.project_name() + '.desktop.in',
+ output: meson.project_name() + '.desktop',
+ install: true,
+@@ -37,7 +36,6 @@ desktop_file = i18n.merge_file(
+ )
+
+ appdata_file = i18n.merge_file(
+- 'appdata',
+ input: meson.project_name() + '.appdata.xml.in',
+ output: meson.project_name() + '.appdata.xml',
+ install: true,
From 1c5efbbf1ad1ba952e0e573293874dd1bd8fe1a4 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 15 Mar 2022 20:24:34 +0100
Subject: [PATCH 51/66] io.elementary.terminal: fix for meson 0.61
---
.../patches/meson-0.61.patch | 38 +++++++++++++++++++
1 file changed, 38 insertions(+)
create mode 100644 srcpkgs/io.elementary.terminal/patches/meson-0.61.patch
diff --git a/srcpkgs/io.elementary.terminal/patches/meson-0.61.patch b/srcpkgs/io.elementary.terminal/patches/meson-0.61.patch
new file mode 100644
index 000000000000..7fd1fb455335
--- /dev/null
+++ b/srcpkgs/io.elementary.terminal/patches/meson-0.61.patch
@@ -0,0 +1,38 @@
+From 15e3ace08cb25e53941249fa1ee680a1e2f871b4 Mon Sep 17 00:00:00 2001
+From: Xeonacid <h.dwwwwww@gmail.com>
+Date: Sat, 8 Jan 2022 02:00:28 +0800
+Subject: [PATCH] Meson: remove positional arguments from i18n.merge_file
+ (#649)
+
+---
+ data/meson.build | 3 ---
+ 1 file changed, 3 deletions(-)
+
+diff --git a/data/meson.build b/data/meson.build
+index 435b84172..a64fc120e 100644
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -4,7 +4,6 @@ install_data(
+ )
+
+ i18n.merge_file (
+- 'desktop',
+ input: meson.project_name() + '.desktop.in',
+ output: meson.project_name() + '.desktop',
+ install: true,
+@@ -14,7 +13,6 @@ i18n.merge_file (
+ )
+
+ i18n.merge_file (
+- 'desktop',
+ input: 'open-pantheon-terminal-here.desktop.in',
+ output: 'open-pantheon-terminal-here.desktop',
+ install: true,
+@@ -24,7 +22,6 @@ i18n.merge_file (
+ )
+
+ i18n.merge_file (
+- 'appdata',
+ input: meson.project_name() + '.appdata.xml.in',
+ output: meson.project_name() + '.appdata.xml',
+ install: true,
From 64f2cf15361716e20cd3ff9c6c6f4f683fff296a Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 12 Mar 2022 17:07:09 +0100
Subject: [PATCH 52/66] libaccounts-glib: fix for meson 0.61
---
srcpkgs/libaccounts-glib/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/libaccounts-glib/template b/srcpkgs/libaccounts-glib/template
index ad3a6e0621a9..9b86ed45ed91 100644
--- a/srcpkgs/libaccounts-glib/template
+++ b/srcpkgs/libaccounts-glib/template
@@ -17,9 +17,9 @@ checksum=eebb1c6debfcf929efb388a0f28d8cc8ec9b32f273e4abe4224a33e5d299cd73
if [ "$CROSS_BUILD" ]; then
# Remove docs. During install of package, it will try
# to run target binary with host, which causes exec error
- pre_build() {
- vsed -e '/docs/d' -i meson.build
- }
+ post_patch() {
+ vsed -e '/docs/d' -i meson.build
+ }
fi
libaccounts-glib-devel_package() {
From 6b51922f577c162f62fc09988139fc048f515423 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 12 Mar 2022 18:44:04 +0100
Subject: [PATCH 53/66] network-manager-applet: fix for meson 0.61
---
.../patches/meson-0.61.patch | 33 +++++++++++++++++++
1 file changed, 33 insertions(+)
create mode 100644 srcpkgs/network-manager-applet/patches/meson-0.61.patch
diff --git a/srcpkgs/network-manager-applet/patches/meson-0.61.patch b/srcpkgs/network-manager-applet/patches/meson-0.61.patch
new file mode 100644
index 000000000000..1060e15b364a
--- /dev/null
+++ b/srcpkgs/network-manager-applet/patches/meson-0.61.patch
@@ -0,0 +1,33 @@
+From 30f91940819bf48a8b61599732c6b1ecea8fedf1 Mon Sep 17 00:00:00 2001
+From: Alexander Kanavin <alex@linutronix.de>
+Date: Fri, 21 Jan 2022 22:34:09 +0100
+Subject: [PATCH] meson.build: address meson 0.61 failures
+
+https://gitlab.gnome.org/GNOME/network-manager-applet/-/merge_requests/107
+---
+ meson.build | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/meson.build b/meson.build
+index 33adb632..6178c0eb 100644
+--- a/meson.build
++++ b/meson.build
+@@ -254,7 +254,6 @@ desktop_file_validate = find_program('desktop-file-validate', required: false)
+
+ foreach desktop: desktop_files
+ i18n.merge_file(
+- desktop + '-desktop',
+ input: desktop + '.desktop.in',
+ output: desktop + '.desktop',
+ install: true,
+@@ -275,7 +274,6 @@ endforeach
+ appdata = 'nm-connection-editor.appdata.xml'
+
+ i18n.merge_file(
+- 'desktop',
+ input: appdata + '.in',
+ output: appdata,
+ install: true,
+--
+GitLab
+
From 48f36f5f62b8eb92b6b754da9611361174578f27 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Fri, 25 Mar 2022 23:46:01 +0100
Subject: [PATCH 54/66] newsflash: fix for meson 0.61
---
srcpkgs/newsflash/patches/meson-0.61.patch | 20 ++++++++++++++++++++
1 file changed, 20 insertions(+)
create mode 100644 srcpkgs/newsflash/patches/meson-0.61.patch
diff --git a/srcpkgs/newsflash/patches/meson-0.61.patch b/srcpkgs/newsflash/patches/meson-0.61.patch
new file mode 100644
index 000000000000..bfc8a67d0aa8
--- /dev/null
+++ b/srcpkgs/newsflash/patches/meson-0.61.patch
@@ -0,0 +1,20 @@
+--- a/data/meson.build
++++ b/data/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('com.gitlab.newsflash.desktop.in.in'),
+@@ -27,7 +27,7 @@ endif
+
+ 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('com.gitlab.newsflash.appdata.xml.in.in'),
+ output: '@BASENAME@',
From 3b97f166f37923ce0b5f1f8b8c265751cd8dd0b3 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Fri, 25 Mar 2022 11:35:35 +0100
Subject: [PATCH 55/66] orc: fix for meson 0.61
---
srcpkgs/orc/template | 15 ++++++++++++---
1 file changed, 12 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/orc/template b/srcpkgs/orc/template
index 36311464556b..10f306289ddf 100644
--- a/srcpkgs/orc/template
+++ b/srcpkgs/orc/template
@@ -3,8 +3,9 @@ pkgname=orc
version=0.4.32
revision=1
build_style=meson
-configure_args="-Dexamples=disabled -Dtests=disabled"
-hostmakedepends="pkg-config gtk-doc"
+build_helper="gir"
+configure_args="-Dexamples=disabled -Dtests=disabled -Dgtk_doc=$(vopt_if gtk_doc enabled disabled)"
+hostmakedepends="pkg-config $(vopt_if gtk_doc gtk-doc)"
short_desc="Oild Runtime Compiler"
maintainer="Orphaned <orphan@voidlinux.org>"
license="BSD-2-Clause"
@@ -12,6 +13,12 @@ homepage="https://cgit.freedesktop.org/gstreamer/orc"
distfiles="http://gstreamer.freedesktop.org/src/orc/orc-${version}.tar.xz"
checksum=a66e3d8f2b7e65178d786a01ef61f2a0a0b4d0b8370de7ce134ba73da4af18f0
+build_options="gtk_doc"
+
+if [ -z "$CROSS_BUILD" ]; then
+ build_options_default+=" gtk_doc"
+fi
+
post_install() {
vlicense COPYING
}
@@ -25,6 +32,8 @@ orc-devel_package() {
vmove "usr/lib/*.a"
vmove "usr/lib/*.so"
vmove usr/share/aclocal
- vmove usr/share/gtk-doc
+ if [ "$build_option_gtk_doc" ]; then
+ vmove usr/share/gtk-doc
+ fi
}
}
From 5b8b52ba5389198fef876dae68a056b1134d6245 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 16 Mar 2022 23:06:25 +0100
Subject: [PATCH 56/66] p11-kit: fix for meson 0.61
---
srcpkgs/p11-kit/patches/meson-0.61.patch | 42 ++++++++++++++++++++++++
srcpkgs/p11-kit/template | 14 ++++++--
2 files changed, 54 insertions(+), 2 deletions(-)
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..43e75620c40e
--- /dev/null
+++ b/srcpkgs/p11-kit/patches/meson-0.61.patch
@@ -0,0 +1,42 @@
+From 9f01a8a45ba913a9b65894cef9369b6010005096 Mon Sep 17 00:00:00 2001
+From: Eli Schwartz <eschwartz@archlinux.org>
+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',
diff --git a/srcpkgs/p11-kit/template b/srcpkgs/p11-kit/template
index cc0b11eb720f..63cdebc7563f 100644
--- a/srcpkgs/p11-kit/template
+++ b/srcpkgs/p11-kit/template
@@ -3,8 +3,9 @@ pkgname=p11-kit
version=0.23.22
revision=3
build_style=meson
+build_helper="qemu"
configure_args="-Dlibffi=enabled -Dsystemd=disabled -Dbash_completion=disabled
- -Dgtk_doc=true -Dman=true -Dnls=true -Dtrust_module=enabled
+ -Dman=true $(vopt_bool gtk_doc gtk_doc) -Dnls=true -Dtrust_module=enabled
-Dtrust_paths=/etc/ssl/certs/ca-certificates.crt"
hostmakedepends="pkg-config gettext gtk-doc libxslt libtasn1-tools"
makedepends="libtasn1-devel libffi-devel"
@@ -22,6 +23,13 @@ else
configure_args+=" -Dtest=false"
fi
+build_options="gtk_doc"
+build_options_default=""
+
+if [ -z "$CROSS_BUILD" ]; then
+ build_options_default+=" gtk_doc"
+fi
+
post_install() {
mv ${DESTDIR}/etc/pkcs11/pkcs11.conf.example \
${DESTDIR}/etc/pkcs11/pkcs11.conf
@@ -38,6 +46,8 @@ p11-kit-devel_package() {
vmove usr/include
vmove "usr/lib/*.so"
vmove usr/lib/pkgconfig
- vmove usr/share/gtk-doc
+ if [ "$build_option_gtk_doc" ]; then
+ vmove usr/share/gtk-doc
+ fi
}
}
From fc65dd976ef6ede1e4748f1033c243b1611a3cd7 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 16 Mar 2022 23:30:51 +0100
Subject: [PATCH 57/66] pantheon-screenshot: fix for meson 0.61
---
.../patches/meson-0.61.patch | 29 +++++++++++++++++++
1 file changed, 29 insertions(+)
create mode 100644 srcpkgs/pantheon-screenshot/patches/meson-0.61.patch
diff --git a/srcpkgs/pantheon-screenshot/patches/meson-0.61.patch b/srcpkgs/pantheon-screenshot/patches/meson-0.61.patch
new file mode 100644
index 000000000000..8a64e9f14a5f
--- /dev/null
+++ b/srcpkgs/pantheon-screenshot/patches/meson-0.61.patch
@@ -0,0 +1,29 @@
+From 80a5d942e813dd098e1ef0f6629b81d2ccef05ae Mon Sep 17 00:00:00 2001
+From: Bobby Rong <rjl931189261@126.com>
+Date: Thu, 13 Jan 2022 13:51:48 +0800
+Subject: [PATCH] Fix data/meson.build (#241)
+
+---
+ data/meson.build | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/data/meson.build b/data/meson.build
+index cb2adc80..76dad525 100644
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -20,7 +20,6 @@ install_data(
+ )
+
+ i18n.merge_file (
+- 'desktop',
+ input: 'screenshot.desktop.in',
+ output: meson.project_name() + '.desktop',
+ install: true,
+@@ -30,7 +29,6 @@ i18n.merge_file (
+ )
+
+ i18n.merge_file (
+- 'appdata',
+ input: 'screenshot.appdata.xml.in',
+ output: meson.project_name() + '.appdata.xml',
+ install: true,
From aca0964009712dd0085d709963af7c3e7b62445e Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 16 Mar 2022 23:33:07 +0100
Subject: [PATCH 58/66] polari: fix for meson 0.61
---
srcpkgs/polari/patches/meson-0.61.patch | 43 +++++++++++++++++++++++++
srcpkgs/polari/template | 1 +
2 files changed, 44 insertions(+)
create mode 100644 srcpkgs/polari/patches/meson-0.61.patch
diff --git a/srcpkgs/polari/patches/meson-0.61.patch b/srcpkgs/polari/patches/meson-0.61.patch
new file mode 100644
index 000000000000..a9ed3bc58032
--- /dev/null
+++ b/srcpkgs/polari/patches/meson-0.61.patch
@@ -0,0 +1,43 @@
+From 0f0a4b54142d8b424969f0b6ace6fc8b53b1d05d Mon Sep 17 00:00:00 2001
+From: Jan Beich <jbeich@FreeBSD.org>
+Date: Mon, 24 Jan 2022 12:32:00 +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.
+
+data/appdata/meson.build:2:0: ERROR: Function does not take positional arguments.
+data/meson.build:5:0: ERROR: Function does not take positional arguments.
+
+Part-of: <https://gitlab.gnome.org/GNOME/polari/-/merge_requests/242>
+---
+ data/appdata/meson.build | 2 +-
+ data/meson.build | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/data/appdata/meson.build b/data/appdata/meson.build
+index 88b4a0be..781ba22f 100644
+--- a/data/appdata/meson.build
++++ b/data/appdata/meson.build
+@@ -1,5 +1,5 @@
+ appdata_name = app_id + '.appdata.xml'
+-appdata = i18n.merge_file(appdata_name,
++appdata = i18n.merge_file(
+ input: appdata_name + '.in',
+ output: appdata_name,
+ po_dir: '../../po',
+diff --git a/data/meson.build b/data/meson.build
+index cedfd57b..655ae700 100644
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -2,7 +2,7 @@ subdir('appdata')
+ subdir('icons')
+
+ desktop_filename = app_id + '.desktop'
+-desktop_file = i18n.merge_file(desktop_filename,
++desktop_file = i18n.merge_file(
+ input: desktop_filename + '.in',
+ output: desktop_filename,
+ po_dir: '../po',
+--
+GitLab
+
diff --git a/srcpkgs/polari/template b/srcpkgs/polari/template
index fda5f1945375..eb7c9d2dd3df 100644
--- a/srcpkgs/polari/template
+++ b/srcpkgs/polari/template
@@ -12,6 +12,7 @@ short_desc="GNOME IRC client"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Apps/Polari"
+changelog="https://gitlab.gnome.org/GNOME/polari/-/raw/main/NEWS"
distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
checksum=a3b05f81660370c67c942b6f44b298c7b78816feb38c926ec2212bde22ea40eb
From 82fd432bad31cbb38a86967a977d8aa51ca77e29 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 16 Mar 2022 23:35:12 +0100
Subject: [PATCH 59/66] shotwell: fix for meson 0.61
---
srcpkgs/shotwell/patches/meson-0.61.patch | 27 +++++++++++++++++++++++
srcpkgs/shotwell/template | 1 +
2 files changed, 28 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 <eschwartz@archlinux.org>
+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
+
diff --git a/srcpkgs/shotwell/template b/srcpkgs/shotwell/template
index b0c1878e31bb..386644d4939e 100644
--- a/srcpkgs/shotwell/template
+++ b/srcpkgs/shotwell/template
@@ -14,6 +14,7 @@ short_desc="Open source photo manager for GNOME"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="LGPL-2.1-or-later, CC-BY-SA-3.0"
homepage="https://wiki.gnome.org/Apps/Shotwell"
+changelog="https://gitlab.gnome.org/GNOME/shotwell/-/raw/master/NEWS"
distfiles="${GNOME_SITE}/shotwell/${version%.*}/shotwell-${version}.tar.xz"
checksum=8de36f20488f4fb7d090194c8af46cd3661bcc81a3d65f980cb17667ed826af2
lib32disabled=yes
From 799f3f286a1ccf80b6fb3d7b1910618dad7b3a14 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 16 Mar 2022 23:36:48 +0100
Subject: [PATCH 60/66] simple-scan: fix for meson 0.61
---
srcpkgs/simple-scan/patches/meson-0.61.patch | 37 ++++++++++++++++++++
1 file changed, 37 insertions(+)
create mode 100644 srcpkgs/simple-scan/patches/meson-0.61.patch
diff --git a/srcpkgs/simple-scan/patches/meson-0.61.patch b/srcpkgs/simple-scan/patches/meson-0.61.patch
new file mode 100644
index 000000000000..e193747322c0
--- /dev/null
+++ b/srcpkgs/simple-scan/patches/meson-0.61.patch
@@ -0,0 +1,37 @@
+From da6626debe00be1a0660f30cf2bf7629186c01d5 Mon Sep 17 00:00:00 2001
+From: r-value <i@rvalue.moe>
+Date: Tue, 16 Nov 2021 02:43:11 +0800
+Subject: [PATCH] Remove incorrect i18n.merge_file argument
+
+The positional argument was being silently ignored until meson 0.60.0 where
+it fails with "ERROR: Function does not take positional arguments".
+---
+ data/meson.build | 6 ++----
+ 1 file changed, 2 insertions(+), 4 deletions(-)
+
+diff --git a/data/meson.build b/data/meson.build
+index 2b5a0ee3..cf6e4ae1 100644
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -8,16 +8,14 @@ install_data ('org.gnome.SimpleScan.gschema.xml',
+ install_dir: join_paths (datadir, 'glib-2.0', 'schemas'))
+ meson.add_install_script ('meson_compile_gschema.py')
+
+-i18n.merge_file ('desktop-file',
+- input: 'simple-scan.desktop.in',
++i18n.merge_file (input: 'simple-scan.desktop.in',
+ output: 'simple-scan.desktop',
+ install: true,
+ install_dir: join_paths (datadir, 'applications'),
+ po_dir: '../po',
+ type: 'desktop')
+
+-i18n.merge_file ('appdata-file',
+- input: 'simple-scan.appdata.xml.in',
++i18n.merge_file (input: 'simple-scan.appdata.xml.in',
+ output: 'simple-scan.appdata.xml',
+ install: true,
+ install_dir: join_paths (datadir, 'metainfo'),
+--
+GitLab
+
From 7317e0295e07a154a85394212f550fcb17047b6f Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 16 Mar 2022 23:39:25 +0100
Subject: [PATCH 61/66] sound-juicer: fix for meson 0.61
---
srcpkgs/sound-juicer/patches/meson-0.61.patch | 35 +++++++++++++++++++
1 file changed, 35 insertions(+)
create mode 100644 srcpkgs/sound-juicer/patches/meson-0.61.patch
diff --git a/srcpkgs/sound-juicer/patches/meson-0.61.patch b/srcpkgs/sound-juicer/patches/meson-0.61.patch
new file mode 100644
index 000000000000..662b7d631f61
--- /dev/null
+++ b/srcpkgs/sound-juicer/patches/meson-0.61.patch
@@ -0,0 +1,35 @@
+From 9f97ca1faca396099f52264a9729aa355f8d122e Mon Sep 17 00:00:00 2001
+From: Jan Beich <jbeich@FreeBSD.org>
+Date: Tue, 25 Jan 2022 12:15:31 +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.
+
+data/meson.build:2:0: ERROR: Function does not take positional arguments.
+data/meson.build:31:0: 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 ccff2d80..4dac8166 100644
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -1,6 +1,5 @@
+ # Desktop file
+ i18n.merge_file(
+- 'desktop',
+ input: configure_file(
+ input: 'org.gnome.SoundJuicer.desktop.in.in',
+ output: 'org.gnome.SoundJuicer.desktop.in',
+@@ -29,7 +28,6 @@ configure_file(
+
+ # Metainfo
+ metainfo_file = i18n.merge_file(
+- 'metainfo',
+ input: files(join_paths('metainfo', 'org.gnome.SoundJuicer.metainfo.xml.in')),
+ output: 'org.gnome.SoundJuicer.metainfo.xml',
+ po_dir: po_dir,
+--
+GitLab
+
From 6fb661d73e153f2a6f6c191734623128f20c7ce8 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 16 Mar 2022 23:40:28 +0100
Subject: [PATCH 62/66] switchboard: fix for meson 0.61
---
srcpkgs/switchboard/patches/meson-0.61.patch | 30 ++++++++++++++++++++
1 file changed, 30 insertions(+)
create mode 100644 srcpkgs/switchboard/patches/meson-0.61.patch
diff --git a/srcpkgs/switchboard/patches/meson-0.61.patch b/srcpkgs/switchboard/patches/meson-0.61.patch
new file mode 100644
index 000000000000..cf29004ec332
--- /dev/null
+++ b/srcpkgs/switchboard/patches/meson-0.61.patch
@@ -0,0 +1,30 @@
+From ecf2a6c42122946cc84150f6927ef69c1f67c909 Mon Sep 17 00:00:00 2001
+From: Xeonacid <h.dwwwwww@gmail.com>
+Date: Sat, 8 Jan 2022 01:58:44 +0800
+Subject: [PATCH] Meson: remove positional arguments from i18n.merge_file
+ (#226)
+
+---
+ data/meson.build | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/data/meson.build b/data/meson.build
+index c456813..109554d 100644
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -1,5 +1,5 @@
+ po_extra_dir = join_paths(meson.source_root(), 'po', 'extra')
+-i18n.merge_file('desktop',
++i18n.merge_file(
+ input: 'io.elementary.switchboard.desktop.in',
+ output: 'io.elementary.switchboard.desktop',
+ install: true,
+@@ -8,7 +8,7 @@ i18n.merge_file('desktop',
+ type: 'desktop'
+ )
+
+-i18n.merge_file('appdata',
++i18n.merge_file(
+ input: 'io.elementary.switchboard.appdata.xml.in',
+ output: 'io.elementary.switchboard.appdata.xml',
+ install: true,
From 3aa45ee73794a332572834614b50ecc60d754a22 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 17 Mar 2022 00:05:03 +0100
Subject: [PATCH 63/66] tau: fix for meson 0.61
---
srcpkgs/tau/patches/meson-0.61.patch | 17 +++++++++++++++++
1 file changed, 17 insertions(+)
create mode 100644 srcpkgs/tau/patches/meson-0.61.patch
diff --git a/srcpkgs/tau/patches/meson-0.61.patch b/srcpkgs/tau/patches/meson-0.61.patch
new file mode 100644
index 000000000000..d7ec3e3365bb
--- /dev/null
+++ b/srcpkgs/tau/patches/meson-0.61.patch
@@ -0,0 +1,17 @@
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -1,4 +1,4 @@
+-desktop_file = i18n.merge_file ('desktop-file',
++desktop_file = i18n.merge_file (
+ type: 'desktop',
+ input: configure_file(
+ input: files('org.gnome.Tau.desktop.in.in'),
+@@ -22,7 +22,7 @@ if desktop_file_validate.found()
+ )
+ endif
+
+-appdata_file = i18n.merge_file ('appdata-file',
++appdata_file = i18n.merge_file (
+ input: configure_file(
+ input: files('org.gnome.Tau.appdata.xml.in.in'),
+ output: 'org.gnome.Tau.appdata.xml.in',
From 373449a57b0d12c4e39651d630d70d746a8ce5bf Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 26 Mar 2022 14:28:48 +0100
Subject: [PATCH 64/66] tilix: fix for meson 0.61
---
srcpkgs/tilix/patches/meson-0.61.patch | 33 ++++++++++++++++++++++++++
1 file changed, 33 insertions(+)
create mode 100644 srcpkgs/tilix/patches/meson-0.61.patch
diff --git a/srcpkgs/tilix/patches/meson-0.61.patch b/srcpkgs/tilix/patches/meson-0.61.patch
new file mode 100644
index 000000000000..c35c8d08ad05
--- /dev/null
+++ b/srcpkgs/tilix/patches/meson-0.61.patch
@@ -0,0 +1,33 @@
+From 7cb2c59a31891f6463d1b181f1ec461c9352d782 Mon Sep 17 00:00:00 2001
+From: Jan Beich <jbeich@FreeBSD.org>
+Date: Tue, 22 Feb 2022 12:06:23 +0000
+Subject: [PATCH] meson: drop unused argument for i18n.merge_file() (#2081)
+
+Ignored in Meson < 0.60.0, deprecated since 0.60.1 and fatal since 0.61.0.
+
+data/meson.build:13:0: ERROR: Function does not take positional arguments.
+data/meson.build:46:0: 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 81e9b410..c8b23e1b 100644
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -11,7 +11,6 @@ install_data(
+
+ # Install the desktop file
+ desktop_file = i18n.merge_file(
+- '@0@.desktop'.format(project_id),
+ output: '@BASENAME@',
+ input: 'pkg/desktop/@0@.desktop.in'.format(project_id),
+ po_dir: meson.source_root() / 'po',
+@@ -44,7 +43,6 @@ metainfo_with_releases = custom_target('metainfo-news-merge',
+
+ # Install the MetaInfo file
+ metainfo_file = i18n.merge_file(
+- tilix_metainfo_name,
+ output: tilix_metainfo_name,
+ input: metainfo_with_releases,
+ po_dir: meson.source_root() / 'po',
From c59fa41e6edafd1359455dc7f3658b84f985648b Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 17 Mar 2022 00:09:00 +0100
Subject: [PATCH 65/66] 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 <hadess@hadess.net>
+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 007315d74538ed43012a61380052055ef6dfbd21 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 17 Mar 2022 00:14:03 +0100
Subject: [PATCH 66/66] virt-viewer: fix for meson 0.61
---
srcpkgs/virt-viewer/patches/meson-0.61.patch | 26 ++++++++++++++++++++
1 file changed, 26 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..0b900e1f2128
--- /dev/null
+++ b/srcpkgs/virt-viewer/patches/meson-0.61.patch
@@ -0,0 +1,26 @@
+--- 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,
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PR PATCH] [Merged]: meson 0.61
2022-01-25 9:13 [PR PATCH] meson 0.61 paper42
` (3 preceding siblings ...)
2022-03-26 13:41 ` paper42
@ 2022-03-26 14:51 ` paper42
4 siblings, 0 replies; 6+ messages in thread
From: paper42 @ 2022-03-26 14:51 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1089 bytes --]
There's a merged pull request on the void-packages repository
meson 0.61
https://github.com/void-linux/void-packages/pull/35226
Description:
WIP, many packages still need to be fixed
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration)
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2022-03-26 14:51 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-01-25 9:13 [PR PATCH] meson 0.61 paper42
2022-03-15 21:28 ` [PR PATCH] [Updated] " paper42
2022-03-16 23:16 ` paper42
2022-03-26 0:54 ` paper42
2022-03-26 13:41 ` paper42
2022-03-26 14:51 ` [PR PATCH] [Merged]: " paper42
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).