[arch-commits] Commit in emacs/trunk (PKGBUILD gnupg21.patch)

[Jürgen Hötzel]

    Date: Monday, April 20, 2015 @ 12:36:15
  Author: juergen
Revision: 237780

Remove GnuPG 2.1 patch

Fixed in Upstream commit dbae12c5dfd236bc5f5916296659407e50fce7d6

Modified:
  emacs/trunk/PKGBUILD
Deleted:
  emacs/trunk/gnupg21.patch

---------------+
 PKGBUILD      |   11 ++---------
 gnupg21.patch |   28 ----------------------------
 2 files changed, 2 insertions(+), 37 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-04-20 10:15:03 UTC (rev 237779)
+++ PKGBUILD	2015-04-20 10:36:15 UTC (rev 237780)
@@ -12,17 +12,10 @@
 depends=('librsvg' 'gpm' 'giflib' 'libxpm' 'libotf' 'm17n-lib' 'gtk3' 'hicolor-icon-theme' 'gconf' 'desktop-file-utils' 'alsa-lib' 'imagemagick' 'gnutls')
 install=emacs.install
 validpgpkeys=('B29426DEFB07724C3C35E5D36592E9A3A0B0F199' '28D3BED851FDF3AB57FEF93C233587A47C207910')
-source=(ftp://ftp.gnu.org/gnu/emacs/$pkgname-$pkgver.tar.xz{,.sig}
-        gnupg21.patch)
+source=(ftp://ftp.gnu.org/gnu/emacs/$pkgname-$pkgver.tar.xz{,.sig})
 md5sums=('50560ee00bac9bb9cf0e822764cd0832'
-         'SKIP'
-         '0583d868e0e304bac3df95b7518615cd')
+         'SKIP')
 
-prepare() {
-  cd "$srcdir"/$pkgname-$pkgver
-  patch -p1 -i ../gnupg21.patch
-}
-
 build() {
   cd "$srcdir"/$pkgname-$pkgver
   ac_cv_lib_gif_EGifPutExtensionLast=yes ./configure --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib \

Deleted: gnupg21.patch
===================================================================
--- gnupg21.patch	2015-04-20 10:15:03 UTC (rev 237779)
+++ gnupg21.patch	2015-04-20 10:36:15 UTC (rev 237780)
@@ -1,28 +0,0 @@
-From 135a9f4b5aead507c030fb7e3e8ad13aaa91f403 Mon Sep 17 00:00:00 2001
-From: Daiki Ueno <ueno at gnu.org>
-Date: Fri, 07 Nov 2014 02:31:12 +0000
-Subject: epg: Adjust to GnuPG 2.1 key listing change
-
-* epg.el (epg--list-keys-1): Ignore fields after the 15th field
-(bug#18979).  Reported by Hideki Saito.
----
-(limited to 'lisp/epg.el')
-
-diff --git a/lisp/epg.el b/lisp/epg.el
-index 0c74531..e4d8c1e 100644
---- a/lisp/epg.el
-+++ b/lisp/epg.el
-@@ -1278,8 +1278,9 @@ callback data (if any)."
- 	      string (match-string 0)
- 	      index 0
- 	      field 0)
--	(while (eq index
--		   (string-match "\\([^:]+\\)?:" string index))
-+	(while (and (< field (length (car keys)))
-+		    (eq index
-+			(string-match "\\([^:]+\\)?:" string index)))
- 	  (setq index (match-end 0))
- 	  (aset (car keys) field (match-string 1 string))
- 	  (setq field (1+ field))))
---
-cgit v0.9.0.2