Skip to content

Instantly share code, notes, and snippets.

Embed
What would you like to do?
Patches for editors/emacs27
diff --git a/editors/emacs27/options.mk b/editors/emacs27/options.mk
index a0e8f6d05e4e..7b254d356d72 100644
--- a/editors/emacs27/options.mk
+++ b/editors/emacs27/options.mk
@@ -2,7 +2,7 @@
### Set options
PKG_OPTIONS_VAR= PKG_OPTIONS.emacs
-PKG_SUPPORTED_OPTIONS= dbus gconf gnutls imagemagick svg xaw3d xft2 xml
+PKG_SUPPORTED_OPTIONS= dbus gconf gnutls imagemagick jansson svg xaw3d xft2 xml
# xaw3d is only valid with tookit = xaw
PKG_OPTIONS_OPTIONAL_GROUPS+= window-system
@@ -22,7 +22,7 @@ PKG_OPTIONS_GROUP.toolkit= gtk gtk2 gtk3 motif xaw lucid
# svg is omitted because it is rarely needed and either very
# heavyweight or unmaintained.
-PKG_SUGGESTED_OPTIONS= dbus gconf gnutls gtk3 xaw3d xft2 xml x11
+PKG_SUGGESTED_OPTIONS= dbus gconf gnutls gtk3 jansson xaw3d xft2 xml x11
.include "../../mk/bsd.options.mk"
@@ -36,6 +36,15 @@ PKG_SUGGESTED_OPTIONS= dbus gconf gnutls gtk3 xaw3d xft2 xml x11
CONFIGURE_ARGS+= --without-dbus
.endif
+###
+### Support JSON
+###
+.if !empty(PKG_OPTIONS:Mjansson)
+. include "../../textproc/jansson/buildlink3.mk"
+.else
+CONFIGURE_ARGS+= --without-json
+.endif
+
###
### Support XML2
###
diff --git a/lib-src/emacsclient.c b/lib-src/emacsclient.c
index 204064f1871..0d3b893e526 100644
--- a/lib-src/emacsclient.c
+++ b/lib-src/emacsclient.c
@@ -1478,7 +1478,11 @@ set_local_socket (char const *server_name)
struct stat connect_stat;
if (fstat (s, &connect_stat) != 0)
sock_status = errno;
+#if !defined(__NetBSD__)
else if (connect_stat.st_uid == uid)
+#else
+ else if (1)
+#endif
return s;
else
sock_status = -1;
  1. patch-jansson-option.diff enables emacs27 to use native JSON feature using jansson library.
  2. patch-lib-src_emacclient_c.diff is a workaround that emacsclient fails to start by checking owner of socket.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment