Fix core_module on MacOS for GLIB >= 2.76 #331
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Here is how it looks on MacOS (for those who haven't seen it yet). |
|
@psychon The CI pipeline on Ubuntu is failing, but the change in this PR only affect MacOS, so it must be unrelated. Is there anything more you want me to test? |
|
Thanks for investigating and testing! The CI issues were solved with #332, I hope. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
This still needs some testing. Don't merge yet.This has been tested on MacOS Intel (on an old MacBook Pro) and on Macos ARM (M2 mini) through an automatic build of Xournal++ that bundles
lua-lgi, see https://github.com/xournalpp/xournalpp/pull/6161/files, using GLib 2.82.On MacOS ARM I have tested all gtk-demo examples after modifying
main.luasuch that it can be run as Xournal++ plugin. I had to replace the GtkSource.View by a Gtk.TextView, since we don't have GtkSourceView bundled in the right version for Xournal++. All gtk-demos worked except the Images demo, which crashes after a short while. It's the same on Windows and Linux. The UI-manager demo asks to press the Alt key, which is a bit unfortunate on MacOS.This PR basically reverts dab172c for GLib >= 2.76. I think the motivation for that commit was to workaround some problems with GLib < 2.76 on MacOS that were fixed in https://gitlab.gnome.org/GNOME/glib/-/merge_requests/2950. That's why the change is only done for GLib >= 2.76