Changeset 223042 in webkit


Ignore:
Timestamp:
Oct 9, 2017, 2:08:49 AM (7 years ago)
Author:
fred.wang@free.fr
Message:

Remove WOFF2 from Source/ThirdParty.
​https://bugs.webkit.org/show_bug.cgi?id=177862

Patch by Frederic Wang <​fwang@igalia.com> on 2017-10-05
Reviewed by Michael Catanzaro.

.:

  • Source/CMakeLists.txt: Do not build the woff2 source.
  • Source/cmake/FindWOFF2Dec.cmake: Added. New cmake module for woff2.
  • Source/cmake/OptionsGTK.cmake: Load the woff2 package.

Source/ThirdParty:

  • woff2/CMakeLists.txt: Removed.
  • woff2/LICENSE: Removed.
  • woff2/README.webkit: Removed.
  • woff2/include/woff2/decode.h: Removed.
  • woff2/include/woff2/encode.h: Removed.
  • woff2/include/woff2/output.h: Removed.
  • woff2/src/buffer.h: Removed.
  • woff2/src/convert_woff2ttf_*.cc: Removed.
  • woff2/src/file.h: Removed.
  • woff2/src/font.cc: Removed.
  • woff2/src/font.h: Removed.
  • woff2/src/glyph.cc: Removed.
  • woff2/src/glyph.h: Removed.
  • woff2/src/normalize.cc: Removed.
  • woff2/src/normalize.h: Removed.
  • woff2/src/port.h: Removed.
  • woff2/src/round.h: Removed.
  • woff2/src/store_bytes.h: Removed.
  • woff2/src/table_tags.cc: Removed.
  • woff2/src/table_tags.h: Removed.
  • woff2/src/transform.cc: Removed.
  • woff2/src/transform.h: Removed.
  • woff2/src/variable_length.cc: Removed.
  • woff2/src/variable_length.h: Removed.
  • woff2/src/woff2_common.cc: Removed.
  • woff2/src/woff2_common.h: Removed.
  • woff2/src/woff2_compress.cc: Removed.
  • woff2/src/woff2_dec.cc: Removed.
  • woff2/src/woff2_decompress.cc: Removed.
  • woff2/src/woff2_enc.cc: Removed.
  • woff2/src/woff2_info.cc: Removed.
  • woff2/src/woff2_out.cc: Removed.
  • woff2/update.sh: Removed.

Source/WebCore:

No new tests, already covered by existing tests.

  • CMakeLists.txt: Use the system brotli/woff2 headers/libraries.

Tools:

  • Scripts/webkitpy/style/checker.py: Remove woff2.
  • gtk/jhbuild.modules: Add new jhbuild module for woff2.
Location:
trunk
Files:
1 added
1 deleted
9 edited

Legend:

Unmodified
Added
Removed

  • trunk/ChangeLog

    r222930 r223042  
     12017-10-05  Frederic Wang  <fwang@igalia.com>
     2
     3        Remove WOFF2 from Source/ThirdParty.
     4        https://bugs.webkit.org/show_bug.cgi?id=177862
     5
     6        Reviewed by Michael Catanzaro.
     7
     8        * Source/CMakeLists.txt: Do not build the woff2 source.
     9        * Source/cmake/FindWOFF2Dec.cmake: Added. New cmake module for woff2.
     10        * Source/cmake/OptionsGTK.cmake: Load the woff2 package.
     11
    1122017-10-05  Carlos Alberto Lopez Perez  <clopez@igalia.com>
    213

  • trunk/Source/CMakeLists.txt

    r222907 r223042  
    1616if (ENABLE_API_TESTS)
    1717    add_subdirectory(ThirdParty/gtest)
    18 endif ()
    19 
    20 if (USE_WOFF2)
    21     add_subdirectory(ThirdParty/woff2)
    2218endif ()
    2319

  • trunk/Source/ThirdParty/ChangeLog

    r222960 r223042  
     12017-10-05  Frederic Wang  <fwang@igalia.com>
     2
     3        Remove WOFF2 from Source/ThirdParty.
     4        https://bugs.webkit.org/show_bug.cgi?id=177862
     5
     6        Reviewed by Michael Catanzaro.
     7
     8        * woff2/CMakeLists.txt: Removed.
     9        * woff2/LICENSE: Removed.
     10        * woff2/README.webkit: Removed.
     11        * woff2/include/woff2/decode.h: Removed.
     12        * woff2/include/woff2/encode.h: Removed.
     13        * woff2/include/woff2/output.h: Removed.
     14        * woff2/src/buffer.h: Removed.
     15        * woff2/src/convert_woff2ttf_*.cc: Removed.
     16        * woff2/src/file.h: Removed.
     17        * woff2/src/font.cc: Removed.
     18        * woff2/src/font.h: Removed.
     19        * woff2/src/glyph.cc: Removed.
     20        * woff2/src/glyph.h: Removed.
     21        * woff2/src/normalize.cc: Removed.
     22        * woff2/src/normalize.h: Removed.
     23        * woff2/src/port.h: Removed.
     24        * woff2/src/round.h: Removed.
     25        * woff2/src/store_bytes.h: Removed.
     26        * woff2/src/table_tags.cc: Removed.
     27        * woff2/src/table_tags.h: Removed.
     28        * woff2/src/transform.cc: Removed.
     29        * woff2/src/transform.h: Removed.
     30        * woff2/src/variable_length.cc: Removed.
     31        * woff2/src/variable_length.h: Removed.
     32        * woff2/src/woff2_common.cc: Removed.
     33        * woff2/src/woff2_common.h: Removed.
     34        * woff2/src/woff2_compress.cc: Removed.
     35        * woff2/src/woff2_dec.cc: Removed.
     36        * woff2/src/woff2_decompress.cc: Removed.
     37        * woff2/src/woff2_enc.cc: Removed.
     38        * woff2/src/woff2_info.cc: Removed.
     39        * woff2/src/woff2_out.cc: Removed.
     40        * woff2/update.sh: Removed.
     41
    1422017-10-05  Frederic Wang  <fwang@igalia.com>
    243

  • trunk/Source/WebCore/CMakeLists.txt

    r222997 r223042  
    36603660
    36613661if (USE_WOFF2)
    3662   list(APPEND WebCore_INCLUDE_DIRECTORIES "${THIRDPARTY_DIR}/woff2/include")
    3663   list(APPEND WebCore_LIBRARIES woff2)
     3662  list(APPEND WebCore_INCLUDE_DIRECTORIES "${WOFF2DEC_INCLUDE_DIRS}")
     3663  list(APPEND WebCore_LIBRARIES "${BROTLIDEC_LIBRARIES}" "${WOFF2DEC_LIBRARIES}")
    36643664endif ()
    36653665

  • trunk/Source/WebCore/ChangeLog

    r223036 r223042  
     12017-10-05  Frederic Wang  <fwang@igalia.com>
     2
     3        Remove WOFF2 from Source/ThirdParty.
     4        https://bugs.webkit.org/show_bug.cgi?id=177862
     5
     6        Reviewed by Michael Catanzaro.
     7
     8        No new tests, already covered by existing tests.
     9
     10        * CMakeLists.txt: Use the system brotli/woff2 headers/libraries.
     11
    1122017-10-08  Darin Adler  <darin@apple.com>
    213

  • trunk/Source/cmake/OptionsGTK.cmake

    r222907 r223042  
    388388       message(FATAL_ERROR "librotlidec is needed for USE_WOFF2.")
    389389    endif ()
     390    find_package(WOFF2Dec 1.0.1)
     391    if (NOT WOFF2DEC_FOUND)
     392       message(FATAL_ERROR "liwoff2dec is needed for USE_WOFF2.")
     393    endif ()
    390394endif ()
    391395

  • trunk/Tools/ChangeLog

    r223041 r223042  
     12017-10-05  Frederic Wang  <fwang@igalia.com>
     2
     3        Remove WOFF2 from Source/ThirdParty.
     4        https://bugs.webkit.org/show_bug.cgi?id=177862
     5
     6        Reviewed by Michael Catanzaro.
     7
     8        * Scripts/webkitpy/style/checker.py: Remove woff2.
     9        * gtk/jhbuild.modules: Add new jhbuild module for woff2.
     10
    1112017-10-08  Sam Weinig  <sam@webkit.org>
    212

  • trunk/Tools/Scripts/webkitpy/style/checker.py

    r222907 r223042  
    214214    ([os.path.join('webkitpy', 'thirdparty'),
    215215      os.path.join('Source', 'ThirdParty', 'ANGLE'),
    216       os.path.join('Source', 'ThirdParty', 'woff2'),
    217216      os.path.join('Source', 'ThirdParty', 'xdgmime')],
    218217     ["-",

  • trunk/Tools/gtk/jhbuild.modules

    r222907 r223042  
    99    <dependencies>
    1010      <dep package="brotli"/>
     11      <dep package="woff2"/>
    1112      <dep package="cairo"/>
    1213      <dep package="fonts"/>
    … …  
    8586  </cmake>
    8687
     88  <cmake id="woff2">
     89    <branch repo="github.com" module="google/woff2.git" checkoutdir="woff2" tag="v1.0.1"/>
     90    <dependencies>
     91      <dep package="brotli"/>
     92    </dependencies>
     93  </cmake>
     94
    8795  <autotools id="cairo"
    8896             autogen-sh="configure">
Note: See TracChangeset for help on using the changeset viewer.