From 6a2cda3b9ba94d0b02846c26e94d71484273f7dc Mon Sep 17 00:00:00 2001
From: Jim Myhrberg <contact@jimeh.me>
Date: Wed, 22 Nov 2023 08:23:02 +0000
Subject: [PATCH] feat(emacs-app): update to point at new 29.1 build

The new build fixes an issue with bundled shared libraries, where
libwebp was not correctly bundled into the application. This lead to
Emacs crashing on start unless libwebp was already installed on the
target machine.

The rebuild does however increase the minimum required macOS version
from 11.0 Big Sur, to 12.0 Monterey. This is because Homebrew no longer
supports macOS 11, making it difficult to produce Emacs builds on it.

Additionally, native Apple Silicon builds are now available as well for
stable releases. They require macOS 13 Ventura however, as that is the
oldest version available on M1-based GitHub Actions runners.
---
 Casks/emacs-app.rb | 21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/Casks/emacs-app.rb b/Casks/emacs-app.rb
index 778710e2..f92729ab 100644
--- a/Casks/emacs-app.rb
+++ b/Casks/emacs-app.rb
@@ -1,15 +1,24 @@
 # frozen_string_literal: true
 
 cask 'emacs-app' do
-  version '29.1'
-
-  sha256 '920485aacb286330857e45eca1605693ec9f26f6436d088051285ce83ff411ec'
-  url 'https://github.com/jimeh/emacs-builds/releases/download/Emacs-29.1/Emacs.2023-07-30.a9b2822.emacs-29-1.macOS-11.x86_64.dmg'
-
   name 'Emacs'
   desc 'GNU Emacs text editor'
   homepage 'https://github.com/jimeh/emacs-builds'
 
+  version '29.1'
+
+  on_arm do
+    sha256 'af65e90cb77c6995fd06f2248f84bbc09160b1aed9661813958317c2843b9e55'
+    url 'https://github.com/jimeh/emacs-builds/releases/download/Emacs-29.1/Emacs.2023-07-30.a9b2822.emacs-29-1.macOS-13.arm64.dmg'
+    depends_on macos: '>= :ventura'
+  end
+
+  on_intel do
+    sha256 '06975a567a038f557f88d865f438aa838a4da3a1771885b747bcd416cb85c67c'
+    url 'https://github.com/jimeh/emacs-builds/releases/download/Emacs-29.1/Emacs.2023-07-30.a9b2822.emacs-29-1.macOS-12.x86_64.dmg'
+    depends_on macos: '>= :monterey'
+  end
+
   livecheck do
     url 'https://github.com/jimeh/emacs-builds.git'
     strategy :git do |tags|
@@ -42,8 +51,6 @@ cask 'emacs-app' do
     ]
   )
 
-  depends_on macos: '>= :catalina'
-
   app 'Emacs.app'
   binary "#{appdir}/Emacs.app/Contents/MacOS/bin/ebrowse"
   binary "#{appdir}/Emacs.app/Contents/MacOS/bin/emacs"