Title: [165488] trunk
- Revision
- 165488
- Author
- [email protected]
- Date
- 2014-03-12 11:24:05 -0700 (Wed, 12 Mar 2014)
Log Message
[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:
Modified Paths
Diff
Modified: trunk/ChangeLog (165487 => 165488)
--- trunk/ChangeLog 2014-03-12 18:18:29 UTC (rev 165487)
+++ trunk/ChangeLog 2014-03-12 18:24:05 UTC (rev 165488)
@@ -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
Modified: trunk/Source/cmake/OptionsGTK.cmake (165487 => 165488)
--- trunk/Source/cmake/OptionsGTK.cmake 2014-03-12 18:18:29 UTC (rev 165487)
+++ trunk/Source/cmake/OptionsGTK.cmake 2014-03-12 18:24:05 UTC (rev 165488)
@@ -108,6 +108,7 @@
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)
Modified: trunk/Source/cmakeconfig.h.cmake (165487 => 165488)
--- trunk/Source/cmakeconfig.h.cmake 2014-03-12 18:18:29 UTC (rev 165487)
+++ trunk/Source/cmakeconfig.h.cmake 2014-03-12 18:24:05 UTC (rev 165488)
@@ -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 */
Modified: trunk/Tools/ChangeLog (165487 => 165488)
--- trunk/Tools/ChangeLog 2014-03-12 18:18:29 UTC (rev 165487)
+++ trunk/Tools/ChangeLog 2014-03-12 18:24:05 UTC (rev 165488)
@@ -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.
Modified: trunk/Tools/MiniBrowser/gtk/BrowserDownloadsBar.c (165487 => 165488)
--- trunk/Tools/MiniBrowser/gtk/BrowserDownloadsBar.c 2014-03-12 18:18:29 UTC (rev 165487)
+++ trunk/Tools/MiniBrowser/gtk/BrowserDownloadsBar.c 2014-03-12 18:24:05 UTC (rev 165488)
@@ -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>
Modified: trunk/Tools/MiniBrowser/gtk/BrowserSearchBar.c (165487 => 165488)
--- trunk/Tools/MiniBrowser/gtk/BrowserSearchBar.c 2014-03-12 18:18:29 UTC (rev 165487)
+++ trunk/Tools/MiniBrowser/gtk/BrowserSearchBar.c 2014-03-12 18:24:05 UTC (rev 165488)
@@ -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"
Modified: trunk/Tools/MiniBrowser/gtk/BrowserWindow.c (165487 => 165488)
--- trunk/Tools/MiniBrowser/gtk/BrowserWindow.c 2014-03-12 18:18:29 UTC (rev 165487)
+++ trunk/Tools/MiniBrowser/gtk/BrowserWindow.c 2014-03-12 18:24:05 UTC (rev 165488)
@@ -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"
Modified: trunk/Tools/MiniBrowser/gtk/main.c (165487 => 165488)
--- trunk/Tools/MiniBrowser/gtk/main.c 2014-03-12 18:18:29 UTC (rev 165487)
+++ trunk/Tools/MiniBrowser/gtk/main.c 2014-03-12 18:24:05 UTC (rev 165488)
@@ -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>
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
