meld: Add upstream patches to fix building and GUI #11692
Merged
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
After the adwaita-icon-theme 42.0 update, meld couldn't find
${MSYSTEM_PREFIX}/share/icons/Adwaita/8x8/legacy/emblem-new.png
, which messed up the GUI. This has already been fixed in meld. The upstream build fix corresponds to mesonbuild/meson#9441. PR tested locally, see screenshots.BTW, meson was looking for
desktop-file-validate
; it doesn't seem to use it though, so I didn't bother adding desktop-file-utils tomakedepends
. I'll leave that to the maintainers.