Revision: 145275 https://trac.macports.org/changeset/145275 Author: jeremyhu@macports.org Date: 2016-01-30 10:54:44 -0800 (Sat, 30 Jan 2016) Log Message: ----------- webkit2-gtk: Fix build if older python is selected (#50472) Modified Paths: -------------- trunk/dports/www/webkit2-gtk/Portfile Added Paths: ----------- trunk/dports/www/webkit2-gtk/files/PR-153712.patch Modified: trunk/dports/www/webkit2-gtk/Portfile =================================================================== --- trunk/dports/www/webkit2-gtk/Portfile 2016-01-30 18:47:58 UTC (rev 145274) +++ trunk/dports/www/webkit2-gtk/Portfile 2016-01-30 18:54:44 UTC (rev 145275) @@ -83,8 +83,10 @@ } # PR-153138.patch: https://bugs.webkit.org/show_bug.cgi?id=153138 +# PR-153712.patch: https://bugs.webkit.org/show_bug.cgi?id=153712 patchfiles-append \ - PR-153138.patch + PR-153138.patch \ + PR-153712.patch # Build out-of-tree configure.post_args ../${worksrcdir} Added: trunk/dports/www/webkit2-gtk/files/PR-153712.patch =================================================================== --- trunk/dports/www/webkit2-gtk/files/PR-153712.patch (rev 0) +++ trunk/dports/www/webkit2-gtk/files/PR-153712.patch 2016-01-30 18:54:44 UTC (rev 145275) @@ -0,0 +1,29 @@ +From c22b739bd1be4edd9d29eba57f9b499c4ad3311d Mon Sep 17 00:00:00 2001 +From: Jeremy Huddleston Sequoia <jeremyhu@apple.com> +Date: Sat, 30 Jan 2016 10:03:25 -0800 +Subject: [PATCH] [GTK] Use configured python executable when executing + generate-inspector-gresource-manifest.py + +https://bugs.webkit.org/show_bug.cgi?id=153712 + +Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com> +--- + Source/WebKit2/PlatformGTK.cmake | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Source/WebKit2/PlatformGTK.cmake b/Source/WebKit2/PlatformGTK.cmake +index c0de9fa..aece75b 100644 +--- Source/WebKit2/PlatformGTK.cmake ++++ Source/WebKit2/PlatformGTK.cmake +@@ -645,7 +645,7 @@ add_custom_command( + DEPENDS ${InspectorFilesDependencies} + ${DERIVED_SOURCES_WEBINSPECTORUI_DIR}/UserInterface/Protocol/InspectorBackendCommands.js + ${TOOLS_DIR}/gtk/generate-inspector-gresource-manifest.py +- COMMAND ${TOOLS_DIR}/gtk/generate-inspector-gresource-manifest.py --output=${DERIVED_SOURCES_WEBKIT2GTK_DIR}/InspectorGResourceBundle.xml ${InspectorFiles} ${DERIVED_SOURCES_WEBINSPECTORUI_DIR}/UserInterface/Protocol/InspectorBackendCommands.js ++ COMMAND ${PYTHON_EXECUTABLE} ${TOOLS_DIR}/gtk/generate-inspector-gresource-manifest.py --output=${DERIVED_SOURCES_WEBKIT2GTK_DIR}/InspectorGResourceBundle.xml ${InspectorFiles} ${DERIVED_SOURCES_WEBINSPECTORUI_DIR}/UserInterface/Protocol/InspectorBackendCommands.js + VERBATIM + ) + +-- +2.7.0 +