Port of Diffuse to macOS #165
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
hugoholgersson
commented
Aug 22, 2022
|
@chenrui333, would you like to review this PR? I ask you because I saw your brew formula in #145. It would be awesome to have Diffuse added to brew. I hope these build changes will make it a little easier. This PR also gives Diffuse more native-macOS feel, including a Dock icon and keyboard shortcuts. Next step could be to port Diffuse to Gtk4 which seems to have better support for the macOS menubar, and other things. |
|
Ok! I'm taking a look (at last! 😅 ) |
Here we strip away Linux-only stuff so devs can create a local "Mac build". There might be other Linux-only stuff that are not needed on Mac still. Follow-ups are welcome.
Tested on macOS 12.5: brew install meson python3 py3cairo pygobject3 gtk+3 meson setup build cd build meson compile meson test meson install After `meson install`, `diffuse` can be used to launch a native Mac app that is installed into /Applications/Diffuse.app. These steps could be put into a Homebrew formula, see https://docs.brew.sh/Formula-Cookbook, as a way to distribute Diffuse on macOS.
For example, on macOS, Cmd+F opens Find. Ctrl+F is kept on other OSes. The same goes for other standard key commands, like Cmd+S etc.
GTK on Mac needs a helper lib to be able to draw .svg files.
MightyCreak
force-pushed
the
mac_os_port
branch
from
b5eccfe
to
e8a7abb
Compare
|
I rebased your branch on master |
hugoholgersson
commented
Oct 26, 2022
hugoholgersson
commented
Oct 26, 2022
hugoholgersson
commented
Oct 26, 2022
hugoholgersson
commented
Oct 26, 2022
This was referenced Oct 26, 2022
|
With this PR, the diffuse should be better put into homebrew-cask rather than homebrew-core. |
This was referenced Dec 30, 2022
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.
Hello there!
I understand this it the most up-to-date repo of Diffuse. It's nice to see that you have taken ownership and made it run with Python 3.
I have been using the tool since 2012, but on Linux. These days I often use macOS at work where I was missing Diffuse as my diff tool for git.
This is my basic port of Diffuse to macOS. Please take a look and accept.
/ Hugo