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

Fri Apr 17 18:27:11 UTC 2015

Date: Friday, April 17, 2015 @ 20:27:11
  Author: andyrtr
Revision: 237319

archrelease: copy trunk to staging-i686, staging-x86_64

Added:
  emacs/repos/staging-i686/
  emacs/repos/staging-i686/PKGBUILD
    (from rev 237318, emacs/trunk/PKGBUILD)
  emacs/repos/staging-i686/emacs.install
    (from rev 237318, emacs/trunk/emacs.install)
  emacs/repos/staging-i686/gnupg21.patch
    (from rev 237318, emacs/trunk/gnupg21.patch)
  emacs/repos/staging-x86_64/
  emacs/repos/staging-x86_64/PKGBUILD
    (from rev 237318, emacs/trunk/PKGBUILD)
  emacs/repos/staging-x86_64/emacs.install
    (from rev 237318, emacs/trunk/emacs.install)
  emacs/repos/staging-x86_64/gnupg21.patch
    (from rev 237318, emacs/trunk/gnupg21.patch)

------------------------------+
 staging-i686/PKGBUILD        |   49 +++++++++++++++++++++++++++++++++++++++++
 staging-i686/emacs.install   |   32 ++++++++++++++++++++++++++
 staging-i686/gnupg21.patch   |   28 +++++++++++++++++++++++
 staging-x86_64/PKGBUILD      |   49 +++++++++++++++++++++++++++++++++++++++++
 staging-x86_64/emacs.install |   32 ++++++++++++++++++++++++++
 staging-x86_64/gnupg21.patch |   28 +++++++++++++++++++++++
 6 files changed, 218 insertions(+)

Copied: emacs/repos/staging-i686/PKGBUILD (from rev 237318, emacs/trunk/PKGBUILD)
===================================================================

--- staging-i686/PKGBUILD	                        (rev 0)
+++ staging-i686/PKGBUILD	2015-04-17 18:27:11 UTC (rev 237319)
@@ -0,0 +1,49 @@
+# $Id$
+# Maintainer: Juergen Hoetzel <juergen at archlinux.org>
+# Contributor: Renchi Raju <renchi at green.tam.uiuc.edu>
+
+pkgname=emacs
+pkgver=24.4
+pkgrel=3
+pkgdesc="The extensible, customizable, self-documenting real-time display editor"
+arch=('i686' 'x86_64')
+url="http://www.gnu.org/software/emacs/emacs.html"
+license=('GPL3')
+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')
+source=(ftp://ftp.gnu.org/gnu/emacs/$pkgname-$pkgver.tar.xz{,.sig}
+        gnupg21.patch)
+md5sums=('ad487658ad7421ad8d7b5152192eb945'
+         'SKIP'
+         '0583d868e0e304bac3df95b7518615cd')
+
+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 \
+    --localstatedir=/var --with-x-toolkit=gtk3 --with-xft
+  make
+}
+
+package() {
+  cd "$srcdir"/$pkgname-$pkgver
+  make DESTDIR="$pkgdir" install
+
+  # remove conflict with ctags package
+  mv "$pkgdir"/usr/bin/{ctags,ctags.emacs}
+  mv "$pkgdir"/usr/share/man/man1/{ctags.1.gz,ctags.emacs.1}
+  # remove conflict with texinfo
+  rm "$pkgdir"/usr/share/info/info.info.gz
+  # fix user/root permissions on usr/share files
+  find "$pkgdir"/usr/share/emacs/$pkgver -exec chown root:root {} \;
+  # fix perms on /var/games
+  chmod 775 "$pkgdir"/var/games
+  chmod 775 "$pkgdir"/var/games/emacs
+  chmod 664 "$pkgdir"/var/games/emacs/*
+  chown -R root:games "$pkgdir"/var/games
+}

Copied: emacs/repos/staging-i686/emacs.install (from rev 237318, emacs/trunk/emacs.install)
===================================================================
--- staging-i686/emacs.install	                        (rev 0)
+++ staging-i686/emacs.install	2015-04-17 18:27:11 UTC (rev 237319)
@@ -0,0 +1,32 @@
+ICON_PATH=usr/share/icons/hicolor
+INFO_DIR=usr/share/info
+
+INFO_FILES=(ada-mode auth autotype bovine calc ccmode cl dbus dired-x ebrowse
+ede ediff edt efaq eieio eintr elisp emacs emacs-gnutls emacs-mime epa erc ert eshell eudc flymake
+forms gnus htmlfontify idlwave mairix-el message mh-e newsticker nxml-mode
+org pcl-cvs pgg rcirc reftex remember sasl sc semantic ses sieve smtpmail
+speedbar srecode tramp url vip viper widget wisent woman)
+
+post_install() {
+  gtk-update-icon-cache -q -t -f ${ICON_PATH}
+  update-desktop-database -q
+
+  [[ -x usr/bin/install-info ]] || return 0
+  for f in ${INFO_FILES[@]}; do
+    install-info ${INFO_DIR}/$f.info.gz ${INFO_DIR}/dir 2> /dev/null
+  done
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+pre_remove() {
+  gtk-update-icon-cache -q -t -f ${ICON_PATH}
+  update-desktop-database -q
+
+  [[ -x usr/bin/install-info ]] || return 0
+  for f in ${INFO_FILES[@]}; do
+    install-info --delete ${INFO_DIR}/$f.info.gz ${INFO_DIR}/dir 2> /dev/null
+  done
+}

Copied: emacs/repos/staging-i686/gnupg21.patch (from rev 237318, emacs/trunk/gnupg21.patch)
===================================================================
--- staging-i686/gnupg21.patch	                        (rev 0)
+++ staging-i686/gnupg21.patch	2015-04-17 18:27:11 UTC (rev 237319)
@@ -0,0 +1,28 @@
+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

Copied: emacs/repos/staging-x86_64/PKGBUILD (from rev 237318, emacs/trunk/PKGBUILD)
===================================================================
--- staging-x86_64/PKGBUILD	                        (rev 0)
+++ staging-x86_64/PKGBUILD	2015-04-17 18:27:11 UTC (rev 237319)
@@ -0,0 +1,49 @@
+# $Id$
+# Maintainer: Juergen Hoetzel <juergen at archlinux.org>
+# Contributor: Renchi Raju <renchi at green.tam.uiuc.edu>
+
+pkgname=emacs
+pkgver=24.4
+pkgrel=3
+pkgdesc="The extensible, customizable, self-documenting real-time display editor"
+arch=('i686' 'x86_64')
+url="http://www.gnu.org/software/emacs/emacs.html"
+license=('GPL3')
+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')
+source=(ftp://ftp.gnu.org/gnu/emacs/$pkgname-$pkgver.tar.xz{,.sig}
+        gnupg21.patch)
+md5sums=('ad487658ad7421ad8d7b5152192eb945'
+         'SKIP'
+         '0583d868e0e304bac3df95b7518615cd')
+
+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 \
+    --localstatedir=/var --with-x-toolkit=gtk3 --with-xft
+  make
+}
+
+package() {
+  cd "$srcdir"/$pkgname-$pkgver
+  make DESTDIR="$pkgdir" install
+
+  # remove conflict with ctags package
+  mv "$pkgdir"/usr/bin/{ctags,ctags.emacs}
+  mv "$pkgdir"/usr/share/man/man1/{ctags.1.gz,ctags.emacs.1}
+  # remove conflict with texinfo
+  rm "$pkgdir"/usr/share/info/info.info.gz
+  # fix user/root permissions on usr/share files
+  find "$pkgdir"/usr/share/emacs/$pkgver -exec chown root:root {} \;
+  # fix perms on /var/games
+  chmod 775 "$pkgdir"/var/games
+  chmod 775 "$pkgdir"/var/games/emacs
+  chmod 664 "$pkgdir"/var/games/emacs/*
+  chown -R root:games "$pkgdir"/var/games
+}

Copied: emacs/repos/staging-x86_64/emacs.install (from rev 237318, emacs/trunk/emacs.install)
===================================================================
--- staging-x86_64/emacs.install	                        (rev 0)
+++ staging-x86_64/emacs.install	2015-04-17 18:27:11 UTC (rev 237319)
@@ -0,0 +1,32 @@
+ICON_PATH=usr/share/icons/hicolor
+INFO_DIR=usr/share/info
+
+INFO_FILES=(ada-mode auth autotype bovine calc ccmode cl dbus dired-x ebrowse
+ede ediff edt efaq eieio eintr elisp emacs emacs-gnutls emacs-mime epa erc ert eshell eudc flymake
+forms gnus htmlfontify idlwave mairix-el message mh-e newsticker nxml-mode
+org pcl-cvs pgg rcirc reftex remember sasl sc semantic ses sieve smtpmail
+speedbar srecode tramp url vip viper widget wisent woman)
+
+post_install() {
+  gtk-update-icon-cache -q -t -f ${ICON_PATH}
+  update-desktop-database -q
+
+  [[ -x usr/bin/install-info ]] || return 0
+  for f in ${INFO_FILES[@]}; do
+    install-info ${INFO_DIR}/$f.info.gz ${INFO_DIR}/dir 2> /dev/null
+  done
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+pre_remove() {
+  gtk-update-icon-cache -q -t -f ${ICON_PATH}
+  update-desktop-database -q
+
+  [[ -x usr/bin/install-info ]] || return 0
+  for f in ${INFO_FILES[@]}; do
+    install-info --delete ${INFO_DIR}/$f.info.gz ${INFO_DIR}/dir 2> /dev/null
+  done
+}

Copied: emacs/repos/staging-x86_64/gnupg21.patch (from rev 237318, emacs/trunk/gnupg21.patch)
===================================================================
--- staging-x86_64/gnupg21.patch	                        (rev 0)
+++ staging-x86_64/gnupg21.patch	2015-04-17 18:27:11 UTC (rev 237319)
@@ -0,0 +1,28 @@
+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

