commit 8b34501f4339bde7518167493bce1d68ad47ff13
Author: Marcin Krol <h...@tld-linux.org>
Date: Sun Jul 16 22:36:00 2023 +0200
- switched to Python 3.x
python3.9.patch | 27 +++++++
python3.patch | 212 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
qt5-qtwebkit.spec | 8 ++-
3 files changed, 245 insertions(+), 2 deletions(-)
---
diff --git a/qt5-qtwebkit.spec b/qt5-qtwebkit.spec
index 062c0b7..3f062e5 100644
--- a/qt5-qtwebkit.spec
+++ b/qt5-qtwebkit.spec
@@ -45,6 +45,8 @@ Patch1: %{name}-docs.patch
Patch2: glib2.68.patch
Patch3: %{name}-gstreamer.patch
Patch4: gcc13.patch
+Patch5: python3.patch
+Patch6: python3.9.patch
# from FC
Patch102: qtwebkit-5.212.0_cmake_cmp0071.patch
Patch108: x32.patch
@@ -68,7 +70,7 @@ BuildRequires: glib2-devel >= 1:2.36
BuildRequires: gperf >= 3.0.1
BuildRequires: gstreamer-devel >= 1.0.3
BuildRequires: gstreamer-gl-devel >= 1.6.0
-BuildRequires: gstreamer-plugins-bad-devel >= 1.4.0
+#BuildRequires: gstreamer-plugins-bad-devel >= 1.4.0
BuildRequires: gstreamer-plugins-base-devel >= 1.0.3
BuildRequires: hyphen-devel
BuildRequires: libicu-devel
@@ -80,7 +82,7 @@ BuildRequires: libxml2-devel >= 1:2.8.0
BuildRequires: libxslt-devel >= 1.1.7
BuildRequires: perl-base >= 1:5.10.0
BuildRequires: pkgconfig
-BuildRequires: python >= 1:2.7.0
+BuildRequires: python3 >= 1:3.2
BuildRequires: ruby >= 1:1.9
%if %{with doc}
BuildRequires: qt5-assistant >= %{qttools_ver}
@@ -197,6 +199,8 @@ Dokumentacja do bibliotek Qt5 WebKit w formacie QCH.
%patch2 -p1
%patch3 -p1
%patch4 -p1
+%patch5 -p1
+%patch6 -p1
%patch102 -p1
%patch108 -p1
diff --git a/python3.9.patch b/python3.9.patch
new file mode 100644
index 0000000..bad26ef
--- /dev/null
+++ b/python3.9.patch
@@ -0,0 +1,27 @@
+From 78360c01c796b6260bf828bc9c8a0ef73c5132fd Mon Sep 17 00:00:00 2001
+From: Konstantin Tokarev <annu...@yandex.ru>
+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 c5dab429c7b0f..af3431275ecf9 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/python3.patch b/python3.patch
new file mode 100644
index 0000000..db7aeb2
--- /dev/null
+++ b/python3.patch
@@ -0,0 +1,212 @@
+diff -ur qtwebkit-5.212.0-alpha4.orig/Source/cmake/WebKitCommon.cmake
qtwebkit-5.212.0-alpha4/Source/cmake/WebKitCommon.cmake
+--- qtwebkit-5.212.0-alpha4.orig/Source/cmake/WebKitCommon.cmake
2020-03-04 18:16:37.000000000 +0100
++++ qtwebkit-5.212.0-alpha4/Source/cmake/WebKitCommon.cmake 2023-07-16
16:19:42.736634911 +0200
+@@ -24,8 +24,7 @@
+ # TODO Enforce version requirement for perl
+ find_package(Perl 5.10.0 REQUIRED)
+
+- set(Python_ADDITIONAL_VERSIONS 3)
+- find_package(PythonInterp 2.7.0 REQUIRED)
++ find_package(Python3 3.2 REQUIRED)
+
+ # We cannot check for RUBY_FOUND because it is set only when the full
package is installed and
+ # the only thing we need is the interpreter. Unlike Python, cmake does
not provide a macro
+diff -ur qtwebkit-5.212.0-alpha4.orig/Source/cmake/WebKitMacros.cmake
qtwebkit-5.212.0-alpha4/Source/cmake/WebKitMacros.cmake
+--- qtwebkit-5.212.0-alpha4.orig/Source/cmake/WebKitMacros.cmake
2020-03-04 18:16:37.000000000 +0100
++++ qtwebkit-5.212.0-alpha4/Source/cmake/WebKitMacros.cmake 2023-07-16
16:20:46.885546011 +0200
+@@ -368,8 +368,8 @@
+ ${WEBKIT2_DIR}/Scripts/webkit/messages.py
+ ${WEBKIT2_DIR}/Scripts/webkit/model.py
+ ${WEBKIT2_DIR}/Scripts/webkit/parser.py
+- COMMAND ${PYTHON_EXECUTABLE}
${WEBKIT2_DIR}/Scripts/generate-message-receiver.py ${_file} >
${DERIVED_SOURCES_WEBKIT2_DIR}/${_name}MessageReceiver.cpp
+- COMMAND ${PYTHON_EXECUTABLE}
${WEBKIT2_DIR}/Scripts/generate-messages-header.py ${_file} >
${DERIVED_SOURCES_WEBKIT2_DIR}/${_name}Messages.h
++ COMMAND ${Python3_EXECUTABLE}
${WEBKIT2_DIR}/Scripts/generate-message-receiver.py ${_file} >
${DERIVED_SOURCES_WEBKIT2_DIR}/${_name}MessageReceiver.cpp
++ COMMAND ${Python3_EXECUTABLE}
${WEBKIT2_DIR}/Scripts/generate-messages-header.py ${_file} >
${DERIVED_SOURCES_WEBKIT2_DIR}/${_name}Messages.h
+ WORKING_DIRECTORY ${WEBKIT2_DIR}
+ VERBATIM)
+
+@@ -385,7 +385,7 @@
+ add_custom_command(
+ OUTPUT ${_output_h} ${_output_cpp}
+ DEPENDS ${JavaScriptCore_SCRIPTS_DIR}/make-js-file-arrays.py
${${_scripts}}
+- COMMAND ${PYTHON_EXECUTABLE}
${JavaScriptCore_SCRIPTS_DIR}/make-js-file-arrays.py -n ${_namespace}
${_output_h} ${_output_cpp} ${${_scripts}}
++ COMMAND ${Python3_EXECUTABLE}
${JavaScriptCore_SCRIPTS_DIR}/make-js-file-arrays.py -n ${_namespace}
${_output_h} ${_output_cpp} ${${_scripts}}
+ VERBATIM)
+ ADD_SOURCE_DEPENDENCIES(${${_scripts_dependencies}} ${_output_h}
${_output_cpp})
+ endmacro()
+diff -ur qtwebkit-5.212.0-alpha4.orig/Source/JavaScriptCore/CMakeLists.txt
qtwebkit-5.212.0-alpha4/Source/JavaScriptCore/CMakeLists.txt
+--- qtwebkit-5.212.0-alpha4.orig/Source/JavaScriptCore/CMakeLists.txt
2020-03-04 18:16:37.000000000 +0100
++++ qtwebkit-5.212.0-alpha4/Source/JavaScriptCore/CMakeLists.txt
2023-07-16 16:20:38.781430913 +0200
+@@ -915,7 +915,7 @@
+ OUTPUT ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/udis86_itab.c
${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/udis86_itab.h
+ DEPENDS ${UDIS_GEN_DEP}
+ WORKING_DIRECTORY ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}
+- COMMAND ${PYTHON_EXECUTABLE}
${JAVASCRIPTCORE_DIR}/disassembler/udis86/ud_itab.py
${JAVASCRIPTCORE_DIR}/disassembler/udis86/optable.xml
${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}
++ COMMAND ${Python3_EXECUTABLE}
${JAVASCRIPTCORE_DIR}/disassembler/udis86/ud_itab.py
${JAVASCRIPTCORE_DIR}/disassembler/udis86/optable.xml
${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}
+ VERBATIM)
+
+ list(APPEND JavaScriptCore_HEADERS
+@@ -953,7 +953,7 @@
+ OUTPUT ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/Bytecodes.h
${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/InitBytecodes.asm
+ MAIN_DEPENDENCY ${JAVASCRIPTCORE_DIR}/generate-bytecode-files
+ DEPENDS ${JAVASCRIPTCORE_DIR}/generate-bytecode-files
bytecode/BytecodeList.json
+- COMMAND ${PYTHON_EXECUTABLE}
${JAVASCRIPTCORE_DIR}/generate-bytecode-files --bytecodes_h
${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/Bytecodes.h --init_bytecodes_asm
${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/InitBytecodes.asm
${JAVASCRIPTCORE_DIR}/bytecode/BytecodeList.json
++ COMMAND ${Python3_EXECUTABLE}
${JAVASCRIPTCORE_DIR}/generate-bytecode-files --bytecodes_h
${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/Bytecodes.h --init_bytecodes_asm
${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/InitBytecodes.asm
${JAVASCRIPTCORE_DIR}/bytecode/BytecodeList.json
+ VERBATIM)
+
+ add_custom_command(
+@@ -1074,7 +1074,7 @@
+ add_custom_command(
+ OUTPUT ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/RegExpJitTables.h
+ MAIN_DEPENDENCY ${CMAKE_CURRENT_SOURCE_DIR}/create_regex_tables
+- COMMAND ${PYTHON_EXECUTABLE}
${CMAKE_CURRENT_SOURCE_DIR}/create_regex_tables >
${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/RegExpJitTables.h
++ COMMAND ${Python3_EXECUTABLE}
${CMAKE_CURRENT_SOURCE_DIR}/create_regex_tables >
${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/RegExpJitTables.h
+ VERBATIM)
+ ADD_SOURCE_DEPENDENCIES(${CMAKE_CURRENT_SOURCE_DIR}/yarr/YarrPattern.cpp
${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/RegExpJitTables.h)
+
+@@ -1084,7 +1084,7 @@
+ OUTPUT ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/KeywordLookup.h
+ MAIN_DEPENDENCY ${CMAKE_CURRENT_SOURCE_DIR}/KeywordLookupGenerator.py
+ DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/parser/Keywords.table
+- COMMAND ${PYTHON_EXECUTABLE}
${CMAKE_CURRENT_SOURCE_DIR}/KeywordLookupGenerator.py
${CMAKE_CURRENT_SOURCE_DIR}/parser/Keywords.table >
${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/KeywordLookup.h
++ COMMAND ${Python3_EXECUTABLE}
${CMAKE_CURRENT_SOURCE_DIR}/KeywordLookupGenerator.py
${CMAKE_CURRENT_SOURCE_DIR}/parser/Keywords.table >
${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/KeywordLookup.h
+ VERBATIM)
+ ADD_SOURCE_DEPENDENCIES(${CMAKE_CURRENT_SOURCE_DIR}/parser/Lexer.cpp
${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/KeywordLookup.h)
+
+@@ -1153,7 +1153,7 @@
+ OUTPUT ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/CombinedDomains.json
+ MAIN_DEPENDENCY
${JavaScriptCore_SCRIPTS_DIR}/generate-combined-inspector-json.py
+ DEPENDS ${JavaScriptCore_INSPECTOR_DOMAINS}
+- COMMAND ${PYTHON_EXECUTABLE}
${JavaScriptCore_SCRIPTS_DIR}/generate-combined-inspector-json.py
${JavaScriptCore_INSPECTOR_DOMAINS} >
${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/CombinedDomains.json
++ COMMAND ${Python3_EXECUTABLE}
${JavaScriptCore_SCRIPTS_DIR}/generate-combined-inspector-json.py
${JavaScriptCore_INSPECTOR_DOMAINS} >
${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/CombinedDomains.json
+ VERBATIM)
+
+ # Inspector Backend Dispatchers, Frontend Dispatchers, Type Builders
+@@ -1169,7 +1169,7 @@
+
${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/inspector/InspectorBackendCommands.js
+ MAIN_DEPENDENCY ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/CombinedDomains.json
+ DEPENDS ${JavaScriptCore_INSPECTOR_PROTOCOL_SCRIPTS}
+- COMMAND ${PYTHON_EXECUTABLE}
${JavaScriptCore_INSPECTOR_SCRIPTS_DIR}/generate-inspector-protocol-bindings.py
--outputDir "${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/inspector" --framework
JavaScriptCore ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/CombinedDomains.json
++ COMMAND ${Python3_EXECUTABLE}
${JavaScriptCore_INSPECTOR_SCRIPTS_DIR}/generate-inspector-protocol-bindings.py
--outputDir "${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/inspector" --framework
JavaScriptCore ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/CombinedDomains.json
+ VERBATIM)
+
+ # JSCBuiltins
+@@ -1231,7 +1231,7 @@
+ OUTPUT ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/JSCBuiltins.cpp
${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/JSCBuiltins.h
+ MAIN_DEPENDENCY ${JavaScriptCore_SCRIPTS_DIR}/generate-js-builtins.py
+ DEPENDS ${JavaScriptCore_BUILTINS_SOURCES} ${BUILTINS_GENERATOR_SCRIPTS}
+- COMMAND ${PYTHON_EXECUTABLE}
${JavaScriptCore_SCRIPTS_DIR}/generate-js-builtins.py --framework
JavaScriptCore --output-directory ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}
--combined ${JavaScriptCore_BUILTINS_SOURCES}
++ COMMAND ${Python3_EXECUTABLE}
${JavaScriptCore_SCRIPTS_DIR}/generate-js-builtins.py --framework
JavaScriptCore --output-directory ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}
--combined ${JavaScriptCore_BUILTINS_SOURCES}
+ VERBATIM)
+
+ list(APPEND JavaScriptCore_SOURCES
+@@ -1253,7 +1253,7 @@
+ MAIN_DEPENDENCY ${JAVASCRIPTCORE_DIR}/inspector/InjectedScriptSource.js
+ DEPENDS ${JavaScriptCore_SCRIPTS_DIR}/xxd.pl
${JavaScriptCore_SCRIPTS_DIR}/jsmin.py
+ COMMAND ${CMAKE_COMMAND} -E echo "//#
sourceURL=__WebInspectorInjectedScript__" >
${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/InjectedScriptSource.min.js
+- COMMAND ${PYTHON_EXECUTABLE} ${JavaScriptCore_SCRIPTS_DIR}/jsmin.py <
${JAVASCRIPTCORE_DIR}/inspector/InjectedScriptSource.js >>
${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/InjectedScriptSource.min.js
++ COMMAND ${Python3_EXECUTABLE} ${JavaScriptCore_SCRIPTS_DIR}/jsmin.py <
${JAVASCRIPTCORE_DIR}/inspector/InjectedScriptSource.js >>
${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/InjectedScriptSource.min.js
+ COMMAND ${PERL_EXECUTABLE} ${JavaScriptCore_SCRIPTS_DIR}/xxd.pl
InjectedScriptSource_js
${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/InjectedScriptSource.min.js
${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/InjectedScriptSource.h
+ VERBATIM)
+
+@@ -1266,7 +1266,7 @@
+ OUTPUT ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/JSReplayInputs.h
${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/JSReplayInputs.cpp
+ MAIN_DEPENDENCY
${CMAKE_CURRENT_SOURCE_DIR}/replay/scripts/CodeGeneratorReplayInputs.py
+ DEPENDS ${JavaScript_WEB_REPLAY_INPUTS}
+- COMMAND ${PYTHON_EXECUTABLE}
${CMAKE_CURRENT_SOURCE_DIR}/replay/scripts/CodeGeneratorReplayInputs.py
--outputDir ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/ --framework JavaScriptCore
${JavaScript_WEB_REPLAY_INPUTS}
++ COMMAND ${Python3_EXECUTABLE}
${CMAKE_CURRENT_SOURCE_DIR}/replay/scripts/CodeGeneratorReplayInputs.py
--outputDir ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/ --framework JavaScriptCore
${JavaScript_WEB_REPLAY_INPUTS}
+ VERBATIM)
+
+ list(APPEND JavaScriptCore_SOURCES
+diff -ur qtwebkit-5.212.0-alpha4.orig/Source/WebCore/CMakeLists.txt
qtwebkit-5.212.0-alpha4/Source/WebCore/CMakeLists.txt
+--- qtwebkit-5.212.0-alpha4.orig/Source/WebCore/CMakeLists.txt 2020-03-04
18:16:37.000000000 +0100
++++ qtwebkit-5.212.0-alpha4/Source/WebCore/CMakeLists.txt 2023-07-16
16:21:16.212962549 +0200
+@@ -3313,7 +3313,7 @@
+ OUTPUT ${DERIVED_SOURCES_WEBCORE_DIR}/WebReplayInputs.h
${DERIVED_SOURCES_WEBCORE_DIR}/WebReplayInputs.cpp
+ MAIN_DEPENDENCY
${JAVASCRIPTCORE_DIR}/replay/scripts/CodeGeneratorReplayInputs.py
+ DEPENDS ${WebCore_WEB_REPLAY_INPUTS}
+- COMMAND ${PYTHON_EXECUTABLE}
${JAVASCRIPTCORE_DIR}/replay/scripts/CodeGeneratorReplayInputs.py --outputDir
${DERIVED_SOURCES_WEBCORE_DIR}/ --framework WebCore ${WebCore_WEB_REPLAY_INPUTS}
++ COMMAND ${Python3_EXECUTABLE}
${JAVASCRIPTCORE_DIR}/replay/scripts/CodeGeneratorReplayInputs.py --outputDir
${DERIVED_SOURCES_WEBCORE_DIR}/ --framework WebCore ${WebCore_WEB_REPLAY_INPUTS}
+ VERBATIM)
+
+ list(APPEND WebCore_SOURCES
+@@ -3436,7 +3436,7 @@
+ MAIN_DEPENDENCY inspector/InspectorOverlayPage.html
+ DEPENDS ${JavaScriptCore_SCRIPTS_DIR}/xxd.pl
${JavaScriptCore_SCRIPTS_DIR}/inline-and-minify-stylesheets-and-scripts.py
+ DEPENDS inspector/InspectorOverlayPage.css
inspector/InspectorOverlayPage.js
+- COMMAND ${PYTHON_EXECUTABLE}
${JavaScriptCore_SCRIPTS_DIR}/inline-and-minify-stylesheets-and-scripts.py
${WEBCORE_DIR}/inspector/InspectorOverlayPage.html
${DERIVED_SOURCES_WEBCORE_DIR}/InspectorOverlayPage.combined.html
++ COMMAND ${Python3_EXECUTABLE}
${JavaScriptCore_SCRIPTS_DIR}/inline-and-minify-stylesheets-and-scripts.py
${WEBCORE_DIR}/inspector/InspectorOverlayPage.html
${DERIVED_SOURCES_WEBCORE_DIR}/InspectorOverlayPage.combined.html
+ COMMAND ${PERL_EXECUTABLE} ${JavaScriptCore_SCRIPTS_DIR}/xxd.pl
InspectorOverlayPage_html
${DERIVED_SOURCES_WEBCORE_DIR}/InspectorOverlayPage.combined.html
${DERIVED_SOURCES_WEBCORE_DIR}/InspectorOverlayPage.h
+ VERBATIM)
+ list(APPEND WebCore_SOURCES
${DERIVED_SOURCES_WEBCORE_DIR}/InspectorOverlayPage.h)
+@@ -3448,7 +3448,7 @@
+ MAIN_DEPENDENCY inspector/CommandLineAPIModuleSource.js
+ DEPENDS ${JavaScriptCore_SCRIPTS_DIR}/xxd.pl
${JavaScriptCore_SCRIPTS_DIR}/jsmin.py
+ COMMAND ${CMAKE_COMMAND} -E echo "//#
sourceURL=__WebInspectorCommandLineAPIModuleSource__" >
${DERIVED_SOURCES_WEBCORE_DIR}/CommandLineAPIModuleSource.min.js
+- COMMAND ${PYTHON_EXECUTABLE} ${JavaScriptCore_SCRIPTS_DIR}/jsmin.py <
${WEBCORE_DIR}/inspector/CommandLineAPIModuleSource.js >>
${DERIVED_SOURCES_WEBCORE_DIR}/CommandLineAPIModuleSource.min.js
++ COMMAND ${Python3_EXECUTABLE} ${JavaScriptCore_SCRIPTS_DIR}/jsmin.py <
${WEBCORE_DIR}/inspector/CommandLineAPIModuleSource.js >>
${DERIVED_SOURCES_WEBCORE_DIR}/CommandLineAPIModuleSource.min.js
+ COMMAND ${PERL_EXECUTABLE} ${JavaScriptCore_SCRIPTS_DIR}/xxd.pl
CommandLineAPIModuleSource_js
${DERIVED_SOURCES_WEBCORE_DIR}/CommandLineAPIModuleSource.min.js
${DERIVED_SOURCES_WEBCORE_DIR}/CommandLineAPIModuleSource.h
+ VERBATIM)
+ list(APPEND WebCore_SOURCES
${DERIVED_SOURCES_WEBCORE_DIR}/CommandLineAPIModuleSource.h)
+@@ -3463,7 +3463,7 @@
+ OUTPUT ${DERIVED_SOURCES_WEBCORE_DIR}/XMLViewerCSS.h
${DERIVED_SOURCES_WEBCORE_DIR}/XMLViewer.min.css
+ MAIN_DEPENDENCY xml/XMLViewer.css
+ DEPENDS ${JavaScriptCore_SCRIPTS_DIR}/xxd.pl
${JavaScriptCore_SCRIPTS_DIR}/cssmin.py
+- COMMAND ${PYTHON_EXECUTABLE} ${JavaScriptCore_SCRIPTS_DIR}/cssmin.py <
${WEBCORE_DIR}/xml/XMLViewer.css >
${DERIVED_SOURCES_WEBCORE_DIR}/XMLViewer.min.css
++ COMMAND ${Python3_EXECUTABLE} ${JavaScriptCore_SCRIPTS_DIR}/cssmin.py <
${WEBCORE_DIR}/xml/XMLViewer.css >
${DERIVED_SOURCES_WEBCORE_DIR}/XMLViewer.min.css
+ COMMAND ${PERL_EXECUTABLE} ${JavaScriptCore_SCRIPTS_DIR}/xxd.pl
XMLViewer_css ${DERIVED_SOURCES_WEBCORE_DIR}/XMLViewer.min.css
${DERIVED_SOURCES_WEBCORE_DIR}/XMLViewerCSS.h
+ VERBATIM)
+ list(APPEND WebCore_SOURCES ${DERIVED_SOURCES_WEBCORE_DIR}/XMLViewerCSS.h)
+@@ -3474,7 +3474,7 @@
+ OUTPUT ${DERIVED_SOURCES_WEBCORE_DIR}/XMLViewerJS.h
${DERIVED_SOURCES_WEBCORE_DIR}/XMLViewer.min.js
+ MAIN_DEPENDENCY xml/XMLViewer.js
+ DEPENDS ${JavaScriptCore_SCRIPTS_DIR}/xxd.pl
${JavaScriptCore_SCRIPTS_DIR}/jsmin.py
+- COMMAND ${PYTHON_EXECUTABLE} ${JavaScriptCore_SCRIPTS_DIR}/jsmin.py <
${WEBCORE_DIR}/xml/XMLViewer.js >
${DERIVED_SOURCES_WEBCORE_DIR}/XMLViewer.min.js
++ COMMAND ${Python3_EXECUTABLE} ${JavaScriptCore_SCRIPTS_DIR}/jsmin.py <
${WEBCORE_DIR}/xml/XMLViewer.js >
${DERIVED_SOURCES_WEBCORE_DIR}/XMLViewer.min.js
+ COMMAND ${PERL_EXECUTABLE} ${JavaScriptCore_SCRIPTS_DIR}/xxd.pl
XMLViewer_js ${DERIVED_SOURCES_WEBCORE_DIR}/XMLViewer.min.js
${DERIVED_SOURCES_WEBCORE_DIR}/XMLViewerJS.h
+ VERBATIM)
+ list(APPEND WebCore_SOURCES ${DERIVED_SOURCES_WEBCORE_DIR}/XMLViewerJS.h)
+@@ -3485,7 +3485,7 @@
+ OUTPUT ${DERIVED_SOURCES_WEBCORE_DIR}/HTMLEntityTable.cpp
+ MAIN_DEPENDENCY ${WEBCORE_DIR}/html/parser/HTMLEntityNames.in
+ DEPENDS ${WEBCORE_DIR}/html/parser/create-html-entity-table
+- COMMAND ${PYTHON_EXECUTABLE}
${WEBCORE_DIR}/html/parser/create-html-entity-table -o
${DERIVED_SOURCES_WEBCORE_DIR}/HTMLEntityTable.cpp
${WEBCORE_DIR}/html/parser/HTMLEntityNames.in
++ COMMAND ${Python3_EXECUTABLE}
${WEBCORE_DIR}/html/parser/create-html-entity-table -o
${DERIVED_SOURCES_WEBCORE_DIR}/HTMLEntityTable.cpp
${WEBCORE_DIR}/html/parser/HTMLEntityNames.in
+ VERBATIM)
+ list(APPEND WebCore_SOURCES
${DERIVED_SOURCES_WEBCORE_DIR}/HTMLEntityTable.cpp)
+
+@@ -3495,7 +3495,7 @@
+ MAIN_DEPENDENCY ${WEBCORE_DIR}/platform/network/HTTPHeaderNames.in
+ DEPENDS ${WEBCORE_DIR}/platform/network/create-http-header-name-table
+ WORKING_DIRECTORY ${DERIVED_SOURCES_WEBCORE_DIR}
+- COMMAND ${PYTHON_EXECUTABLE}
${WEBCORE_DIR}/platform/network/create-http-header-name-table
${WEBCORE_DIR}/platform/network/HTTPHeaderNames.in "${GPERF_EXECUTABLE}"
++ COMMAND ${Python3_EXECUTABLE}
${WEBCORE_DIR}/platform/network/create-http-header-name-table
${WEBCORE_DIR}/platform/network/HTTPHeaderNames.in "${GPERF_EXECUTABLE}"
+ VERBATIM)
+ list(APPEND WebCore_SOURCES
${DERIVED_SOURCES_WEBCORE_DIR}/HTTPHeaderNames.cpp)
+
+@@ -3534,14 +3534,14 @@
+ OUTPUT
${DERIVED_SOURCES_WEBCORE_DIR}/SelectorPseudoClassAndCompatibilityElementMap.gperf
${DERIVED_SOURCES_WEBCORE_DIR}/SelectorPseudoClassAndCompatibilityElementMap.cpp
+ MAIN_DEPENDENCY
${WEBCORE_DIR}/css/makeSelectorPseudoClassAndCompatibilityElementMap.py
+ WORKING_DIRECTORY ${DERIVED_SOURCES_WEBCORE_DIR}
+- COMMAND ${PYTHON_EXECUTABLE}
${WEBCORE_DIR}/css/makeSelectorPseudoClassAndCompatibilityElementMap.py
${WEBCORE_DIR}/css/SelectorPseudoClassAndCompatibilityElementMap.in
"${GPERF_EXECUTABLE}" "${FEATURE_DEFINES_WITH_SPACE_SEPARATOR}"
++ COMMAND ${Python3_EXECUTABLE}
${WEBCORE_DIR}/css/makeSelectorPseudoClassAndCompatibilityElementMap.py
${WEBCORE_DIR}/css/SelectorPseudoClassAndCompatibilityElementMap.in
"${GPERF_EXECUTABLE}" "${FEATURE_DEFINES_WITH_SPACE_SEPARATOR}"
+ VERBATIM)
+ list(APPEND WebCore_SOURCES
${DERIVED_SOURCES_WEBCORE_DIR}/SelectorPseudoClassAndCompatibilityElementMap.cpp)
+ add_custom_command(
+ OUTPUT ${DERIVED_SOURCES_WEBCORE_DIR}/SelectorPseudoElementTypeMap.gperf
${DERIVED_SOURCES_WEBCORE_DIR}/SelectorPseudoElementTypeMap.cpp
+ MAIN_DEPENDENCY ${WEBCORE_DIR}/css/makeSelectorPseudoElementsMap.py
+ WORKING_DIRECTORY ${DERIVED_SOURCES_WEBCORE_DIR}
+- COMMAND ${PYTHON_EXECUTABLE}
${WEBCORE_DIR}/css/makeSelectorPseudoElementsMap.py
${WEBCORE_DIR}/css/SelectorPseudoElementTypeMap.in "${GPERF_EXECUTABLE}"
"${FEATURE_DEFINES_WITH_SPACE_SEPARATOR}"
++ COMMAND ${Python3_EXECUTABLE}
${WEBCORE_DIR}/css/makeSelectorPseudoElementsMap.py
${WEBCORE_DIR}/css/SelectorPseudoElementTypeMap.in "${GPERF_EXECUTABLE}"
"${FEATURE_DEFINES_WITH_SPACE_SEPARATOR}"
+ VERBATIM)
+ list(APPEND WebCore_SOURCES
${DERIVED_SOURCES_WEBCORE_DIR}/SelectorPseudoElementTypeMap.cpp)
+
+@@ -3690,7 +3690,7 @@
+ ${DERIVED_SOURCES_WEBCORE_DIR}/${_objectName}Builtins.h
+ MAIN_DEPENDENCY ${_builtinSource}
+ DEPENDS ${BUILTINS_GENERATOR_SCRIPTS}
+- COMMAND ${PYTHON_EXECUTABLE}
${JavaScriptCore_SCRIPTS_DIR}/generate-js-builtins.py --framework WebCore
--output-directory ${DERIVED_SOURCES_WEBCORE_DIR} ${_builtinSource}
++ COMMAND ${Python3_EXECUTABLE}
${JavaScriptCore_SCRIPTS_DIR}/generate-js-builtins.py --framework WebCore
--output-directory ${DERIVED_SOURCES_WEBCORE_DIR} ${_builtinSource}
+ VERBATIM)
+ list(APPEND WebCore_SOURCES
+ ${DERIVED_SOURCES_WEBCORE_DIR}/${_objectName}Builtins.h
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/qt5-qtwebkit.git/commitdiff/8b34501f4339bde7518167493bce1d68ad47ff13
_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
