[webkit-changes] [144468] releases/WebKitGTK/webkit-2.0

Fri, 01 Mar 2013 10:05:28 -0800

Title: [144468] releases/WebKitGTK/webkit-2.0
Revision
144468
Author
[email protected]
Date
2013-03-01 10:07:25 -0800 (Fri, 01 Mar 2013)

Log Message

Merge r143869 - [GTK] GTK+ 2 build broken since GTK_API_VERSION_2 moved to autoconfig.h
https://bugs.webkit.org/show_bug.cgi?id=110702

Reviewed by Martin Robinson.

Source/WebCore:

No tests. Build fix, no behaviour change.

* platform/gtk/GtkVersioning.h: include the autotoolsconfig.h header,
which contains the GTK_API_VERSION_2 define now.

Source/WebKit/gtk:

* tests/testapplicationcache.c: include autotoolsconfig.h.
* tests/testatk.c: ditto.
* tests/testatkroles.c: ditto.
* tests/testcontextmenu.c: ditto.
* tests/testcopyandpaste.c: ditto.
* tests/testdomdocument.c: ditto.
* tests/testdomdomwindow.c: ditto.
* tests/testdomnode.c: ditto.
* tests/testdownload.c: ditto.
* tests/testfavicondatabase.c: ditto.
* tests/testglobals.c: ditto.
* tests/testhittestresult.c: ditto.
* tests/testhttpbackend.c: ditto.
* tests/testkeyevents.c: ditto.
* tests/testloading.c: ditto.
* tests/testmimehandling.c: ditto.
* tests/testnetworkrequest.c: ditto.
* tests/testnetworkresponse.c: ditto.
* tests/testwebbackforwardlist.c: ditto.
* tests/testwebdatasource.c: ditto.
* tests/testwebframe.c: ditto.
* tests/testwebhistoryitem.c: ditto.
* tests/testwebinspector.c: ditto.
* tests/testwebplugindatabase.c: ditto.
* tests/testwebresource.c: ditto.
* tests/testwebsettings.c: ditto.
* tests/testwebview.c: ditto.
* tests/testwindow.c: ditto.

Tools:

* GtkLauncher/main.c: include autotoolsconfig.h.
* Scripts/webkitpy/style/checker.py: make GtkLauncher/main.c exempt of
the include ordering check, since it uses autotoolsconfig.h which needs to
come first.

Modified Paths

Diff

Modified: releases/WebKitGTK/webkit-2.0/Source/WebCore/ChangeLog (144467 => 144468)


--- releases/WebKitGTK/webkit-2.0/Source/WebCore/ChangeLog	2013-03-01 17:57:56 UTC (rev 144467)
+++ releases/WebKitGTK/webkit-2.0/Source/WebCore/ChangeLog	2013-03-01 18:07:25 UTC (rev 144468)
@@ -1,3 +1,15 @@
+2013-02-24  Gustavo Noronha Silva  <[email protected]>
+
+        [GTK] GTK+ 2 build broken since GTK_API_VERSION_2 moved to autoconfig.h
+        https://bugs.webkit.org/show_bug.cgi?id=110702
+
+        Reviewed by Martin Robinson.
+
+        No tests. Build fix, no behaviour change.
+
+        * platform/gtk/GtkVersioning.h: include the autotoolsconfig.h header,
+        which contains the GTK_API_VERSION_2 define now.
+
 2013-02-25  Sergio Villar Senin  <[email protected]>
 
         [soup] "Too many redirects" error loading chat in plus.google.com

Modified: releases/WebKitGTK/webkit-2.0/Source/WebCore/platform/gtk/GtkVersioning.h (144467 => 144468)


--- releases/WebKitGTK/webkit-2.0/Source/WebCore/platform/gtk/GtkVersioning.h	2013-03-01 17:57:56 UTC (rev 144467)
+++ releases/WebKitGTK/webkit-2.0/Source/WebCore/platform/gtk/GtkVersioning.h	2013-03-01 18:07:25 UTC (rev 144468)
@@ -21,6 +21,7 @@
 #ifndef GtkVersioning_h
 #define GtkVersioning_h
 
+#include "autotoolsconfig.h"
 #include <gtk/gtk.h>
 
 #ifndef GTK_API_VERSION_2

Modified: releases/WebKitGTK/webkit-2.0/Source/WebKit/gtk/ChangeLog (144467 => 144468)


--- releases/WebKitGTK/webkit-2.0/Source/WebKit/gtk/ChangeLog	2013-03-01 17:57:56 UTC (rev 144467)
+++ releases/WebKitGTK/webkit-2.0/Source/WebKit/gtk/ChangeLog	2013-03-01 18:07:25 UTC (rev 144468)
@@ -1,3 +1,39 @@
+2013-02-24  Gustavo Noronha Silva  <[email protected]>
+
+        [GTK] GTK+ 2 build broken since GTK_API_VERSION_2 moved to autoconfig.h
+        https://bugs.webkit.org/show_bug.cgi?id=110702
+
+        Reviewed by Martin Robinson.
+
+        * tests/testapplicationcache.c: include autotoolsconfig.h.
+        * tests/testatk.c: ditto.
+        * tests/testatkroles.c: ditto.
+        * tests/testcontextmenu.c: ditto.
+        * tests/testcopyandpaste.c: ditto.
+        * tests/testdomdocument.c: ditto.
+        * tests/testdomdomwindow.c: ditto.
+        * tests/testdomnode.c: ditto.
+        * tests/testdownload.c: ditto.
+        * tests/testfavicondatabase.c: ditto.
+        * tests/testglobals.c: ditto.
+        * tests/testhittestresult.c: ditto.
+        * tests/testhttpbackend.c: ditto.
+        * tests/testkeyevents.c: ditto.
+        * tests/testloading.c: ditto.
+        * tests/testmimehandling.c: ditto.
+        * tests/testnetworkrequest.c: ditto.
+        * tests/testnetworkresponse.c: ditto.
+        * tests/testwebbackforwardlist.c: ditto.
+        * tests/testwebdatasource.c: ditto.
+        * tests/testwebframe.c: ditto.
+        * tests/testwebhistoryitem.c: ditto.
+        * tests/testwebinspector.c: ditto.
+        * tests/testwebplugindatabase.c: ditto.
+        * tests/testwebresource.c: ditto.
+        * tests/testwebsettings.c: ditto.
+        * tests/testwebview.c: ditto.
+        * tests/testwindow.c: ditto.
+
 2013-02-22  Carlos Garcia Campos  <[email protected]>
 
         Unreviewed. Update NEWS and Versions.m4 for 1.11.90 release.

Modified: releases/WebKitGTK/webkit-2.0/Source/WebKit/gtk/tests/testapplicationcache.c (144467 => 144468)


--- releases/WebKitGTK/webkit-2.0/Source/WebKit/gtk/tests/testapplicationcache.c	2013-03-01 17:57:56 UTC (rev 144467)
+++ releases/WebKitGTK/webkit-2.0/Source/WebKit/gtk/tests/testapplicationcache.c	2013-03-01 18:07:25 UTC (rev 144468)
@@ -17,6 +17,7 @@
  * Boston, MA 02110-1301, USA.
  */
 
+#include "autotoolsconfig.h"
 #include <glib.h>
 #include <glib/gprintf.h>
 #include <gtk/gtk.h>

Modified: releases/WebKitGTK/webkit-2.0/Source/WebKit/gtk/tests/testatk.c (144467 => 144468)


--- releases/WebKitGTK/webkit-2.0/Source/WebKit/gtk/tests/testatk.c	2013-03-01 17:57:56 UTC (rev 144467)
+++ releases/WebKitGTK/webkit-2.0/Source/WebKit/gtk/tests/testatk.c	2013-03-01 18:07:25 UTC (rev 144468)
@@ -17,6 +17,7 @@
  * Boston, MA 02110-1301, USA.
  */
 
+#include "autotoolsconfig.h"
 #include <errno.h>
 #include <glib.h>
 #include <glib/gstdio.h>

Modified: releases/WebKitGTK/webkit-2.0/Source/WebKit/gtk/tests/testatkroles.c (144467 => 144468)


--- releases/WebKitGTK/webkit-2.0/Source/WebKit/gtk/tests/testatkroles.c	2013-03-01 17:57:56 UTC (rev 144467)
+++ releases/WebKitGTK/webkit-2.0/Source/WebKit/gtk/tests/testatkroles.c	2013-03-01 18:07:25 UTC (rev 144468)
@@ -18,6 +18,7 @@
  * Boston, MA 02110-1301, USA.
  */
 
+#include "autotoolsconfig.h"
 #include <glib.h>
 #include <glib/gstdio.h>
 #include <gtk/gtk.h>

Modified: releases/WebKitGTK/webkit-2.0/Source/WebKit/gtk/tests/testcontextmenu.c (144467 => 144468)


--- releases/WebKitGTK/webkit-2.0/Source/WebKit/gtk/tests/testcontextmenu.c	2013-03-01 17:57:56 UTC (rev 144467)
+++ releases/WebKitGTK/webkit-2.0/Source/WebKit/gtk/tests/testcontextmenu.c	2013-03-01 18:07:25 UTC (rev 144468)
@@ -17,6 +17,7 @@
  * Boston, MA 02110-1301, USA.
  */
 
+#include "autotoolsconfig.h"
 #include <webkit/webkit.h>
 
 #if GTK_CHECK_VERSION(2, 14, 0)

Modified: releases/WebKitGTK/webkit-2.0/Source/WebKit/gtk/tests/testcopyandpaste.c (144467 => 144468)


--- releases/WebKitGTK/webkit-2.0/Source/WebKit/gtk/tests/testcopyandpaste.c	2013-03-01 17:57:56 UTC (rev 144467)
+++ releases/WebKitGTK/webkit-2.0/Source/WebKit/gtk/tests/testcopyandpaste.c	2013-03-01 18:07:25 UTC (rev 144468)
@@ -17,6 +17,7 @@
  * Boston, MA 02110-1301, USA.
  */
 
+#include "autotoolsconfig.h"
 #include <errno.h>
 #include <unistd.h>
 #include <string.h>

Modified: releases/WebKitGTK/webkit-2.0/Source/WebKit/gtk/tests/testdomdocument.c (144467 => 144468)


--- releases/WebKitGTK/webkit-2.0/Source/WebKit/gtk/tests/testdomdocument.c	2013-03-01 17:57:56 UTC (rev 144467)
+++ releases/WebKitGTK/webkit-2.0/Source/WebKit/gtk/tests/testdomdocument.c	2013-03-01 18:07:25 UTC (rev 144468)
@@ -17,6 +17,7 @@
  * Boston, MA 02110-1301, USA.
  */
 
+#include "autotoolsconfig.h"
 #include "test_utils.h"
 
 #include <glib.h>

Modified: releases/WebKitGTK/webkit-2.0/Source/WebKit/gtk/tests/testdomdomwindow.c (144467 => 144468)


--- releases/WebKitGTK/webkit-2.0/Source/WebKit/gtk/tests/testdomdomwindow.c	2013-03-01 17:57:56 UTC (rev 144467)
+++ releases/WebKitGTK/webkit-2.0/Source/WebKit/gtk/tests/testdomdomwindow.c	2013-03-01 18:07:25 UTC (rev 144468)
@@ -17,6 +17,7 @@
  * Boston, MA 02110-1301, USA.
  */
 
+#include "autotoolsconfig.h"
 #include "test_utils.h"
 
 #include <glib.h>

Modified: releases/WebKitGTK/webkit-2.0/Source/WebKit/gtk/tests/testdomnode.c (144467 => 144468)


--- releases/WebKitGTK/webkit-2.0/Source/WebKit/gtk/tests/testdomnode.c	2013-03-01 17:57:56 UTC (rev 144467)
+++ releases/WebKitGTK/webkit-2.0/Source/WebKit/gtk/tests/testdomnode.c	2013-03-01 18:07:25 UTC (rev 144468)
@@ -17,6 +17,7 @@
  * Boston, MA 02110-1301, USA.
  */
 
+#include "autotoolsconfig.h"
 #include "test_utils.h"
 
 #include <glib.h>

Modified: releases/WebKitGTK/webkit-2.0/Source/WebKit/gtk/tests/testdownload.c (144467 => 144468)


--- releases/WebKitGTK/webkit-2.0/Source/WebKit/gtk/tests/testdownload.c	2013-03-01 17:57:56 UTC (rev 144467)
+++ releases/WebKitGTK/webkit-2.0/Source/WebKit/gtk/tests/testdownload.c	2013-03-01 18:07:25 UTC (rev 144468)
@@ -17,6 +17,7 @@
  * Boston, MA 02110-1301, USA.
  */
 
+#include "autotoolsconfig.h"
 #include <errno.h>
 #include <unistd.h>
 #include <glib/gstdio.h>

Modified: releases/WebKitGTK/webkit-2.0/Source/WebKit/gtk/tests/testfavicondatabase.c (144467 => 144468)


--- releases/WebKitGTK/webkit-2.0/Source/WebKit/gtk/tests/testfavicondatabase.c	2013-03-01 17:57:56 UTC (rev 144467)
+++ releases/WebKitGTK/webkit-2.0/Source/WebKit/gtk/tests/testfavicondatabase.c	2013-03-01 18:07:25 UTC (rev 144468)
@@ -17,6 +17,7 @@
  * Boston, MA 02110-1301, USA.
  */
 
+#include "autotoolsconfig.h"
 #include "test_utils.h"
 #include <glib/gstdio.h>
 #include <gtk/gtk.h>

Modified: releases/WebKitGTK/webkit-2.0/Source/WebKit/gtk/tests/testglobals.c (144467 => 144468)


--- releases/WebKitGTK/webkit-2.0/Source/WebKit/gtk/tests/testglobals.c	2013-03-01 17:57:56 UTC (rev 144467)
+++ releases/WebKitGTK/webkit-2.0/Source/WebKit/gtk/tests/testglobals.c	2013-03-01 18:07:25 UTC (rev 144468)
@@ -17,6 +17,7 @@
  * Boston, MA 02110-1301, USA.
  */
 
+#include "autotoolsconfig.h"
 #include <gtk/gtk.h>
 #include <libsoup/soup.h>
 #include <webkit/webkit.h>

Modified: releases/WebKitGTK/webkit-2.0/Source/WebKit/gtk/tests/testhittestresult.c (144467 => 144468)


--- releases/WebKitGTK/webkit-2.0/Source/WebKit/gtk/tests/testhittestresult.c	2013-03-01 17:57:56 UTC (rev 144467)
+++ releases/WebKitGTK/webkit-2.0/Source/WebKit/gtk/tests/testhittestresult.c	2013-03-01 18:07:25 UTC (rev 144468)
@@ -17,6 +17,7 @@
  * Boston, MA 02110-1301, USA.
  */
 
+#include "autotoolsconfig.h"
 #include <errno.h>
 #include <unistd.h>
 #include <glib/gstdio.h>

Modified: releases/WebKitGTK/webkit-2.0/Source/WebKit/gtk/tests/testhttpbackend.c (144467 => 144468)


--- releases/WebKitGTK/webkit-2.0/Source/WebKit/gtk/tests/testhttpbackend.c	2013-03-01 17:57:56 UTC (rev 144467)
+++ releases/WebKitGTK/webkit-2.0/Source/WebKit/gtk/tests/testhttpbackend.c	2013-03-01 18:07:25 UTC (rev 144468)
@@ -17,6 +17,7 @@
  * Boston, MA 02110-1301, USA.
  */
 
+#include "autotoolsconfig.h"
 #include <errno.h>
 #include <unistd.h>
 #include <glib.h>

Modified: releases/WebKitGTK/webkit-2.0/Source/WebKit/gtk/tests/testkeyevents.c (144467 => 144468)


--- releases/WebKitGTK/webkit-2.0/Source/WebKit/gtk/tests/testkeyevents.c	2013-03-01 17:57:56 UTC (rev 144467)
+++ releases/WebKitGTK/webkit-2.0/Source/WebKit/gtk/tests/testkeyevents.c	2013-03-01 18:07:25 UTC (rev 144468)
@@ -17,6 +17,7 @@
  * Boston, MA 02110-1301, USA.
  */
 
+#include "autotoolsconfig.h"
 #include <errno.h>
 #include <unistd.h>
 #include <string.h>

Modified: releases/WebKitGTK/webkit-2.0/Source/WebKit/gtk/tests/testloading.c (144467 => 144468)


--- releases/WebKitGTK/webkit-2.0/Source/WebKit/gtk/tests/testloading.c	2013-03-01 17:57:56 UTC (rev 144467)
+++ releases/WebKitGTK/webkit-2.0/Source/WebKit/gtk/tests/testloading.c	2013-03-01 18:07:25 UTC (rev 144468)
@@ -18,6 +18,7 @@
  * Boston, MA 02110-1301, USA.
  */
 
+#include "autotoolsconfig.h"
 #include <gtk/gtk.h>
 #include <libsoup/soup.h>
 #include <string.h>

Modified: releases/WebKitGTK/webkit-2.0/Source/WebKit/gtk/tests/testmimehandling.c (144467 => 144468)


--- releases/WebKitGTK/webkit-2.0/Source/WebKit/gtk/tests/testmimehandling.c	2013-03-01 17:57:56 UTC (rev 144467)
+++ releases/WebKitGTK/webkit-2.0/Source/WebKit/gtk/tests/testmimehandling.c	2013-03-01 18:07:25 UTC (rev 144468)
@@ -18,6 +18,7 @@
  * Boston, MA 02110-1301, USA.
  */
 
+#include "autotoolsconfig.h"
 #include "test_utils.h"
 
 #include <glib.h>

Modified: releases/WebKitGTK/webkit-2.0/Source/WebKit/gtk/tests/testnetworkrequest.c (144467 => 144468)


--- releases/WebKitGTK/webkit-2.0/Source/WebKit/gtk/tests/testnetworkrequest.c	2013-03-01 17:57:56 UTC (rev 144467)
+++ releases/WebKitGTK/webkit-2.0/Source/WebKit/gtk/tests/testnetworkrequest.c	2013-03-01 18:07:25 UTC (rev 144468)
@@ -17,6 +17,7 @@
  * Boston, MA 02110-1301, USA.
  */
 
+#include "autotoolsconfig.h"
 #include <errno.h>
 #include <unistd.h>
 #include <glib.h>

Modified: releases/WebKitGTK/webkit-2.0/Source/WebKit/gtk/tests/testnetworkresponse.c (144467 => 144468)


--- releases/WebKitGTK/webkit-2.0/Source/WebKit/gtk/tests/testnetworkresponse.c	2013-03-01 17:57:56 UTC (rev 144467)
+++ releases/WebKitGTK/webkit-2.0/Source/WebKit/gtk/tests/testnetworkresponse.c	2013-03-01 18:07:25 UTC (rev 144468)
@@ -18,6 +18,7 @@
  * Boston, MA 02110-1301, USA.
  */
 
+#include "autotoolsconfig.h"
 #include <errno.h>
 #include <unistd.h>
 #include <glib.h>

Modified: releases/WebKitGTK/webkit-2.0/Source/WebKit/gtk/tests/testwebbackforwardlist.c (144467 => 144468)


--- releases/WebKitGTK/webkit-2.0/Source/WebKit/gtk/tests/testwebbackforwardlist.c	2013-03-01 17:57:56 UTC (rev 144467)
+++ releases/WebKitGTK/webkit-2.0/Source/WebKit/gtk/tests/testwebbackforwardlist.c	2013-03-01 18:07:25 UTC (rev 144468)
@@ -17,6 +17,7 @@
  * Boston, MA 02110-1301, USA.
  */
 
+#include "autotoolsconfig.h"
 #include <glib.h>
 #include <gtk/gtk.h>
 #include <webkit/webkit.h>

Modified: releases/WebKitGTK/webkit-2.0/Source/WebKit/gtk/tests/testwebdatasource.c (144467 => 144468)


--- releases/WebKitGTK/webkit-2.0/Source/WebKit/gtk/tests/testwebdatasource.c	2013-03-01 17:57:56 UTC (rev 144467)
+++ releases/WebKitGTK/webkit-2.0/Source/WebKit/gtk/tests/testwebdatasource.c	2013-03-01 18:07:25 UTC (rev 144468)
@@ -17,6 +17,7 @@
  * Boston, MA 02110-1301, USA.
  */
 
+#include "autotoolsconfig.h"
 #include <glib.h>
 #include <gtk/gtk.h>
 #include <webkit/webkit.h>

Modified: releases/WebKitGTK/webkit-2.0/Source/WebKit/gtk/tests/testwebframe.c (144467 => 144468)


--- releases/WebKitGTK/webkit-2.0/Source/WebKit/gtk/tests/testwebframe.c	2013-03-01 17:57:56 UTC (rev 144467)
+++ releases/WebKitGTK/webkit-2.0/Source/WebKit/gtk/tests/testwebframe.c	2013-03-01 18:07:25 UTC (rev 144468)
@@ -18,6 +18,7 @@
  * Boston, MA 02110-1301, USA.
  */
 
+#include "autotoolsconfig.h"
 #include <errno.h>
 #include <unistd.h>
 #include <glib.h>

Modified: releases/WebKitGTK/webkit-2.0/Source/WebKit/gtk/tests/testwebhistoryitem.c (144467 => 144468)


--- releases/WebKitGTK/webkit-2.0/Source/WebKit/gtk/tests/testwebhistoryitem.c	2013-03-01 17:57:56 UTC (rev 144467)
+++ releases/WebKitGTK/webkit-2.0/Source/WebKit/gtk/tests/testwebhistoryitem.c	2013-03-01 18:07:25 UTC (rev 144468)
@@ -17,6 +17,7 @@
  * Boston, MA 02110-1301, USA.
  */
 
+#include "autotoolsconfig.h"
 #include <glib.h>
 #include <gtk/gtk.h>
 #include <webkit/webkit.h>

Modified: releases/WebKitGTK/webkit-2.0/Source/WebKit/gtk/tests/testwebinspector.c (144467 => 144468)


--- releases/WebKitGTK/webkit-2.0/Source/WebKit/gtk/tests/testwebinspector.c	2013-03-01 17:57:56 UTC (rev 144467)
+++ releases/WebKitGTK/webkit-2.0/Source/WebKit/gtk/tests/testwebinspector.c	2013-03-01 18:07:25 UTC (rev 144468)
@@ -17,6 +17,7 @@
  * Boston, MA 02110-1301, USA.
  */
 
+#include "autotoolsconfig.h"
 #include "test_utils.h"
 
 #include <string.h>

Modified: releases/WebKitGTK/webkit-2.0/Source/WebKit/gtk/tests/testwebplugindatabase.c (144467 => 144468)


--- releases/WebKitGTK/webkit-2.0/Source/WebKit/gtk/tests/testwebplugindatabase.c	2013-03-01 17:57:56 UTC (rev 144467)
+++ releases/WebKitGTK/webkit-2.0/Source/WebKit/gtk/tests/testwebplugindatabase.c	2013-03-01 18:07:25 UTC (rev 144468)
@@ -17,6 +17,7 @@
  * Boston, MA 02110-1301, USA.
  */
 
+#include "autotoolsconfig.h"
 #include <errno.h>
 #include <glib.h>
 #include <glib/gstdio.h>

Modified: releases/WebKitGTK/webkit-2.0/Source/WebKit/gtk/tests/testwebresource.c (144467 => 144468)


--- releases/WebKitGTK/webkit-2.0/Source/WebKit/gtk/tests/testwebresource.c	2013-03-01 17:57:56 UTC (rev 144467)
+++ releases/WebKitGTK/webkit-2.0/Source/WebKit/gtk/tests/testwebresource.c	2013-03-01 18:07:25 UTC (rev 144468)
@@ -17,6 +17,7 @@
  * Boston, MA 02110-1301, USA.
  */
 
+#include "autotoolsconfig.h"
 #include <glib.h>
 #include <gtk/gtk.h>
 #include <libsoup/soup.h>

Modified: releases/WebKitGTK/webkit-2.0/Source/WebKit/gtk/tests/testwebsettings.c (144467 => 144468)


--- releases/WebKitGTK/webkit-2.0/Source/WebKit/gtk/tests/testwebsettings.c	2013-03-01 17:57:56 UTC (rev 144467)
+++ releases/WebKitGTK/webkit-2.0/Source/WebKit/gtk/tests/testwebsettings.c	2013-03-01 18:07:25 UTC (rev 144468)
@@ -17,6 +17,7 @@
  * Boston, MA 02110-1301, USA.
  */
 
+#include "autotoolsconfig.h"
 #include <glib.h>
 #include <gtk/gtk.h>
 #include <webkit/webkit.h>

Modified: releases/WebKitGTK/webkit-2.0/Source/WebKit/gtk/tests/testwebview.c (144467 => 144468)


--- releases/WebKitGTK/webkit-2.0/Source/WebKit/gtk/tests/testwebview.c	2013-03-01 17:57:56 UTC (rev 144467)
+++ releases/WebKitGTK/webkit-2.0/Source/WebKit/gtk/tests/testwebview.c	2013-03-01 18:07:25 UTC (rev 144468)
@@ -19,6 +19,7 @@
  * Boston, MA 02110-1301, USA.
  */
 
+#include "autotoolsconfig.h"
 #include "test_utils.h"
 
 #include <errno.h>

Modified: releases/WebKitGTK/webkit-2.0/Source/WebKit/gtk/tests/testwindow.c (144467 => 144468)


--- releases/WebKitGTK/webkit-2.0/Source/WebKit/gtk/tests/testwindow.c	2013-03-01 17:57:56 UTC (rev 144467)
+++ releases/WebKitGTK/webkit-2.0/Source/WebKit/gtk/tests/testwindow.c	2013-03-01 18:07:25 UTC (rev 144468)
@@ -17,6 +17,7 @@
  * Boston, MA 02110-1301, USA.
  */
 
+#include "autotoolsconfig.h"
 #include <gtk/gtk.h>
 #include <webkit/webkit.h>

Modified: releases/WebKitGTK/webkit-2.0/Tools/ChangeLog (144467 => 144468)


--- releases/WebKitGTK/webkit-2.0/Tools/ChangeLog	2013-03-01 17:57:56 UTC (rev 144467)
+++ releases/WebKitGTK/webkit-2.0/Tools/ChangeLog	2013-03-01 18:07:25 UTC (rev 144468)
@@ -1,3 +1,15 @@
+2013-02-24  Gustavo Noronha Silva  <[email protected]>
+
+        [GTK] GTK+ 2 build broken since GTK_API_VERSION_2 moved to autoconfig.h
+        https://bugs.webkit.org/show_bug.cgi?id=110702
+
+        Reviewed by Martin Robinson.
+
+        * GtkLauncher/main.c: include autotoolsconfig.h.
+        * Scripts/webkitpy/style/checker.py: make GtkLauncher/main.c exempt of
+        the include ordering check, since it uses autotoolsconfig.h which needs to
+        come first.
+
 2013-02-21  Martin Robinson  <[email protected]>
 
         gtk/DumpRenderTree.cpp is missing <locale.h> include

Modified: releases/WebKitGTK/webkit-2.0/Tools/GtkLauncher/main.c (144467 => 144468)


--- releases/WebKitGTK/webkit-2.0/Tools/GtkLauncher/main.c	2013-03-01 17:57:56 UTC (rev 144467)
+++ releases/WebKitGTK/webkit-2.0/Tools/GtkLauncher/main.c	2013-03-01 18:07:25 UTC (rev 144468)
@@ -25,6 +25,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include "autotoolsconfig.h"
 #include "LauncherInspectorWindow.h"
 #include <errno.h>
 #include <gst/gst.h>

Modified: releases/WebKitGTK/webkit-2.0/Tools/Scripts/webkitpy/style/checker.py (144467 => 144468)


--- releases/WebKitGTK/webkit-2.0/Tools/Scripts/webkitpy/style/checker.py	2013-03-01 17:57:56 UTC (rev 144467)
+++ releases/WebKitGTK/webkit-2.0/Tools/Scripts/webkitpy/style/checker.py	2013-03-01 18:07:25 UTC (rev 144468)
@@ -165,6 +165,11 @@
       "Source/WebKit2/UIProcess/API/qt"],
      ["-readability/parameter_name"]),
 
+    ([# The GTK+ port uses the autotoolsconfig.h header in some C sources
+      # to serve the same purpose of config.h.
+      "Tools/GtkLauncher/main.c"],
+     ["-build/include_order"]),
+
     ([# The GTK+ APIs use GTK+ naming style, which includes
       # lower-cased, underscore-separated values, whitespace before
       # parens for function calls, and always having variable names.

_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to