Bug 121573 – [GTK] Build fails against GTK2

• Component: WebKitGTK
• Status: RESOLVED FIXED

[Dominique Leuenberger]

Attempting to build webkitgtk 2.1.92 fails when doing the GTK2 build:

[ 1211s] Source/WebKit/gtk/WebCoreSupport/AcceleratedCompositingContextGL.cpp: In member function 'void WebKit::AcceleratedCompositingContext::initialize()':
[ 1211s] Source/WebKit/gtk/WebCoreSupport/AcceleratedCompositingContextGL.cpp:88:36: error: 'GDK_IS_X11_DISPLAY' was not declared in this scope
[ 1211s]      if (!GDK_IS_X11_DISPLAY(display))
[ 1211s]                                     ^
[ 1211s] make[1]: *** [Source/WebKit/gtk/WebCoreSupport/libwebkitgtk_1_0_la-AcceleratedCompositingContextGL.lo] Error 1
[ 1211s] make[1]: Leaving directory `/home/abuild/rpmbuild/BUILD/webkitgtk-2.1.92'
[ 1211s] make: *** [all] Error 2
[ 1211s] error: Bad exit status from /var/tmp/rpm-tmp.g1Tb5F (%build)

[Dominique Leuenberger]

I applied this patch to my local tree, and this seems to do the trick:

Index: webkitgtk-2.1.92/Source/WebKit/gtk/WebCoreSupport/AcceleratedCompositingContextGL.cpp
===================================================================
--- webkitgtk-2.1.92.orig/Source/WebKit/gtk/WebCoreSupport/AcceleratedCompositingContextGL.cpp
+++ webkitgtk-2.1.92/Source/WebKit/gtk/WebCoreSupport/AcceleratedCompositingContextGL.cpp
@@ -30,6 +30,7 @@
 #include "TextureMapperGL.h"
 #include "TextureMapperLayer.h"
 #include "webkitwebviewprivate.h"
+#include "GtkVersioning.h"
 #include <wtf/CurrentTime.h>
 
 #if USE(OPENGL_ES_2)

[Zan Dobersek]

Landed in r156261 with proper attribution.
http://trac.webkit.org/changeset/156261

Added as a proposed merge for the 2.2 branch.
https://trac.webkit.org/wiki/WebKitGTK/2.2.x

Thanks for reporting this.