-
-
Notifications
You must be signed in to change notification settings - Fork 18.2k
emacs-macport: 29.4 -> 30.1 #393512
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
emacs-macport: 29.4 -> 30.1 #393512
Changes from all commits
7252edf
dac423f
cd9a65c
c1db941
e69459d
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,12 @@ | ||
| diff --git a/src/conf_post.h b/src/conf_post.h | ||
| index e3272278832..01d3bcf9a81 100644 | ||
| --- a/src/conf_post.h | ||
| +++ b/src/conf_post.h | ||
| @@ -58,6 +58,7 @@ along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>. */ | ||
| #if NS_IMPL_GNUSTEP || defined __MINGW32__ | ||
| typedef unsigned int bool_bf; | ||
| #else | ||
| +#include <stdbool.h> /* Clang in C mode does not automatically define bool unless you explicitly include that header */ | ||
| typedef bool bool_bf; | ||
| #endif | ||
|
|
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,7 @@ | ||
| #if __has_include("config.h") | ||
| #include "config.h" | ||
| #endif | ||
|
|
||
| #ifndef NOESCAPE_NOOP_H_ | ||
| #define NOESCAPE_NOOP_H_ | ||
|
|
||
|
|
||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,7 @@ | ||
| { | ||
| lib, | ||
| fetchFromBitbucket, | ||
| fetchFromGitHub, | ||
| fetchFromSavannah, | ||
| }: | ||
|
|
||
|
|
@@ -31,8 +32,8 @@ let | |
| } | ||
| ); | ||
| "macport" = ( | ||
| fetchFromBitbucket { | ||
| owner = "mituharu"; | ||
|
||
| fetchFromGitHub { | ||
| owner = "jdtsmith"; | ||
| repo = "emacs-mac"; | ||
| inherit rev hash; | ||
| } | ||
|
|
@@ -88,7 +89,9 @@ let | |
| matthewbauer | ||
| panchoh | ||
| ]; | ||
| "macport" = with lib.maintainers; [ ]; | ||
| "macport" = with lib.maintainers; [ | ||
| lactose | ||
| ]; | ||
| } | ||
| .${variant}; | ||
| platforms = | ||
|
|
@@ -121,40 +124,12 @@ in | |
| ]; | ||
| }); | ||
|
|
||
| emacs28-macport = import ./make-emacs.nix (mkArgs { | ||
| pname = "emacs-mac"; | ||
| version = "28.2"; | ||
| variant = "macport"; | ||
| rev = "emacs-28.2-mac-9.1"; | ||
| hash = "sha256-Ne2jQ2nVLNiQmnkkOXVc5AkLVkTpm8pFC7VNY2gQjPE="; | ||
| patches = fetchpatch: [ | ||
| # CVE-2022-45939 | ||
| (fetchpatch { | ||
| url = "https://git.savannah.gnu.org/cgit/emacs.git/patch/?id=d48bb4874bc6cd3e69c7a15fc3c91cc141025c51"; | ||
| hash = "sha256-TiBQkexn/eb6+IqJNDqR/Rn7S7LVdHmL/21A5tGsyJs="; | ||
| }) | ||
|
|
||
| # https://lists.gnu.org/archive/html/emacs-devel/2024-03/msg00611.html | ||
| (fetchpatch { | ||
| url = "https://gitweb.gentoo.org/proj/emacs-patches.git/plain/emacs/28.2/10_all_org-macro-eval.patch?id=af40e12cb742510e5d40a06ffc6dfca97e340dd6"; | ||
| hash = "sha256-OdGt4e9JGjWJPkfJhbYsmQQc6jart4BH5aIKPIbWKFs="; | ||
| }) | ||
| (fetchpatch { | ||
| url = "https://gitweb.gentoo.org/proj/emacs-patches.git/plain/emacs/28.2/11_all_untrusted-content.patch?id=af40e12cb742510e5d40a06ffc6dfca97e340dd6"; | ||
| hash = "sha256-wa2bsnCt5yFx0+RAFZGBPI+OoKkbrfkkMer/KBEc/wA="; | ||
| }) | ||
| (fetchpatch { | ||
| url = "https://gitweb.gentoo.org/proj/emacs-patches.git/plain/emacs/28.2/12_all_org-remote-unsafe.patch?id=af40e12cb742510e5d40a06ffc6dfca97e340dd6"; | ||
| hash = "sha256-b6WU1o3PfDV/6BTPfPNUFny6oERJCNsDrvflxX3Yvek="; | ||
| }) | ||
| ]; | ||
| }); | ||
|
|
||
| emacs29-macport = import ./make-emacs.nix (mkArgs { | ||
| emacs30-macport = import ./make-emacs.nix (mkArgs { | ||
| pname = "emacs-mac"; | ||
| version = "29.1"; | ||
| version = "30.1.50"; | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. @juuyokka I think latest version is now at "30.2.50". See jdtsmith/emacs-mac@34f3540 |
||
| variant = "macport"; | ||
| rev = "emacs-29.1-mac-10.0"; | ||
| hash = "sha256-TE829qJdPjeOQ+kD0SfyO8d5YpJjBge/g+nScwj+XVU="; | ||
| rev = "a50f20585960d92510fb62c95cb12606218a2081"; | ||
| hash = "sha256-Ap4ZBb9NYIbwLroOoqvpQU/hjhaJJDB+3/1V0Q2c6aA="; | ||
| patches = _: [ ./macport-stdbool.patch ]; | ||
| }); | ||
| } | ||
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@juuyokka is
apple-sdk_14the minimum sdk version that is needed for this?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It has additional functionality on newer SDKs. There is no harm in using a newer SDK for a correctly-written application that does runtime availability checks before using newer APIs, and this appears to do so. However, macOS 14 will be the baseline for 25.11 anyway, so it may not be worth explicitly specifying until they implement optional functionality for newer versions.