Skip to content

Conversation

@rolandlo
Copy link
Contributor

@rolandlo rolandlo commented Dec 19, 2024

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.lua such 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

@rolandlo
Copy link
Contributor Author

Here is how it looks on MacOS (for those who haven't seen it yet).
image

@rolandlo
Copy link
Contributor Author

@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?

@psychon psychon merged commit a412921 into lgi-devs:master Dec 27, 2024
10 of 15 checks passed
@psychon
Copy link
Collaborator

psychon commented Dec 27, 2024

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

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants