gentoo resync : 25.03.2022

3 files changed, 32 insertions, 2 deletions

diff --git a/app-editors/gnome-text-editor/Manifest b/app-editors/gnome-text-editor/Manifest
index f69b9645a97a..0cdd51afb406 100644
--- a/app-editors/gnome-text-editor/Manifest
+++ b/app-editors/gnome-text-editor/Manifest
@@ -1,3 +1,4 @@
-DIST gnome-text-editor-42.rc1.tar.xz 1093060 BLAKE2B 14bddc82e4dd410b357cff7274ed35c07b13da7648db5840eb2c8dae7c057935b9b6f5f249c8c04f3a8ed27543014de8f7fc38b98985cd481064752f28a0b623 SHA512 debebccceb4bbe2bfc87a1c1f0813b10fc0c565cc89c6b3a826daa0a3344c88b9f20135087335f61d7b736a8c8ada7e2f823795c1e6c8d3d03ac7325afd0a9ae
-EBUILD gnome-text-editor-42_rc1.ebuild 1035 BLAKE2B 8dfae66f2828821092940062df160dac39b838083b95bf386a1285f96c30185b748278bd7d78eab632b00112a7d34120172fbfaa13322009f70d38ee4e94c3f9 SHA512 23da6adfe47b5cb4aef50dbad287a746947f5bab606b8862984acc8b06390ec4b115d29167dcb25cc2e8e527c8111fe420629c44e6e3051aec42af1e134dfc8a
+AUX 42.0-appdata-fix-appstream-validation.patch 712 BLAKE2B d8d19718488343f41c0144a293ff094cb498a44beb57c487601891eb79338fbcaf2991f9fecd75ebe586dcd0fa504a9780e64c1e50afd0352b5c7fb9233b87ad SHA512 6c88ab7162e8e3ae1068da2b9eeb2ada66915edfd153d5911945c88eaee05124893ccc7a7b9447b62d4867d941bd1bc707453da350bfc4f76af7e379f442900c
+DIST gnome-text-editor-42.0.tar.xz 1126224 BLAKE2B 7e02cea493696630284d7994f1d227a5589ad7aa7d7b98e5f67655ebcd69f7e2ded1195368e666ad26621b6b32168c7defde1cd3c2e278ca8741bf572979154e SHA512 4462ef0e0113863e752ce2c4d499386cbf9d72c67126fb60512eea39bd53bed6d56b2a62511e9af62024f9704ba722411ebbd5040aabcefce0b460925b91ad1f
+EBUILD gnome-text-editor-42.0.ebuild 1108 BLAKE2B a27db557a0419cb0ce7797b14e6552f19c4aa98cdd4ade357e9e12d7c3e92b0a1470d20d0f2c1101abb1e3c61bcc24dd741f17fed3aac9a5a58d031b36da61ac SHA512 154f0fc1bd5fe9eb64388b458a6a60d7d97e3c90b9a8805a817cdd4e29d677ffb66fdb710946b74754604aa445b174aeecfe3ad2e800aa62f49095a17819ea24
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/app-editors/gnome-text-editor/files/42.0-appdata-fix-appstream-validation.patch b/app-editors/gnome-text-editor/files/42.0-appdata-fix-appstream-validation.patch
new file mode 100644
index 000000000000..d53b8d481ba3
--- /dev/null
+++ b/app-editors/gnome-text-editor/files/42.0-appdata-fix-appstream-validation.patch
@@ -0,0 +1,25 @@
+From 985c8dd411a27ad067fe9ac8951d644bad57324a Mon Sep 17 00:00:00 2001
+From: Christian Hergert <chergert@redhat.com>
+Date: Fri, 18 Mar 2022 22:35:37 -0700
+Subject: [PATCH] appdata: fix appstream validation
+
+Fixes #329
+---
+ data/org.gnome.TextEditor.appdata.xml.in.in | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/data/org.gnome.TextEditor.appdata.xml.in.in b/data/org.gnome.TextEditor.appdata.xml.in.in
+index f4e751f..3a39a8d 100644
+--- a/data/org.gnome.TextEditor.appdata.xml.in.in
++++ b/data/org.gnome.TextEditor.appdata.xml.in.in
+@@ -45,7 +45,6 @@
+ 
+   <releases>
+     <release version="42.0" date="2022-03-18"/>
+-    <release version="42.rc1" date="2022-03-07"/>
+   </releases>
+ 
+   <kudos>
+-- 
+2.34.1
+
diff --git a/app-editors/gnome-text-editor/gnome-text-editor-42_rc1.ebuild b/app-editors/gnome-text-editor/gnome-text-editor-42.0.ebuild
index 7f7de71f724e..c48b7bacaddd 100644
--- a/app-editors/gnome-text-editor/gnome-text-editor-42_rc1.ebuild
+++ b/app-editors/gnome-text-editor/gnome-text-editor-42.0.ebuild
@@ -38,6 +38,10 @@ BDEPEND="
 	virtual/pkgconfig
 "
 
+PATCHES=(
+	"${FILESDIR}"/${PV}-appdata-fix-appstream-validation.patch
+)
+
 src_configure() {
 	local emesonargs=(
 		$(meson_feature spell enchant)