File phantomjs-2.1.1-qt5-webkit-python3.patch of Package phantomjs
--- a/src/qt/qtwebkit/Source/JavaScriptCore/disassembler/udis86/ud_opcode.py
+++ b/src/qt/qtwebkit/Source/JavaScriptCore/disassembler/udis86/ud_opcode.py
@@ -115,9 +115,9 @@
'/mod' : lambda v: '00' if v == '!11' else '01',
# Mode extensions:
# (16, 32, 64) => (00, 01, 02)
- '/o' : lambda v: "%02x" % (int(v) / 32),
- '/a' : lambda v: "%02x" % (int(v) / 32),
- '/m' : lambda v: "%02x" % (int(v) / 32),
+ '/o' : lambda v: "%02x" % (int(v) // 32),
+ '/a' : lambda v: "%02x" % (int(v) // 32),
+ '/m' : lambda v: "%02x" % (int(v) // 32),
'/sse' : lambda v: UdOpcodeTables.OpcExtIndex['sse'][v]
}
--- a/src/qt/qtwebkit/Source/JavaScriptCore/DerivedSources.pri
+++ b/src/qt/qtwebkit/Source/JavaScriptCore/DerivedSources.pri
@@ -83,14 +83,14 @@
retgen.output = RegExpJitTables.h
retgen.script = $$PWD/create_regex_tables
retgen.input = retgen.script
-retgen.commands = python $$retgen.script > ${QMAKE_FILE_OUT}
+retgen.commands = python3 $$retgen.script > ${QMAKE_FILE_OUT}
GENERATORS += retgen
#GENERATOR: "KeywordLookup.h": decision tree used by the lexer
klgen.output = KeywordLookup.h
klgen.script = $$PWD/KeywordLookupGenerator.py
klgen.input = KEYWORDLUT_FILES
-klgen.commands = python $$klgen.script ${QMAKE_FILE_NAME} > ${QMAKE_FILE_OUT}
+klgen.commands = python3 $$klgen.script ${QMAKE_FILE_NAME} > ${QMAKE_FILE_OUT}
GENERATORS += klgen
EXTRACTOR_BINARY = LLIntOffsetsExtractor$$BIN_EXTENSION
@@ -114,7 +114,7 @@
disassembler.input = DISASSEMBLER_FILES
disassembler.script = $$PWD/disassembler/udis86/itab.py
disassembler.depends = $$DISASSEMBLER_DEPENDENCY
- disassembler.commands = python $$disassembler.script ${QMAKE_FILE_NAME} --outputDir ${QMAKE_FUNC_FILE_OUT_PATH}
+ disassembler.commands = python3 $$disassembler.script ${QMAKE_FILE_NAME} --outputDir ${QMAKE_FUNC_FILE_OUT_PATH}
disassembler.CONFIG += no_link
GENERATORS += disassembler
}
--- a/src/qt/qtwebkit/Source/WebCore/DerivedSources.pri
+++ b/src/qt/qtwebkit/Source/WebCore/DerivedSources.pri
@@ -822,7 +822,7 @@
inspectorValidate.output = InspectorProtocolVersion.h
inspectorValidate.input = INSPECTOR_JSON
inspectorValidate.script = $$PWD/inspector/generate-inspector-protocol-version
-inspectorValidate.commands = python $$inspectorValidate.script -o ${QMAKE_FILE_OUT} ${QMAKE_FILE_IN}
+inspectorValidate.commands = python3 $$inspectorValidate.script -o ${QMAKE_FILE_OUT} ${QMAKE_FILE_IN}
inspectorValidate.depends = $$PWD/inspector/generate-inspector-protocol-version
inspectorValidate.add_output_to_sources = false
GENERATORS += inspectorValidate
@@ -830,7 +830,7 @@
inspectorJSON.output = InspectorFrontend.cpp InspectorBackendDispatcher.cpp InspectorTypeBuilder.cpp
inspectorJSON.input = INSPECTOR_JSON
inspectorJSON.script = $$PWD/inspector/CodeGeneratorInspector.py
-inspectorJSON.commands = python $$inspectorJSON.script $$PWD/inspector/Inspector.json --output_h_dir ${QMAKE_FUNC_FILE_OUT_PATH} --output_cpp_dir ${QMAKE_FUNC_FILE_OUT_PATH}
+inspectorJSON.commands = python3 $$inspectorJSON.script $$PWD/inspector/Inspector.json --output_h_dir ${QMAKE_FUNC_FILE_OUT_PATH} --output_cpp_dir ${QMAKE_FUNC_FILE_OUT_PATH}
inspectorJSON.depends = $$inspectorJSON.script
GENERATORS += inspectorJSON
@@ -930,7 +930,7 @@
entities.output = HTMLEntityTable.cpp
entities.input = HTML_ENTITIES
entities.script = $$PWD/html/parser/create-html-entity-table
-entities.commands = python $$entities.script -o ${QMAKE_FILE_OUT} $$HTML_ENTITIES
+entities.commands = python3 $$entities.script -o ${QMAKE_FILE_OUT} $$HTML_ENTITIES
entities.clean = ${QMAKE_FILE_OUT}
entities.depends = $$PWD/html/parser/create-html-entity-table
GENERATORS += entities
--- a/src/qt/qtwebkit/Tools/qmake/mkspecs/features/configure.prf
+++ b/src/qt/qtwebkit/Tools/qmake/mkspecs/features/configure.prf
@@ -128,7 +128,7 @@
}
winrt: addReasonForSkippingBuild("QtWebKit is not supported on Windows Phone/Windows RT")
- requiredPrograms = gperf python perl bison ruby flex
+ requiredPrograms = gperf python3 perl bison ruby flex
for(program, requiredPrograms): \
!programExistsInPath($$program): \
addReasonForSkippingBuild("Missing $$program from PATH")
--- a/src/qt/qtwebkit/Tools/qmake/mkspecs/features/default_pre.prf
+++ b/src/qt/qtwebkit/Tools/qmake/mkspecs/features/default_pre.prf
@@ -59,8 +59,8 @@
win32-msvc*: MAKEFILE_NOOP_COMMAND = @echo >NUL
# Set up a default python version
-scratchbox: PYTHON = python2.6
-else: PYTHON = python
+scratchbox: PYTHON = python3.7
+else: PYTHON = python3
# We use private_tests to detect developer build, since the destdir will
# always be our webkit build dir. This might change as configure changes.