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

gnome-calculator: Add patches #11915

Merged
merged 2 commits into from Jun 26, 2022
Merged

Conversation

lb90
Copy link
Collaborator

@lb90 lb90 commented Jun 22, 2022

Fixes #11804
Fixes #11848

@lazka
Copy link
Member

lazka commented Jun 22, 2022

blocked on #11864 currently, sry

@lb90 lb90 force-pushed the gnome-calculator-add-patches branch from 5d17946 to 0da6dfd Compare June 26, 2022 12:06
@lazka lazka merged commit 5e4c100 into msys2:master Jun 26, 2022
@lazka
Copy link
Member

lazka commented Jun 26, 2022

blocked on #11864 currently, sry

oh, I guess it was not related after all, just a similar traceback

@Biswa96
Copy link
Member

Biswa96 commented Jun 26, 2022

oh, I guess it was not related after all, just a similar traceback

Nope, meson/python was not guilty. The CI output was error: failed to load doclet which was the bug from vala. I had the fix in my mind when I opened this issue https://gitlab.gnome.org/GNOME/vala/-/issues/1302. But it was only in my mind. Justice served 👨‍⚖️

@lb90
Copy link
Collaborator Author

lb90 commented Jun 26, 2022

Forgot to bump the pkgrel number 😄

Thanks!

@Biswa96
Copy link
Member

Biswa96 commented Jul 2, 2022

I have just noticed that some svg files in $prefix/share/devhelp/books/GCalc-2/ are missing in the package after this change. I assume it may be due to the vala change. Investigating 🕵️

@lb90
Copy link
Collaborator Author

lb90 commented Jul 2, 2022

Ok, if needed we can add a patch to #11983

@Biswa96
Copy link
Member

Biswa96 commented Jul 2, 2022

The Config.PACKAGE_DATADIR and Config.PACKAGE_VALADOC_ICONDIR are two remaining paths in vala which I have tried to replace with the same logic as previous. But with those modification, vala can not be built.

Though some svg files in $prefix/share/devhelp/books/GCalc-2/ are missing in this PR, the actual gnome-calculator package has those files. It is because vala has hardcoded paths from msys2-autobuild directories.

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.

libxml2 crash gnome-calculator crash when inputting a variable name
3 participants