Accepting request 1166776 from editors

- Modify patch emacs-25.1-custom-fonts.patch
  * include math.h for all kinds of fonts handling (boo#1222637) 
- Modify patch emacs-27.1-Xauthority4server.patch
  * Add After=graphical-session.target in emacs.service (boo#1222172)

OBS-URL: https://build.opensuse.org/request/show/1166776
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/emacs?expand=0&rev=185
This commit is contained in:
Ana Guerrero 2024-04-11 17:40:40 +00:00 committed by Git OBS Bridge
commit fa97134261
3 changed files with 26 additions and 14 deletions

View File

@ -6,7 +6,7 @@ Work around openSUSE bug #1016172
2 files changed, 14 insertions(+), 5 deletions(-)
--- lisp/dynamic-setting.el
+++ lisp/dynamic-setting.el 2023-08-01 07:10:18.292217247 +0000
+++ lisp/dynamic-setting.el 2024-04-11 06:03:25.603986456 +0000
@@ -33,6 +33,7 @@
;;; Customizable variables
@ -39,15 +39,15 @@ Work around openSUSE bug #1016172
;; display, by clearing the font and face caches. This will
;; cause all fonts to be recreated.
--- src/xsettings.c
+++ src/xsettings.c 2023-08-01 06:57:06.034741701 +0000
@@ -58,6 +58,7 @@ typedef unsigned int CARD32;
#include <fontconfig/fontconfig.h>
#include "ftfont.h"
#elif defined HAVE_XFT
+#include <math.h>
#include <X11/Xft/Xft.h>
#endif
+++ src/xsettings.c 2024-04-11 06:04:36.790667318 +0000
@@ -21,6 +21,7 @@ along with GNU Emacs. If not, see <http
#include <float.h>
#include <limits.h>
+#include <math.h>
#include <fcntl.h>
#include <byteswap.h>
@@ -839,7 +840,11 @@ apply_xft_settings (Display_Info *dpyinf
#endif
FcPatternGetInteger (pat, FC_LCD_FILTER, 0, &oldsettings.lcdfilter);

View File

@ -5,13 +5,17 @@ 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 +
etc/emacs.service | 2 ++
lisp/server.el | 45 +++++++++++++++++++++++++++++++++++++++++++--
2 files changed, 44 insertions(+), 2 deletions(-)
2 files changed, 45 insertions(+), 2 deletions(-)
--- etc/emacs.service
+++ etc/emacs.service 2023-08-01 07:24:44.856332618 +0000
@@ -8,6 +8,7 @@ Documentation=info:emacs man:emacs(1) ht
+++ etc/emacs.service 2024-04-11 06:46:29.320172754 +0000
@@ -5,9 +5,11 @@
[Unit]
Description=Emacs text editor
Documentation=info:emacs man:emacs(1) https://gnu.org/software/emacs/
+After=graphical-session.target
[Service]
Type=notify
@ -20,7 +24,7 @@ even if the Xauthority file is not the default expected by XCloseDisplay()
# Emacs will exit with status 15 after having received SIGTERM, which
--- lisp/server.el
+++ lisp/server.el 2024-02-02 07:50:00.878231817 +0000
+++ lisp/server.el 2024-04-11 06:17:17.692578500 +0000
@@ -289,6 +289,11 @@ If nil, no instructions are displayed."
"The directory in which to place the server socket.
If local sockets are not supported, this is nil.")

View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Thu Apr 11 06:13:45 UTC 2024 - Dr. Werner Fink <werner@suse.de>
- Modify patch emacs-25.1-custom-fonts.patch
* include math.h for all kinds of fonts handling (boo#1222637)
- Modify patch emacs-27.1-Xauthority4server.patch
* Add After=graphical-session.target in emacs.service (boo#1222172)
-------------------------------------------------------------------
Tue Apr 2 08:54:52 UTC 2024 - Dr. Werner Fink <werner@suse.de>