[GTK][CMAKE] Remove compile warnings about GTK+ deprecated API

https://bugs.webkit.org/show_bug.cgi?id=130014

Reviewed by Martin Robinson.

.:

Set GDK_VERSION_MIN_REQUIRED to GDK_VERSION_3_6.

* Source/cmake/OptionsGTK.cmake:
* Source/cmakeconfig.h.cmake:

Tools:

Include cmake or autotools config header.

* MiniBrowser/gtk/BrowserDownloadsBar.c:
* MiniBrowser/gtk/BrowserSearchBar.c:
* MiniBrowser/gtk/BrowserWindow.c:
* MiniBrowser/gtk/main.c:

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@165488 268f45cc-cd09-0410-ab3c-d52691b4dbfc

ChangeLog

@@ -1,3 +1,15 @@
+2014-03-12  Carlos Garcia Campos  <[email protected]>
+
+        [GTK][CMAKE] Remove compile warnings about GTK+ deprecated API
+        https://bugs.webkit.org/show_bug.cgi?id=130014
+
+        Reviewed by Martin Robinson.
+
+        Set GDK_VERSION_MIN_REQUIRED to GDK_VERSION_3_6.
+
+        * Source/cmake/OptionsGTK.cmake:
+        * Source/cmakeconfig.h.cmake:
+
 2014-03-12  Martin Robinson  <[email protected]>
 
         [GTK][CMAKE] Too verbose build output

Source/cmake/OptionsGTK.cmake

@@ -108,6 +108,7 @@ if (NOT USE_GTK2)
     set(GTK_API_VERSION 3.0)
     set(ENABLE_PLUGIN_PROCESS ON)
     set(ENABLE_WEBKIT2 ON)
+    set(GDK_VERSION_MIN_REQUIRED GDK_VERSION_3_6)
 else ()
     set(WEBKITGTK_API_VERSION 2.0)
     set(GTK_API_VERSION 2.0)

Source/cmakeconfig.h.cmake

@@ -127,4 +127,8 @@
 #cmakedefine01 WTF_USE_TILED_BACKING_STORE
 #cmakedefine01 HAVE_LLVM
 
+#if defined(BUILDING_GTK__) && !defined(GTK_API_VERSION_2)
+#define GDK_VERSION_MIN_REQUIRED @GDK_VERSION_MIN_REQUIRED@
+#endif
+
 #endif /* CMAKECONFIG_H */

Tools/ChangeLog

@@ -1,3 +1,17 @@
+2014-03-12  Carlos Garcia Campos  <[email protected]>
+
+        [GTK][CMAKE] Remove compile warnings about GTK+ deprecated API
+        https://bugs.webkit.org/show_bug.cgi?id=130014
+
+        Reviewed by Martin Robinson.
+
+        Include cmake or autotools config header.
+
+        * MiniBrowser/gtk/BrowserDownloadsBar.c:
+        * MiniBrowser/gtk/BrowserSearchBar.c:
+        * MiniBrowser/gtk/BrowserWindow.c:
+        * MiniBrowser/gtk/main.c:
+
 2014-03-12  Commit Queue  <[email protected]>
 
         Unreviewed, rolling out r165471.

Tools/MiniBrowser/gtk/BrowserDownloadsBar.c

@@ -23,6 +23,13 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#if defined(HAVE_CONFIG_H) && HAVE_CONFIG_H
+#ifdef BUILDING_WITH_CMAKE
+#include "cmakeconfig.h"
+#else
+#include "autotoolsconfig.h"
+#endif
+#endif
 #include "BrowserDownloadsBar.h"
 
 #include <glib/gi18n.h>

Tools/MiniBrowser/gtk/BrowserSearchBar.c

@@ -23,6 +23,13 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#if defined(HAVE_CONFIG_H) && HAVE_CONFIG_H
+#ifdef BUILDING_WITH_CMAKE
+#include "cmakeconfig.h"
+#else
+#include "autotoolsconfig.h"
+#endif
+#endif
 #include "BrowserSearchBar.h"
 
 

Tools/MiniBrowser/gtk/BrowserWindow.c

@@ -25,6 +25,13 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#if defined(HAVE_CONFIG_H) && HAVE_CONFIG_H
+#ifdef BUILDING_WITH_CMAKE
+#include "cmakeconfig.h"
+#else
+#include "autotoolsconfig.h"
+#endif
+#endif
 #include "BrowserWindow.h"
 
 #include "BrowserDownloadsBar.h"

Tools/MiniBrowser/gtk/main.c

@@ -25,6 +25,14 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#if defined(HAVE_CONFIG_H) && HAVE_CONFIG_H
+#ifdef BUILDING_WITH_CMAKE
+#include "cmakeconfig.h"
+#else
+#include "autotoolsconfig.h"
+#endif
+#endif
+
 #include "BrowserWindow.h"
 #include <errno.h>
 #include <gtk/gtk.h>