Title: [176928] trunk
- Revision
- 176928
- Author
- be...@igalia.com
- Date
- 2014-12-07 11:24:14 -0800 (Sun, 07 Dec 2014)
Log Message
[GTK] WebKit has a new required dependency on GnuTLS
https://bugs.webkit.org/show_bug.cgi?id=136158
Reviewed by Martin Robinson.
Detect if GnuTLS is installed and enable or disable subtle crypto
support accordingly.
* Source/cmake/OptionsGTK.cmake:
Modified Paths
Diff
Modified: trunk/ChangeLog (176927 => 176928)
--- trunk/ChangeLog 2014-12-07 18:57:14 UTC (rev 176927)
+++ trunk/ChangeLog 2014-12-07 19:24:14 UTC (rev 176928)
@@ -1,3 +1,15 @@
+2014-12-07 Alberto Garcia <be...@igalia.com>
+
+ [GTK] WebKit has a new required dependency on GnuTLS
+ https://bugs.webkit.org/show_bug.cgi?id=136158
+
+ Reviewed by Martin Robinson.
+
+ Detect if GnuTLS is installed and enable or disable subtle crypto
+ support accordingly.
+
+ * Source/cmake/OptionsGTK.cmake:
+
2014-12-07 Carlos Garcia Campos <cgar...@igalia.com>
[GTK] Missing API detected in GObject DOM bindings after r176630
Modified: trunk/Source/cmake/OptionsGTK.cmake (176927 => 176928)
--- trunk/Source/cmake/OptionsGTK.cmake 2014-12-07 18:57:14 UTC (rev 176927)
+++ trunk/Source/cmake/OptionsGTK.cmake 2014-12-07 19:24:14 UTC (rev 176928)
@@ -49,6 +49,7 @@
find_package(OpenGL)
find_package(EGL)
find_package(GeoClue2 2.1.5)
+find_package(GnuTLS 3.0.0)
if (NOT GEOCLUE2_FOUND)
find_package(GeoClue)
@@ -86,6 +87,16 @@
message(FATAL_ERROR "cairo-gl is needed for Accelerated 2D Canvas support")
endif ()
+if (GNUTLS_FOUND)
+ WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_SUBTLE_CRYPTO ON)
+else ()
+ WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_SUBTLE_CRYPTO OFF)
+endif ()
+
+if (ENABLE_SUBTLE_CRYPTO AND NOT(GNUTLS_FOUND))
+ message(FATAL_ERROR "Subtle crypto support needs GnuTLS 3.0.0")
+endif ()
+
if (GEOCLUE2_FOUND OR GEOCLUE_FOUND)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_GEOLOCATION ON)
else ()
@@ -147,7 +158,6 @@
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_SECCOMP_FILTERS OFF)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_SHARED_WORKERS ON)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_SPELLCHECK ON)
-WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_SUBTLE_CRYPTO OFF)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_TEMPLATE_ELEMENT ON)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_TOUCH_EVENTS ON)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_USERSELECT_ALL ON)
@@ -394,7 +404,3 @@
FILE_PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE
)
endif ()
-
-if (ENABLE_SUBTLE_CRYPTO)
- find_package(GnuTLS 3.0.0 REQUIRED)
-endif ()
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
