gentoo resync : 02.02.2022

3 files changed, 63 insertions, 2 deletions

diff --git a/dev-util/glade/Manifest b/dev-util/glade/Manifest
index b961e7853138..f6f3fa1bfa77 100644
--- a/dev-util/glade/Manifest
+++ b/dev-util/glade/Manifest
@@ -1,4 +1,5 @@
 AUX glade-3.14.1-doc-version.patch 853 BLAKE2B b7cad3cc9d49cfe24189ba21bffaec2c524d3c7953d722b3b03d57ad68297fee6757330c1a2d90f36bcfe52d1d9ef4d95b81eeb19109bc8957f671ac40d31573 SHA512 cc9aec06f6acdfdf538de7043f9f753768e0e4c26fa9eef7e52b4e42aa6fd3836185c18ffd51abfc2aa3e6f5b2472e68914112230d2b8856e8a3c61e9d865ecf
+AUX glade-3.38.2-meson-0.61.patch 1334 BLAKE2B 009af5a6617b59519eec3c4033d63f898ca71621628ef519da6d0ea68bc16e588f74b04d972c405c554a3f7f608e1704a1dd314a030b890c8b52e46ac0b7d8af SHA512 3248d5faf635a15303e8249637608b840b699208f1caae2d21e612caf3826a15de71456764ef98b801eb97fe3fe19e71fd868528a502d5540df4bb7ae75dbf11
 DIST glade-3.38.2.tar.xz 2709224 BLAKE2B 2bcd447b90d6e67abc44dd273f0f5d7fc1d6848ef0bd878481f2c10e8846828e63fbf9c9c96e5effe8126b4aec7eb05886606ca1dc5fb94943bc5d1d8d0ef4e2 SHA512 2df8c8363206905663cd3ac9196da44445425a888b64f1b3b3ac6cd41e14c4a82a5d2c299730ef0606c3970a04dd8f245bb5639218794eb67dcbd26fae17565e
-EBUILD glade-3.38.2.ebuild 1895 BLAKE2B 6b6567a45fa1bc8298613fb029d448a5e40f85920e7648b443a934e772e764cfb933332cba206483782690cedc3ff14c8a100c9895ea5fbbb5d97eddbbdd85e3 SHA512 f3c050c504d111678095de0f001c65a8116c7ca187c67a0e2f09d497a3c80540ff38c9c01cdda7f128c38d5eebcfcf6c76e7167186e358a892da3b163c232058
+EBUILD glade-3.38.2.ebuild 1975 BLAKE2B a92853e65b8f7edb25e6f78ef31e3094158b12fbbfb45f2b9655d638452ad6b4e62c83bf9cb7268d89a3f8946d78f62e7b4301dbcb30fd2b4851374cc67ee882 SHA512 f06fba20805b3b61968d27acbd9777771d2662e13de009bd363e37ea53f2d819881d648edfcbaa6699c3d145c473c893f3cfae09eb54c78240e0e92f0eb01031
 MISC metadata.xml 443 BLAKE2B 26f4701b1aaa6e751e838240b2c5d5f45b76b5dc2a5321a2f58384f9afa25ddd0409722cbe8865fb160272968babdc9145cbeb9ff3602697a7aaec3c9d5e6db6 SHA512 6a334008fb56ba68d64a0f1c064032b9677d8891bb0af7d6f9a02ee5408dfccb2e917f64ece43bc2e9b3ea740a29f2bae12b7fa14c07b7c6dca388d2e9725af8
diff --git a/dev-util/glade/files/glade-3.38.2-meson-0.61.patch b/dev-util/glade/files/glade-3.38.2-meson-0.61.patch
new file mode 100644
index 000000000000..72f9c0e509ba
--- /dev/null
+++ b/dev-util/glade/files/glade-3.38.2-meson-0.61.patch
@@ -0,0 +1,57 @@
+From 61304b2e8bac8ded76643cb7c3e781f73881dd2b Mon Sep 17 00:00:00 2001
+From: Mike Gilbert <floppym@gentoo.org>
+Date: Thu, 20 Jan 2022 14:18:09 -0500
+Subject: [PATCH 1/2] meson: i18n.merge_file() does not take a positional
+ argument
+
+---
+ data/meson.build | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/data/meson.build b/data/meson.build
+index 9f244566..bfbc514c 100644
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -2,7 +2,6 @@ desktop_conf = configuration_data()
+ desktop_conf.set('VERSION', glade_version)
+ 
+ i18n.merge_file(
+-  'desktop',
+   type: 'desktop',
+   input: configure_file(
+     input: 'org.gnome.Glade.desktop.in.in',
+@@ -18,7 +17,6 @@ i18n.merge_file(
+ appdata = glade_name + '.appdata.xml'
+ 
+ i18n.merge_file(
+-  'appdata',
+   input: 'org.gnome.Glade.appdata.xml.in',
+   output: '@BASENAME@',
+   po_dir: po_dir,
+-- 
+GitLab
+
+
+From 04ba6f969f716fbfe3c7feb7e4bab8678cc1e9eb Mon Sep 17 00:00:00 2001
+From: Mike Gilbert <floppym@gentoo.org>
+Date: Thu, 20 Jan 2022 14:19:03 -0500
+Subject: [PATCH 2/2] Remove duplicate entry for 'da' from help/LINGUAS
+
+---
+ help/LINGUAS | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/help/LINGUAS b/help/LINGUAS
+index fc3cd4c3..d67e42c8 100644
+--- a/help/LINGUAS
++++ b/help/LINGUAS
+@@ -1,6 +1,5 @@
+ # please keep this list sorted alphabetically
+ #
+-da
+ bg
+ ca
+ cs
+-- 
+GitLab
+
diff --git a/dev-util/glade/glade-3.38.2.ebuild b/dev-util/glade/glade-3.38.2.ebuild
index b904db0e2b54..5844cf0a192c 100644
--- a/dev-util/glade/glade-3.38.2.ebuild
+++ b/dev-util/glade/glade-3.38.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -50,6 +50,9 @@ PATCHES=(
 	# To avoid file collison with other slots, rename help module.
 	# Prevent the UI from loading glade:3's gladeui devhelp documentation.
 	"${FILESDIR}"/${PN}-3.14.1-doc-version.patch
+
+	# https://bugs.gentoo.org/831453
+	"${FILESDIR}"/glade-3.38.2-meson-0.61.patch
 )
 
 pkg_setup() {