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

Stop using gtk-mac-integration and fix broken CI #103

Merged
merged 4 commits into from
Mar 3, 2020

Conversation

maoe
Copy link
Member

@maoe maoe commented Mar 1, 2020

This PR does two things:

  1. remove the dependency on gtk-mac-integration to make it easier to build ThreadScope on macOS at the expense of the logo in Dock
  2. update .travis.yml and appveyor.yml to build the project with newer GHCs

The icon in the Dock now looks like this:
Screen Shot 2020-03-03 at 8 09 09

The missing logo is certainly not nice but we should be able to add it back when porting ThreadScope to haskell-gi in #100.

maoe added 2 commits March 1, 2020 23:09
gtk2hs/gtk-mac-integration has been unmaintained for nearly 3 years
now and it makes it harder to build ThreadScope on macOS.

We've been using it only to display the logo in the Dock so the
effect of this removal is minimal. We can add this feature back
when porting ThreadScope to gi-gtk.
gtk needs +have-quartz-gtk constraint to build on macOS. Also some
gtk2hs packages need gcc-9 to build. See
gtk2hs/gtk2hs#291.
@maoe maoe force-pushed the macos-fixes branch 11 times, most recently from 5bb3c54 to a2f53cc Compare March 2, 2020 15:16
@maoe maoe changed the title Macos fixes Stop using gtk-mac-integration and fix broken CI Mar 2, 2020
@maoe maoe marked this pull request as ready for review March 2, 2020 23:11
@maoe
Copy link
Member Author

maoe commented Mar 3, 2020

Now CI passes. I'll merge this and cut a release.

@maoe maoe merged commit b19117f into haskell:master Mar 3, 2020
@maoe maoe deleted the macos-fixes branch March 3, 2020 22:19
@Mikolaj
Copy link
Member

Mikolaj commented Mar 3, 2020

Great job! (not that I tested it; just cheerleading :)

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