gentoo resync : 28.04.2021

4 files changed, 62 insertions, 3 deletions

diff --git a/dev-qt/qtwebkit/Manifest b/dev-qt/qtwebkit/Manifest
index d17ea458f5e7..e3491ab1a862 100644
--- a/dev-qt/qtwebkit/Manifest
+++ b/dev-qt/qtwebkit/Manifest
@@ -1,5 +1,7 @@
 AUX qtwebkit-5.212.0_pre20200309-bison-3.7.patch 1613 BLAKE2B 0d2d173b5575ed5e1c52a07c5ceb14210bfb0a91e50a064df1e293451d64708822eb54d65947413efb13711d4c0c8e01441869248a4461446bd2bc122f07746b SHA512 cf21eff51e1026f4e506724a512b9925d4619909f5924bf01055244817ec9594e9d3ce105b510cd28ecce4772d122d1393fb7273501e20e16749f43282a3200b
+AUX qtwebkit-5.212.0_pre20200309-glib-2.68.patch 887 BLAKE2B 1a191fd47693d70bc6ddbafcc8031bdd511c3be63121c1014471a93ebf3f1326a922277c42520a878192e0db4bb679cc007f27451ffac1aecdd86032b9d383c2 SHA512 7948ab8d40e954bfcafaceb69ea51991f45a684d8875d542bdf39af46266f5c312581662ea591a8199aa5e3583a6e3612e175f73a75b66ffd094e304aa7d67a9
 AUX qtwebkit-5.212.0_pre20200309-icu-68.patch 4981 BLAKE2B c031aa8ec816749fa35e3876d007a02d60a3a5ff0fc57a2774a13fc23559b39cc5bfeec6fedd96cb36d7eed5d1b388049d190673afbe5b0fd2f0343f8afd5344 SHA512 b1cf2a5c07e4876e74913687417ffd751e6dcb3fa783c545ba50064d31c9a4bb1515ce9c26b399f2b9b53b588791e4e6f571ad7cfe631087ecd3709bce675a9e
+AUX qtwebkit-5.212.0_pre20200309-python-3.9.patch 1100 BLAKE2B 2b44f8614a81141fd372d97cec2661b712e3cc68a01d5ed83d89c778eacc218a95a3273b7f464bbcd5380806859a40598cc166a8473fb30e76ca7e6b002b460f SHA512 9bcb07cfa61684d154f9b80b231c32423a8b80820445372634ef620c11a9267e98ae0318e143e6358f0668b10f90a44b163f0eeeee5476a0b5fbd31af5c4bf9a
 DIST qtwebkit-5.212.0-alpha4.tar.xz 12528508 BLAKE2B 72d7444f270f47b62044cf683ed306803660bfbafe1450440ea29e43e3c0e6e841b6e860dfa8affc1b32b7c539448f04e22a7ae38cce055d37905dfb3240aab0 SHA512 33f11270bd030599beff9c1983a6c5ff2d61f407cc8a6825f7f405d46f9184c720fc7f60c7359f08f828db96a2170092875066a0d5c0a21ff09bc48a2603fbf6
-EBUILD qtwebkit-5.212.0_pre20200309-r1.ebuild 3979 BLAKE2B 118627c78f8bb95e1b80bd003617290d29c7bab09ddf8c3dd91ab7f41997ba900c7fac833a2b05b5eaf392b1831390fdf5760a8105edc983fa4df8e799b0a3d1 SHA512 7dea49d3dbc4725c603963deeaf4936defc5fd7505baf68711897fd21dcf9cc7da0a848b8e5f3386d7eded1060afd554374ebb8b59b3ddefb619399cd0e7e5ff
+EBUILD qtwebkit-5.212.0_pre20200309-r1.ebuild 4080 BLAKE2B ea006e78af9e3bbe63f7581377aeb006977ab5a6e4b1d5ee1d0930d95f98c44b56c44861422b245ef3e83318a4f6e3088f28e4e0a383b53b23c5c5e18e4c264a SHA512 b1f3b4ca60b6f6cfdb81a6194c8669304b3a84c9f06a4a741103ed3ad72804a03516577d8d94e3aa888c4da67d29ffccf15c2c825702a3a8b4508be0d5b4803c
 MISC metadata.xml 1152 BLAKE2B 6291c4643d29dd68af56e6054c4db1ebb307fdf2097012182dc77a2754e51bca84c1f53ae7c9f6305ead35cc47334a9e0ca605871aac899ce06482d983c8406f SHA512 28146a11931ab5b106d7bfa08dd3cb38ed3ae1fec003ca27f3f3234887bc9d65a82c76e5ab50334e94de02c3b6455a228acec2574c551e218e53e2005becc6c6
diff --git a/dev-qt/qtwebkit/files/qtwebkit-5.212.0_pre20200309-glib-2.68.patch b/dev-qt/qtwebkit/files/qtwebkit-5.212.0_pre20200309-glib-2.68.patch
new file mode 100644
index 000000000000..f377a311362c
--- /dev/null
+++ b/dev-qt/qtwebkit/files/qtwebkit-5.212.0_pre20200309-glib-2.68.patch
@@ -0,0 +1,28 @@
+https://github.com/qtwebkit/qtwebkit/pull/1058
+
+From 5b698ba3faffd4e198a45be9fe74f53307395e4b Mon Sep 17 00:00:00 2001
+From: Fabian Vogt <fvogt@suse.de>
+Date: Wed, 7 Apr 2021 13:38:09 +0200
+Subject: [PATCH] Remove invalid g_object declarations to fix build with glib
+ >= 2.68
+
+g_object_ref_sink is defined as a macro meanwhile and so the build fails.
+Just remove the declarations, glib.h is included anyway.
+---
+ Source/WTF/wtf/glib/GRefPtr.h | 3 ---
+ 1 file changed, 3 deletions(-)
+
+diff --git a/Source/WTF/wtf/glib/GRefPtr.h b/Source/WTF/wtf/glib/GRefPtr.h
+index 06133d82cb35..d9a1d2f145f5 100644
+--- a/Source/WTF/wtf/glib/GRefPtr.h
++++ b/Source/WTF/wtf/glib/GRefPtr.h
+@@ -29,9 +29,6 @@
+ #include <algorithm>
+ #include <glib.h>
+ 
+-extern "C" void g_object_unref(gpointer);
+-extern "C" gpointer g_object_ref_sink(gpointer);
+-
+ namespace WTF {
+ 
+ enum GRefPtrAdoptType { GRefPtrAdopt };
diff --git a/dev-qt/qtwebkit/files/qtwebkit-5.212.0_pre20200309-python-3.9.patch b/dev-qt/qtwebkit/files/qtwebkit-5.212.0_pre20200309-python-3.9.patch
new file mode 100644
index 000000000000..a3b677b779b1
--- /dev/null
+++ b/dev-qt/qtwebkit/files/qtwebkit-5.212.0_pre20200309-python-3.9.patch
@@ -0,0 +1,27 @@
+From 78360c01c796b6260bf828bc9c8a0ef73c5132fd Mon Sep 17 00:00:00 2001
+From: Konstantin Tokarev <annulen@yandex.ru>
+Date: Wed, 3 Jun 2020 15:01:42 +0300
+Subject: [PATCH] Fix compilation with Python 3.9: avoid passing encoding to
+ json.load()
+
+In Python 2.7 UTF-8 is assumed by default, while in Python 3 this argument
+is not supported.
+
+Change-Id: Ic459d60a6b20bc1838d8771bc36ac41614fe61a9
+---
+ Source/JavaScriptCore/generate-bytecode-files | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Source/JavaScriptCore/generate-bytecode-files b/Source/JavaScriptCore/generate-bytecode-files
+index c5dab429c7b0..af3431275ecf 100644
+--- a/Source/JavaScriptCore/generate-bytecode-files
++++ b/Source/JavaScriptCore/generate-bytecode-files
+@@ -163,7 +163,7 @@ if __name__ == "__main__":
+         initBytecodesFile = openOrExit(initASMFileName, "w")
+ 
+     try:
+-        bytecodeSections = json.load(bytecodeFile, encoding = "utf-8")
++        bytecodeSections = json.load(bytecodeFile)
+     except:
+         print("Unexpected error parsing {0}: {1}".format(bytecodeJSONFile, sys.exc_info()))
+ 
diff --git a/dev-qt/qtwebkit/qtwebkit-5.212.0_pre20200309-r1.ebuild b/dev-qt/qtwebkit/qtwebkit-5.212.0_pre20200309-r1.ebuild
index d6744c8a4054..f2e91b79caf5 100644
--- a/dev-qt/qtwebkit/qtwebkit-5.212.0_pre20200309-r1.ebuild
+++ b/dev-qt/qtwebkit/qtwebkit-5.212.0_pre20200309-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ else
 	KEYWORDS="amd64 arm arm64 ppc64 x86"
 	S="${WORKDIR}/${MY_P}"
 fi
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7,8,9} )
 USE_RUBY="ruby25 ruby26 ruby27"
 inherit check-reqs cmake flag-o-matic python-any-r1 qmake-utils ruby-single toolchain-funcs
 
@@ -86,6 +86,8 @@ CHECKREQS_DISK_BUILD="16G" # bug 417307
 PATCHES=(
 	"${FILESDIR}/${P}-bison-3.7.patch" # bug 736499
 	"${FILESDIR}/${P}-icu-68.patch" # bug 753260
+	"${FILESDIR}/${P}-python-3.9.patch" # bug 766303
+	"${FILESDIR}/${P}-glib-2.68.patch" # bug 777759
 )
 
 _check_reqs() {