Bug 121414 – [GTK][2.2] Enable the Wayland target by default if the GTK+ Wayland dependency is available

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

[Zan Dobersek]

The Wayland target should be enabled by default if the GTK+ dependency is of version >= 3.10 was produced with the Wayland backend enabled.

This bug covers the 2.2 stable branch. I plan to do the same thing for the trunk, but in a separate bug with hopefully some additional refactoring regarding the --with-target configuration option.

[Zan Dobersek]

Created attachment 211748 [details]
Patch

[Gustavo Noronha (kov)]

Comment on attachment 211748 [details]
Patch

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

> Source/autotools/ReadCommandLineArguments.m4:65
> +    if test "$with_wayland_target" != "auto"; then

This would also match no, so wayland ends up being a hard requirement if it was explicitly disabled?

[Zan Dobersek]

Comment on attachment 211748 [details]
Patch

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

>> Source/autotools/ReadCommandLineArguments.m4:65
>> +    if test "$with_wayland_target" != "auto"; then
> 
> This would also match no, so wayland ends up being a hard requirement if it was explicitly disabled?

This checks that with_wayland_target wasn't previously set to 'auto', i.e. that it's basically still undefined.

[Zan Dobersek]

Comment on attachment 211748 [details]
Patch

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

> Source/autotools/Versions.m4:21
> +m4_define([gtk3_wayland_required_version], [3.9.14])

A question about the version to use here. The idea is to use the 3.10 series, but putting 3.10.0 here isn't possible just yet.
Is 3.9.14 fine here? Will this be bumped to 3.10.0 once 2.2 is released?

[Martin Robinson]

Comment on attachment 211748 [details]
Patch

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

Looks good, but please look into removing the unnecessary temporary variable before landing.

> Source/autotools/FindDependencies.m4:223
> +    ], [have_gtk_wayland=yes], [have_gtk_wayland=no])
> +    if test "$have_gtk_wayland" = "no"; then
> +        if test "$with_wayland_target" = "yes"; then
> +            AC_MSG_ERROR([GTK+ Wayland dependency (gtk+-wayland-$GTK_API_VERSION >= gtk3_wayland_required_version) not found.])
> +        else
> +            AC_MSG_WARN([GTK+ Wayland dependency (gtk+-wayland-$GTK_API_VERSION >= gtk3_wayland_required_version) not found, disabling the Wayland target.])
> +            with_wayland_target=no
> +        fi
> +    else
> +        with_wayland_target=yes
> +    fi
>  fi

You don't have to have the temporary variable have_gtk_wayland. Instead you can put the code you want to execute in the square brackets.

[Zan Dobersek]

Landed the adjusted patch in r155899.
http://trac.webkit.org/changeset/155899