Bug 163689 – [GTK] Bump glib to 2.50.1 (or find alternative solution to Gtk+ CUPS build issue)

• Component: WebKitGTK
• Status: RESOLVED LATER

[Manuel Rego Casasnovas]

In order to fix bug #163591, we need to apply an upstream patch into GTK+.
But GTK+ won't build anymore with that patch unless glib is in version 2.50.

So first we need to bump glib version and then we could fix the GTK+ and CUPS issue.

[Manuel Rego Casasnovas]

Created attachment 292101 [details]
Patch

[Michael Catanzaro]

Comment on attachment 292101 [details]
Patch

You need --disable-libmount to fix the build.

Please watch the test bots after you land this, just in case.

[Manuel Rego Casasnovas]

Created attachment 292156 [details]
Adding --disable-libmount

[WebKit Commit Bot]

Comment on attachment 292156 [details]
Adding --disable-libmount

Clearing flags on attachment: 292156

Committed r207589: <http://trac.webkit.org/changeset/207589>

[WebKit Commit Bot]

All reviewed patches have been landed.  Closing bug.

[Michael Catanzaro]

It's too many new failures for now, when we're trying to get the bot green. If you want to try gardening them all, then we can try landing again, otherwise we can try this again once we get the bot green.

[WebKit Commit Bot]

Re-opened since this is blocked by bug 163765

[Carlos Garcia Campos]

(In reply to comment #6)
> It's too many new failures for now, when we're trying to get the bot green.
> If you want to try gardening them all, then we can try landing again,
> otherwise we can try this again once we get the bot green.

I'm surprised a glib upgrade caused differences in layout test results :-(

[Manuel Rego Casasnovas]

We should probably rollout bug #163591 too, because otherwise you couldn't build GTK+ right now. :-/

[Joanmarie Diggs]

Created attachment 293029 [details]
Patch

[Michael Catanzaro]

Comment on attachment 293029 [details]
Patch

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

> Tools/gtk/jhbuild.modules:211
> +      <patch file="glib-use-upstream-gettext.patch" strip="1"/>

I don't get it, the patch doesn't do anything to switch to upstream gettext, so it's named wrongly at least. It looks like it just adds a deprecation warning.

[Michael Catanzaro]

If the patch really fixes the build, then you could name it glib-deprecate-am-glib-gnu-gettext.patch

As background for the autotools stuff: AM_GLIB_GNU_GETTEXT is a downstream macro that GNOME used to use instead of AM_GNU_GETTEXT, the upstream macro, before intltool. AM_GNU_GETTEXT (gettext), AM_GLIB_GNU_GETTEXT (glib-gettext), and IT_PROG_INTLTOOL (intltool) are all different slightly-incompatible ways of translating applications. glib-gettext and intltool exist to work around gettext not supporting various important features. Nowadays gettext can do everything we need in GNOME, so we don't need the downstream things anymore. The patch you have here looks like it just adds a build warning to warn maintainers to stop using the AM_GLIB_GNU_GETTEXT macro and start using AM_GNU_GETTEXT instead. Actually doing that requires more work. GLib has itself not yet made the transition; if you check the git history, Javier tried multiple times to start using upstream gettext, but each time it got reverted, so GLib is still itself using glib-gettext. The confusion here is that the commit message of the patch deprecating AM_GLIB_GNU_GETTEXT does say "use upstream gettext" but it is actually a directive to users of GLib to start using upstream gettext, whereas you (reasonably) interpreted it to mean that GLib itself now uses upstream gettext directly.

All of the above is one good reason why meson now exists. :)

[Joanmarie Diggs]

*** Configuring gtk+ *** [18/40]
/home/jd/checkout/WebKitGtk/WebKitBuild/DependenciesGTK/Source/gtk+-3.16.4/autogen.sh --prefix /home/jd/checkout/WebKitGtk/WebKitBuild/DependenciesGTK/Root --disable-introspection --enable-introspection --disable-Werror 
autoreconf: Entering directory `.'
autoreconf: configure.ac: not using Gettext
autoreconf: running: aclocal --force -I m4 ${ACLOCAL_FLAGS}
/home/jd/checkout/WebKitGtk/WebKitBuild/DependenciesGTK/Root/share/aclocal/glib-gettext.m4:39: error: m4_copy: won't overwrite defined macro: glib_DEFUN
/home/jd/checkout/WebKitGtk/WebKitBuild/DependenciesGTK/Root/share/aclocal/glib-gettext.m4:39: the top level
autom4te: /usr/bin/m4 failed with exit status: 1
aclocal: error: echo failed with exit status: 1
autoreconf: aclocal failed with exit status: 1
Failed to build GTK+ port dependencies with jhbuild
Died at ./Tools/Scripts/update-webkitgtk-libs line 24.

[Joanmarie Diggs]

Created attachment 293036 [details]
Patch

[WebKit Commit Bot]

Comment on attachment 293036 [details]
Patch

Clearing flags on attachment: 293036

Committed r207992: <http://trac.webkit.org/changeset/207992>

[WebKit Commit Bot]

All reviewed patches have been landed.  Closing bug.

[WebKit Commit Bot]

Re-opened since this is blocked by bug 164070

[Philippe Normand]

Why was this rolled out? The rollout patch mentions "aclocal version conflicts" which is a vague statement, at best.

[Philippe Normand]

(In reply to comment #13)
> *** Configuring gtk+ *** [18/40]
> /home/jd/checkout/WebKitGtk/WebKitBuild/DependenciesGTK/Source/gtk+-3.16.4/
> autogen.sh --prefix
> /home/jd/checkout/WebKitGtk/WebKitBuild/DependenciesGTK/Root
> --disable-introspection --enable-introspection --disable-Werror 
> autoreconf: Entering directory `.'
> autoreconf: configure.ac: not using Gettext
> autoreconf: running: aclocal --force -I m4 ${ACLOCAL_FLAGS}
> /home/jd/checkout/WebKitGtk/WebKitBuild/DependenciesGTK/Root/share/aclocal/
> glib-gettext.m4:39: error: m4_copy: won't overwrite defined macro: glib_DEFUN
> /home/jd/checkout/WebKitGtk/WebKitBuild/DependenciesGTK/Root/share/aclocal/
> glib-gettext.m4:39: the top level
> autom4te: /usr/bin/m4 failed with exit status: 1
> aclocal: error: echo failed with exit status: 1
> autoreconf: aclocal failed with exit status: 1
> Failed to build GTK+ port dependencies with jhbuild
> Died at ./Tools/Scripts/update-webkitgtk-libs line 24.

With this patch and the patch for gtk+3.16 applied I still get this error here.

[Philippe Normand]

Huh nevermind I also get this error without the patch :S

[Philippe Normand]

Forgot to remove Source/glib* before rebuilding. Sorry for the spam here :)

[Michael Catanzaro]

(In reply to comment #18)
> Why was this rolled out? The rollout patch mentions "aclocal version
> conflicts" which is a vague statement, at best.

It broke the buildbots since the glib tarball was generated with a different version of Automake than is installed on the buildbots. To try landing again, I would try removing autogen-sh="configure" from the glib module -- that should do the trick.

Of course, best of all would be to help gardening so that we can upgrade glib.

[Philippe Normand]

I suppose this patch is no longer needed since #163591 is fixed.