diff options
-rw-r--r-- | .SRCINFO | 16 | ||||
-rw-r--r-- | 0001-Ignore-color-fonts-when-using-Xft.patch | 72 | ||||
-rw-r--r-- | 0001-Port-FC_COLOR-change-to-older-fontconfig.patch | 32 | ||||
-rw-r--r-- | 0001-src-ftfont.c-ftfont_spec_pattern-Fix-whitespace.patch | 25 | ||||
-rw-r--r-- | PKGBUILD | 23 |
5 files changed, 11 insertions, 157 deletions
@@ -1,7 +1,7 @@ pkgbase = emacs-gtk2 pkgdesc = The extensible, customizable, self-documenting real-time display editor - pkgver = 26.1 - pkgrel = 3 + pkgver = 26.3 + pkgrel = 1 url = http://www.gnu.org/software/emacs/emacs.html arch = x86_64 license = GPL3 @@ -19,18 +19,12 @@ pkgbase = emacs-gtk2 depends = gnutls provides = emacs conflicts = emacs - source = ftp://ftp.gnu.org/gnu/emacs/emacs-26.1.tar.xz - source = ftp://ftp.gnu.org/gnu/emacs/emacs-26.1.tar.xz.sig - source = 0001-Ignore-color-fonts-when-using-Xft.patch - source = 0001-Port-FC_COLOR-change-to-older-fontconfig.patch - source = 0001-src-ftfont.c-ftfont_spec_pattern-Fix-whitespace.patch + source = ftp://ftp.gnu.org/gnu/emacs/emacs-26.3.tar.xz + source = ftp://ftp.gnu.org/gnu/emacs/emacs-26.3.tar.xz.sig validpgpkeys = B29426DEFB07724C3C35E5D36592E9A3A0B0F199 validpgpkeys = 28D3BED851FDF3AB57FEF93C233587A47C207910 - sha256sums = 1cf4fc240cd77c25309d15e18593789c8dbfba5c2b44d8f77c886542300fd32c + sha256sums = 4d90e6751ad8967822c6e092db07466b9d383ef1653feb2f95c93e7de66d3485 sha256sums = SKIP - sha256sums = 5bc53171bbb82e6dea26950f14da6a06f4371162b3bccb624397365e6e02f480 - sha256sums = 6d16de2078108d742a8935044926f439869e231cc18ec23777bbed4857625f96 - sha256sums = ca48398d6a83e9a22a4117beca151f476e6286a9abbfddd0f7c0f187ebfc50d7 pkgname = emacs-gtk2 diff --git a/0001-Ignore-color-fonts-when-using-Xft.patch b/0001-Ignore-color-fonts-when-using-Xft.patch deleted file mode 100644 index e17130658ff3..000000000000 --- a/0001-Ignore-color-fonts-when-using-Xft.patch +++ /dev/null @@ -1,72 +0,0 @@ -From f21fa142aca53e3de5783e1ce6fe1bf116174aeb Mon Sep 17 00:00:00 2001 -From: Robert Pluim <rpluim@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 - diff --git a/0001-Port-FC_COLOR-change-to-older-fontconfig.patch b/0001-Port-FC_COLOR-change-to-older-fontconfig.patch deleted file mode 100644 index ba14df6b6384..000000000000 --- a/0001-Port-FC_COLOR-change-to-older-fontconfig.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 97d61f878e6378efbde73923a36f71caac73a4a0 Mon Sep 17 00:00:00 2001 -From: Paul Eggert <eggert@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 - diff --git a/0001-src-ftfont.c-ftfont_spec_pattern-Fix-whitespace.patch b/0001-src-ftfont.c-ftfont_spec_pattern-Fix-whitespace.patch deleted file mode 100644 index 8cc1fcccd6ff..000000000000 --- a/0001-src-ftfont.c-ftfont_spec_pattern-Fix-whitespace.patch +++ /dev/null @@ -1,25 +0,0 @@ -From acaebed014951fdd13855aa7bba9aee60618785f Mon Sep 17 00:00:00 2001 -From: Eli Zaretskii <eliz@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 - @@ -3,8 +3,8 @@ # Contributor: Renchi Raju <renchi@green.tam.uiuc.edu> pkgname=emacs-gtk2 _pkgname=emacs -pkgver=26.1 -pkgrel=3 +pkgver=26.3 +pkgrel=1 pkgdesc="The extensible, customizable, self-documenting real-time display editor" arch=('x86_64') url="http://www.gnu.org/software/emacs/emacs.html" @@ -14,22 +14,11 @@ depends=('librsvg' 'gpm' 'giflib' 'libxpm' 'libotf' 'm17n-lib' 'gtk2' conflicts=('emacs') provides=('emacs') validpgpkeys=('B29426DEFB07724C3C35E5D36592E9A3A0B0F199' '28D3BED851FDF3AB57FEF93C233587A47C207910') -source=(ftp://ftp.gnu.org/gnu/emacs/$_pkgname-$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) -sha256sums=('1cf4fc240cd77c25309d15e18593789c8dbfba5c2b44d8f77c886542300fd32c' - 'SKIP' - '5bc53171bbb82e6dea26950f14da6a06f4371162b3bccb624397365e6e02f480' - '6d16de2078108d742a8935044926f439869e231cc18ec23777bbed4857625f96' - 'ca48398d6a83e9a22a4117beca151f476e6286a9abbfddd0f7c0f187ebfc50d7') +source=("ftp://ftp.gnu.org/gnu/emacs/$_pkgname-$pkgver.tar.xz" + "ftp://ftp.gnu.org/gnu/emacs/$_pkgname-$pkgver.tar.xz.sig") +sha256sums=('4d90e6751ad8967822c6e092db07466b9d383ef1653feb2f95c93e7de66d3485' + 'SKIP') -prepare() { - cd "$_pkgname-$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 "$_pkgname-$pkgver" |