From 45ded7fbb5ee9a88ce0a7cc842f0ab762f7d69e12bff22a9c5f86f69b5fd229f Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Thu, 11 Apr 2024 06:14:43 +0000 Subject: [PATCH 1/5] boo#1222637 OBS-URL: https://build.opensuse.org/package/show/editors/emacs?expand=0&rev=386 --- emacs-25.1-custom-fonts.patch | 18 +++++++++--------- emacs.changes | 6 ++++++ emacs.spec | 1 + 3 files changed, 16 insertions(+), 9 deletions(-) diff --git a/emacs-25.1-custom-fonts.patch b/emacs-25.1-custom-fonts.patch index 5a35a8f..1f5d33b 100644 --- a/emacs-25.1-custom-fonts.patch +++ b/emacs-25.1-custom-fonts.patch @@ -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 - #include "ftfont.h" - #elif defined HAVE_XFT -+#include - #include - #endif ++++ src/xsettings.c 2024-04-11 06:04:36.790667318 +0000 +@@ -21,6 +21,7 @@ along with GNU Emacs. If not, see + #include ++#include + #include + + #include @@ -839,7 +840,11 @@ apply_xft_settings (Display_Info *dpyinf #endif FcPatternGetInteger (pat, FC_LCD_FILTER, 0, &oldsettings.lcdfilter); diff --git a/emacs.changes b/emacs.changes index 89bc91d..14ff25c 100644 --- a/emacs.changes +++ b/emacs.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Apr 11 06:13:45 UTC 2024 - Dr. Werner Fink + +- Modify patch emacs-25.1-custom-fonts.patch + * include math.h for all kinds of fonts handling (boo#1222637) + ------------------------------------------------------------------- Tue Apr 2 08:54:52 UTC 2024 - Dr. Werner Fink diff --git a/emacs.spec b/emacs.spec index d4ab431..f9880b7 100644 --- a/emacs.spec +++ b/emacs.spec @@ -349,6 +349,7 @@ and most assembler-like syntaxes. %patch -P16 -p0 -b .flyspell %patch -P22 -p0 -b .pd %patch -P23 -p0 -b .custfnt +exit 1 %patch -P24 -p1 -b .imag %patch -P25 -p0 -b .xft %patch -P26 -p0 -b .fmt From cf8216f02674a65db68b70f280880046f0daead7e677d73ae4fb699a9f2a264d Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Thu, 11 Apr 2024 06:17:00 +0000 Subject: [PATCH 2/5] . OBS-URL: https://build.opensuse.org/package/show/editors/emacs?expand=0&rev=387 --- emacs.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/emacs.spec b/emacs.spec index f9880b7..d4ab431 100644 --- a/emacs.spec +++ b/emacs.spec @@ -349,7 +349,6 @@ and most assembler-like syntaxes. %patch -P16 -p0 -b .flyspell %patch -P22 -p0 -b .pd %patch -P23 -p0 -b .custfnt -exit 1 %patch -P24 -p1 -b .imag %patch -P25 -p0 -b .xft %patch -P26 -p0 -b .fmt From f87a5a66870da88a36ccc581f71df214e500c475736e34d97a72a86304a7ddf1 Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Thu, 11 Apr 2024 06:47:29 +0000 Subject: [PATCH 3/5] boo#1222172 OBS-URL: https://build.opensuse.org/package/show/editors/emacs?expand=0&rev=388 --- emacs-27.1-Xauthority4server.patch | 14 +++++++++----- emacs.spec | 1 + 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/emacs-27.1-Xauthority4server.patch b/emacs-27.1-Xauthority4server.patch index 77e6179..539e466 100644 --- a/emacs-27.1-Xauthority4server.patch +++ b/emacs-27.1-Xauthority4server.patch @@ -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.") diff --git a/emacs.spec b/emacs.spec index d4ab431..f4cf530 100644 --- a/emacs.spec +++ b/emacs.spec @@ -353,6 +353,7 @@ and most assembler-like syntaxes. %patch -P25 -p0 -b .xft %patch -P26 -p0 -b .fmt %patch -P29 -p0 -b .xauth +exit 1 %patch -P0 -p0 -b .0 %if %{without tex4pdf} pushd etc/refcards/ From 695a9e92fe5a26977a409f90853cc5c57c10981ab26bfe77b01884882f3da11b Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Thu, 11 Apr 2024 06:54:34 +0000 Subject: [PATCH 4/5] . OBS-URL: https://build.opensuse.org/package/show/editors/emacs?expand=0&rev=389 --- emacs.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/emacs.spec b/emacs.spec index f4cf530..d4ab431 100644 --- a/emacs.spec +++ b/emacs.spec @@ -353,7 +353,6 @@ and most assembler-like syntaxes. %patch -P25 -p0 -b .xft %patch -P26 -p0 -b .fmt %patch -P29 -p0 -b .xauth -exit 1 %patch -P0 -p0 -b .0 %if %{without tex4pdf} pushd etc/refcards/ From 671b33faa9970cdcf8fd716c06bba77d46fa9ce649cbdc7b91d67a6110284e6b Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Thu, 11 Apr 2024 07:16:30 +0000 Subject: [PATCH 5/5] . OBS-URL: https://build.opensuse.org/package/show/editors/emacs?expand=0&rev=390 --- emacs.changes | 2 ++ 1 file changed, 2 insertions(+) diff --git a/emacs.changes b/emacs.changes index 14ff25c..8182835 100644 --- a/emacs.changes +++ b/emacs.changes @@ -3,6 +3,8 @@ Thu Apr 11 06:13:45 UTC 2024 - Dr. Werner Fink - 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