From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id DBED81382C5 for ; Tue, 6 Apr 2021 21:34:21 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 333D0E09B0; Tue, 6 Apr 2021 21:34:21 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 11727E09B0 for ; Tue, 6 Apr 2021 21:34:21 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 76CEF335D1E for ; Tue, 6 Apr 2021 21:34:12 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C3FE6633 for ; Tue, 6 Apr 2021 21:34:10 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1617744804.c57fa9aac2b976ed3302c7c54310ccde0e7673e6.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebkit/, dev-qt/qtwebkit/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-qt/qtwebkit/files/qtwebkit-5.212.0_pre20200309-python-3.9.patch dev-qt/qtwebkit/qtwebkit-5.212.0_pre20200309-r1.ebuild X-VCS-Directories: dev-qt/qtwebkit/files/ dev-qt/qtwebkit/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: c57fa9aac2b976ed3302c7c54310ccde0e7673e6 X-VCS-Branch: master Date: Tue, 6 Apr 2021 21:34:10 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: ef4ce9ef-a797-4ac6-8213-0d524e982824 X-Archives-Hash: 0e7be0366d7d787ce0c95a0f52287ea2 commit: c57fa9aac2b976ed3302c7c54310ccde0e7673e6 Author: Andreas Sturmlechner gentoo org> AuthorDate: Tue Apr 6 19:59:51 2021 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Tue Apr 6 21:33:24 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c57fa9aa dev-qt/qtwebkit: Fix build with python-3.9 Thanks-to: Francesco Riosa gmail.com> Closes: https://bugs.gentoo.org/766303 Package-Manager: Portage-3.0.18, Repoman-3.0.3 Signed-off-by: Andreas Sturmlechner gentoo.org> .../qtwebkit-5.212.0_pre20200309-python-3.9.patch | 27 ++++++++++++++++++++++ .../qtwebkit-5.212.0_pre20200309-r1.ebuild | 3 ++- 2 files changed, 29 insertions(+), 1 deletion(-) 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 00000000000..a3b677b779b --- /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 +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 d6744c8a405..62ebc6f09e8 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 @@ -86,6 +86,7 @@ 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 ) _check_reqs() {