aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Müller <ulm@gentoo.org>2023-06-13 18:02:39 +0200
committerUlrich Müller <ulm@gentoo.org>2023-06-13 18:02:39 +0200
commit99517a30c1a326025aa658bbd397d09cde0e5f08 (patch)
tree45e72adfe019941300df5686b499117527af4245
parent28.3: Update patchset (diff)
downloademacs-patches-emacs-28.2-patches-4.tar.gz
emacs-patches-emacs-28.2-patches-4.tar.bz2
emacs-patches-emacs-28.2-patches-4.zip
Fix D-Bus session bus issue when running as a daemonemacs-28.3-patches-2emacs-28.2-patches-4
Bug: https://bugs.gentoo.org/908438 Signed-off-by: Ulrich Müller <ulm@gentoo.org>
-rw-r--r--emacs/28.2/08_all_dbusbind.patch50
-rw-r--r--emacs/28.3/05_all_dbusbind.patch50
2 files changed, 100 insertions, 0 deletions
diff --git a/emacs/28.2/08_all_dbusbind.patch b/emacs/28.2/08_all_dbusbind.patch
new file mode 100644
index 0000000..994ec12
--- /dev/null
+++ b/emacs/28.2/08_all_dbusbind.patch
@@ -0,0 +1,50 @@
+Fix D-Bus session bus issue when running as a daemon
+Patch backported from emacs-29 branch
+https://bugs.gentoo.org/908438
+
+commit 1383efe01d0ee8ba3ea8da5ab41b07f5672191bf
+Author: Michael Albinus <michael.albinus@gmx.de>
+Date: Mon Jun 12 12:45:38 2023 +0200
+
+ Fix setting $DBUS_SESSION_BUS_ADDRESS after Emacs has started
+
+--- emacs-28.2/doc/misc/dbus.texi
++++ emacs-28.2/doc/misc/dbus.texi
+@@ -1853,8 +1853,24 @@
+ corresponding bus. For the system and session buses, this function is
+ called when loading @file{dbus.el}, there is no need to call it again.
+
+-The function returns the number of connections this Emacs session has
+-established to the @var{bus} under the same unique name
++If Emacs was invoked when there was no D-Bus session bus available
++yet, you can set the environment variable
++@env{DBUS_SESSION_BUS_ADDRESS} once the session bus daemon is running
++and offering the address. Calling @code{dbus-init-bus} initializes
++the connection to the session bus.
++
++@lisp
++(setenv "DBUS_SESSION_BUS_ADDRESS" "unix:path=/run/user/1000/bus")
++
++@result{} "unix:path=/run/user/1000/bus"
++
++(dbus-init-bus :session)
++
++@result{} 2
++@end lisp
++
++@code{dbus-init-bus} returns the number of connections this Emacs
++session has established to the @var{bus} under the same unique name
+ (@pxref{dbus-get-unique-name}). It depends on the libraries Emacs is
+ linked with, and on the environment Emacs is running. For example, if
+ Emacs is linked with the GTK+ toolkit, and it runs in a GTK+-aware
+--- emacs-28.2/src/dbusbind.c
++++ emacs-28.2/src/dbusbind.c
+@@ -276,7 +276,7 @@
+
+ #define XD_DBUS_VALIDATE_BUS_ADDRESS(bus) \
+ do { \
+- char const *session_bus_address = getenv ("DBUS_SESSION_BUS_ADDRESS"); \
++ char const *session_bus_address = egetenv ("DBUS_SESSION_BUS_ADDRESS"); \
+ if (STRINGP (bus)) \
+ { \
+ DBusAddressEntry **entries; \
diff --git a/emacs/28.3/05_all_dbusbind.patch b/emacs/28.3/05_all_dbusbind.patch
new file mode 100644
index 0000000..994ec12
--- /dev/null
+++ b/emacs/28.3/05_all_dbusbind.patch
@@ -0,0 +1,50 @@
+Fix D-Bus session bus issue when running as a daemon
+Patch backported from emacs-29 branch
+https://bugs.gentoo.org/908438
+
+commit 1383efe01d0ee8ba3ea8da5ab41b07f5672191bf
+Author: Michael Albinus <michael.albinus@gmx.de>
+Date: Mon Jun 12 12:45:38 2023 +0200
+
+ Fix setting $DBUS_SESSION_BUS_ADDRESS after Emacs has started
+
+--- emacs-28.2/doc/misc/dbus.texi
++++ emacs-28.2/doc/misc/dbus.texi
+@@ -1853,8 +1853,24 @@
+ corresponding bus. For the system and session buses, this function is
+ called when loading @file{dbus.el}, there is no need to call it again.
+
+-The function returns the number of connections this Emacs session has
+-established to the @var{bus} under the same unique name
++If Emacs was invoked when there was no D-Bus session bus available
++yet, you can set the environment variable
++@env{DBUS_SESSION_BUS_ADDRESS} once the session bus daemon is running
++and offering the address. Calling @code{dbus-init-bus} initializes
++the connection to the session bus.
++
++@lisp
++(setenv "DBUS_SESSION_BUS_ADDRESS" "unix:path=/run/user/1000/bus")
++
++@result{} "unix:path=/run/user/1000/bus"
++
++(dbus-init-bus :session)
++
++@result{} 2
++@end lisp
++
++@code{dbus-init-bus} returns the number of connections this Emacs
++session has established to the @var{bus} under the same unique name
+ (@pxref{dbus-get-unique-name}). It depends on the libraries Emacs is
+ linked with, and on the environment Emacs is running. For example, if
+ Emacs is linked with the GTK+ toolkit, and it runs in a GTK+-aware
+--- emacs-28.2/src/dbusbind.c
++++ emacs-28.2/src/dbusbind.c
+@@ -276,7 +276,7 @@
+
+ #define XD_DBUS_VALIDATE_BUS_ADDRESS(bus) \
+ do { \
+- char const *session_bus_address = getenv ("DBUS_SESSION_BUS_ADDRESS"); \
++ char const *session_bus_address = egetenv ("DBUS_SESSION_BUS_ADDRESS"); \
+ if (STRINGP (bus)) \
+ { \
+ DBusAddressEntry **entries; \