[neon/qt/qt5webkit/Neon/testing] debian: Backport upstream patch to fix build with Python 3.9.

Dmitry Shachnev null at kde.org
Tue May 18 13:35:02 BST 2021


Git commit 7b84c4af07fba052d864476391af2a02f18a5754 by Dmitry Shachnev.
Committed on 23/11/2020 at 16:59.
Pushed by sitter into branch 'Neon/testing'.

Backport upstream patch to fix build with Python 3.9.

M  +2    -0    debian/changelog
A  +15   -0    debian/patches/python_3.9.diff
M  +1    -0    debian/patches/series

https://invent.kde.org/neon/qt/qt5webkit/commit/7b84c4af07fba052d864476391af2a02f18a5754

diff --git a/debian/changelog b/debian/changelog
index bff8c49..8327e92 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,7 @@
 qtwebkit-opensource-src (5.212.0~alpha4-9) UNRELEASED; urgency=medium
 
+  [ Dmitry Shachnev ]
+  * Backport upstream patch to fix build with Python 3.9.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Mon, 23 Nov 2020 19:59:01 +0300
 
diff --git a/debian/patches/python_3.9.diff b/debian/patches/python_3.9.diff
new file mode 100644
index 0000000..7081e97
--- /dev/null
+++ b/debian/patches/python_3.9.diff
@@ -0,0 +1,15 @@
+Description: fix compilation with Python 3.9: avoid passing encoding to json.load()
+Origin: upstream, https://github.com/qtwebkit/qtwebkit/commit/78360c01c796b626
+Last-Update: 2020-11-23
+
+--- 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/debian/patches/series b/debian/patches/series
index 63e4553..0326844 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@ path_max.diff
 support_riscv64.diff
 bison_3.7.diff
 no_pdf_image_plugin.diff
+python_3.9.diff



More information about the Neon-commits mailing list