[gnome-build-meta/abderrahim/webkit-python3: 4/4] sdk/WebKitGTK+: add a patch to build with python3
- From: Abderrahim Kitouni <akitouni src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-build-meta/abderrahim/webkit-python3: 4/4] sdk/WebKitGTK+: add a patch to build with python3
- Date: Fri, 1 Feb 2019 14:16:56 +0000 (UTC)
commit dab82883956c9635bb9e41d899f3fbe81f4c725e
Author: Abderrahim Kitouni <akitouni gnome org>
Date: Thu Jan 31 14:27:25 2019 +0100
sdk/WebKitGTK+: add a patch to build with python3
elements/sdk/WebKitGTK+.bst | 5 ++---
files/webkitgtk/python3.patch | 13 +++++++++++++
2 files changed, 15 insertions(+), 3 deletions(-)
---
diff --git a/elements/sdk/WebKitGTK+.bst b/elements/sdk/WebKitGTK+.bst
index 61ab494c..6792d33e 100644
--- a/elements/sdk/WebKitGTK+.bst
+++ b/elements/sdk/WebKitGTK+.bst
@@ -9,6 +9,8 @@ sources:
# * Remember to create a merge request rather than pushing directly :)
- kind: patch
path: files/webkitgtk/bug-193903.patch
+- kind: patch
+ path: files/webkitgtk/python3.patch
- kind: patch
path: files/webkitgtk/gtk-doc-introspection-cross-compiling.patch
- kind: local
@@ -40,9 +42,6 @@ depends:
- filename: base/gperf.bst
junction: freedesktop-sdk.bst
type: build
-- filename: base/python2.bst
- junction: freedesktop-sdk.bst
- type: build
- filename: base/ruby.bst
junction: freedesktop-sdk.bst
type: build
diff --git a/files/webkitgtk/python3.patch b/files/webkitgtk/python3.patch
new file mode 100644
index 00000000..8a965470
--- /dev/null
+++ b/files/webkitgtk/python3.patch
@@ -0,0 +1,13 @@
+diff -ur WebKit2/Source/WebKit/InspectorGResources.cmake WebKit/Source/WebKit/InspectorGResources.cmake
+--- WebKit2/Source/WebKit/InspectorGResources.cmake 2018-11-09 14:57:26.000000000 +0100
++++ WebKit/Source/WebKit/InspectorGResources.cmake 2019-01-31 12:20:35.106535676 +0100
+@@ -62,7 +62,7 @@
+ ${InspectorResourceScripts}
+ ${DERIVED_SOURCES_WEBINSPECTORUI_DIR}/UserInterface/Protocol/InspectorBackendCommands.js
+ COMMAND cp ${DERIVED_SOURCES_WEBINSPECTORUI_DIR}/UserInterface/Protocol/InspectorBackendCommands.js
${FORWARDING_HEADERS_DIR}/JavaScriptCore/Scripts
+- COMMAND ${CMAKE_COMMAND} -E env "DERIVED_SOURCES_DIR=${DERIVED_SOURCES_WEBINSPECTORUI_DIR}"
"SRCROOT=${CMAKE_SOURCE_DIR}/Source/WebInspectorUI"
"JAVASCRIPTCORE_PRIVATE_HEADERS_DIR=${FORWARDING_HEADERS_DIR}/JavaScriptCore/Scripts"
"TARGET_BUILD_DIR=${_derived_sources_dir}/InspectorResources"
"UNLOCALIZED_RESOURCES_FOLDER_PATH=WebInspectorUI"
"COMBINE_INSPECTOR_RESOURCES=${COMBINE_INSPECTOR_RESOURCES}"
"COMBINE_TEST_RESOURCES=${COMBINE_TEST_RESOURCES}"
${CMAKE_SOURCE_DIR}/Source/WebInspectorUI/Scripts/copy-user-interface-resources.pl
++ COMMAND ${CMAKE_COMMAND} -E env "DERIVED_SOURCES_DIR=${DERIVED_SOURCES_WEBINSPECTORUI_DIR}"
"SRCROOT=${CMAKE_SOURCE_DIR}/Source/WebInspectorUI"
"JAVASCRIPTCORE_PRIVATE_HEADERS_DIR=${FORWARDING_HEADERS_DIR}/JavaScriptCore/Scripts"
"TARGET_BUILD_DIR=${_derived_sources_dir}/InspectorResources"
"UNLOCALIZED_RESOURCES_FOLDER_PATH=WebInspectorUI"
"COMBINE_INSPECTOR_RESOURCES=${COMBINE_INSPECTOR_RESOURCES}"
"COMBINE_TEST_RESOURCES=${COMBINE_TEST_RESOURCES}" PYTHON=${PYTHON_EXECUTABLE}
${CMAKE_SOURCE_DIR}/Source/WebInspectorUI/Scripts/copy-user-interface-resources.pl
+ COMMAND mkdir -p ${_derived_sources_dir}/InspectorResources/WebInspectorUI/Localizations/en.lproj
+ COMMAND cp ${CMAKE_SOURCE_DIR}/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js
${_derived_sources_dir}/InspectorResources/WebInspectorUI/Localizations/en.lproj/localizedStrings.js
+ COMMAND touch ${CMAKE_BINARY_DIR}/inspector-resources.stamp
+
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]