Bug 182933 – [GTK][CMake] Support building with Enchant 2.x

• Status: RESOLVED
• Resolution: FIXED
• Component: WebCore Misc.

[Adrian Perez]

Today I noticed that Arch Linux has stopped shipping Enchant 1.x a
while ago, and that for building WebKitGTK+ the following patch is
applied:

  https://git.archlinux.org/svntogit/packages.git/tree/trunk/enchant-2.diff?h=packages/webkit2gtk

The patch is very simple, and it merely changes “FindEnchant.cmake”
so it checks for “enchant-2” instead of “enchant” using pkg-config.
The usage that WebKitGTK+ makes of Enchant does not seem to rely on
any API changed between the Enchant 1.x series and the 2.x ones, so
it should be safe to check whether any of them is available.

On a chat with Michael Catanzaro he pointed out that Enchant 2.x
will still take time to be adopted by all GNU/Linux distributions,
and in the meanwhile we should try to keep the build working fine
with both 1.x and 2.x — and making WebKitGTK+ buildable out of the
box with the newer releases is the first step.

[Adrian Perez]

Created attachment 334171 [details]
Patch

[Adrian Perez]

Comment on attachment 334171 [details]
Patch

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

There's a small typo in the comment, I'll fix it before landing.

> Source/cmake/FindEnchant.cmake:48
> +    # cases in which e.g. both versions of the library are installed, but on

The “on” needs to be deleted in this phrase, it should read “but the
headers are usable/present only for one of them”.

[Adrian Perez]

Created attachment 334172 [details]
Patch

Rebased patch with typo in comment fixed

[Adrian Perez]

On a chat with Michael Catanzaro we have agreed that it's probably
better to check for Enchant 2.x first, so I'll re-upload the patch
with that change done.

[Michael Catanzaro]

Comment on attachment 334172 [details]
Patch

This looks good, just swap the order so enchant-2 is checked first, and please add a FIXME to remove the check for old enchant after a couple of years.

[Adrian Perez]

Created attachment 334275 [details]
Patch

[Adrian Perez]

Created attachment 334277 [details]
Patch for landing

[WebKit Commit Bot]

Comment on attachment 334277 [details]
Patch for landing

Clearing flags on attachment: 334277

Committed r228826: <https://trac.webkit.org/changeset/228826>

[WebKit Commit Bot]

All reviewed patches have been landed.  Closing bug.

[Radar WebKit Bug Importer]

<rdar://problem/37712970>