diff --git a/emacs-xft-color-font-crash.patch b/emacs-xft-color-font-crash.patch new file mode 100644 index 0000000..7d8051a --- /dev/null +++ b/emacs-xft-color-font-crash.patch @@ -0,0 +1,48 @@ +commit 408bf21a8c8b5bf5a78785608255463ad1038871 +Author: Robert Pluim +Date: Tue Apr 3 11:06:01 2018 +0200 + + Ignore color fonts when using Xft + + * src/font.c (syms_of_font): New configuration variable + xft-ignore-color-fonts, default t. + * src/ftfont.c (ftfont_spec_pattern): Tell fontconfig to ignore + color fonts if xft-ignore-color-fonts is t. (Bug#30874, Bug#30045) + * etc/NEWS: Document xft-ignore-color-fonts. + +diff --git a/src/font.c b/src/font.c +index a6d3f5d479..ef3f92b594 100644 +--- a/src/font.c ++++ b/src/font.c +@@ -5473,6 +5473,13 @@ Disabling compaction of font caches might enlarge the Emacs memory + footprint in sessions that use lots of different fonts. */); + inhibit_compacting_font_caches = 0; + ++ DEFVAR_BOOL ("xft-ignore-color-fonts", ++ Vxft_ignore_color_fonts, ++ doc: /* ++Non-nil means don't query fontconfig for color fonts, since they often ++cause Xft crashes. Only has an effect in Xft builds. */); ++ Vxft_ignore_color_fonts = 1; ++ + #ifdef HAVE_WINDOW_SYSTEM + #ifdef HAVE_FREETYPE + syms_of_ftfont (); +diff --git a/src/ftfont.c b/src/ftfont.c +index c2e093e633..24a92dd52e 100644 +--- a/src/ftfont.c ++++ b/src/ftfont.c +@@ -764,6 +764,13 @@ ftfont_spec_pattern (Lisp_Object spec, char *otlayout, struct OpenTypeSpec **ots + if (scalable >= 0 + && ! FcPatternAddBool (pattern, FC_SCALABLE, scalable ? FcTrue : FcFalse)) + goto err; ++#ifdef HAVE_XFT ++ /* We really don't like color fonts, they cause Xft crashes. See ++ Bug#30874. */ ++ if (Vxft_ignore_color_fonts ++ && ! FcPatternAddBool(pattern, FC_COLOR, FcFalse)) ++ goto err; ++#endif + + goto finish; + diff --git a/emacs.spec b/emacs.spec index 8488c03..3f04672 100644 --- a/emacs.spec +++ b/emacs.spec @@ -5,7 +5,7 @@ Summary: GNU Emacs text editor Name: emacs Epoch: 1 Version: 26.1 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv3+ and CC0-1.0 URL: http://www.gnu.org/software/emacs/ Group: Applications/Editors @@ -22,6 +22,8 @@ Source9: %{name}.appdata.xml # rhbz#713600 Patch1: emacs-spellchecker.patch Patch2: emacs-system-crypto-policies.patch +# https://git.savannah.gnu.org/cgit/emacs.git/commit/?id=408bf21a8c8b5bf5a78785608255463ad1038871 +Patch3: emacs-xft-color-font-crash.patch BuildRequires: atk-devel BuildRequires: cairo-devel @@ -184,6 +186,7 @@ packages that add functionality to Emacs. %patch1 -p1 -b .spellchecker %patch2 -p1 -b .system-crypto-policies +%patch3 -p1 autoconf # We prefer our emacs.desktop file @@ -475,6 +478,10 @@ fi %dir %{_datadir}/emacs/site-lisp/site-start.d %changelog +* Tue Jun 26 2018 Jan Synáček - 1:26.1-3 +- Refix: Emacs crashes when loading color fonts (#1519038) + + emacs SIGABRT after XProtocolError on displaying an email in Gnus (#1591223) + * Tue Jun 19 2018 Miro Hrončok - 1:26.1-2 - Rebuilt for Python 3.7