Changeset 185802 in webkit

Timestamp:

Jun 20, 2015, 4:00:45 PM (11 years ago)

Author:

Michael Catanzaro

Message:

[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:

Location:

trunk

Files:

• ChangeLog (modified) (1 diff)
• Source/WTF/ChangeLog (modified) (1 diff)
• Source/WTF/wtf/Platform.h (modified) (1 diff)
• Source/cmake/OptionsGTK.cmake (modified) (1 diff)

trunk/ChangeLog

@@ +1 @@
+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>
 

trunk/Source/WTF/ChangeLog

@@ +1 @@
+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>
 

trunk/Source/WTF/wtf/Platform.h

@@ -489 +489 @@
 #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

trunk/Source/cmake/OptionsGTK.cmake

@@ -245 +245 @@
     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)