From 7aa405812802abbd2b78d8c98aee7fca23a2eab2 Mon Sep 17 00:00:00 2001 From: Jim Myhrberg Date: Wed, 13 Aug 2025 01:38:46 +0100 Subject: [PATCH] fix(emacs-31-builds): disable fix-window-role patch after it was merged upstream --- build-emacs-for-macos | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/build-emacs-for-macos b/build-emacs-for-macos index c504ab4..c798445 100755 --- a/build-emacs-for-macos +++ b/build-emacs-for-macos @@ -1073,7 +1073,7 @@ class Build # Enabled by default patches. - if (26..31).include?(effective_version) + if (26..30).include?(effective_version) p << { url: 'https://github.com/d12frosted/homebrew-emacs-plus/raw/master/' \ @@ -1081,6 +1081,19 @@ class Build } end + # The fix-window-role patch was merged into Emacs 31 on 2025-07-31 with + # commit 6e1054a40bf6df1429a2b16fdd0d7652dae4d537. Hence builds for commits + # before then need the patch from the last commit in emacs-plus before it + # was removed. + if effective_version == 31 && meta[:date] < Time.parse('2025-07-31') + p << { + url: + 'https://github.com/d12frosted/homebrew-emacs-plus/raw/' \ + '3e95d573d5f13aba7808193b66312b38a7c66851/' \ + 'patches/emacs-31/fix-window-role.patch' + } + end + if (27..31).include?(effective_version) p << { url: