CVS commit: pkgsrc/x11/qt5-qtwebkit

["Tobias Nygren" <tnn%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   tnn
Date:           Mon Oct 11 10:14:41 UTC 2021

Modified Files:
        pkgsrc/x11/qt5-qtwebkit: Makefile distinfo
Added Files:
        pkgsrc/x11/qt5-qtwebkit/patches:
            patch-Source_JavaScriptCore_generate-bytecode-files

Log Message:
qt5-qtwebkit: revert marking as incompat with python 3.9

This now makes pkgsrc pull in python 3.10 which breaks pkgsrc.
The dependency handling doesn't deal well with stepping forwards from
PYTHON_VERSION_DEFAULT it seems.

Anyway ... the issue with python 3.9 was fixed by upstream long ago.
Use their fix.


To generate a diff of this commit:
cvs rdiff -u -r1.90 -r1.91 pkgsrc/x11/qt5-qtwebkit/Makefile
cvs rdiff -u -r1.21 -r1.22 pkgsrc/x11/qt5-qtwebkit/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/x11/qt5-qtwebkit/patches/patch-Source_JavaScriptCore_generate-bytecode-files

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/x11/qt5-qtwebkit/Makefile
diff -u pkgsrc/x11/qt5-qtwebkit/Makefile:1.90 pkgsrc/x11/qt5-qtwebkit/Makefile:1.91
--- pkgsrc/x11/qt5-qtwebkit/Makefile:1.90       Sun Jun 13 06:53:00 2021
+++ pkgsrc/x11/qt5-qtwebkit/Makefile    Mon Oct 11 10:14:40 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.90 2021/06/13 06:53:00 nia Exp $
+# $NetBSD: Makefile,v 1.91 2021/10/11 10:14:40 tnn Exp $
 
 QTWKVERSION=   5.212.0-alpha4
 DISTNAME=      qtwebkit-${QTWKVERSION}
@@ -107,8 +107,6 @@ post-install:
 .include "../../x11/qt5-qtlocation/buildlink3.mk"
 .include "../../x11/qt5-qtsensors/buildlink3.mk"
 .include "../../x11/qt5-qtwebchannel/buildlink3.mk"
-# Source/JavaScriptCore/bytecode/BytecodeList.json unexpected keyword 'encoding'
-PYTHON_VERSIONS_INCOMPATIBLE=  39
 PYTHON_FOR_BUILD_ONLY= tool
 .include "../../lang/python/tool.mk"
 .include "../../lang/ruby/buildlink3.mk"

Index: pkgsrc/x11/qt5-qtwebkit/distinfo
diff -u pkgsrc/x11/qt5-qtwebkit/distinfo:1.21 pkgsrc/x11/qt5-qtwebkit/distinfo:1.22
--- pkgsrc/x11/qt5-qtwebkit/distinfo:1.21       Thu Oct  7 15:14:09 2021
+++ pkgsrc/x11/qt5-qtwebkit/distinfo    Mon Oct 11 10:14:40 2021
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.21 2021/10/07 15:14:09 nia Exp $
+$NetBSD: distinfo,v 1.22 2021/10/11 10:14:40 tnn Exp $
 
 RMD160 (qtwebkit-5.212.0-alpha4.tar.xz) = af000947daa429945d80e3c23e5cfd0eb13793be
 SHA512 (qtwebkit-5.212.0-alpha4.tar.xz) = 33f11270bd030599beff9c1983a6c5ff2d61f407cc8a6825f7f405d46f9184c720fc7f60c7359f08f828db96a2170092875066a0d5c0a21ff09bc48a2603fbf6
@@ -9,6 +9,7 @@ SHA1 (patch-Source_JavaScriptCore_assemb
 SHA1 (patch-Source_JavaScriptCore_assembler_ARMAssembler.h) = 7bbb0a59a0c087abaaddda08fc31aa24809acb70
 SHA1 (patch-Source_JavaScriptCore_assembler_MacroAssemblerARM.cpp) = 79b54cb1d03d976a0629fbd8ee9ac1881951ba10
 SHA1 (patch-Source_JavaScriptCore_dfg_DFGNode.h) = a3eba122c7226a80dacf1b762747fe0a7408b849
+SHA1 (patch-Source_JavaScriptCore_generate-bytecode-files) = b58ca94781fcf7b9f6a3eba715af2784e7a0acc0
 SHA1 (patch-Source_JavaScriptCore_heap_MachineStackMarker.cpp) = 35f2ba0cc3fe0d76c28a3a244621291a17a5334a
 SHA1 (patch-Source_JavaScriptCore_jit_ThunkGenerators.cpp) = f0ca56e4b4060c0a8d756289d7c25d1ead6b07be
 SHA1 (patch-Source_JavaScriptCore_tools_CodeProfiling.cpp) = 94c139413eecb875bba98c7749bba24cfcc16632

Added files:

Index: pkgsrc/x11/qt5-qtwebkit/patches/patch-Source_JavaScriptCore_generate-bytecode-files
diff -u /dev/null pkgsrc/x11/qt5-qtwebkit/patches/patch-Source_JavaScriptCore_generate-bytecode-files:1.1
--- /dev/null   Mon Oct 11 10:14:41 2021
+++ pkgsrc/x11/qt5-qtwebkit/patches/patch-Source_JavaScriptCore_generate-bytecode-files Mon Oct 11 10:14:40 2021
@@ -0,0 +1,17 @@
+$NetBSD: patch-Source_JavaScriptCore_generate-bytecode-files,v 1.1 2021/10/11 10:14:40 tnn Exp $
+
+python 3.9 breakage:
+https://github.com/qtwebkit/qtwebkit/issues/993
+https://github.com/qtwebkit/qtwebkit/commit/78360c01c796b6260bf828bc9c8a0ef73c5132fd
+
+--- Source/JavaScriptCore/generate-bytecode-files.orig 2020-03-04 17:16:37.000000000 +0000
++++ 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()))
+