Title: [224793] trunk
- Revision
- 224793
- Author
- [email protected]
- Date
- 2017-11-13 16:42:20 -0800 (Mon, 13 Nov 2017)
Log Message
[GTK] Require woff2 1.0.2 and drop direct brotli dependency
https://bugs.webkit.org/show_bug.cgi?id=179630
Reviewed by Frédéric Wang.
.:
* Source/cmake/FindBrotliDec.cmake: Removed.
* Source/cmake/OptionsGTK.cmake:
Tools:
* gtk/jhbuild.modules:
Modified Paths
Removed Paths
Diff
Modified: trunk/ChangeLog (224792 => 224793)
--- trunk/ChangeLog 2017-11-14 00:20:25 UTC (rev 224792)
+++ trunk/ChangeLog 2017-11-14 00:42:20 UTC (rev 224793)
@@ -1,3 +1,13 @@
+2017-11-13 Michael Catanzaro <[email protected]>
+
+ [GTK] Require woff2 1.0.2 and drop direct brotli dependency
+ https://bugs.webkit.org/show_bug.cgi?id=179630
+
+ Reviewed by Frédéric Wang.
+
+ * Source/cmake/FindBrotliDec.cmake: Removed.
+ * Source/cmake/OptionsGTK.cmake:
+
2017-11-09 Michael Catanzaro <[email protected]>
[WPE] Use linker script to control exported symbols
Deleted: trunk/Source/cmake/FindBrotliDec.cmake (224792 => 224793)
--- trunk/Source/cmake/FindBrotliDec.cmake 2017-11-14 00:20:25 UTC (rev 224792)
+++ trunk/Source/cmake/FindBrotliDec.cmake 2017-11-14 00:42:20 UTC (rev 224793)
@@ -1,53 +0,0 @@
-# - Try to find BrotliDec.
-# Once done, this will define
-#
-# BROTLIDEC_FOUND - system has BrotliDec.
-# BROTLIDEC_INCLUDE_DIRS - the BrotliDec include directories
-# BROTLIDEC_LIBRARIES - link these to use BrotliDec.
-#
-# Copyright (C) 2017 Igalia S.L.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-# 1. Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-# notice, this list of conditions and the following disclaimer in the
-# documentation and/or other materials provided with the distribution.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER AND ITS CONTRIBUTORS ``AS
-# IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
-# THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR ITS
-# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-find_package(PkgConfig)
-pkg_check_modules(PC_BROTLIDEC libbrotlidec)
-
-find_path(BROTLIDEC_INCLUDE_DIRS
- NAMES brotli/decode.h
- HINTS ${PC_BROTLIDEC_INCLUDEDIR}
-)
-
-find_library(BROTLIDEC_LIBRARIES
- NAMES brotlidec
- HINTS ${PC_BROTLIDEC_LIBDIR}
-)
-
-include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(BrotliDec
- REQUIRED_VARS BROTLIDEC_INCLUDE_DIRS BROTLIDEC_LIBRARIES
- FOUND_VAR BROTLIDEC_FOUND
- VERSION_VAR PC_BROTLIDEC_VERSION)
-
-mark_as_advanced(
- BROTLIDEC_INCLUDE_DIRS
- BROTLIDEC_LIBRARIES
-)
Modified: trunk/Source/cmake/OptionsGTK.cmake (224792 => 224793)
--- trunk/Source/cmake/OptionsGTK.cmake 2017-11-14 00:20:25 UTC (rev 224792)
+++ trunk/Source/cmake/OptionsGTK.cmake 2017-11-14 00:42:20 UTC (rev 224793)
@@ -365,11 +365,7 @@
endif ()
if (USE_WOFF2)
- find_package(BrotliDec 1.0.1)
- if (NOT BROTLIDEC_FOUND)
- message(FATAL_ERROR "libbrotlidec is needed for USE_WOFF2.")
- endif ()
- find_package(WOFF2Dec 1.0.1)
+ find_package(WOFF2Dec 1.0.2)
if (NOT WOFF2DEC_FOUND)
message(FATAL_ERROR "libwoff2dec is needed for USE_WOFF2.")
endif ()
Modified: trunk/Tools/ChangeLog (224792 => 224793)
--- trunk/Tools/ChangeLog 2017-11-14 00:20:25 UTC (rev 224792)
+++ trunk/Tools/ChangeLog 2017-11-14 00:42:20 UTC (rev 224793)
@@ -1,3 +1,12 @@
+2017-11-13 Michael Catanzaro <[email protected]>
+
+ [GTK] Require woff2 1.0.2 and drop direct brotli dependency
+ https://bugs.webkit.org/show_bug.cgi?id=179630
+
+ Reviewed by Frédéric Wang.
+
+ * gtk/jhbuild.modules:
+
2017-11-08 Keith Miller <[email protected]>
Async iteration should only fetch the next method once and add feature flag
Modified: trunk/Tools/gtk/jhbuild.modules (224792 => 224793)
--- trunk/Tools/gtk/jhbuild.modules 2017-11-14 00:20:25 UTC (rev 224792)
+++ trunk/Tools/gtk/jhbuild.modules 2017-11-14 00:42:20 UTC (rev 224793)
@@ -85,7 +85,7 @@
</cmake>
<cmake id="woff2">
- <branch repo="github.com" module="google/woff2.git" checkoutdir="woff2" tag="v1.0.1"/>
+ <branch repo="github.com" module="google/woff2.git" checkoutdir="woff2" tag="v1.0.2"/>
<dependencies>
<dep package="brotli"/>
</dependencies>
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
