[arch-commits] Commit in emacs-nox/trunk (5 files)

Jaroslav Lichtblau jlichtblau at archlinux.org
Sat May 25 19:06:31 UTC 2019


    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.patch	2019-05-25 18:55:41 UTC (rev 470772)
+++ 0001-Ignore-color-fonts-when-using-Xft.patch	2019-05-25 19:06:31 UTC (rev 470773)
@@ -1,72 +0,0 @@
-From f21fa142aca53e3de5783e1ce6fe1bf116174aeb Mon Sep 17 00:00:00 2001
-From: Robert Pluim <rpluim at gmail.com>
-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 <eggert at cs.ucla.edu>
-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: 0001-src-ftfont.c-ftfont_spec_pattern-Fix-whitespace.patch
===================================================================
--- 0001-src-ftfont.c-ftfont_spec_pattern-Fix-whitespace.patch	2019-05-25 18:55:41 UTC (rev 470772)
+++ 0001-src-ftfont.c-ftfont_spec_pattern-Fix-whitespace.patch	2019-05-25 19:06:31 UTC (rev 470773)
@@ -1,25 +0,0 @@
-From acaebed014951fdd13855aa7bba9aee60618785f Mon Sep 17 00:00:00 2001
-From: Eli Zaretskii <eliz at gnu.org>
-Date: Tue, 3 Apr 2018 19:59:40 +0300
-Subject: [PATCH] ; * src/ftfont.c (ftfont_spec_pattern): Fix whitespace.
-
----
- src/ftfont.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/ftfont.c b/src/ftfont.c
-index 84e4a30389..8f048d2983 100644
---- a/src/ftfont.c
-+++ b/src/ftfont.c
-@@ -768,7 +768,7 @@ ftfont_spec_pattern (Lisp_Object spec, char *otlayout, struct OpenTypeSpec **ots
-   /* We really don't like color fonts, they cause Xft crashes.  See
-      Bug#30874.  */
-   if (Vxft_ignore_color_fonts
--      && ! FcPatternAddBool(pattern, FC_COLOR, FcFalse))
-+      && ! FcPatternAddBool (pattern, FC_COLOR, FcFalse))
-     goto err;
- #endif
- 
--- 
-2.17.1
-

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-05-25 18:55:41 UTC (rev 470772)
+++ PKGBUILD	2019-05-25 19:06:31 UTC (rev 470773)
@@ -2,35 +2,21 @@
 # Contributor: Chris Brannon <cmbrannon at cox.net>
 
 pkgname=emacs-nox
-pkgver=26.1
+pkgver=26.2
 pkgrel=1
 pkgdesc="The extensible, customizable, self-documenting real-time display editor, without X11 support"
 arch=('x86_64')
-url="http://www.gnu.org/software/emacs/emacs.html"
+url="https://www.gnu.org/software/emacs/emacs.html"
 license=('GPL3')
 depends=('dbus' 'ncurses' 'perl' 'libxml2' 'glib2' 'gnutls')
 provides=('emacs')
 conflicts=('emacs')
 changelog=$pkgname.changelog
-source=(ftp://ftp.gnu.org/gnu/emacs/emacs-$pkgver.tar.xz{,.sig}
-        0001-Ignore-color-fonts-when-using-Xft.patch
-        0001-Port-FC_COLOR-change-to-older-fontconfig.patch
-        0001-src-ftfont.c-ftfont_spec_pattern-Fix-whitespace.patch)
+source=(https://ftp.gnu.org/gnu/emacs/emacs-$pkgver.tar.xz{,.sig})
 validpgpkeys=('28D3BED851FDF3AB57FEF93C233587A47C207910')
-sha256sums=('1cf4fc240cd77c25309d15e18593789c8dbfba5c2b44d8f77c886542300fd32c'
-            'SKIP'
-            '5bc53171bbb82e6dea26950f14da6a06f4371162b3bccb624397365e6e02f480'
-            '6d16de2078108d742a8935044926f439869e231cc18ec23777bbed4857625f96'
-            'ca48398d6a83e9a22a4117beca151f476e6286a9abbfddd0f7c0f187ebfc50d7')
+sha256sums=('151ce69dbe5b809d4492ffae4a4b153b2778459de6deb26f35691e1281a9c58e'
+            'SKIP')
 
-prepare() {
-  cd "${srcdir}"/emacs-$pkgver
-
-  patch -Np1 -i "${srcdir}/0001-Ignore-color-fonts-when-using-Xft.patch"
-  patch -Np1 -i "${srcdir}/0001-Port-FC_COLOR-change-to-older-fontconfig.patch"
-  patch -Np1 -i "${srcdir}/0001-src-ftfont.c-ftfont_spec_pattern-Fix-whitespace.patch"
-}
-
 build() {
   cd "${srcdir}"/emacs-$pkgver
 

Modified: emacs-nox.changelog
===================================================================
--- emacs-nox.changelog	2019-05-25 18:55:41 UTC (rev 470772)
+++ emacs-nox.changelog	2019-05-25 19:06:31 UTC (rev 470773)
@@ -1,3 +1,6 @@
+2019-05-25 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+	* emacs-nox 26.2-1
+
 2018-07-08 Jaroslav Lichtblau <svetlemodry at archlinux.org>
 	* emacs-nox 26.1-1
 


More information about the arch-commits mailing list