Title: [226113] releases/WebKitGTK/webkit-2.18/Source/WebCore
- Revision
- 226113
- Author
- [email protected]
- Date
- 2017-12-19 00:13:07 -0800 (Tue, 19 Dec 2017)
Log Message
Merge r224725 - [GTK] PlatformGTK.cmake: use the PKG_CONFIG_EXECUTABLE variable
https://bugs.webkit.org/show_bug.cgi?id=179547
Patch by Helmut Grohne <[email protected]> on 2017-11-11
Reviewed by Michael Catanzaro.
* PlatformGTK.cmake: Use PKG_CONFIG_EXECUTABLE instead of
hardcoding the executable name.
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.18/Source/WebCore/ChangeLog (226112 => 226113)
--- releases/WebKitGTK/webkit-2.18/Source/WebCore/ChangeLog 2017-12-19 08:07:06 UTC (rev 226112)
+++ releases/WebKitGTK/webkit-2.18/Source/WebCore/ChangeLog 2017-12-19 08:13:07 UTC (rev 226113)
@@ -1,3 +1,13 @@
+2017-11-11 Helmut Grohne <[email protected]>
+
+ [GTK] PlatformGTK.cmake: use the PKG_CONFIG_EXECUTABLE variable
+ https://bugs.webkit.org/show_bug.cgi?id=179547
+
+ Reviewed by Michael Catanzaro.
+
+ * PlatformGTK.cmake: Use PKG_CONFIG_EXECUTABLE instead of
+ hardcoding the executable name.
+
2017-12-04 Carlos Garcia Campos <[email protected]>
[GStreamer] More leaks in TextCombinerGStreamer
Modified: releases/WebKitGTK/webkit-2.18/Source/WebCore/PlatformGTK.cmake (226112 => 226113)
--- releases/WebKitGTK/webkit-2.18/Source/WebCore/PlatformGTK.cmake 2017-12-19 08:07:06 UTC (rev 226112)
+++ releases/WebKitGTK/webkit-2.18/Source/WebCore/PlatformGTK.cmake 2017-12-19 08:13:07 UTC (rev 226113)
@@ -188,7 +188,7 @@
list(APPEND WebCore_DERIVED_SOURCES
${DERIVED_SOURCES_WEBCORE_DIR}/Geoclue2Interface.c
)
- execute_process(COMMAND pkg-config --variable dbus_interface geoclue-2.0 OUTPUT_VARIABLE GEOCLUE_DBUS_INTERFACE)
+ execute_process(COMMAND ${PKG_CONFIG_EXECUTABLE} --variable dbus_interface geoclue-2.0 OUTPUT_VARIABLE GEOCLUE_DBUS_INTERFACE)
add_custom_command(
OUTPUT ${DERIVED_SOURCES_WEBCORE_DIR}/Geoclue2Interface.c ${DERIVED_SOURCES_WEBCORE_DIR}/Geoclue2Interface.h
COMMAND gdbus-codegen --interface-prefix org.freedesktop.GeoClue2. --c-namespace Geoclue --generate-c-code ${DERIVED_SOURCES_WEBCORE_DIR}/Geoclue2Interface ${GEOCLUE_DBUS_INTERFACE}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
