Re: [PR PATCH] [Updated] meson 0.61

[paper42 <paper42@users.noreply.github.com>]

[-- 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