[arch-commits] Commit in emacs-nox/trunk (5 files)
Date: Saturday, May 25, 2019 @ 19:06:31
Author: jlichtblau
Revision: 470773
upgpkg: emacs-nox 26.2-1 - new upstream release
Modified:
emacs-nox/trunk/PKGBUILD
emacs-nox/trunk/emacs-nox.changelog
Deleted:
emacs-nox/trunk/0001-Ignore-color-fonts-when-using-Xft.patch
emacs-nox/trunk/0001-Port-FC_COLOR-change-to-older-fontconfig.patch
emacs-nox/trunk/0001-src-ftfont.c-ftfont_spec_pattern-Fix-whitespace.patch
+
0001-Ignore-color-fonts-when-using-Xft.patch | 72 ---
0001-Port-FC_COLOR-change-to-older-fontconfig.patch| 32
0001-src-ftfont.c-ftfont_spec_pattern-Fix-whitespace.patch | 25 ---
PKGBUILD | 24 ---
emacs-nox.changelog|3
5 files changed, 8 insertions(+), 148 deletions(-)
Deleted: 0001-Ignore-color-fonts-when-using-Xft.patch
===
--- 0001-Ignore-color-fonts-when-using-Xft.patch2019-05-25 18:55:41 UTC
(rev 470772)
+++ 0001-Ignore-color-fonts-when-using-Xft.patch2019-05-25 19:06:31 UTC
(rev 470773)
@@ -1,72 +0,0 @@
-From f21fa142aca53e3de5783e1ce6fe1bf116174aeb Mon Sep 17 00:00:00 2001
-From: Robert Pluim
-Date: Tue, 3 Apr 2018 11:06:01 +0200
-Subject: [PATCH] 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.
- etc/NEWS | 6 ++
- src/font.c | 7 +++
- src/ftfont.c | 7 +++
- 3 files changed, 20 insertions(+)
-
-diff --git a/etc/NEWS b/etc/NEWS
-index 873e2dfd1d..2bec8de0ea 100644
a/etc/NEWS
-+++ b/etc/NEWS
-@@ -31,6 +31,12 @@ in its NEWS.)
-
- * Changes in Emacs 26.2
-
-+---
-+** New variable 'xft-ignore-color-fonts'.
-+Default t means don't try to load color fonts when using Xft, as they
-+often cause crashes. Set it to nil if you really need those fonts.
-+(Bug#30874)
-+
-
- * Editing Changes in Emacs 26.2
-
-diff --git a/src/font.c b/src/font.c
-index e53935a15c..305bb14576 100644
a/src/font.c
-+++ b/src/font.c
-@@ -5476,6 +5476,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;
-
---
-2.17.1
-
Deleted: 0001-Port-FC_COLOR-change-to-older-fontconfig.patch
===
--- 0001-Port-FC_COLOR-change-to-older-fontconfig.patch 2019-05-25 18:55:41 UTC
(rev 470772)
+++ 0001-Port-FC_COLOR-change-to-older-fontconfig.patch 2019-05-25 19:06:31 UTC
(rev 470773)
@@ -1,32 +0,0 @@
-From 97d61f878e6378efbde73923a36f71caac73a4a0 Mon Sep 17 00:00:00 2001
-From: Paul Eggert
-Date: Tue, 3 Apr 2018 08:12:41 -0700
-Subject: [PATCH] Port FC_COLOR change to older fontconfig
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Problem reported by John ff in:
-https://lists.gnu.org/r/emacs-devel/2018-04/msg00058.html
-* src/ftfont.c (ftfont_spec_pattern) [!FC_COLOR]:
-Don’t use FC_COLOR on older fontconfigs that don’t have it.
- src/ftfont.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/ftfont.c b/src/ftfont.c
-index 24a92dd52e..84e4a30389 100644
a/src/ftfont.c
-+++ b/src/ftfont.c
-@@ -764,7 +764,7 @@ 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
-+#if defined HAVE_XFT && defined FC_COLOR
- /* We really don't like color fonts, they cause Xft crashes. See
- Bug#30874. */
- if (Vxft_ignore_color_fonts
---
-2.17.1
-
Deleted:
[arch-commits] Commit in emacs-nox/trunk (5 files)
Date: Sunday, July 8, 2018 @ 09:50:53
Author: jlichtblau
Revision: 354710
upgpkg: emacs-nox 26.1-1 - new upstream release
Added:
emacs-nox/trunk/0001-Ignore-color-fonts-when-using-Xft.patch
emacs-nox/trunk/0001-Port-FC_COLOR-change-to-older-fontconfig.patch
emacs-nox/trunk/0001-src-ftfont.c-ftfont_spec_pattern-Fix-whitespace.patch
Modified:
emacs-nox/trunk/PKGBUILD
emacs-nox/trunk/emacs-nox.changelog
+
0001-Ignore-color-fonts-when-using-Xft.patch | 72 +++
0001-Port-FC_COLOR-change-to-older-fontconfig.patch| 32
0001-src-ftfont.c-ftfont_spec_pattern-Fix-whitespace.patch | 25 +++
PKGBUILD | 27 ++--
emacs-nox.changelog|3
5 files changed, 150 insertions(+), 9 deletions(-)
Added: 0001-Ignore-color-fonts-when-using-Xft.patch
===
--- 0001-Ignore-color-fonts-when-using-Xft.patch
(rev 0)
+++ 0001-Ignore-color-fonts-when-using-Xft.patch2018-07-08 09:50:53 UTC
(rev 354710)
@@ -0,0 +1,72 @@
+From f21fa142aca53e3de5783e1ce6fe1bf116174aeb Mon Sep 17 00:00:00 2001
+From: Robert Pluim
+Date: Tue, 3 Apr 2018 11:06:01 +0200
+Subject: [PATCH] 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.
+---
+ etc/NEWS | 6 ++
+ src/font.c | 7 +++
+ src/ftfont.c | 7 +++
+ 3 files changed, 20 insertions(+)
+
+diff --git a/etc/NEWS b/etc/NEWS
+index 873e2dfd1d..2bec8de0ea 100644
+--- a/etc/NEWS
b/etc/NEWS
+@@ -31,6 +31,12 @@ in its NEWS.)
+
+ * Changes in Emacs 26.2
+
++---
++** New variable 'xft-ignore-color-fonts'.
++Default t means don't try to load color fonts when using Xft, as they
++often cause crashes. Set it to nil if you really need those fonts.
++(Bug#30874)
++
+
+ * Editing Changes in Emacs 26.2
+
+diff --git a/src/font.c b/src/font.c
+index e53935a15c..305bb14576 100644
+--- a/src/font.c
b/src/font.c
+@@ -5476,6 +5476,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;
+
+--
+2.17.1
+
Added: 0001-Port-FC_COLOR-change-to-older-fontconfig.patch
===
--- 0001-Port-FC_COLOR-change-to-older-fontconfig.patch
(rev 0)
+++ 0001-Port-FC_COLOR-change-to-older-fontconfig.patch 2018-07-08 09:50:53 UTC
(rev 354710)
@@ -0,0 +1,32 @@
+From 97d61f878e6378efbde73923a36f71caac73a4a0 Mon Sep 17 00:00:00 2001
+From: Paul Eggert
+Date: Tue, 3 Apr 2018 08:12:41 -0700
+Subject: [PATCH] Port FC_COLOR change to older fontconfig
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Problem reported by John ff in:
+https://lists.gnu.org/r/emacs-devel/2018-04/msg00058.html
+* src/ftfont.c (ftfont_spec_pattern) [!FC_COLOR]:
+Don’t use FC_COLOR on older fontconfigs that don’t have it.
+---
+ src/ftfont.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/ftfont.c b/src/ftfont.c
+index 24a92dd52e..84e4a30389 100644
+--- a/src/ftfont.c
b/src/ftfont.c
+@@ -764,7 +764,7 @@ 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
++#if defined HAVE_XFT && defined FC_COLOR
+ /* We really don't like color fonts, they cause Xft crashes. See
+ Bug#30874. */
+ if (Vxft_ignore_color_fonts
+--
+2.17.1
+
Added: 0001-src-ftfont.c-ftfont_spec_pattern-Fix-whitespace.patch
