From b271624fcbd02748fcbd3beb466017df13c40934 Mon Sep 17 00:00:00 2001 From: Pavel Feldman Date: Wed, 22 Jul 2020 20:46:00 -0700 Subject: [PATCH] browser(webkit): hardcode woff enabled on win (#3103) --- browser_patches/webkit/BUILD_NUMBER | 4 ++-- browser_patches/webkit/patches/bootstrap.diff | 14 ++++++++++++-- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/browser_patches/webkit/BUILD_NUMBER b/browser_patches/webkit/BUILD_NUMBER index a3d39367c4..1ac57f7005 100644 --- a/browser_patches/webkit/BUILD_NUMBER +++ b/browser_patches/webkit/BUILD_NUMBER @@ -1,2 +1,2 @@ -1311 -Changed: yurys@chromium.org Tue Jul 21 18:47:35 PDT 2020 +1312 +Changed: pavel.feldman@gmail.com Thu, Jul 23, 2020 3:44:28 AM diff --git a/browser_patches/webkit/patches/bootstrap.diff b/browser_patches/webkit/patches/bootstrap.diff index 8a815558e0..c95b73c088 100644 --- a/browser_patches/webkit/patches/bootstrap.diff +++ b/browser_patches/webkit/patches/bootstrap.diff @@ -15123,10 +15123,20 @@ index 4785d5a01d86462d8a897f90ce233df650af0cf4..a804a5df69b817e901a7d7408d43de41 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_NETSCAPE_PLUGIN_API PRIVATE OFF) else () diff --git a/Source/cmake/OptionsWinCairo.cmake b/Source/cmake/OptionsWinCairo.cmake -index 8a9c9e8d5bc6c283bf766efdf8cdc5e6aff546fb..fa6950a71a57b449c6d40a55578b012bacfbe7c1 100644 +index 8a9c9e8d5bc6c283bf766efdf8cdc5e6aff546fb..29fb661996f2e280fc80cfa4940567896819e53c 100644 --- a/Source/cmake/OptionsWinCairo.cmake +++ b/Source/cmake/OptionsWinCairo.cmake -@@ -36,6 +36,29 @@ if (WebP_FOUND) +@@ -27,15 +27,36 @@ if (OpenJPEG_FOUND) + endif () + + find_package(WOFF2 1.0.2 COMPONENTS dec) +-if (WOFF2_FOUND) +- SET_AND_EXPOSE_TO_BUILD(USE_WOFF2 ON) +-endif () ++SET_AND_EXPOSE_TO_BUILD(USE_WOFF2 ON) + + find_package(WebP COMPONENTS demux) + if (WebP_FOUND) SET_AND_EXPOSE_TO_BUILD(USE_WEBP ON) endif ()