<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[280466] trunk</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/280466">280466</a></dd>
<dt>Author</dt> <dd>clopez@igalia.com</dd>
<dt>Date</dt> <dd>2021-07-29 19:57:55 -0700 (Thu, 29 Jul 2021)</dd>
</dl>

<h3>Log Message</h3>
<pre>[WPE][GTK] build broken with python2 after <a href="http://trac.webkit.org/projects/webkit/changeset/280382">r280382</a>
https://bugs.webkit.org/show_bug.cgi?id=228629

Reviewed by Philippe Normand.

Source/JavaScriptCore:

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):</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCorePlatformGTKcmake">trunk/Source/JavaScriptCore/PlatformGTK.cmake</a></li>
<li><a href="#trunkSourceWebKitChangeLog">trunk/Source/WebKit/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitPlatformGTKcmake">trunk/Source/WebKit/PlatformGTK.cmake</a></li>
<li><a href="#trunkSourceWebKitPlatformWPEcmake">trunk/Source/WebKit/PlatformWPE.cmake</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsglibapplybuildrevisiontofilespy">trunk/Tools/glib/apply-build-revision-to-files.py</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (280465 => 280466)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog    2021-07-30 02:32:26 UTC (rev 280465)
+++ trunk/Source/JavaScriptCore/ChangeLog       2021-07-30 02:57:55 UTC (rev 280466)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2021-07-29  Carlos Alberto Lopez Perez  <clopez@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:
+
</ins><span class="cx"> 2021-07-29  Tadeu Zagallo  <tzagallo@apple.com>
</span><span class="cx"> 
</span><span class="cx">         definePropertyOnReceiver should check if receiver canPerformFastPutInline
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorePlatformGTKcmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/PlatformGTK.cmake (280465 => 280466)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/PlatformGTK.cmake    2021-07-30 02:32:26 UTC (rev 280465)
+++ trunk/Source/JavaScriptCore/PlatformGTK.cmake       2021-07-30 02:57:55 UTC (rev 280466)
</span><span class="lines">@@ -6,7 +6,7 @@
</span><span class="cx"> if (EXISTS "${TOOLS_DIR}/glib/apply-build-revision-to-files.py")
</span><span class="cx">     configure_file(javascriptcoregtk.pc.in ${JavaScriptCore_PKGCONFIG_FILE} @ONLY)
</span><span class="cx">     add_custom_target(JavaScriptCore-build-revision
</span><del>-        python3 "${TOOLS_DIR}/glib/apply-build-revision-to-files.py" ${JavaScriptCore_PKGCONFIG_FILE}
</del><ins>+        ${PYTHON_EXECUTABLE} "${TOOLS_DIR}/glib/apply-build-revision-to-files.py" ${JavaScriptCore_PKGCONFIG_FILE}
</ins><span class="cx">         DEPENDS ${JavaScriptCore_PKGCONFIG_FILE}
</span><span class="cx">         WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} VERBATIM)
</span><span class="cx">     list(APPEND JavaScriptCore_DEPENDENCIES
</span></span></pre></div>
<a id="trunkSourceWebKitChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/ChangeLog (280465 => 280466)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2021-07-29  Carlos Alberto Lopez Perez  <clopez@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:
+
</ins><span class="cx"> 2021-07-29  Jer Noble  <jer.noble@apple.com>
</span><span class="cx"> 
</span><span class="cx">         [macOS|AS] VTImageRotationSession returns a kVTImageRotationNotSupportedErr, breaks painting rotated videos
</span></span></pre></div>
<a id="trunkSourceWebKitPlatformGTKcmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/PlatformGTK.cmake (280465 => 280466)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -17,7 +17,7 @@
</span><span class="cx">     configure_file(gtk/webkit2gtk-web-extension.pc.in ${WebKit2WebExtension_PKGCONFIG_FILE} @ONLY)
</span><span class="cx">     configure_file(Shared/glib/BuildRevision.h.in ${WebKit2Gtk_FRAMEWORK_HEADERS_DIR}/BuildRevision.h @ONLY)
</span><span class="cx">     add_custom_target(WebKit-build-revision
</span><del>-        python3 "${TOOLS_DIR}/glib/apply-build-revision-to-files.py" ${WebKit2Gtk_FRAMEWORK_HEADERS_DIR}/BuildRevision.h ${WebKit2_PKGCONFIG_FILE} ${WebKit2WebExtension_PKGCONFIG_FILE}
</del><ins>+        ${PYTHON_EXECUTABLE} "${TOOLS_DIR}/glib/apply-build-revision-to-files.py" ${WebKit2Gtk_FRAMEWORK_HEADERS_DIR}/BuildRevision.h ${WebKit2_PKGCONFIG_FILE} ${WebKit2WebExtension_PKGCONFIG_FILE}
</ins><span class="cx">         DEPENDS ${WebKit2Gtk_FRAMEWORK_HEADERS_DIR}/BuildRevision.h ${WebKit2_PKGCONFIG_FILE} ${WebKit2WebExtension_PKGCONFIG_FILE}
</span><span class="cx">         WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} VERBATIM)
</span><span class="cx">     list(APPEND WebKit_DEPENDENCIES
</span></span></pre></div>
<a id="trunkSourceWebKitPlatformWPEcmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/PlatformWPE.cmake (280465 => 280466)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -21,7 +21,7 @@
</span><span class="cx"> if (EXISTS "${TOOLS_DIR}/glib/apply-build-revision-to-files.py")
</span><span class="cx">     configure_file(Shared/glib/BuildRevision.h.in ${FORWARDING_HEADERS_WPE_DIR}/BuildRevision.h @ONLY)
</span><span class="cx">     add_custom_target(WebKit-build-revision
</span><del>-        python3 "${TOOLS_DIR}/glib/apply-build-revision-to-files.py" ${FORWARDING_HEADERS_WPE_DIR}/BuildRevision.h
</del><ins>+        ${PYTHON_EXECUTABLE} "${TOOLS_DIR}/glib/apply-build-revision-to-files.py" ${FORWARDING_HEADERS_WPE_DIR}/BuildRevision.h
</ins><span class="cx">         DEPENDS ${FORWARDING_HEADERS_WPE_DIR}/BuildRevision.h
</span><span class="cx">         WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} VERBATIM)
</span><span class="cx">     list(APPEND WebKit_DEPENDENCIES
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (280465 => 280466)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog    2021-07-30 02:32:26 UTC (rev 280465)
+++ trunk/Tools/ChangeLog       2021-07-30 02:57:55 UTC (rev 280466)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2021-07-29  Carlos Alberto Lopez Perez  <clopez@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):
+
</ins><span class="cx"> 2021-07-29  Jonathan Bedard  <jbedard@apple.com>
</span><span class="cx"> 
</span><span class="cx">         [git-webkit] Handle relative paths in filtered commands
</span></span></pre></div>
<a id="trunkToolsglibapplybuildrevisiontofilespy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/glib/apply-build-revision-to-files.py (280465 => 280466)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -30,7 +30,7 @@
</span><span class="cx"> def main(args):
</span><span class="cx">     scm = SCMDetector(FileSystem(), Executive()).default_scm()
</span><span class="cx">     svn_revision = scm.head_svn_revision()
</span><del>-    build_revision = f"r{svn_revision}"
</del><ins>+    build_revision = "r{}".format(svn_revision)
</ins><span class="cx"> 
</span><span class="cx">     for in_file in args:
</span><span class="cx">         with open(in_file) as fd:
</span></span></pre>
</div>
</div>

</body>
</html>