[WPE] Remove GnuTLS dependency
authorcommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 2 Oct 2017 20:00:03 +0000 (20:00 +0000)
committercommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 2 Oct 2017 20:00:03 +0000 (20:00 +0000)
https://bugs.webkit.org/show_bug.cgi?id=177750

Patch by Olivier Blin <olivier.blin@softathome.com> on 2017-10-02
Reviewed by Michael Catanzaro.

libgcrypt is used by default instead of GnuTLS.
See bug 163125

.:

* Source/cmake/OptionsWPE.cmake:

Source/WebCore:

* PlatformWPE.cmake:

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

ChangeLog
Source/WebCore/ChangeLog
Source/WebCore/PlatformWPE.cmake
Source/cmake/OptionsWPE.cmake

index 64fdc1c..e8fafae 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,17 @@
 2017-10-02  Olivier Blin  <olivier.blin@softathome.com>
 
+        [WPE] Remove GnuTLS dependency
+        https://bugs.webkit.org/show_bug.cgi?id=177750
+
+        Reviewed by Michael Catanzaro.
+
+        libgcrypt is used by default instead of GnuTLS.
+        See bug 163125
+
+        * Source/cmake/OptionsWPE.cmake:
+
+2017-10-02  Olivier Blin  <olivier.blin@softathome.com>
+
         [WPE] Do not require XSLT if disabled
         https://bugs.webkit.org/show_bug.cgi?id=177752
 
index 1db7c1f..9efd32b 100644 (file)
@@ -1,3 +1,15 @@
+2017-10-02  Olivier Blin  <olivier.blin@softathome.com>
+
+        [WPE] Remove GnuTLS dependency
+        https://bugs.webkit.org/show_bug.cgi?id=177750
+
+        Reviewed by Michael Catanzaro.
+
+        libgcrypt is used by default instead of GnuTLS.
+        See bug 163125
+
+        * PlatformWPE.cmake:
+
 2017-10-02  Zalan Bujtas  <zalan@apple.com>
 
         Addressing post-review comments after r222621
index e558d69..b97cfc5 100644 (file)
@@ -170,7 +170,6 @@ list(APPEND WebCore_LIBRARIES
     ${GLIB_GMODULE_LIBRARIES}
     ${GLIB_GOBJECT_LIBRARIES}
     ${GLIB_LIBRARIES}
-    ${GNUTLS_LIBRARIES}
     ${ICU_LIBRARIES}
     ${LIBSOUP_LIBRARIES}
     ${LIBTASN1_LIBRARIES}
@@ -181,7 +180,6 @@ list(APPEND WebCore_INCLUDE_DIRECTORIES
     ${CAIRO_INCLUDE_DIRS}
     ${GIO_UNIX_INCLUDE_DIRS}
     ${GLIB_INCLUDE_DIRS}
-    ${GNUTLS_INCLUDE_DIRS}
     ${ICU_INCLUDE_DIRS}
     ${LIBSOUP_INCLUDE_DIRS}
     ${LIBTASN1_INCLUDE_DIRS}
index 4ed2271..5297912 100644 (file)
@@ -58,7 +58,6 @@ find_package(ICU REQUIRED)
 find_package(Threads REQUIRED)
 find_package(ZLIB REQUIRED)
 find_package(GLIB 2.40.0 REQUIRED COMPONENTS gio gio-unix gobject gthread gmodule)
-find_package(GnuTLS 3.0.0 REQUIRED)
 
 find_package(Cairo 1.10.2 REQUIRED)
 find_package(Fontconfig 2.8.0 REQUIRED)