Skip to content

Gnome regressions#9812

Merged
dcbaker merged 4 commits intomesonbuild:masterfrom
eli-schwartz:gnome-regressions
Jan 12, 2022
Merged

Gnome regressions#9812
dcbaker merged 4 commits intomesonbuild:masterfrom
eli-schwartz:gnome-regressions

Conversation

@eli-schwartz
Copy link
Member

/cc @paper42

Per the gdbus-codegen documentation, this "may be used several times",
and it is:
- a valid use case
- used that way in the wild

Fixes building at least geoclue2, gdm.
Fixes gtk3 build, which uses typesfile.

All these arguments are processed by a function that explicitly handles
both str and File, and converts them to absolute paths. They clearly
need to handle File objects.
As soon as we check for args[1] we declare it is of type FileOrString,
and the additional ones specified in the `sources` kwarg explicitly
allow this. It makes no sense to not accept it as the posarg too.

Fixes building tracker-miners.
@eli-schwartz eli-schwartz added this to the 0.61.1 milestone Jan 12, 2022
@eli-schwartz eli-schwartz requested a review from dcbaker January 12, 2022 04:53
@codecov
Copy link

codecov bot commented Jan 12, 2022

Codecov Report

Merging #9812 (15d7cde) into master (ebcaa7b) will increase coverage by 3.15%.
The diff coverage is 96.75%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #9812      +/-   ##
==========================================
+ Coverage   64.35%   67.51%   +3.15%     
==========================================
  Files         200      400     +200     
  Lines       42679    85474   +42795     
  Branches     9321    18839    +9518     
==========================================
+ Hits        27468    57710   +30242     
- Misses      13006    23251   +10245     
- Partials     2205     4513    +2308     
Impacted Files Coverage Δ
mesonbuild/dependencies/hdf5.py 85.98% <ø> (ø)
mesonbuild/mesonmain.py 68.35% <0.00%> (ø)
mesonbuild/modules/__init__.py 93.93% <0.00%> (ø)
mesonbuild/mesonlib/universal.py 81.37% <66.66%> (ø)
mesonbuild/modules/gnome.py 78.69% <75.00%> (ø)
mesonbuild/mesondata.py 95.23% <91.66%> (ø)
mesonbuild/build.py 77.55% <97.89%> (ø)
mesonbuild/backend/backends.py 88.23% <100.00%> (ø)
mesonbuild/cmake/interpreter.py 83.35% <100.00%> (ø)
mesonbuild/dependencies/cmake.py 87.97% <100.00%> (ø)
... and 221 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update f956b95...15d7cde. Read the comment docs.

Copy link
Member

@dcbaker dcbaker left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for fixing these!

@dcbaker dcbaker merged commit 71540d1 into mesonbuild:master Jan 12, 2022
nirbheek added a commit to nirbheek/meson that referenced this pull request Jan 13, 2022
nirbheek added a commit to nirbheek/meson that referenced this pull request Jan 14, 2022
nirbheek added a commit to nirbheek/meson that referenced this pull request Jan 14, 2022
Dudemanguy pushed a commit to Dudemanguy/meson that referenced this pull request Jan 21, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants