forked from pool/emacs
Accepting request 879238 from editors
Automatic submission by obs-autosubmit OBS-URL: https://build.opensuse.org/request/show/879238 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/emacs?expand=0&rev=153
This commit is contained in:
Dominique Leuenberger
Git OBS Bridge
commit
9276234f2e
112
emacs-27.1-Xauthority4server.patch
Normal file
112
emacs-27.1-Xauthority4server.patch
Normal file
@ -0,0 +1,112 @@
|
||||
From werner@suse.de
|
||||
Date: Mon, 08 Mar 2021 13:35:41 +0000
|
||||
Subject: Allow GNU Emacs server to open X Display
|
||||
|
||||
even if the Xauthority file is not the default expected by XCloseDisplay()
|
||||
|
||||
---
|
||||
etc/emacs.service | 1 +
|
||||
lisp/server.el | 40 ++++++++++++++++++++++++++++++++++++++--
|
||||
2 files changed, 39 insertions(+), 2 deletions(-)
|
||||
|
||||
--- etc/emacs.service
|
||||
+++ etc/emacs.service 2021-03-08 13:24:42.504543632 +0000
|
||||
@@ -8,6 +8,7 @@ Documentation=info:emacs man:emacs(1) ht
|
||||
|
||||
[Service]
|
||||
Type=notify
|
||||
+Environment=XAUTHORITY=%t/emacs/xauth
|
||||
ExecStart=emacs --fg-daemon
|
||||
ExecStop=emacsclient --eval "(kill-emacs)"
|
||||
# The location of the SSH auth socket varies by distribution, and some
|
||||
--- lisp/server.el
|
||||
+++ lisp/server.el 2021-03-08 13:12:50.619365207 +0000
|
||||
@@ -281,6 +281,11 @@ the \"-f\" switch otherwise."
|
||||
"The directory in which to place the server socket.
|
||||
If local sockets are not supported, this is nil.")
|
||||
|
||||
+;; Hold the Xauthority if an X Display is used
|
||||
+(defvar server-xauth-file nil
|
||||
+ "The Xauthority file to hold the Xauthority cookies.
|
||||
+If no Xauthority is used, this is nil.")
|
||||
+
|
||||
(defun server-clients-with (property value)
|
||||
"Return a list of clients with PROPERTY set to VALUE."
|
||||
(let (result)
|
||||
@@ -630,7 +635,8 @@ the `server-process' variable."
|
||||
(t (yes-or-no-p
|
||||
"The current server still has clients; delete them? "))))
|
||||
(let* ((server-dir (if server-use-tcp server-auth-dir server-socket-dir))
|
||||
- (server-file (expand-file-name server-name server-dir)))
|
||||
+ (server-file (expand-file-name server-name server-dir))
|
||||
+ (xauth-file (concat server-dir "/xauth")))
|
||||
(when server-process
|
||||
;; kill it dead!
|
||||
(ignore-errors (delete-process server-process)))
|
||||
@@ -704,6 +710,14 @@ server or call `\\[server-force-delete]'
|
||||
:plist '(:authenticated t)))))
|
||||
(unless server-process (error "Could not start server process"))
|
||||
(process-put server-process :server-file server-file)
|
||||
+ ;; File to hold Xauthority cookies
|
||||
+ (unless (file-exists-p xauth-file)
|
||||
+ (make-empty-file xauth-file))
|
||||
+ (when (file-exists-p xauth-file)
|
||||
+ (let ((var (concat "XAUTHORITY=" xauth-file)))
|
||||
+ (dolist (proc (process-list))
|
||||
+ (process-put proc 'env (cons var (process-get proc 'env)))))
|
||||
+ (setq server-xauth-file xauth-file))
|
||||
(when server-use-tcp
|
||||
(let ((auth-key (server-get-auth-key)))
|
||||
(process-put server-process :auth-key auth-key)
|
||||
@@ -832,7 +846,7 @@ This handles splitting the command if it
|
||||
(let ((frame
|
||||
(server-with-environment
|
||||
(process-get proc 'env)
|
||||
- '("LANG" "LC_CTYPE" "LC_ALL"
|
||||
+ '("LANG" "LC_CTYPE" "LC_ALL" "LC_PAPER" "LC_MEASUREMENT"
|
||||
;; For tgetent(3); list according to ncurses(3).
|
||||
"BAUDRATE" "COLUMNS" "ESCDELAY" "HOME" "LINES"
|
||||
"NCURSES_ASSUMED_COLORS" "NCURSES_NO_PADDING"
|
||||
@@ -1088,6 +1102,8 @@ The following commands are accepted by t
|
||||
nowait ; t if emacsclient does not want to wait for us.
|
||||
frame ; Frame opened for the client (if any).
|
||||
display ; Open frame on this display.
|
||||
+ (xauth-file (expand-file-name "~/.Xauthority"))
|
||||
+ xauth-cmd
|
||||
parent-id ; Window ID for XEmbed
|
||||
dontkill ; t if client should not be killed.
|
||||
commands
|
||||
@@ -1228,6 +1244,16 @@ The following commands are accepted by t
|
||||
;; -env NAME=VALUE: An environment variable.
|
||||
("-env"
|
||||
(let ((var (pop args-left)))
|
||||
+ (if (and (stringp var)
|
||||
+ (string-match "^\\([^=]+\\)=\\(.*\\)" var))
|
||||
+ (if (cond ((string-equal (match-string 1 var) "LANG") t)
|
||||
+ ((string-equal (match-string 1 var) "LC_CTYPE") t)
|
||||
+ ((string-equal (match-string 1 var) "LC_ALL") t)
|
||||
+ ((string-equal (match-string 1 var) "LC_PAPER") t)
|
||||
+ ((string-equal (match-string 1 var) "LC_MEASUREMENT") t)
|
||||
+ ((string-equal (match-string 1 var) "DISPLAY") t)
|
||||
+ ((string-equal (match-string 1 var) "XAUTHORITY") (setq xauth-file (match-string 2 var))))
|
||||
+ (setenv (match-string 1 var) (match-string 2 var) t)))
|
||||
;; XXX Variables should be encoded as in getenv/setenv.
|
||||
(process-put proc 'env
|
||||
(cons var (process-get proc 'env)))))
|
||||
@@ -1243,6 +1269,16 @@ The following commands are accepted by t
|
||||
;; Unknown command.
|
||||
(arg (error "Unknown command: %s" arg))))
|
||||
|
||||
+ (if (and display server-xauth-file)
|
||||
+ (progn
|
||||
+ (if (not xauth-file)
|
||||
+ (setq xauth-file (expand-file-name "~/.Xauthority")))
|
||||
+ (if (and (file-exists-p xauth-file) (not (file-equal-p xauth-file server-xauth-file)))
|
||||
+ (progn
|
||||
+ (setq xauth-cmd (concat "xauth -f " xauth-file " extract - " display
|
||||
+ "| xauth -f " server-xauth-file " merge -"))
|
||||
+ (shell-command xauth-cmd)))))
|
||||
+
|
||||
;; If both -no-wait and -tty are given with file or sexp
|
||||
;; arguments, use an existing frame.
|
||||
(and nowait
|
||||
@ -1,3 +1,11 @@
|
||||
-------------------------------------------------------------------
|
||||
Mon Mar 8 13:40:06 UTC 2021 - Dr. Werner Fink <werner@suse.de>
|
||||
|
||||
- Add patch emacs-27.1-Xauthority4server.patch
|
||||
* Allow GNU Emacs server to open X Display even if the Xauthority
|
||||
file is not the default expected by XCloseDisplay()
|
||||
* Hopefully fix boo#1174534 and boo#1179854
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Jan 26 14:17:37 UTC 2021 - Dominique Leuenberger <dimstar@opensuse.org>
|
||||
|
||||
|
||||
@ -179,6 +179,7 @@ Patch25: emacs-26.1-xft4x11.patch
|
||||
Patch26: emacs-27.1-pdftex.patch
|
||||
Patch27: emacs-27.1-home.patch
|
||||
Patch28: emacs-27.1-gif.patch
|
||||
Patch29: emacs-27.1-Xauthority4server.patch
|
||||
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
%{expand: %%global include_info %(test -s /usr/share/info/info.info* && echo 0 || echo 1)}
|
||||
@ -296,6 +297,7 @@ and most assembler-like syntaxes.
|
||||
%patch26 -p0 -b .fmt
|
||||
%patch27 -p0 -b .home
|
||||
%patch28 -p1 -b .crash
|
||||
%patch29 -p0 -b .xauth
|
||||
%patch -p0 -b .0
|
||||
%if %{without tex4pdf}
|
||||
pushd etc/refcards/
|
||||
@ -586,6 +588,7 @@ rm -vf %{buildroot}%{_datadir}/emacs/%{version}/lisp/term.el.term
|
||||
rm -vf %{buildroot}%{_datadir}/emacs/%{version}/etc/ETAGS.EBNF
|
||||
rm -vf %{buildroot}%{_datadir}/emacs/%{version}/etc/ETAGS.README
|
||||
rm -vf %{buildroot}%{_datadir}/emacs/%{version}/etc/refcards/*.fmt
|
||||
rm -vf %{buildroot}%{_datadir}/emacs/%{version}/etc/emacs.service.xauth
|
||||
rm -vf %{buildroot}%{_datadir}/emacs/%{version}/lisp/elc.tar.gz
|
||||
rm -vf %{buildroot}%{_datadir}/emacs/%{version}/lisp/mail/sendmail.el.snd
|
||||
rm -vf %{buildroot}%{_datadir}/emacs/%{version}/lisp/ldefs-boot.el.psbdf
|
||||
@ -607,6 +610,7 @@ rm -vf %{buildroot}%{_datadir}/emacs/%{version}/lisp/textmodes/ispell.el.0
|
||||
rm -vf %{buildroot}%{_datadir}/emacs/%{version}/lisp/epg.el.gnupg
|
||||
rm -vf %{buildroot}%{_datadir}/emacs/%{version}/lisp/mouse.el.prime
|
||||
rm -vf %{buildroot}%{_datadir}/emacs/%{version}/lisp/dynamic-setting.el.custfnt
|
||||
rm -vf %{buildroot}%{_datadir}/emacs/%{version}/lisp/server.el.xauth
|
||||
unelc %{buildroot}%{_datadir}/emacs/%{version}/lisp/bindings.elc
|
||||
unelc %{buildroot}%{_datadir}/emacs/%{version}/lisp/cus-start.elc
|
||||
unelc %{buildroot}%{_datadir}/emacs/%{version}/lisp/generic-x.elc
|
||||
|
||||
Loading…
Reference in New Issue
Block a user