Bug 171918 - [GTK] Bump GTK+ and its dependencies in jhbuild
Summary: [GTK] Bump GTK+ and its dependencies in jhbuild
Status: RESOLVED FIXED
Alias: None
Product: WebKit
Classification: Unclassified
Component: WebKitGTK (show other bugs)
Version: WebKit Nightly Build
Hardware: Unspecified Unspecified
: P2 Normal
Assignee: Carlos Alberto Lopez Perez
URL:
Keywords:
Depends on: 171920 171921
Blocks: 170500
  Show dependency treegraph
 
Reported: 2017-05-10 04:26 PDT by Carlos Garcia Campos
Modified: 2017-06-01 12:52 PDT (History)
4 users (show)

See Also:


Attachments
Patch (6.97 MB, patch)
2017-05-10 04:28 PDT, Carlos Garcia Campos
clopez: review+
Details | Formatted Diff | Diff
Patch for landing (6.97 MB, patch)
2017-05-10 06:30 PDT, Carlos Garcia Campos
no flags Details | Formatted Diff | Diff
Patch (6.93 MB, patch)
2017-06-01 11:43 PDT, Carlos Alberto Lopez Perez
no flags Details | Formatted Diff | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Carlos Garcia Campos 2017-05-10 04:26:18 PDT
To a more recent versions
Comment 1 Carlos Garcia Campos 2017-05-10 04:28:18 PDT
Created attachment 309589 [details]
Patch
Comment 2 Carlos Garcia Campos 2017-05-10 04:53:33 PDT
Committed r216578: <http://trac.webkit.org/changeset/216578>
Comment 3 Carlos Alberto Lopez Perez 2017-05-10 04:58:15 PDT
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
Comment 4 Carlos Garcia Campos 2017-05-10 05:02:49 PDT
(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>
Comment 5 WebKit Commit Bot 2017-05-10 05:23:26 PDT
Re-opened since this is blocked by bug 171920
Comment 6 Carlos Garcia Campos 2017-05-10 05:27:35 PDT
GTK+ was built without wayland support, because it needs a newer wayland, so we need to bump it too.
Comment 7 Carlos Garcia Campos 2017-05-10 06:30:58 PDT
Created attachment 309600 [details]
Patch for landing

Please, don't cq+ this until bug #171921 is fixed.
Comment 8 Joanmarie Diggs 2017-05-25 05:37:53 PDT
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.
Comment 9 Carlos Garcia Campos 2017-05-25 05:48:04 PDT
(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?
Comment 10 Joanmarie Diggs 2017-05-25 06:52:05 PDT
(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.
Comment 11 Joanmarie Diggs 2017-05-25 09:52:32 PDT
Annnnnd we're bumped. https://trac.webkit.org/changeset/217426/webkit#file11
Comment 12 Carlos Alberto Lopez Perez 2017-06-01 11:43:34 PDT
Created attachment 311735 [details]
Patch

patch for landing
Comment 13 WebKit Commit Bot 2017-06-01 12:52:43 PDT
Comment on attachment 311735 [details]
Patch

Clearing flags on attachment: 311735

Committed r217674: <http://trac.webkit.org/changeset/217674>
Comment 14 WebKit Commit Bot 2017-06-01 12:52:44 PDT
All reviewed patches have been landed.  Closing bug.