Title: [205622] releases/WebKitGTK/webkit-2.14/Source/WebKit2
- Revision
- 205622
- Author
- [email protected]
- Date
- 2016-09-08 04:13:57 -0700 (Thu, 08 Sep 2016)
Log Message
Merge r205294 - [GTK] Fix configuration without wayland support
https://bugs.webkit.org/show_bug.cgi?id=161475
WebKit2WaylandClientProtocol.c is a derived source that is created
conditionally on ENABLE_WAYLAND_TARGET. It was being included
in the sources list unconditionally, so configure failed whenever
wayland support was unavailable.
Patch by Jeremy Huddleston Sequoia <[email protected]> on 2016-09-01
Reviewed by Žan Doberšek.
* PlatformGTK.cmake: Include WebKit2WaylandClientProtocol.c in source list conditional on ENABLE_WAYLAND_TARGET
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.14/Source/WebKit2/ChangeLog (205621 => 205622)
--- releases/WebKitGTK/webkit-2.14/Source/WebKit2/ChangeLog 2016-09-08 11:11:19 UTC (rev 205621)
+++ releases/WebKitGTK/webkit-2.14/Source/WebKit2/ChangeLog 2016-09-08 11:13:57 UTC (rev 205622)
@@ -1,3 +1,17 @@
+2016-09-01 Jeremy Huddleston Sequoia <[email protected]>
+
+ [GTK] Fix configuration without wayland support
+ https://bugs.webkit.org/show_bug.cgi?id=161475
+
+ WebKit2WaylandClientProtocol.c is a derived source that is created
+ conditionally on ENABLE_WAYLAND_TARGET. It was being included
+ in the sources list unconditionally, so configure failed whenever
+ wayland support was unavailable.
+
+ Reviewed by Žan Doberšek.
+
+ * PlatformGTK.cmake: Include WebKit2WaylandClientProtocol.c in source list conditional on ENABLE_WAYLAND_TARGET
+
2016-08-31 Andreas Kling <[email protected]>
DOM event handling should pass Event around by reference.
Modified: releases/WebKitGTK/webkit-2.14/Source/WebKit2/PlatformGTK.cmake (205621 => 205622)
--- releases/WebKitGTK/webkit-2.14/Source/WebKit2/PlatformGTK.cmake 2016-09-08 11:11:19 UTC (rev 205621)
+++ releases/WebKitGTK/webkit-2.14/Source/WebKit2/PlatformGTK.cmake 2016-09-08 11:13:57 UTC (rev 205622)
@@ -373,12 +373,17 @@
${DERIVED_SOURCES_WEBKIT2GTK_DIR}/InspectorGResourceBundle.c
${DERIVED_SOURCES_WEBKIT2GTK_DIR}/WebKit2InspectorGResourceBundle.c
${DERIVED_SOURCES_WEBKIT2GTK_DIR}/WebKit2ResourcesGResourceBundle.c
- ${DERIVED_SOURCES_WEBKIT2GTK_DIR}/WebKit2WaylandClientProtocol.c
${DERIVED_SOURCES_WEBKIT2GTK_API_DIR}/WebKitEnumTypes.cpp
${DERIVED_SOURCES_WEBKIT2GTK_API_DIR}/WebKitMarshal.cpp
)
+if (ENABLE_WAYLAND_TARGET)
+ list(APPEND WebKit2_DERIVED_SOURCES
+ ${DERIVED_SOURCES_WEBKIT2GTK_DIR}/WebKit2WaylandClientProtocol.c
+ )
+endif ()
+
set(WebKit2GTK_INSTALLED_HEADERS
${DERIVED_SOURCES_WEBKIT2GTK_API_DIR}/WebKitEnumTypes.h
${DERIVED_SOURCES_WEBKIT2GTK_API_DIR}/WebKitVersion.h
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
