Title: [248948] trunk/Source/WebKit
- Revision
- 248948
- Author
- ape...@igalia.com
- Date
- 2019-08-21 10:23:32 -0700 (Wed, 21 Aug 2019)
Log Message
[GTK] Build failure due to unwieldy definition of “None” from X11 headers
https://bugs.webkit.org/show_bug.cgi?id=200984
Reviewed by Carlos Alberto Lopez Perez.
* SourcesGTK.txt: Mark AcceleratedBackingStore.cpp with @no-unify
because it includes AcceleratedSurfaceX11.h when building with
ENABLE_X11_TARGET=ON, which in turn will include the X11 headers.
It is just lucky that most of the time the order of the generated
#include statements in the unified sources has been masking this
problem.
Modified Paths
Diff
Modified: trunk/Source/WebKit/ChangeLog (248947 => 248948)
--- trunk/Source/WebKit/ChangeLog 2019-08-21 17:21:27 UTC (rev 248947)
+++ trunk/Source/WebKit/ChangeLog 2019-08-21 17:23:32 UTC (rev 248948)
@@ -1,3 +1,17 @@
+2019-08-21 Adrian Perez de Castro <ape...@igalia.com>
+
+ [GTK] Build failure due to unwieldy definition of “None” from X11 headers
+ https://bugs.webkit.org/show_bug.cgi?id=200984
+
+ Reviewed by Carlos Alberto Lopez Perez.
+
+ * SourcesGTK.txt: Mark AcceleratedBackingStore.cpp with @no-unify
+ because it includes AcceleratedSurfaceX11.h when building with
+ ENABLE_X11_TARGET=ON, which in turn will include the X11 headers.
+ It is just lucky that most of the time the order of the generated
+ #include statements in the unified sources has been masking this
+ problem.
+
2019-08-21 Rob Buis <rb...@igalia.com>
Verify Prefetch and credential behavior
Modified: trunk/Source/WebKit/SourcesGTK.txt (248947 => 248948)
--- trunk/Source/WebKit/SourcesGTK.txt 2019-08-21 17:21:27 UTC (rev 248947)
+++ trunk/Source/WebKit/SourcesGTK.txt 2019-08-21 17:23:32 UTC (rev 248948)
@@ -236,7 +236,7 @@
UIProcess/gstreamer/InstallMissingMediaPluginsPermissionRequest.cpp
UIProcess/gstreamer/WebPageProxyGStreamer.cpp
-UIProcess/gtk/AcceleratedBackingStore.cpp
+UIProcess/gtk/AcceleratedBackingStore.cpp @no-unify
UIProcess/gtk/AcceleratedBackingStoreWayland.cpp @no-unify
UIProcess/gtk/AcceleratedBackingStoreX11.cpp @no-unify
UIProcess/gtk/DragAndDropHandler.cpp
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
