Title: [185802] trunk
- Revision
- 185802
- Author
- [email protected]
- Date
- 2015-06-20 16:00:45 -0700 (Sat, 20 Jun 2015)
Log 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:
Modified Paths
Diff
Modified: trunk/ChangeLog (185801 => 185802)
--- trunk/ChangeLog 2015-06-20 22:50:58 UTC (rev 185801)
+++ trunk/ChangeLog 2015-06-20 23:00:45 UTC (rev 185802)
@@ -1,3 +1,14 @@
+2015-06-20 Michael Catanzaro <[email protected]>
+
+ [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 <[email protected]>
[EFL] Do not consider test directories when DEVELOPER_MODE is OFF
Modified: trunk/Source/WTF/ChangeLog (185801 => 185802)
--- trunk/Source/WTF/ChangeLog 2015-06-20 22:50:58 UTC (rev 185801)
+++ trunk/Source/WTF/ChangeLog 2015-06-20 23:00:45 UTC (rev 185802)
@@ -1,3 +1,14 @@
+2015-06-20 Michael Catanzaro <[email protected]>
+
+ [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 <[email protected]>
[SOUP] Define SOUP_VERSION_MIN_REQUIRED
Modified: trunk/Source/WTF/wtf/Platform.h (185801 => 185802)
--- trunk/Source/WTF/wtf/Platform.h 2015-06-20 22:50:58 UTC (rev 185801)
+++ trunk/Source/WTF/wtf/Platform.h 2015-06-20 23:00:45 UTC (rev 185802)
@@ -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
Modified: trunk/Source/cmake/OptionsGTK.cmake (185801 => 185802)
--- trunk/Source/cmake/OptionsGTK.cmake 2015-06-20 22:50:58 UTC (rev 185801)
+++ trunk/Source/cmake/OptionsGTK.cmake 2015-06-20 23:00:45 UTC (rev 185802)
@@ -244,7 +244,7 @@
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)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
