Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

meld: Add upstream patches to fix building and GUI #11692

Merged
merged 1 commit into from
May 20, 2022

Conversation

cbrt64
Copy link
Contributor

@cbrt64 cbrt64 commented May 19, 2022

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.

bad
good

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 to makedepends. I'll leave that to the maintainers.

@lazka
Copy link
Member

lazka commented May 19, 2022

That has been bothering me for weeks! Thanks

@lazka lazka merged commit 52e8d16 into msys2:master May 20, 2022
@cbrt64
Copy link
Contributor Author

cbrt64 commented May 23, 2022

Hi, thanks! It's nice to know my amateur poking around can be useful to somebody. HAND!

@cbrt64 cbrt64 deleted the fix/meld3 branch May 30, 2022 19:08
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