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

Frederik Schwan freswa at gemini.archlinux.org
Tue Apr 5 14:24:35 UTC 2022


    Date: Tuesday, April 5, 2022 @ 14:24:35
  Author: freswa
Revision: 441585

chore: improve readability of PKGBUILD

Modified:
  emacs/trunk/PKGBUILD
Deleted:
  emacs/trunk/0001-Ignore-color-fonts-when-using-Xft.patch
  emacs/trunk/0001-Port-FC_COLOR-change-to-older-fontconfig.patch
  emacs/trunk/0001-src-ftfont.c-ftfont_spec_pattern-Fix-whitespace.patch
  emacs/trunk/glibc-2.34.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                                                   |   37 +++--
 glibc-2.34.patch                                           |   39 -----
 5 files changed, 23 insertions(+), 182 deletions(-)

Deleted: 0001-Ignore-color-fonts-when-using-Xft.patch
===================================================================
--- 0001-Ignore-color-fonts-when-using-Xft.patch	2022-04-05 14:00:00 UTC (rev 441584)
+++ 0001-Ignore-color-fonts-when-using-Xft.patch	2022-04-05 14:24:35 UTC (rev 441585)
@@ -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	2022-04-05 14:00:00 UTC (rev 441584)
+++ 0001-Port-FC_COLOR-change-to-older-fontconfig.patch	2022-04-05 14:24:35 UTC (rev 441585)
@@ -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	2022-04-05 14:00:00 UTC (rev 441584)
+++ 0001-src-ftfont.c-ftfont_spec_pattern-Fix-whitespace.patch	2022-04-05 14:24:35 UTC (rev 441585)
@@ -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	2022-04-05 14:00:00 UTC (rev 441584)
+++ PKGBUILD	2022-04-05 14:24:35 UTC (rev 441585)
@@ -1,33 +1,42 @@
 # Maintainer: Juergen Hoetzel <juergen at archlinux.org>
+# Maintainer: Frederik Schwan <freswa at archlinux dot org>
 # Contributor: Renchi Raju <renchi at green.tam.uiuc.edu>
 
 pkgname=emacs
 pkgver=28.1
 pkgrel=1
-pkgdesc="The extensible, customizable, self-documenting real-time display editor"
+pkgdesc='The extensible, customizable, self-documenting real-time display editor'
 arch=('x86_64')
-url="https://www.gnu.org/software/emacs/emacs.html"
+url='https://www.gnu.org/software/emacs/emacs.html'
 license=('GPL3')
-depends=('librsvg' 'gpm' 'giflib' 'libxpm' 'libotf' 'm17n-lib' 'gtk3' 'hicolor-icon-theme' 'desktop-file-utils' 'alsa-lib' 'gnutls' 'jansson' 'cairo' 'harfbuzz')
+depends=('librsvg' 'gpm' 'giflib' 'libxpm' 'libotf' 'm17n-lib' 'gtk3'
+          'hicolor-icon-theme' 'desktop-file-utils' 'alsa-lib' 'gnutls'
+          'jansson' 'cairo' 'harfbuzz'
+)
 validpgpkeys=('17E90D521672C04631B1183EE78DAE0F3115E06B')
 source=(https://ftp.gnu.org/gnu/emacs/$pkgname-$pkgver.tar.xz{,.sig})
-sha1sums=('a198d69dfa5a42c30cabe9a82edb101ac5ee423c' 'SKIP')
+b2sums=('42a12bec2dc74f4838ae79b5589fb7439ff415d8ddd34f2ff7a8c503f909ddd4144ad35ae19c758d8627cfa9ed29276b326c5bec3853a77cd179e9fb17d22ad7'
+        'SKIP')
 
-
-prepare() {
+build() {
   cd $pkgname-$pkgver
-}
-
-build() {
-  cd "$srcdir"/$pkgname-$pkgver
-  ac_cv_lib_gif_EGifPutExtensionLast=yes ./configure --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib \
-                                    --localstatedir=/var --with-x-toolkit=gtk3 --with-xft --with-wide-int \
-                                    --with-modules --with-cairo --with-harfbuzz
+  export ac_cv_lib_gif_EGifPutExtensionLast=yes
+  ./configure \
+    --sysconfdir=/etc \
+    --prefix=/usr \
+    --libexecdir=/usr/lib \
+    --localstatedir=/var \
+    --with-cairo \
+    --with-harfbuzz \
+    --with-modules \
+    --with-wide-int \
+    --with-x-toolkit=gtk3 \
+    --with-xft
   make
 }
 
 package() {
-  cd "$srcdir"/$pkgname-$pkgver
+  cd $pkgname-$pkgver
   make DESTDIR="$pkgdir" install
 
   # remove conflict with ctags package

Deleted: glibc-2.34.patch
===================================================================
--- glibc-2.34.patch	2022-04-05 14:00:00 UTC (rev 441584)
+++ glibc-2.34.patch	2022-04-05 14:24:35 UTC (rev 441585)
@@ -1,39 +0,0 @@
-From f97e07ea807cc6d38774a3888a15091b20645ac6 Mon Sep 17 00:00:00 2001
-From: Paul Eggert <eggert at cs.ucla.edu>
-Date: Tue, 9 Mar 2021 11:22:59 -0800
-Subject: [PATCH] Port alternate signal stack to upcoming glibc 2.34
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-* src/sysdep.c (sigsegv_stack): Increase size to 64 KiB and align
-it to max_align_t.  This copies from Gnulib’s c-stack.c, and works
-around a portability bug in draft glibc 2.34, which no longer
-defines SIGSTKSZ when _GNU_SOURCE is defined.
----
- src/sysdep.c | 10 +++++++++-
- 1 file changed, 9 insertions(+), 1 deletion(-)
-
-diff --git a/src/sysdep.c b/src/sysdep.c
-index 941b4e2fa2..24d8832b2f 100644
---- a/src/sysdep.c
-+++ b/src/sysdep.c
-@@ -1785,7 +1785,15 @@ handle_arith_signal (int sig)
- 
- /* Alternate stack used by SIGSEGV handler below.  */
- 
--static unsigned char sigsegv_stack[SIGSTKSZ];
-+/* Storage for the alternate signal stack.
-+   64 KiB is not too large for Emacs, and is large enough
-+   for all known platforms.  Smaller sizes may run into trouble.
-+   For example, libsigsegv 2.6 through 2.8 have a bug where some
-+   architectures use more than the Linux default of an 8 KiB alternate
-+   stack when deciding if a fault was caused by stack overflow.  */
-+static max_align_t sigsegv_stack[(64 * 1024
-+				  + sizeof (max_align_t) - 1)
-+				 / sizeof (max_align_t)];
- 
- 
- /* Return true if SIGINFO indicates a stack overflow.  */
--- 
-2.29.2



More information about the arch-commits mailing list