gentoo resync : 02.02.2022

3 files changed, 106 insertions, 1 deletions

diff --git a/app-dicts/gnome-dictionary/Manifest b/app-dicts/gnome-dictionary/Manifest
index 157b856ecb28..251b0605b025 100644
--- a/app-dicts/gnome-dictionary/Manifest
+++ b/app-dicts/gnome-dictionary/Manifest
@@ -1,4 +1,5 @@
+AUX gnome-dictionary-40.0-meson-0.61.patch 3469 BLAKE2B ad1290e8727ce222746dca3c72c42d53dfe276ebbf54c39f0efea847da6768103f5176ed1f4715418058cbb650426ab55412d1e275551230fc440cc3414fdc21 SHA512 31e5232edd1f00468dc870037a831a99092de956c9faa65c4513fad2c6c470fd948d812d309b4bcced93e0bbab3d1ae72c142afa49dfd075c8f2db299f1fcb48
 DIST gnome-dictionary-40.0.tar.xz 603388 BLAKE2B 1fae73ea5b554786f1ee1bf641b0dc94ee8953a045e4a59b72823075b8c0905d0098827ad35f94e26d26fcbdbed1fd2980391ce582871ae6df4d273d9de5add4 SHA512 96e8c5efbba43e1a7d247703ac17cbcb8579cc633f6db74b6fe4431e0b1aed47ab76fd15cc114497b5ee76fb33b57fd9936cc869ffe905f208c836b5a231b126
-EBUILD gnome-dictionary-40.0-r1.ebuild 1140 BLAKE2B 7b285602a73c7b290ab25b991911e4372a65fb84e1c90ecac5d3af628b0b90034a50992b9750fd785db1707f4c5aa8adb40d53fa4e88bf4545ce79549e352a5e SHA512 551d09f658e75bb7c89345ccf1c18cc4b63bed486558ffe76aa3f959a24fd3447d10ae6a0e998bf74ec62ae4576fe6e304841ac22d7409a5a3d8a4c3389f6c2c
+EBUILD gnome-dictionary-40.0-r1.ebuild 1190 BLAKE2B d9905b04962869481c0179d5e01132adccefaa853fa3bd77dde2af93e9087e6d98ff4fc25329b28c07a58fac4b4892a5c79ec8664a8b95e997209e23c8158cdd SHA512 83099b29a529b3ed1011826f205e90075b6dfd0cdc07574847d802382efaaad7af7ec548d5a7372d087f6a10b478331b2a54bcf9ef65d7083d5b14e4198728fa
 EBUILD gnome-dictionary-40.0.ebuild 985 BLAKE2B b027d9bbadabd18a6e7943fd1ea3c92c76d03ad608e361eefa27a3652bf8bb5943fda18033b38163bec37cdf73ca3496262ce8f8c9c56772407bb2c343800e0c SHA512 2d30869962ad3be0d26fb7d221ccdb68e373c38610a0c3297de1c8402665ce33ac60563da8eb688483e4cb5aeea230c21466b0a5013641118851c7a2c50d572f
 MISC metadata.xml 317 BLAKE2B 0f99dd59faa31be1761a21290c1d34ed89467c22582727cb88030c0dba83bc7ee9d390f655ab7a63a0b5cb25e8efa2f17b90fbd08c093fece6d4d873018ea201 SHA512 28137d259d69aae3d9ea5161100a0063718bf43c3447ad5d42e75c4ab212288b07f5cbc281e44d648817c2fe7bc05af0a2428a9f9d5f495b2ecefa66f16bda34
diff --git a/app-dicts/gnome-dictionary/files/gnome-dictionary-40.0-meson-0.61.patch b/app-dicts/gnome-dictionary/files/gnome-dictionary-40.0-meson-0.61.patch
new file mode 100644
index 000000000000..f14b4cbe2949
--- /dev/null
+++ b/app-dicts/gnome-dictionary/files/gnome-dictionary-40.0-meson-0.61.patch
@@ -0,0 +1,100 @@
+https://gitlab.gnome.org/GNOME/gnome-dictionary/-/commit/87c026cfe4acbcfc62d15950f88a71d8d9678c7e.patch
+https://gitlab.gnome.org/GNOME/gnome-dictionary/-/merge_requests/18.patch
+https://bugs.gentoo.org/831555
+
+From 87c026cfe4acbcfc62d15950f88a71d8d9678c7e Mon Sep 17 00:00:00 2001
+From: Emmanuele Bassi <ebassi@gnome.org>
+Date: Thu, 22 Apr 2021 15:11:59 +0100
+Subject: [PATCH] build: Fix test dependencies with Meson 0.57
+
+We need to explicitly depend on the generated files.
+---
+ data/appdata/meson.build | 3 ++-
+ data/meson.build         | 3 ++-
+ 2 files changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/data/appdata/meson.build b/data/appdata/meson.build
+index 1dc4ed7..ef95c85 100644
+--- 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',
++appdata_file = i18n.merge_file('appdata',
+   input: configure_file(
+     input: 'org.gnome.Dictionary.appdata.xml.in.in',
+     output: 'org.gnome.Dictionary.appdata.xml.in',
+@@ -18,6 +18,7 @@ if appstream_util.found()
+     appstream_util,
+     args: [ 'validate', '--nonet', application_id + '.appdata.xml' ],
+     workdir: meson.current_build_dir(),
++    depends: appdata_file,
+   )
+ endif
+ 
+diff --git a/data/meson.build b/data/meson.build
+index 660e6b8..1723c8f 100644
+--- 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',
++desktop_file = i18n.merge_file('desktop',
+   input: configure_file(
+     input: 'org.gnome.Dictionary.desktop.in.in',
+     output: 'org.gnome.Dictionary.desktop.in',
+@@ -22,6 +22,7 @@ if desktop_file_validate.found()
+     desktop_file_validate,
+     args: application_id + '.desktop',
+     workdir: meson.current_build_dir(),
++    depends: desktop_file,
+   )
+ endif
+ 
+-- 
+GitLab
+
+From cf3f8a67cd6f3059c555ed9cf0f5fba10abb7f68 Mon Sep 17 00:00:00 2001
+From: Jan Beich <jbeich@FreeBSD.org>
+Date: Mon, 24 Jan 2022 11:13:54 +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:3:5: ERROR: Function does not take positional arguments.
+data/meson.build:6:5: ERROR: Function does not take positional arguments.
+data/meson.build:49:5: ERROR: Function does not take positional arguments.
+--- 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)
+-appdata_file = i18n.merge_file('appdata',
++appdata_file = 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)
+-desktop_file = i18n.merge_file('desktop',
++desktop_file = i18n.merge_file(
+   input: configure_file(
+     input: 'org.gnome.Dictionary.desktop.in.in',
+     output: 'org.gnome.Dictionary.desktop.in',
+@@ -46,7 +46,7 @@ sources = [
+ ]
+ 
+ foreach s: sources
+-  i18n.merge_file('sources',
++  i18n.merge_file(
+     input: '@0@.in'.format(s),
+     output: s,
+     install: true,
+GitLab
diff --git a/app-dicts/gnome-dictionary/gnome-dictionary-40.0-r1.ebuild b/app-dicts/gnome-dictionary/gnome-dictionary-40.0-r1.ebuild
index 0a2c8fabe1fc..9ff55d568d54 100644
--- a/app-dicts/gnome-dictionary/gnome-dictionary-40.0-r1.ebuild
+++ b/app-dicts/gnome-dictionary/gnome-dictionary-40.0-r1.ebuild
@@ -29,6 +29,10 @@ BDEPEND="
 	virtual/pkgconfig
 "
 
+PATCHES=(
+	"${FILESDIR}"/${P}-meson-0.61.patch
+)
+
 src_configure() {
 	# Replicate what a release buildtype would set, as we use -Dbuildtype=plain
 	append-cflags -DG_DISABLE_ASSERT -DG_DISABLE_CHECKS -DG_DISABLE_CAST_CHECKS