From 2db483db12e7fdd4aa4f95311365090434bfb3dc Mon Sep 17 00:00:00 2001 From: Xin Xu Date: Thu, 15 Sep 2022 18:42:56 -0400 Subject: [PATCH] emacs-28.2-mac-9.1 for cask --- Casks/emacs-mac-spacemacs-icon.rb | 23 ++++++++--------- Casks/emacs-mac.rb | 29 ++++++++++----------- README.md | 43 +++++++++++++++++++------------ 3 files changed, 51 insertions(+), 44 deletions(-) diff --git a/Casks/emacs-mac-spacemacs-icon.rb b/Casks/emacs-mac-spacemacs-icon.rb index 4eb4226..1fa54b8 100644 --- a/Casks/emacs-mac-spacemacs-icon.rb +++ b/Casks/emacs-mac-spacemacs-icon.rb @@ -1,27 +1,26 @@ cask 'emacs-mac-spacemacs-icon' do - version 'emacs-28.1-mac-9.0.1' + version 'emacs-28.2-mac-9.1' if Hardware::CPU.intel? - if MacOS.version <= :mojave - odie "Because of the limitation of build system, there is no cask support for mojave(10.14) and earlier, please build from Homebrew formula." - elsif MacOS.version <= :catalina - sha256 '7e16185a41b8197339e9e5f943d5c68f039f230b7350dfab883e0f2668c04a56' - url 'https://github.com/railwaycat/homebrew-emacsmacport/releases/download/emacs-28.1-mac-9.0.1/emacs-28.1-mac-9.0.1-10.15.7-spacemacs-icon.zip' + if MacOS.version <= :catalina + odie "Because of the limitation of build system, there is no cask support for Catalina(10.15) and earlier, please build from Homebrew formula." + elsif MacOS.version <= :big_sur + sha256 '8bd96c3500d8cbb02a9102baac76e34c88a1b9fd2ac6af295ceb0410788be712' + url 'https://github.com/railwaycat/homebrew-emacsmacport/releases/download/emacs-28.2-mac-9.1/emacs-28.2-mac-9.1-11.6.8-spacemacs-icon.zip' else # for macOS version is or newer than Big Sur # elsif MacOS.version <= :big_sur # reserved for later - sha256 '04221d92edb5f6dfd59a859f070d01e6fb281ade170bb54de176e24779b3556d' - url 'https://github.com/railwaycat/homebrew-emacsmacport/releases/download/emacs-28.1-mac-9.0.1/emacs-28.1-mac-9.0.1-11.6.5-spacemacs-icon.zip' + sha256 '7693e13cab343f081210f78973cb8b13b9bf768734a989afb87c64adb1e5902b' + url 'https://github.com/railwaycat/homebrew-emacsmacport/releases/download/emacs-28.2-mac-9.1/emacs-28.2-mac-9.1-12.6-spacemacs-icon.zip' end else if MacOS.version <= :big_sur - sha256 '00811da1b69f7edef017c3c28db8decf3e19ed4039829aa6239aeaefbb0ee106' - url 'https://github.com/railwaycat/homebrew-emacsmacport/releases/download/emacs-28.1-mac-9.0/emacs-28.1-mac-9.0-arm64-11.6.5-spacemacs-icon.zip' + odie "Because of the limitation of build system, there is no Apple Silicon cask support for Big Sur(11) and earlier, please build from Homebrew formula." else # for macOS version is or newer than Big Sur # elsif MacOS.version <= :monterey # reserved for later - sha256 'd23fe977de07b7fd52efb42f076c19a1132e43097d4d23dbaa878af718a9ccff' - url 'https://github.com/railwaycat/homebrew-emacsmacport/releases/download/emacs-28.1-mac-9.0.1/emacs-28.1-mac-9.0.1-arm64-12.3.1-spacemacs-icon.zip' + sha256 '90f8c924e3dabe9e5344190c8e841f4d918b447a47899011f1909728dd79b64b' + url 'https://github.com/railwaycat/homebrew-emacsmacport/releases/download/emacs-28.2-mac-9.1/emacs-28.2-mac-9.1-arm64-12.5.1-spacemacs-icon.zip' end end diff --git a/Casks/emacs-mac.rb b/Casks/emacs-mac.rb index fc4ea1a..a5e4575 100644 --- a/Casks/emacs-mac.rb +++ b/Casks/emacs-mac.rb @@ -1,27 +1,26 @@ cask 'emacs-mac' do - version 'emacs-28.1-mac-9.0.1' + version 'emacs-28.2-mac-9.1' if Hardware::CPU.intel? - if MacOS.version <= :mojave - odie "Because of the limitation of build system, there is no cask support for Mojave(10.14) and earlier, please build from Homebrew formula." - elsif MacOS.version <= :catalina - sha256 'dd49a5685e335268403fd0ab99c86809029c5cdd9f93ef6560596b9487b28c6d' - url 'https://github.com/railwaycat/homebrew-emacsmacport/releases/download/emacs-28.1-mac-9.0.1/emacs-28.1-mac-9.0.1-10.15.7.zip' + if MacOS.version <= :catalina + odie "Because of the limitation of build system, there is no cask support for Catalina(10.15) and earlier, please build from Homebrew formula." + elsif MacOS.version <= :big_sur + sha256 '6a62f75894475fa3d9474cb5b7a9a596c5c5466b94398687b8a71d84fc3af6d8' + url 'https://github.com/railwaycat/homebrew-emacsmacport/releases/download/emacs-28.2-mac-9.1/emacs-28.2-mac-9.1-11.6.8.zip' else - # for macOS version is or newer than Big Sur - # elsif MacOS.version <= :big_sur # reserved for later - sha256 '5b23fd090421ab77e5580274fb70316d3f1a760da06c87f706d18ca4971fb95d' - url 'https://github.com/railwaycat/homebrew-emacsmacport/releases/download/emacs-28.1-mac-9.0.1/emacs-28.1-mac-9.0.1-11.6.5.zip' + # for macOS version is or newer than Monterey + # elsif MacOS.version <= :monterey # reserved for later + sha256 '484690f89fceaa03f686b38bff6c12f462bf26e1e8d61283fe22df30d1481482' + url 'https://github.com/railwaycat/homebrew-emacsmacport/releases/download/emacs-28.2-mac-9.1/emacs-28.2-mac-9.1-12.6.zip' end else if MacOS.version <= :big_sur - sha256 '7250d73194b82ea185041913b999304980c39218d14f4f98b056beed9ef4fdcf' - url 'https://github.com/railwaycat/homebrew-emacsmacport/releases/download/emacs-28.1-mac-9.0/emacs-28.1-mac-9.0-arm64-11.6.5.zip' + odie "Because of the limitation of build system, there is no Apple Silicon cask support for Big Sur(11) and earlier, please build from Homebrew formula." else - # for macOS version is or newer than Big Sur + # for macOS version is or newer than Monterey # elsif MacOS.version <= :monterey # reserved for later - sha256 'f76dfe76131d26d76a4a34a89487fd01388ccf5d1b35744b05d5f0aa361ff8bf' - url 'https://github.com/railwaycat/homebrew-emacsmacport/releases/download/emacs-28.1-mac-9.0.1/emacs-28.1-mac-9.0.1-arm64-12.3.1.zip' + sha256 '488a1bf68a87a3dd304a25f2a1fe2f0b4ae95c2c80bfe4e53bdbeff0e3a2c5d4' + url 'https://github.com/railwaycat/homebrew-emacsmacport/releases/download/emacs-28.2-mac-9.1/emacs-28.2-mac-9.1-arm64-12.5.1.zip' end end diff --git a/README.md b/README.md index fbc64e8..587dd1a 100644 --- a/README.md +++ b/README.md @@ -31,7 +31,7 @@ If you'd like to install with Homebrew, please: `$ brew tap railwaycat/emacsmacport` and then - + `$ brew install emacs-mac` If you are using cask: @@ -44,29 +44,38 @@ To disable this tap, please: ### Pre-built Download ### +Pre-built bundles can be downloaded from the release page: + https://github.com/railwaycat/homebrew-emacsmacport/releases -Pre-built for macOS 10.13(High Sierra)/10.14(Mojave) and above, please -download based on your macOS version. Due to the limitation of Travis-CI, -pre-built for macOS before 10.13 is not supported for now, please install by homebrew -(without `--cask`) in case you are using an older version macOS. +Bundles are the same as those from Homebrew Cask. -## Useful links ## +Support macOS versions: -* Switch meta and option key - https://gist.github.com/3498096 +* Intel Mac + - Monterey (macOS12) + - Big Sur (macOS11) +* Apple Silicon Mac + - Monterey (macOS12) + +For macOS versions not be listed above, please install from Homebrew formula +(install without `--cask`). + +Intel Mac bundles are built by GitHub Actions, the version support limitation is +from the macOS versions they +[support](https://docs.github.com/en/actions/using-github-hosted-runners/about-github-hosted-runners#supported-runners-and-hardware-resources) +currently. + +Apple Silicon bundles are built on a M1 Mac with +[Tart](https://github.com/cirruslabs/tart). The version support limitation is +because Apple only supports macOS virtualization since Monterey (macOS12). + +## Useful links ## * Emacs mac port on [MacPorts](https://www.macports.org/) (not be maintained by the maintainer of this repo): - [emacs-mac-app](https://ports.macports.org/port/emacs-mac-app/) - [emacs-mac-app-devel](https://ports.macports.org/port/emacs-mac-app-devel/) -* An Emacs.app CLI starter, modified from Aquamacs - https://gist.github.com/4043945 - -## Included Patches Information ## +* Switch meta and option key - https://gist.github.com/3498096 -* No title bar - `--with-no-title-bars` - Enabled by default when build with this patch. This feature can been controlled by `mac-use-title-bar`, a boolean with default value `false`. Value settings will been used in new frame **after** Emacs started. (<- yes this is a bug). - -* Natural title bar - `--with-natural-title-bar` - Disabled by default when build with this patch, more information see this [wiki page](https://github.com/railwaycat/homebrew-emacsmacport/wiki/Natural-Title-Bar) +* An Emacs.app CLI starter, modified from Aquamacs - https://gist.github.com/4043945