[WinCairo] Update WinCairoRequirements

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

Reviewed by Alex Christensen.

.:

* Source/cmake/OptionsWinCairo.cmake:

Source/WebCore:

No new tests. No change in behavior.

* PlatformWin.cmake:

Source/WebKit:

* PlatformWin.cmake:

Tools:

* TestWebKitAPI/PlatformWin.cmake:

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

diff --git a/ChangeLog b/ChangeLog
index 2a3d681..371f186 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2017-11-16  Don Olmstead  <don.olmstead@sony.com>
+
+        [WinCairo] Update WinCairoRequirements
+        https://bugs.webkit.org/show_bug.cgi?id=179790
+
+        Reviewed by Alex Christensen.
+
+        * Source/cmake/OptionsWinCairo.cmake:
+
 2017-11-16  Daniel Bates  <dabates@apple.com>
 
         Add feature define for alternative presentation button element

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index 57b95e2..f4560ee 100644 (file)
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,14 @@
+2017-11-16  Don Olmstead  <don.olmstead@sony.com>
+
+        [WinCairo] Update WinCairoRequirements
+        https://bugs.webkit.org/show_bug.cgi?id=179790
+
+        Reviewed by Alex Christensen.
+
+        No new tests. No change in behavior.
+
+        * PlatformWin.cmake:
+
 2017-11-16  Antoine Quint  <graouts@apple.com>
 
         [Web Animations] Allow KeyframeEffect to support CSS property animation blending

diff --git a/Source/WebCore/PlatformWin.cmake b/Source/WebCore/PlatformWin.cmake
index 4663cba..533b497 100644 (file)
--- a/Source/WebCore/PlatformWin.cmake
+++ b/Source/WebCore/PlatformWin.cmake
@@ -298,13 +298,17 @@ file(COPY
     DESTINATION
     ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/WebKit.resources
 )
-if (WTF_PLATFORM_WIN_CAIRO AND EXISTS ${WEBKIT_LIBRARIES_DIR}/cacert.pem)
+if (WTF_PLATFORM_WIN_CAIRO AND EXISTS ${WEBKIT_LIBRARIES_DIR}/etc/ssl/cert.pem)
     make_directory(${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/WebKit.resources/certificates)
     file(COPY
-        ${WEBKIT_LIBRARIES_DIR}/cacert.pem
+        ${WEBKIT_LIBRARIES_DIR}/etc/ssl/cert.pem
         DESTINATION
         ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/WebKit.resources/certificates
     )
+    file(RENAME
+        ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/WebKit.resources/certificates/cert.pem
+        ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/WebKit.resources/certificates/cacert.pem
+    )
 endif ()
 
 file(MAKE_DIRECTORY ${FORWARDING_HEADERS_DIR}/WebCore)

diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
index 8412204..558018e 100644 (file)
--- a/Source/WebKit/ChangeLog
+++ b/Source/WebKit/ChangeLog
@@ -1,3 +1,12 @@
+2017-11-16  Don Olmstead  <don.olmstead@sony.com>
+
+        [WinCairo] Update WinCairoRequirements
+        https://bugs.webkit.org/show_bug.cgi?id=179790
+
+        Reviewed by Alex Christensen.
+
+        * PlatformWin.cmake:
+
 2017-11-16  Youenn Fablet  <youenn@apple.com>
 
         Service Worker should get the body of intercepted requests

diff --git a/Source/WebKit/PlatformWin.cmake b/Source/WebKit/PlatformWin.cmake
index 57f1504..4874cb0 100644 (file)
--- a/Source/WebKit/PlatformWin.cmake
+++ b/Source/WebKit/PlatformWin.cmake
@@ -121,9 +121,8 @@ if (${WTF_PLATFORM_WIN_CAIRO})
     add_definitions(-DUSE_CAIRO=1 -DUSE_CURL=1)
 
     list(APPEND WebKit_LIBRARIES
-        libeay32.lib
+        ${OPENSSL_LIBRARIES}
         mfuuid.lib
-        ssleay32.lib
         strmiids.lib
     )
 endif ()

diff --git a/Source/cmake/OptionsWinCairo.cmake b/Source/cmake/OptionsWinCairo.cmake
index 3ccde45..834004f 100644 (file)
--- a/Source/cmake/OptionsWinCairo.cmake
+++ b/Source/cmake/OptionsWinCairo.cmake
@@ -2,17 +2,17 @@ set(WTF_PLATFORM_WIN_CAIRO 1)
 
 include(OptionsWin)
 
-find_package(Cairo 1.14.4 REQUIRED)
-find_package(CURL 7.45.0 REQUIRED)
-find_package(JPEG REQUIRED)
-find_package(LibXml2 2.8.0 REQUIRED)
-find_package(OpenSSL REQUIRED)
-find_package(PNG REQUIRED)
-find_package(Sqlite REQUIRED)
-find_package(ZLIB REQUIRED)
+find_package(Cairo 1.14.10 REQUIRED)
+find_package(CURL 7.56.1 REQUIRED)
+find_package(JPEG 1.5.2 REQUIRED)
+find_package(LibXml2 2.9.7 REQUIRED)
+find_package(OpenSSL 2.0.0 REQUIRED)
+find_package(PNG 1.6.34 REQUIRED)
+find_package(Sqlite 3.21.0 REQUIRED)
+find_package(ZLIB 1.2.11 REQUIRED)
 
 if (ENABLE_XSLT)
-    find_package(LibXslt 1.1.7 REQUIRED)
+    find_package(LibXslt 1.1.32 REQUIRED)
 endif ()
 
 SET_AND_EXPOSE_TO_BUILD(USE_CAIRO ON)

diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index 199833b..c8f898c 100644 (file)
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,3 +1,12 @@
+2017-11-16  Don Olmstead  <don.olmstead@sony.com>
+
+        [WinCairo] Update WinCairoRequirements
+        https://bugs.webkit.org/show_bug.cgi?id=179790
+
+        Reviewed by Alex Christensen.
+
+        * TestWebKitAPI/PlatformWin.cmake:
+
 2017-11-16  Daniel Bates  <dabates@apple.com>
 
         Add feature define for alternative presentation button element

diff --git a/Tools/TestWebKitAPI/PlatformWin.cmake b/Tools/TestWebKitAPI/PlatformWin.cmake
index 498a88d..7142194 100644 (file)
--- a/Tools/TestWebKitAPI/PlatformWin.cmake
+++ b/Tools/TestWebKitAPI/PlatformWin.cmake
@@ -73,10 +73,9 @@ set(TestWebCoreLib_SOURCES
 if (${WTF_PLATFORM_WIN_CAIRO})
     list(APPEND test_webcore_LIBRARIES
         ${CAIRO_LIBRARIES}
+        ${OPENSSL_LIBRARIES}
         libANGLE
-        libeay32
         mfuuid
-        ssleay32
         strmiids
         vcruntime
     )