Bug 237089 – Bubblewrap launcher doesn't bind font locations from XDG_DATA_DIRS

• Component: WebKitGTK
• Status: RESOLVED FIXED

[apteryx]

The BubbleWrap launcher of WebKitGTK doesn't expose font locations present in XDG_DATA_DIRS.  This problem was originally reported by a Guix user at https://issues.guix.gnu.org/41174.

[apteryx]

Created attachment 453016 [details]
Patch

[Patrick Griffis]

Looks reasonable.

[Michael Catanzaro]

Comment on attachment 453016 [details]
Patch

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

I agree, except for code style nits:

> Source/WebKit/UIProcess/Launcher/glib/BubblewrapLauncher.cpp:308
> +    for (auto dataDir = dataDirs; dataDir != nullptr && *dataDir != nullptr; dataDir++) {

I'm surprised the style bot didn't complain about this. Always write out the * on auto* to make it more clear that it's a pointer, and never explicitly compare against nullptr:

for (auto* dataDir = dataDirs; dataDir && *dataDir; dataDir++) {

[Michael Catanzaro]

Comment on attachment 453016 [details]
Patch

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

> Source/WebKit/ChangeLog:3
> +        Expose all fonts locations present in XDG_DATA_DIRS

First line should match the title of the bug:

Bubblewrap launcher doesn't bind font locations from XDG_DATA_DIRS

[apteryx]

Created attachment 453031 [details]
Patch

[apteryx]

(In reply to Michael Catanzaro from comment #3)
> Comment on attachment 453016 [details]
> Patch
> 
> View in context:
> https://bugs.webkit.org/attachment.cgi?id=453016&action=review
> 
> I agree, except for code style nits:
> 
> > Source/WebKit/UIProcess/Launcher/glib/BubblewrapLauncher.cpp:308
> > +    for (auto dataDir = dataDirs; dataDir != nullptr && *dataDir != nullptr; dataDir++) {
> 
> I'm surprised the style bot didn't complain about this. Always write out the
> * on auto* to make it more clear that it's a pointer, and never explicitly
> compare against nullptr:
> 
> for (auto* dataDir = dataDirs; dataDir && *dataDir; dataDir++) {

Adjusted. Thanks for the prompt review!

[apteryx]

(In reply to Michael Catanzaro from comment #4)
> Comment on attachment 453016 [details]
> Patch
> 
> View in context:
> https://bugs.webkit.org/attachment.cgi?id=453016&action=review
> 
> > Source/WebKit/ChangeLog:3
> > +        Expose all fonts locations present in XDG_DATA_DIRS
> 
> First line should match the title of the bug:
> 
> Bubblewrap launcher doesn't bind font locations from XDG_DATA_DIRS

Done.

[EWS]

Committed r290395 (247709@main): <https://commits.webkit.org/247709@main>

All reviewed patches have been landed. Closing bug and clearing flags on attachment 453031 [details].