[arch-commits] Commit in emacs/repos/extra-x86_64 (8 files)

2020-08-28 Thread Jürgen Hötzel via arch-commits 
Date: Friday, August 28, 2020 @ 18:37:01
  Author: juergen
Revision: 394847

archrelease: copy trunk to extra-x86_64

Added:
  emacs/repos/extra-x86_64/0001-Ignore-color-fonts-when-using-Xft.patch
(from rev 394846, emacs/trunk/0001-Ignore-color-fonts-when-using-Xft.patch)
  emacs/repos/extra-x86_64/0001-Port-FC_COLOR-change-to-older-fontconfig.patch
(from rev 394846, 
emacs/trunk/0001-Port-FC_COLOR-change-to-older-fontconfig.patch)
  
emacs/repos/extra-x86_64/0001-src-ftfont.c-ftfont_spec_pattern-Fix-whitespace.patch
(from rev 394846, 
emacs/trunk/0001-src-ftfont.c-ftfont_spec_pattern-Fix-whitespace.patch)
  emacs/repos/extra-x86_64/PKGBUILD
(from rev 394846, emacs/trunk/PKGBUILD)
Deleted:
  emacs/repos/extra-x86_64/0001-Ignore-color-fonts-when-using-Xft.patch
  emacs/repos/extra-x86_64/0001-Port-FC_COLOR-change-to-older-fontconfig.patch
  
emacs/repos/extra-x86_64/0001-src-ftfont.c-ftfont_spec_pattern-Fix-whitespace.patch
  emacs/repos/extra-x86_64/PKGBUILD

+
 0001-Ignore-color-fonts-when-using-Xft.patch   |  144 +--
 0001-Port-FC_COLOR-change-to-older-fontconfig.patch|   64 ++--
 0001-src-ftfont.c-ftfont_spec_pattern-Fix-whitespace.patch |   50 +--
 PKGBUILD   |   70 ++---
 4 files changed, 164 insertions(+), 164 deletions(-)

Deleted: 0001-Ignore-color-fonts-when-using-Xft.patch
===
--- 0001-Ignore-color-fonts-when-using-Xft.patch2020-08-28 18:36:47 UTC 
(rev 394846)
+++ 0001-Ignore-color-fonts-when-using-Xft.patch2020-08-28 18:37:01 UTC 
(rev 394847)
@@ -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
-

Copied: emacs/repos/extra-x86_64/0001-Ignore-color-fonts-when-using-Xft.patch 
(from rev 394846, emacs/trunk/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.patch2020-08-28 18:37:01 UTC 
(rev 394847)
@@ -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

[arch-commits] Commit in emacs/repos/extra-x86_64 (8 files)

2020-08-13 Thread Jürgen Hötzel via arch-commits 
Date: Thursday, August 13, 2020 @ 18:37:48
  Author: juergen
Revision: 394022

archrelease: copy trunk to extra-x86_64

Added:
  emacs/repos/extra-x86_64/0001-Ignore-color-fonts-when-using-Xft.patch
(from rev 394021, emacs/trunk/0001-Ignore-color-fonts-when-using-Xft.patch)
  emacs/repos/extra-x86_64/0001-Port-FC_COLOR-change-to-older-fontconfig.patch
(from rev 394021, 
emacs/trunk/0001-Port-FC_COLOR-change-to-older-fontconfig.patch)
  
emacs/repos/extra-x86_64/0001-src-ftfont.c-ftfont_spec_pattern-Fix-whitespace.patch
(from rev 394021, 
emacs/trunk/0001-src-ftfont.c-ftfont_spec_pattern-Fix-whitespace.patch)
  emacs/repos/extra-x86_64/PKGBUILD
(from rev 394021, emacs/trunk/PKGBUILD)
Deleted:
  emacs/repos/extra-x86_64/0001-Ignore-color-fonts-when-using-Xft.patch
  emacs/repos/extra-x86_64/0001-Port-FC_COLOR-change-to-older-fontconfig.patch
  
emacs/repos/extra-x86_64/0001-src-ftfont.c-ftfont_spec_pattern-Fix-whitespace.patch
  emacs/repos/extra-x86_64/PKGBUILD

+
 0001-Ignore-color-fonts-when-using-Xft.patch   |  144 +--
 0001-Port-FC_COLOR-change-to-older-fontconfig.patch|   64 ++--
 0001-src-ftfont.c-ftfont_spec_pattern-Fix-whitespace.patch |   50 +--
 PKGBUILD   |   70 ++---
 4 files changed, 164 insertions(+), 164 deletions(-)

Deleted: 0001-Ignore-color-fonts-when-using-Xft.patch
===
--- 0001-Ignore-color-fonts-when-using-Xft.patch2020-08-13 18:37:28 UTC 
(rev 394021)
+++ 0001-Ignore-color-fonts-when-using-Xft.patch2020-08-13 18:37:48 UTC 
(rev 394022)
@@ -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
-

Copied: emacs/repos/extra-x86_64/0001-Ignore-color-fonts-when-using-Xft.patch 
(from rev 394021, emacs/trunk/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.patch2020-08-13 18:37:48 UTC 
(rev 394022)
@@ -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

[arch-commits] Commit in emacs/repos/extra-x86_64 (8 files)

2020-08-11 Thread Jürgen Hötzel via arch-commits 
Date: Tuesday, August 11, 2020 @ 19:27:50
  Author: juergen
Revision: 393546

archrelease: copy trunk to extra-x86_64

Added:
  emacs/repos/extra-x86_64/0001-Ignore-color-fonts-when-using-Xft.patch
(from rev 393545, emacs/trunk/0001-Ignore-color-fonts-when-using-Xft.patch)
  emacs/repos/extra-x86_64/0001-Port-FC_COLOR-change-to-older-fontconfig.patch
(from rev 393545, 
emacs/trunk/0001-Port-FC_COLOR-change-to-older-fontconfig.patch)
  
emacs/repos/extra-x86_64/0001-src-ftfont.c-ftfont_spec_pattern-Fix-whitespace.patch
(from rev 393545, 
emacs/trunk/0001-src-ftfont.c-ftfont_spec_pattern-Fix-whitespace.patch)
  emacs/repos/extra-x86_64/PKGBUILD
(from rev 393545, emacs/trunk/PKGBUILD)
Deleted:
  emacs/repos/extra-x86_64/0001-Ignore-color-fonts-when-using-Xft.patch
  emacs/repos/extra-x86_64/0001-Port-FC_COLOR-change-to-older-fontconfig.patch
  
emacs/repos/extra-x86_64/0001-src-ftfont.c-ftfont_spec_pattern-Fix-whitespace.patch
  emacs/repos/extra-x86_64/PKGBUILD

+
 0001-Ignore-color-fonts-when-using-Xft.patch   |  144 +--
 0001-Port-FC_COLOR-change-to-older-fontconfig.patch|   64 ++--
 0001-src-ftfont.c-ftfont_spec_pattern-Fix-whitespace.patch |   50 +--
 PKGBUILD   |   71 ++---
 4 files changed, 164 insertions(+), 165 deletions(-)

Deleted: 0001-Ignore-color-fonts-when-using-Xft.patch
===
--- 0001-Ignore-color-fonts-when-using-Xft.patch2020-08-11 19:27:45 UTC 
(rev 393545)
+++ 0001-Ignore-color-fonts-when-using-Xft.patch2020-08-11 19:27:50 UTC 
(rev 393546)
@@ -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
-

Copied: emacs/repos/extra-x86_64/0001-Ignore-color-fonts-when-using-Xft.patch 
(from rev 393545, emacs/trunk/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.patch2020-08-11 19:27:50 UTC 
(rev 393546)
@@ -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

[arch-commits] Commit in emacs/repos/extra-x86_64 (8 files)

2019-08-29 Thread Jürgen Hötzel via arch-commits 
Date: Thursday, August 29, 2019 @ 19:53:55
  Author: juergen
Revision: 361391

archrelease: copy trunk to extra-x86_64

Added:
  emacs/repos/extra-x86_64/0001-Ignore-color-fonts-when-using-Xft.patch
(from rev 361390, emacs/trunk/0001-Ignore-color-fonts-when-using-Xft.patch)
  emacs/repos/extra-x86_64/0001-Port-FC_COLOR-change-to-older-fontconfig.patch
(from rev 361390, 
emacs/trunk/0001-Port-FC_COLOR-change-to-older-fontconfig.patch)
  
emacs/repos/extra-x86_64/0001-src-ftfont.c-ftfont_spec_pattern-Fix-whitespace.patch
(from rev 361390, 
emacs/trunk/0001-src-ftfont.c-ftfont_spec_pattern-Fix-whitespace.patch)
  emacs/repos/extra-x86_64/PKGBUILD
(from rev 361390, emacs/trunk/PKGBUILD)
Deleted:
  emacs/repos/extra-x86_64/0001-Ignore-color-fonts-when-using-Xft.patch
  emacs/repos/extra-x86_64/0001-Port-FC_COLOR-change-to-older-fontconfig.patch
  
emacs/repos/extra-x86_64/0001-src-ftfont.c-ftfont_spec_pattern-Fix-whitespace.patch
  emacs/repos/extra-x86_64/PKGBUILD

+
 0001-Ignore-color-fonts-when-using-Xft.patch   |  144 +--
 0001-Port-FC_COLOR-change-to-older-fontconfig.patch|   64 ++--
 0001-src-ftfont.c-ftfont_spec_pattern-Fix-whitespace.patch |   50 +--
 PKGBUILD   |   72 ++---
 4 files changed, 165 insertions(+), 165 deletions(-)

Deleted: 0001-Ignore-color-fonts-when-using-Xft.patch
===
--- 0001-Ignore-color-fonts-when-using-Xft.patch2019-08-29 19:53:30 UTC 
(rev 361390)
+++ 0001-Ignore-color-fonts-when-using-Xft.patch2019-08-29 19:53:55 UTC 
(rev 361391)
@@ -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
-

Copied: emacs/repos/extra-x86_64/0001-Ignore-color-fonts-when-using-Xft.patch 
(from rev 361390, emacs/trunk/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.patch2019-08-29 19:53:55 UTC 
(rev 361391)
@@ -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

[arch-commits] Commit in emacs/repos/extra-x86_64 (8 files)

2019-04-12 Thread Jürgen Hötzel via arch-commits 
Date: Friday, April 12, 2019 @ 18:29:50
  Author: juergen
Revision: 350648

archrelease: copy trunk to extra-x86_64

Added:
  emacs/repos/extra-x86_64/0001-Ignore-color-fonts-when-using-Xft.patch
(from rev 350647, emacs/trunk/0001-Ignore-color-fonts-when-using-Xft.patch)
  emacs/repos/extra-x86_64/0001-Port-FC_COLOR-change-to-older-fontconfig.patch
(from rev 350647, 
emacs/trunk/0001-Port-FC_COLOR-change-to-older-fontconfig.patch)
  
emacs/repos/extra-x86_64/0001-src-ftfont.c-ftfont_spec_pattern-Fix-whitespace.patch
(from rev 350647, 
emacs/trunk/0001-src-ftfont.c-ftfont_spec_pattern-Fix-whitespace.patch)
  emacs/repos/extra-x86_64/PKGBUILD
(from rev 350647, emacs/trunk/PKGBUILD)
Deleted:
  emacs/repos/extra-x86_64/0001-Ignore-color-fonts-when-using-Xft.patch
  emacs/repos/extra-x86_64/0001-Port-FC_COLOR-change-to-older-fontconfig.patch
  
emacs/repos/extra-x86_64/0001-src-ftfont.c-ftfont_spec_pattern-Fix-whitespace.patch
  emacs/repos/extra-x86_64/PKGBUILD

+
 0001-Ignore-color-fonts-when-using-Xft.patch   |  144 +--
 0001-Port-FC_COLOR-change-to-older-fontconfig.patch|   64 ++--
 0001-src-ftfont.c-ftfont_spec_pattern-Fix-whitespace.patch |   50 +--
 PKGBUILD   |   85 ++
 4 files changed, 165 insertions(+), 178 deletions(-)

Deleted: 0001-Ignore-color-fonts-when-using-Xft.patch
===
--- 0001-Ignore-color-fonts-when-using-Xft.patch2019-04-12 18:29:09 UTC 
(rev 350647)
+++ 0001-Ignore-color-fonts-when-using-Xft.patch2019-04-12 18:29:50 UTC 
(rev 350648)
@@ -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
-

Copied: emacs/repos/extra-x86_64/0001-Ignore-color-fonts-when-using-Xft.patch 
(from rev 350647, emacs/trunk/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.patch2019-04-12 18:29:50 UTC 
(rev 350648)
@@ -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

[arch-commits] Commit in emacs/repos/extra-x86_64 (8 files)

2019-03-17 Thread Jürgen Hötzel via arch-commits 
Date: Sunday, March 17, 2019 @ 13:51:37
  Author: juergen
Revision: 348572

archrelease: copy trunk to extra-x86_64

Added:
  emacs/repos/extra-x86_64/0001-Ignore-color-fonts-when-using-Xft.patch
(from rev 348571, emacs/trunk/0001-Ignore-color-fonts-when-using-Xft.patch)
  emacs/repos/extra-x86_64/0001-Port-FC_COLOR-change-to-older-fontconfig.patch
(from rev 348571, 
emacs/trunk/0001-Port-FC_COLOR-change-to-older-fontconfig.patch)
  
emacs/repos/extra-x86_64/0001-src-ftfont.c-ftfont_spec_pattern-Fix-whitespace.patch
(from rev 348571, 
emacs/trunk/0001-src-ftfont.c-ftfont_spec_pattern-Fix-whitespace.patch)
  emacs/repos/extra-x86_64/PKGBUILD
(from rev 348571, emacs/trunk/PKGBUILD)
Deleted:
  emacs/repos/extra-x86_64/0001-Ignore-color-fonts-when-using-Xft.patch
  emacs/repos/extra-x86_64/0001-Port-FC_COLOR-change-to-older-fontconfig.patch
  
emacs/repos/extra-x86_64/0001-src-ftfont.c-ftfont_spec_pattern-Fix-whitespace.patch
  emacs/repos/extra-x86_64/PKGBUILD

+
 0001-Ignore-color-fonts-when-using-Xft.patch   |  144 +--
 0001-Port-FC_COLOR-change-to-older-fontconfig.patch|   64 ++--
 0001-src-ftfont.c-ftfont_spec_pattern-Fix-whitespace.patch |   50 +--
 PKGBUILD   |   99 +++
 4 files changed, 178 insertions(+), 179 deletions(-)

Deleted: 0001-Ignore-color-fonts-when-using-Xft.patch
===
--- 0001-Ignore-color-fonts-when-using-Xft.patch2019-03-17 13:51:24 UTC 
(rev 348571)
+++ 0001-Ignore-color-fonts-when-using-Xft.patch2019-03-17 13:51:37 UTC 
(rev 348572)
@@ -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
-

Copied: emacs/repos/extra-x86_64/0001-Ignore-color-fonts-when-using-Xft.patch 
(from rev 348571, emacs/trunk/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.patch2019-03-17 13:51:37 UTC 
(rev 348572)
@@ -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