From 0919966ec74f9e402c5ed442d938f12980c57fc2 Mon Sep 17 00:00:00 2001
From: Doro Rose <doroerose@gmail.com>
Date: Wed, 27 Aug 2025 14:09:11 +0200
Subject: [PATCH] emacs-macport: 29.4 -> 30.2

Co-authored-by: lactose <lactose@allthingslinux.org>
Co-authored-by: Lin Jian <me@linj.tech>
Co-authored-by: pancho horrillo <pancho@pancho.name>
---
 doc/release-notes/rl-2511.section.md        |  5 +++
 pkgs/applications/editors/emacs/default.nix |  4 +--
 pkgs/applications/editors/emacs/sources.nix | 40 ++++++++-------------
 pkgs/top-level/all-packages.nix             |  4 +--
 4 files changed, 23 insertions(+), 30 deletions(-)

diff --git a/doc/release-notes/rl-2511.section.md b/doc/release-notes/rl-2511.section.md
index 519fd06f6f16..119baa4d1837 100644
--- a/doc/release-notes/rl-2511.section.md
+++ b/doc/release-notes/rl-2511.section.md
@@ -155,6 +155,11 @@
 
 - `rofi-emoji-wayland` has been merged into `rofi-emoji` as `rofi` has been updated to `2.0.0` and supports both X11 & Wayland.
 
+- `emacs-macport` has been moved to a fork of Mitsuharu Yamamoto's patched source code starting with Emacs v30 as the original project seems to be currently dormant. All older versions of this package have been dropped.
+  This introduces some backwards‐incompatible changes; see the NEWS for details.
+  NEWS can be viewed from Emacs by typing `C-h n`, or by clicking `Help->Emacs News` from the menu bar.
+  It can also be browsed [online](https://git.savannah.gnu.org/cgit/emacs.git/tree/etc/NEWS?h=emacs-30).
+
 ## Other Notable Changes {#sec-nixpkgs-release-25.11-notable-changes}
 
 <!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->
diff --git a/pkgs/applications/editors/emacs/default.nix b/pkgs/applications/editors/emacs/default.nix
index 24f722bf37b1..295579c7c085 100644
--- a/pkgs/applications/editors/emacs/default.nix
+++ b/pkgs/applications/editors/emacs/default.nix
@@ -12,7 +12,7 @@ lib.makeScope pkgs.newScope (
     sources = import ./sources.nix {
       inherit lib;
       inherit (pkgs)
-        fetchFromBitbucket
+        fetchFromGitHub
         fetchzip
         ;
     };
@@ -31,7 +31,7 @@ lib.makeScope pkgs.newScope (
       withPgtk = true;
     };
 
-    emacs29-macport = callPackage (self.sources.emacs29-macport) (
+    emacs30-macport = callPackage (self.sources.emacs30-macport) (
       inheritedArgs
       // {
         srcRepo = true;
diff --git a/pkgs/applications/editors/emacs/sources.nix b/pkgs/applications/editors/emacs/sources.nix
index d3fb3da3b599..60f6105abe7d 100644
--- a/pkgs/applications/editors/emacs/sources.nix
+++ b/pkgs/applications/editors/emacs/sources.nix
@@ -1,6 +1,6 @@
 {
   lib,
-  fetchFromBitbucket,
+  fetchFromGitHub,
   fetchzip,
 }:
 
@@ -32,8 +32,8 @@ let
             }
           );
           "macport" = (
-            fetchFromBitbucket {
-              owner = "mituharu";
+            fetchFromGitHub {
+              owner = "jdtsmith";
               repo = "emacs-mac";
               inherit rev hash;
             }
@@ -68,13 +68,14 @@ let
         ''
         + lib.optionalString (variant == "macport") ''
 
-          This release is built from Mitsuharu Yamamoto's patched source code
-          tailored for macOS.
+          This release initially was built from Mitsuharu Yamamoto's patched source code
+          tailored for macOS. Moved to a fork of the latter starting with emacs v30 as the
+          original project seems to be currently dormant.
         '';
         changelog =
           {
             "mainline" = "https://www.gnu.org/savannah-checkouts/gnu/emacs/news/NEWS.${version}";
-            "macport" = "https://bitbucket.org/mituharu/emacs-mac/raw/${rev}/NEWS-mac";
+            "macport" = "https://github.com/jdtsmith/emacs-mac/blob/${rev}/NEWS-mac";
           }
           .${variant};
         license = lib.licenses.gpl3Plus;
@@ -88,7 +89,9 @@ let
               matthewbauer
               panchoh
             ];
-            "macport" = with lib.maintainers; [ ];
+            "macport" = with lib.maintainers; [
+              kfiz
+            ];
           }
           .${variant};
         platforms =
@@ -117,26 +120,11 @@ in
     ];
   });
 
-  emacs29-macport = import ./make-emacs.nix (mkArgs {
+  emacs30-macport = import ./make-emacs.nix (mkArgs {
     pname = "emacs-mac";
-    version = "29.4";
+    version = "30.2.50";
     variant = "macport";
-    rev = "emacs-29.4-mac-10.1";
-    hash = "sha256-8OQ+fon9tclbh/eUJ09uqKfMaz9M77QnLIp2R8QB6Ic=";
-    patches = fetchpatch: [
-      # CVE-2024-53920
-      (fetchpatch {
-        url = "https://gitweb.gentoo.org/proj/emacs-patches.git/plain/emacs/29.4/07_all_trusted-content.patch?id=f24370de4de0a37304958ec1569d5c50c1745b7f";
-        hash = "sha256-zUWM2HDO5MHEB5fC5TCUxzmSafMvXO5usRzCyp9Q7P4=";
-      })
-
-      # CVE-2025-1244
-      (fetchpatch {
-        url = "https://gitweb.gentoo.org/proj/emacs-patches.git/plain/emacs/29.4/06_all_man.patch?id=f24370de4de0a37304958ec1569d5c50c1745b7f";
-        hash = "sha256-Vdf6GF5YmGoHTkxiD9mdYH0hgvfovZwrqYN1NQ++U1w=";
-      })
-    ];
-
-    meta.knownVulnerabilities = [ ];
+    rev = "emacs-mac-30.2";
+    hash = "sha256-i/W2Xa6Vk1+T1fs6fa4wJVMLLB6BK8QAPcdmPrU8NwM=";
   });
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index aadbbeac1b37..95c8574b1fbf 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11405,10 +11405,10 @@ with pkgs;
     emacs30-nox
     emacs30-pgtk
 
-    emacs29-macport
+    emacs30-macport
     ;
 
-  emacs-macport = emacs29-macport;
+  emacs-macport = emacs30-macport;
   emacs = emacs30;
   emacs-gtk = emacs30-gtk3;
   emacs-nox = emacs30-nox;