From 45ded7fbb5ee9a88ce0a7cc842f0ab762f7d69e12bff22a9c5f86f69b5fd229f Mon Sep 17 00:00:00 2001
From: "Dr. Werner Fink" <werner@suse.com>
Date: Thu, 11 Apr 2024 06:14:43 +0000
Subject: [PATCH] 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 <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);
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 <werner@suse.de>
+
+- 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 <werner@suse.de>
 
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