Unreviewed, rolling out r172393.

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

discussion needed about GnuTLS version bump on the bots
(Requested by philn on #webkit).

Reverted changeset:

https://bugs.webkit.org/show_bug.cgi?id=133317
http://trac.webkit.org/changeset/172393

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

diff --git a/ChangeLog b/ChangeLog
index 94cc85a..f81ac79 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2014-08-11  Commit Queue  <commit-queue@webkit.org>
+
+        Unreviewed, rolling out r172393.
+        https://bugs.webkit.org/show_bug.cgi?id=135796
+
+        discussion needed about GnuTLS version bump on the bots
+        (Requested by philn on #webkit).
+
+        Reverted changeset:
+
+        https://bugs.webkit.org/show_bug.cgi?id=133317
+        http://trac.webkit.org/changeset/172393
+
 2014-08-11  Eduardo Lima Mitev  <elima@igalia.com>
         [GTK] Adds dependency on GnuTLS 3.0+ for the implementation of subtle crypto algorithms
         https://bugs.webkit.org/show_bug.cgi?id=133317

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index 19f96f1..d1813ed 100644 (file)
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,16 @@
+2014-08-11  Commit Queue  <commit-queue@webkit.org>
+
+        Unreviewed, rolling out r172393.
+        https://bugs.webkit.org/show_bug.cgi?id=135796
+
+        discussion needed about GnuTLS version bump on the bots
+        (Requested by philn on #webkit).
+
+        Reverted changeset:
+
+        https://bugs.webkit.org/show_bug.cgi?id=133317
+        http://trac.webkit.org/changeset/172393
+
 2014-08-11  Eduardo Lima Mitev  <elima@igalia.com>
         [GTK] Adds dependency on GnuTLS 3.0+ for the implementation of subtle crypto algorithms
         https://bugs.webkit.org/show_bug.cgi?id=133317

diff --git a/Source/WebCore/PlatformGTK.cmake b/Source/WebCore/PlatformGTK.cmake
index a92c667..f649e50 100644 (file)
--- a/Source/WebCore/PlatformGTK.cmake
+++ b/Source/WebCore/PlatformGTK.cmake
@@ -822,11 +822,4 @@ if (ENABLE_SUBTLE_CRYPTO)
         crypto/gtk/CryptoKeyRSAGtk.cpp
         crypto/gtk/SerializedCryptoKeyWrapGtk.cpp
     )
-
-    list(APPEND WebCore_INCLUDE_DIRECTORIES
-        ${GNUTLS_INCLUDE_DIRS}
-    )
-    list(APPEND WebCore_LIBRARIES
-        ${GNUTLS_LIBRARIES}
-    )
 endif ()

diff --git a/Source/cmake/OptionsGTK.cmake b/Source/cmake/OptionsGTK.cmake
index 36e6fb1..2256fb1 100644 (file)
--- a/Source/cmake/OptionsGTK.cmake
+++ b/Source/cmake/OptionsGTK.cmake
@@ -372,7 +372,3 @@ file(WRITE
 file(COPY ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/build.sh
   DESTINATION ${CMAKE_BINARY_DIR}
   FILE_PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE)
-
-if (ENABLE_SUBTLE_CRYPTO)
-    find_package(GnuTLS 3.0.0 REQUIRED)
-endif ()