Bug 171918 – [GTK] Bump GTK+ and its dependencies in jhbuild

• Component: WebKitGTK
• Status: RESOLVED FIXED

[Carlos Garcia Campos]

To a more recent versions

[Carlos Garcia Campos]

Created attachment 309589 [details]
Patch

[Carlos Garcia Campos]

Committed r216578: <http://trac.webkit.org/changeset/216578>

[Carlos Alberto Lopez Perez]

Comment on attachment 309589 [details]
Patch

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

> Tools/gtk/jhbuild.modules:606
> +      <dep package="harfbuzz"/>
> +      <if condition-unset="macos">
> +	<dep package="harfbuzz"/>
> +	<dep package="fontconfig"/>
> +      </if>

I just noticed this...

I think there is some trouble on this block of dependencies.

 <dependencies>
      <dep package="glib"/>
      <dep package="cairo"/>
      <dep package="harfbuzz"/>
      <if condition-unset="macos">
	<dep package="harfbuzz"/>
	<dep package="fontconfig"/>
      </if>
    </dependencies>

why harfbuzz is twice for condition != macos.

And why fontconfig was before unconditionally and now is only for != macos

[Carlos Garcia Campos]

(In reply to Carlos Alberto Lopez Perez from comment #3)
> Comment on attachment 309589 [details]
> Patch
> 
> View in context:
> https://bugs.webkit.org/attachment.cgi?id=309589&action=review
> 
> > Tools/gtk/jhbuild.modules:606
> > +      <dep package="harfbuzz"/>
> > +      <if condition-unset="macos">
> > +	<dep package="harfbuzz"/>
> > +	<dep package="fontconfig"/>
> > +      </if>
> 
> I just noticed this...
> 
> I think there is some trouble on this block of dependencies.
> 
>  <dependencies>
>       <dep package="glib"/>
>       <dep package="cairo"/>
>       <dep package="harfbuzz"/>
>       <if condition-unset="macos">
> 	<dep package="harfbuzz"/>
> 	<dep package="fontconfig"/>
>       </if>
>     </dependencies>
> 
> why harfbuzz is twice for condition != macos.

I forgot to remove the previous line, I'll do it in a follow up. Good catch!.
 
> And why fontconfig was before unconditionally and now is only for != macos

Because in macos CoreFoo libraries are used instead. This is what the original jhbuild has:

<if condition-unset="quartz">
        <dep package="harfbuzz"/>
        <dep package="fontconfig"/>
</if>

[WebKit Commit Bot]

Re-opened since this is blocked by bug 171920

[Carlos Garcia Campos]

GTK+ was built without wayland support, because it needs a newer wayland, so we need to bump it too.

[Carlos Garcia Campos]

Created attachment 309600 [details]
Patch for landing

Please, don't cq+ this until bug #171921 is fixed.

[Joanmarie Diggs]

Note that I am going to need to bump atk, at-spi2-core, and at-spi2-atk even higher for bug 172355 and a couple of other bugs I've not yet filed related to new ARIA 1.1 features I need to implement. I'm hoping that (at least) the fix for bug 172355 will land before this patch lands. Lemme know if you'd like me to do a new patch for this bug after it does.

[Carlos Garcia Campos]

(In reply to Joanmarie Diggs (irc: joanie) from comment #8)
> Note that I am going to need to bump atk, at-spi2-core, and at-spi2-atk even
> higher for bug 172355 and a couple of other bugs I've not yet filed related
> to new ARIA 1.1 features I need to implement. I'm hoping that (at least) the
> fix for bug 172355 will land before this patch lands. Lemme know if you'd
> like me to do a new patch for this bug after it does.

Ah, even higher, what versions do you need then?

[Joanmarie Diggs]

(In reply to Carlos Garcia Campos from comment #9)
> (In reply to Joanmarie Diggs (irc: joanie) from comment #8)
> > Note that I am going to need to bump atk, at-spi2-core, and at-spi2-atk even
> > higher for bug 172355 and a couple of other bugs I've not yet filed related
> > to new ARIA 1.1 features I need to implement. I'm hoping that (at least) the
> > fix for bug 172355 will land before this patch lands. Lemme know if you'd
> > like me to do a new patch for this bug after it does.
> 
> Ah, even higher, what versions do you need then?

2.25.2 of all three.

[Joanmarie Diggs]

Annnnnd we're bumped. https://trac.webkit.org/changeset/217426/webkit#file11

[Carlos Alberto Lopez Perez]

Created attachment 311735 [details]
Patch

patch for landing

[WebKit Commit Bot]

Comment on attachment 311735 [details]
Patch

Clearing flags on attachment: 311735

Committed r217674: <http://trac.webkit.org/changeset/217674>

[WebKit Commit Bot]

All reviewed patches have been landed.  Closing bug.