[EFL][GTK] Define GLIB_VERSION_MIN_REQUIRED and require glib 2.36 for GTK

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

Reviewed by Martin Robinson.

.:

Bump our GLib requirement to 2.36 to reflect reality, since we are using GTask.

* Source/cmake/OptionsGTK.cmake:

Source/WTF:

Define GLIB_VERSION_MIN_REQUIRED to avoid deprecation warnings.

* wtf/Platform.h:

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

diff --git a/ChangeLog b/ChangeLog
index fac0c2937db6f83b6c7827eaacab67064f373588..41a147abaaa00dee8938ca087f1d50241b87b78b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2015-06-20  Michael Catanzaro  <mcatanzaro@igalia.com>
+
+        [EFL][GTK] Define GLIB_VERSION_MIN_REQUIRED and require glib 2.36 for GTK
+        https://bugs.webkit.org/show_bug.cgi?id=146181
+
+        Reviewed by Martin Robinson.
+
+        Bump our GLib requirement to 2.36 to reflect reality, since we are using GTask.
+
+        * Source/cmake/OptionsGTK.cmake:
+
 2015-06-20  Ryuan Choi  <ryuan.choi@navercorp.com>
 
         [EFL] Do not consider test directories when DEVELOPER_MODE is OFF

diff --git a/Source/WTF/ChangeLog b/Source/WTF/ChangeLog
index f022d07e2c60e0aa39512a32669d0fd4d97bf191..eee20e397e590e674e78c6d66c9490045daa43d6 100644 (file)
--- a/Source/WTF/ChangeLog
+++ b/Source/WTF/ChangeLog
@@ -1,3 +1,14 @@
+2015-06-20  Michael Catanzaro  <mcatanzaro@igalia.com>
+
+        [EFL][GTK] Define GLIB_VERSION_MIN_REQUIRED and require glib 2.36 for GTK
+        https://bugs.webkit.org/show_bug.cgi?id=146181
+
+        Reviewed by Martin Robinson.
+
+        Define GLIB_VERSION_MIN_REQUIRED to avoid deprecation warnings.
+
+        * wtf/Platform.h:
+
 2015-06-19  Michael Catanzaro  <mcatanzaro@igalia.com>
 
         [SOUP] Define SOUP_VERSION_MIN_REQUIRED

diff --git a/Source/WTF/wtf/Platform.h b/Source/WTF/wtf/Platform.h
index f39363a9829dedba82036aa049bbabcef291fb64..c234f50182793c1f6d5bb30350fe5e32c036cbfc 100644 (file)
--- a/Source/WTF/wtf/Platform.h
+++ b/Source/WTF/wtf/Platform.h
@@ -488,6 +488,12 @@
 #define USE_WEBP 1
 #endif
 
+#if PLATFORM(EFL)
+#define GLIB_VERSION_MIN_REQUIRED GLIB_VERSION_2_38
+#elif PLATFORM(GTK)
+#define GLIB_VERSION_MIN_REQUIRED GLIB_VERSION_2_36
+#endif
+
 #if PLATFORM(GTK) && !defined(GTK_API_VERSION_2)
 #define GDK_VERSION_MIN_REQUIRED GDK_VERSION_3_6
 #endif

diff --git a/Source/cmake/OptionsGTK.cmake b/Source/cmake/OptionsGTK.cmake
index 55ae2437eccd2aea7169dcfef48ddd0bbebd485b..044fa911b32b98339b54f4710f9f89f802dec2bf 100644 (file)
--- a/Source/cmake/OptionsGTK.cmake
+++ b/Source/cmake/OptionsGTK.cmake
@@ -244,7 +244,7 @@ set(glib_components gio gobject gthread gmodule)
 if (ENABLE_GAMEPAD_DEPRECATED OR ENABLE_GEOLOCATION)
     list(APPEND glib_components gio-unix)
 endif ()
-find_package(GLIB 2.33.2 REQUIRED COMPONENTS ${glib_components})
+find_package(GLIB 2.36 REQUIRED COMPONENTS ${glib_components})
 
 if (ENABLE_CREDENTIAL_STORAGE)
     find_package(Libsecret)