summaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5/qtwebkit/0008-Fix-compilation-with-Python-3.9-avoid-passing-encodi.patch
diff options
context:
space:
mode:
Diffstat (limited to 'recipes-qt/qt5/qtwebkit/0008-Fix-compilation-with-Python-3.9-avoid-passing-encodi.patch')
-rw-r--r--recipes-qt/qt5/qtwebkit/0008-Fix-compilation-with-Python-3.9-avoid-passing-encodi.patch32
1 files changed, 32 insertions, 0 deletions
diff --git a/recipes-qt/qt5/qtwebkit/0008-Fix-compilation-with-Python-3.9-avoid-passing-encodi.patch b/recipes-qt/qt5/qtwebkit/0008-Fix-compilation-with-Python-3.9-avoid-passing-encodi.patch
new file mode 100644
index 00000000..4eef3451
--- /dev/null
+++ b/recipes-qt/qt5/qtwebkit/0008-Fix-compilation-with-Python-3.9-avoid-passing-encodi.patch
@@ -0,0 +1,32 @@
1From df9f6a8c9d59996b52bfdc5ea6f780de517905e5 Mon Sep 17 00:00:00 2001
2From: Konstantin Tokarev <annulen@yandex.ru>
3Date: Wed, 3 Jun 2020 15:01:42 +0300
4Subject: [PATCH] Fix compilation with Python 3.9: avoid passing encoding to
5 json.load()
6
7In Python 2.7 UTF-8 is assumed by default, while in Python 3 this argument
8is not supported.
9
10Upstream-Status: Backport [https://github.com/qtwebkit/qtwebkit/commit/78360c01c796b6260bf828bc9c8a0ef73c5132fd]
11Change-Id: Ic459d60a6b20bc1838d8771bc36ac41614fe61a9
12Signed-off-by: Khem Raj <raj.khem@gmail.com>
13---
14 Source/JavaScriptCore/generate-bytecode-files | 2 +-
15 1 file changed, 1 insertion(+), 1 deletion(-)
16
17diff --git a/Source/JavaScriptCore/generate-bytecode-files b/Source/JavaScriptCore/generate-bytecode-files
18index c5dab429c..af3431275 100644
19--- a/Source/JavaScriptCore/generate-bytecode-files
20+++ b/Source/JavaScriptCore/generate-bytecode-files
21@@ -163,7 +163,7 @@ if __name__ == "__main__":
22 initBytecodesFile = openOrExit(initASMFileName, "w")
23
24 try:
25- bytecodeSections = json.load(bytecodeFile, encoding = "utf-8")
26+ bytecodeSections = json.load(bytecodeFile)
27 except:
28 print("Unexpected error parsing {0}: {1}".format(bytecodeJSONFile, sys.exc_info()))
29
30--
312.29.2
32