Meld for OSX
From: Guy Brown guyanthonybrown@yahoo.com Subject: Issues with Melts Batch Security after upgrade to Mac OS Catalina Date: October 9, 2019 at 11:02 AM To: Frank Spera spera@geol.ucsb.edu, Wendy Bohrson bohrson@mines.edu, Jussi S. Heinonen jussi.s.heinonen@helsinki.fi, Jenna Adams jvadams10@gmail.com, Melissa Scruggs melissascruggs@umail.ucsb.edu Apple are pushing this OS. Menu for Macs N' Melts. The concept behind MELT is simple: a modern twist on a classic comfort food. The menu is approachable and the food is scrumptious. There is something about going back to basics that just makes sense. Grilled cheese sandwiches put smiles on faces. Whether it's a plain grilled cheese, a Burger with Matilda sauce, or a spicy Buffalo Chicken.
Monorail is an independent record shop in Glasgow, Scotland. Monorail Music continues to follow Scottish Government advice with regard to Covid-19.
This is a fork of Meld packaged and bundled for OSX. The original website for Meld is here http://meldmerge.org. Minor work has been done to also integrate OSX menu and shortcuts, but the app is truly the original, excellent Meld.
Download OSX dmg file
You may download any of the following versions. The 3.21.0 (r2) is the latest and the recommended version at this point.
- Version 3.21.0 (r2) Latest (Catalina & Mojave)
- Version 3.19.2 (r5) (Mojave & High Sierra)
- Version 3.19.2 (r3) (Mojave & High Sierra)
- Version 3.19.0 (r1) (Previous stable version - High Sierra)
- Version 3.16.0 (r1) (Not for High Sierra)
- Version 3.15.4 (r2) (Not for High Sierra)
- Version 3.15.2 (r2) (Not for High Sierra)
- Version 3.13.4 (Not for High Sierra)
- Version 1.8 (Not for High Sierra)
Tip: A lot of people are asking how to use this package as a git difftool/mergetool.Once installed, edit your ~/.gitconfig and add the following lines
Tip:Meld OSX also understands/checks for the following environment variables.
The theme change can be done by changing the variable in the wrapper script
find the part that says
and change it to
and you'll have a fully dark meld..
Why Meld for Mac/OSX and not Macports/Homebrew
Top reasons behind using this fork over Macports or Homebrew builds:
- Retina support (check the screenshot!)
- Latest 3.x series
- No hassle install (drag/drop like any other app)
- Integrates with OSX menu
Supports standard OSX shortcuts (cmd-c/cmd-v instead of ctrl)(Merged to upstream)- Note: Homebrew now installs Meld for OSX
Screenshot
Special Thanks
- To Kai Willadsen http://meldmerge.org/ for creating Meld.
- To the Gnome project https://www.gnome.org/
- To Alex Kras whose web page (How To Run Meld on Mac OS X Yosemite Without Homebrew, MacPorts, or Think) served as my reference for tracking Meld for OSX usage and issues when I had absolutely no time to maintain this.
TODO
- Get rid of the Meld wrapper shell script (this should get rid of all the wrappers needed to run Meld from the terminal)
- Support Meld localizations (currently only English works)
Suggestions / Issues
If you have a suggestion or you are facing an issue running this Meld fork, please open an issue here https://github.com/yousseb/meld/issues. Please note that your issue has to be specific to the OSX fork and not to Meld itself. I have no plans/time to work on Meld itself.
Contribute to Meld for OSX
- Head to https://github.com/yousseb/meld
- Fork the repository and clone your fork locally.
- Follow the build instructions in https://github.com/yousseb/meld/blob/master/osx/README.md to generate your own dmg.
- Do your magic, commit and push to your fork.
- Create a pull request.
Not Accepting Donations
I'm not currently accepting donations for the development of this fork. I just missed a proper implementation of Meld on Mac so I thought of creating this fork. If you want to donate, please donate to the original Meld project.
The following is copied from the original Meld page http://meldmerge.org/. Please visit the original project website for more info. For the full help manual, please visit http://meldmerge.org/help/.
What is Meld?
Meld is a visual diff and merge tool targeted at developers. Meld helps you compare files, directories, and version controlled projects. It provides two- and three-way comparison of both files and directories, and has support for many popular version control systems.
Meld helps you review code changes and understand patches. It might even help you to figure out what is going on in that merge you keep avoiding.
Features
- Two- and three-way comparison of files and directories
- File comparisons update as you type
- Auto-merge mode and actions on change blocks help make merges easier
- Visualisations make it easier to compare your files
- Supports Git, Bazaar, Mercurial, Subversion, etc.
- …and more
Meld is licensed under the GPL v2, except as noted
In depth features
File comparison
- Edit files in-place, and your comparison updates on-the-fly
- Perform two- and three-way diffs and merges
- Easily navigate between differences and conflicts
- Visualise global and local differences with insertions, changes and conflicts marked
- Use the built-in regex text filtering to ignore uninteresting differences
- Syntax highlighting
Directory comparison
- Compare two or three directories file-by-file, showing new, missing, and altered files
- Directly open file comparisons of any conflicting or differing files
- Filter out files or directories to avoid seeing spurious differences
- Simple file management is also available
Melt Town Mac Os 11
Version control
- Meld supports many version control systems, including Git, Mercurial, Bazaar and SVN
- Launch file comparisons to check what changes were made, before you commit
- View file versioning statuses
- Simple version control actions are also available (i.e., commit/update/add/remove/delete files)
Melt Town Mac Os X
Merge mode (in development)
- Automatically merge two files using a common ancestor
- Mark and display the base version of all conflicting changes in the middle pane
- Visualise and merge independent modifications of the same file
- Lock down read-only merge bases to avoid mistakes
- Command line interface for easy integration with existing tools, including git mergetool
This page provides instructions for configuring your Mac OS X system to run a native version of the rhyolite-MELTS (which supersedes MELTS) or pMELTS software package. Rhyolite-MELTS is based on the original MELTS calibration with modifications that should affect only the stability of quartz and alkali-feldspar. Consequently, application of rhyolite-MELTS to more mafic systems (or any system that is quartz and alkali-feldspar absent) should yield results identical to those from the orginal MELTS calibration. In addition, a number of algorithmic modifications to rhyolite-MELTS make the program less prone to numerical failures.
Results computed using the rhyolite-MELTS/pMELTS software package should be properly cited.
Download and configure
Melt Town Mac Os Catalina
- Verify that your Macintosh runs one of the following:
- Sierra (10.12)
- El Capitan (10.11)
- Yosemite (10.10+)
- Mavericks (10.9+)
- Mountain Lion (10.8+)
- If this is the first installation of MELTS, install an X11 server, which ensures that the MELTS executable will launch:
- Download XQuartz from xquartz.macosforge.org and install the application.
- For Sierra, install XQuartz 2.7.9 or later.
- For other MacOS versions, install XQuartz 2.7.7 or 2.7.8. - Log out and log back into your computer, or restart it.
- Download XQuartz from xquartz.macosforge.org and install the application.
- Download the compressed executable image of rhyolite-MELTS/pMELTS, and save it to the hard drive:
- (Sierra) Download the compressed executable image, and save it as rhyolite-Melts-Mac-OS-10.12+.zip.
- (Other MacOS versions) Download the compressed executable image, and save it as rhyolite-Melts-Mac-OS-10.8+.zip.
- Open the OS X Terminal utilities application, and navigate to the location of the file rhyolite-Melts-Mac-OS-10.12+.zip or rhyolite-Melts-Mac-OS-10.8+.zip.
- Make sure that the decompressed file is named Melts-rhyolite-public:
- If your browser does not automatically decompress zipped files, decompress the executable image: In the terminal window run the UNIX command unzip rhyolite-Melts-Mac-OS-10.12+.zip or unzip rhyolite-Melts-Mac-OS-10.8+.zip.
- If the browser automatically decompresses the zip file, the result is named Melts-rhyolite-public.
- In the terminal window, run the following UNIX command, which ensures that the executable image has the correct permissions:
- chmod 755 Melts-rhyolite-public
- Optionally, move the executable image to a convenient directory.
- Optionally, download the MELTS input file morb.melts and the pMELTS input file mm3.melts for testing purposes.
- In a terminal window, navigate to the directory where you placed the executable image, and start the program by typing:
- ./Melts-rhyolite-public
- Choose rhyolite-MELTS version 1.0.2, 1.1.0 or 1.2.0, or pMELTS mode. The interface appears on your screen. Resize as appropriate in order to see the entire interface.
rhyolite-MELTS + H2O-CO2 fluid (v 1.2.x)
This version is a replacement and upgrade from rhyolite-MELTS 1.0.x. It is the rhyolite-MELTS model with water properties completely replaced with the H2O-CO2 fluid saturation model of Ghiorso and Gualda (2015). Thermodynamic properties of the fluid phase are calculated from the model of Duan and Zhang (2006). Use this version to model crystallization in bulk compositions other than those that saturate in quartz and crystallize to the two-feldspar-, quartz-, fluid-saturated ternary minimum.
Cite as Gualda et al., 2012, and as Ghiorso and Gualda, 2015.
rhyolite-MELTS + H2O-CO2 fluid (v 1.1.x)
Use this version ONLY to model crystallization in bulk compositions that saturate in quartz and crystallize to the two-feldspar-, quartz-, fluid-saturated ternary minimum. This version is the rhyolite-MELTS model with CO2 melt properties and mixed-fluid energetic terms from Ghiorso and Gualda (2015), utilizing H2O melt properties and H2O-anhydrous component energetic mixing terms from MELTS (which are the same as in rhyolite-MELTS v 1.0.x). Thermodynamic properties of the fluid phase are calculated from the model of Duan and Zhang (2006).
Cite as Gualda et al., 2012, and as Ghiorso and Gualda, 2015 (water model from Ghiorso and Sack, 1995).
rhyolite-MELTS (original, v 1.0.x)
This version is the MELTS model (Ghiorso and Sack, 1995) with corrections to the free energies of quartz and sanidine so that the eutectic-like crystallization at the ternary minimum in the quartz-two-feldspar+fluid system is recovered. (This version replaces MELTS, which should no longer be used to calculate phase relations in magmatic systems.) Use this version to model crystallization in natural composition liquids at pressures below 2 GPa. The fluid phase is modeled as pure H2O. PhasePlot implements the rhyolite-MELTS model.
Cite as Gualda et al., 2012.Citations:
Gualda G.A.R., Ghiorso M.S., Lemons R.V., Carley T.L. (2012) Rhyolite-MELTS: A modified calibration of MELTS optimized for silica-rich, fluid-bearing magmatic systems. Journal of Petrology, 53, 875-890.
Ghiorso M.S. and Gualda, G.A.R. (2015) An H2O-CO2 mixed fluid saturation model compatible with rhyolite-MELTS. Contributions to Mineralogy and Petrology 2015, in press.
Duan Z. and Zhang Z. (2006) Equation of state of the H2O, CO2, and H2O–CO2 systems up to 10 GPa and 2573.15 K: Molecular dynamics simulations with ab initio potential surface. Geochimica et Cosmochimica Acta, 70, 2311–2324.