Title: [280466] trunk
- Revision
- 280466
- Author
- clo...@igalia.com
- Date
- 2021-07-29 19:57:55 -0700 (Thu, 29 Jul 2021)
Log Message
[WPE][GTK] build broken with python2 after r280382
https://bugs.webkit.org/show_bug.cgi?id=228629
Reviewed by Philippe Normand.
Source/_javascript_Core:
Call {PYTHON_EXECUTABLE} instead of python3.
* PlatformGTK.cmake:
Source/WebKit:
Call {PYTHON_EXECUTABLE} instead of python3. Our build currently
supports both versions of python (2 and 3). If the user wants
to force a specific version it can do that via the CMake argument
-DPYTHON_EXECUTABLE=/path/to/python/interpreter
No new tests, is a build fix.
* PlatformGTK.cmake:
* PlatformWPE.cmake:
Tools:
Fix compatibility with python2.
* glib/apply-build-revision-to-files.py:
(main):
Modified Paths
Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (280465 => 280466)
--- trunk/Source/_javascript_Core/ChangeLog 2021-07-30 02:32:26 UTC (rev 280465)
+++ trunk/Source/_javascript_Core/ChangeLog 2021-07-30 02:57:55 UTC (rev 280466)
@@ -1,3 +1,14 @@
+2021-07-29 Carlos Alberto Lopez Perez <clo...@igalia.com>
+
+ [WPE][GTK] build broken with python2 after r280382
+ https://bugs.webkit.org/show_bug.cgi?id=228629
+
+ Reviewed by Philippe Normand.
+
+ Call {PYTHON_EXECUTABLE} instead of python3.
+
+ * PlatformGTK.cmake:
+
2021-07-29 Tadeu Zagallo <tzaga...@apple.com>
definePropertyOnReceiver should check if receiver canPerformFastPutInline
Modified: trunk/Source/_javascript_Core/PlatformGTK.cmake (280465 => 280466)
--- trunk/Source/_javascript_Core/PlatformGTK.cmake 2021-07-30 02:32:26 UTC (rev 280465)
+++ trunk/Source/_javascript_Core/PlatformGTK.cmake 2021-07-30 02:57:55 UTC (rev 280466)
@@ -6,7 +6,7 @@
if (EXISTS "${TOOLS_DIR}/glib/apply-build-revision-to-files.py")
configure_file(_javascript_coregtk.pc.in ${_javascript_Core_PKGCONFIG_FILE} @ONLY)
add_custom_target(_javascript_Core-build-revision
- python3 "${TOOLS_DIR}/glib/apply-build-revision-to-files.py" ${_javascript_Core_PKGCONFIG_FILE}
+ ${PYTHON_EXECUTABLE} "${TOOLS_DIR}/glib/apply-build-revision-to-files.py" ${_javascript_Core_PKGCONFIG_FILE}
DEPENDS ${_javascript_Core_PKGCONFIG_FILE}
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} VERBATIM)
list(APPEND _javascript_Core_DEPENDENCIES
Modified: trunk/Source/WebKit/ChangeLog (280465 => 280466)
--- trunk/Source/WebKit/ChangeLog 2021-07-30 02:32:26 UTC (rev 280465)
+++ trunk/Source/WebKit/ChangeLog 2021-07-30 02:57:55 UTC (rev 280466)
@@ -1,3 +1,20 @@
+2021-07-29 Carlos Alberto Lopez Perez <clo...@igalia.com>
+
+ [WPE][GTK] build broken with python2 after r280382
+ https://bugs.webkit.org/show_bug.cgi?id=228629
+
+ Reviewed by Philippe Normand.
+
+ Call {PYTHON_EXECUTABLE} instead of python3. Our build currently
+ supports both versions of python (2 and 3). If the user wants
+ to force a specific version it can do that via the CMake argument
+ -DPYTHON_EXECUTABLE=/path/to/python/interpreter
+
+ No new tests, is a build fix.
+
+ * PlatformGTK.cmake:
+ * PlatformWPE.cmake:
+
2021-07-29 Jer Noble <jer.no...@apple.com>
[macOS|AS] VTImageRotationSession returns a kVTImageRotationNotSupportedErr, breaks painting rotated videos
Modified: trunk/Source/WebKit/PlatformGTK.cmake (280465 => 280466)
--- trunk/Source/WebKit/PlatformGTK.cmake 2021-07-30 02:32:26 UTC (rev 280465)
+++ trunk/Source/WebKit/PlatformGTK.cmake 2021-07-30 02:57:55 UTC (rev 280466)
@@ -17,7 +17,7 @@
configure_file(gtk/webkit2gtk-web-extension.pc.in ${WebKit2WebExtension_PKGCONFIG_FILE} @ONLY)
configure_file(Shared/glib/BuildRevision.h.in ${WebKit2Gtk_FRAMEWORK_HEADERS_DIR}/BuildRevision.h @ONLY)
add_custom_target(WebKit-build-revision
- python3 "${TOOLS_DIR}/glib/apply-build-revision-to-files.py" ${WebKit2Gtk_FRAMEWORK_HEADERS_DIR}/BuildRevision.h ${WebKit2_PKGCONFIG_FILE} ${WebKit2WebExtension_PKGCONFIG_FILE}
+ ${PYTHON_EXECUTABLE} "${TOOLS_DIR}/glib/apply-build-revision-to-files.py" ${WebKit2Gtk_FRAMEWORK_HEADERS_DIR}/BuildRevision.h ${WebKit2_PKGCONFIG_FILE} ${WebKit2WebExtension_PKGCONFIG_FILE}
DEPENDS ${WebKit2Gtk_FRAMEWORK_HEADERS_DIR}/BuildRevision.h ${WebKit2_PKGCONFIG_FILE} ${WebKit2WebExtension_PKGCONFIG_FILE}
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} VERBATIM)
list(APPEND WebKit_DEPENDENCIES
Modified: trunk/Source/WebKit/PlatformWPE.cmake (280465 => 280466)
--- trunk/Source/WebKit/PlatformWPE.cmake 2021-07-30 02:32:26 UTC (rev 280465)
+++ trunk/Source/WebKit/PlatformWPE.cmake 2021-07-30 02:57:55 UTC (rev 280466)
@@ -21,7 +21,7 @@
if (EXISTS "${TOOLS_DIR}/glib/apply-build-revision-to-files.py")
configure_file(Shared/glib/BuildRevision.h.in ${FORWARDING_HEADERS_WPE_DIR}/BuildRevision.h @ONLY)
add_custom_target(WebKit-build-revision
- python3 "${TOOLS_DIR}/glib/apply-build-revision-to-files.py" ${FORWARDING_HEADERS_WPE_DIR}/BuildRevision.h
+ ${PYTHON_EXECUTABLE} "${TOOLS_DIR}/glib/apply-build-revision-to-files.py" ${FORWARDING_HEADERS_WPE_DIR}/BuildRevision.h
DEPENDS ${FORWARDING_HEADERS_WPE_DIR}/BuildRevision.h
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} VERBATIM)
list(APPEND WebKit_DEPENDENCIES
Modified: trunk/Tools/ChangeLog (280465 => 280466)
--- trunk/Tools/ChangeLog 2021-07-30 02:32:26 UTC (rev 280465)
+++ trunk/Tools/ChangeLog 2021-07-30 02:57:55 UTC (rev 280466)
@@ -1,3 +1,15 @@
+2021-07-29 Carlos Alberto Lopez Perez <clo...@igalia.com>
+
+ [WPE][GTK] build broken with python2 after r280382
+ https://bugs.webkit.org/show_bug.cgi?id=228629
+
+ Reviewed by Philippe Normand.
+
+ Fix compatibility with python2.
+
+ * glib/apply-build-revision-to-files.py:
+ (main):
+
2021-07-29 Jonathan Bedard <jbed...@apple.com>
[git-webkit] Handle relative paths in filtered commands
Modified: trunk/Tools/glib/apply-build-revision-to-files.py (280465 => 280466)
--- trunk/Tools/glib/apply-build-revision-to-files.py 2021-07-30 02:32:26 UTC (rev 280465)
+++ trunk/Tools/glib/apply-build-revision-to-files.py 2021-07-30 02:57:55 UTC (rev 280466)
@@ -30,7 +30,7 @@
def main(args):
scm = SCMDetector(FileSystem(), Executive()).default_scm()
svn_revision = scm.head_svn_revision()
- build_revision = f"r{svn_revision}"
+ build_revision = "r{}".format(svn_revision)
for in_file in args:
with open(in_file) as fd:
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
