Bug 177804 – Remove Brotli from Source/ThirdParty

• Status: RESOLVED
• Resolution: FIXED
• Component: WebKitGTK

[Frédéric Wang (:fredw)]

After the upgrade to brotli 1.0.1, I believe we can just remove the sources from the WebKit repository and instead use a jhbuild or system library for brotli.

[Frédéric Wang (:fredw)]

Created attachment 322505 [details]
Patch (WIP)

This finds brotli using cmake. Still need to do the jhbuild part.

[Michael Catanzaro]

Comment on attachment 322505 [details]
Patch (WIP)

View in context: https://bugs.webkit.org/attachment.cgi?id=322505&action=review

Super, thanks

> Source/cmake/OptionsGTK.cmake:383
> +if (USE_WOFF2)
> +    find_package(BrotliDec)
> +    if (NOT BROTLIDEC_FOUND)
> +       message(FATAL_ERROR "librotlidec is needed for USE_WOFF2.")
> +    endif ()
> +endif ()

Good, but also, instead of setting USE_WOFF2 at the top of OptionsGTK.cmake, you'll need to remove that and set it using WEBKIT_OPTION_DEFINE. It should go next to USE_LIBNOTIFY/USE_LIBHYPHEN/USE_LIBSECRET

[Adrian Perez]

(In reply to Frédéric Wang (:fredw) from comment #0)
> After the upgrade to brotli 1.0.1, I believe we can just remove the sources
> from the WebKit repository and instead use a jhbuild or system library for
> brotli.

Less bundled dependencies are always a good thing!

\o/

[Frédéric Wang (:fredw)]

Created attachment 322527 [details]
Patch

Addressing Michael's feedback and adding jhbuild config for brotli.

[Frédéric Wang (:fredw)]

Created attachment 322528 [details]
Patch (177768+177804)

[Frédéric Wang (:fredw)]

Brotli should also be removed from Tools/Scripts/webkitpy/style/checker.py

[Frédéric Wang (:fredw)]

Created attachment 322800 [details]
Patch

[Michael Catanzaro]

Comment on attachment 322800 [details]
Patch

Awesome!

[Michael Catanzaro]

You need to pass the min required version to find_package().

[Frédéric Wang (:fredw)]

(In reply to Michael Catanzaro from comment #9)
> You need to pass the min required version to find_package().

Right, I'll do it.

> UnicodeDecodeError: 'utf8' codec can't decode byte 0xe8 in position 738: invalid continuation byte

It seems this is a Python bug with the script that applies the patch, so I'll land it manually.

[Frédéric Wang (:fredw)]

Committed r222907: <http://trac.webkit.org/changeset/222907>