[arch-commits] Commit in emacs/repos/extra-x86_64 (5 files)
Jürgen Hötzel
juergen at archlinux.org
Mon Apr 20 10:46:51 UTC 2015
Date: Monday, April 20, 2015 @ 12:46:50
Author: juergen
Revision: 237781
archrelease: copy trunk to extra-x86_64
Added:
emacs/repos/extra-x86_64/PKGBUILD
(from rev 237780, emacs/trunk/PKGBUILD)
emacs/repos/extra-x86_64/emacs.install
(from rev 237780, emacs/trunk/emacs.install)
Deleted:
emacs/repos/extra-x86_64/PKGBUILD
emacs/repos/extra-x86_64/emacs.install
emacs/repos/extra-x86_64/gnupg21.patch
---------------+
PKGBUILD | 91 +++++++++++++++++++++++++-------------------------------
emacs.install | 64 +++++++++++++++++++--------------------
gnupg21.patch | 28 -----------------
3 files changed, 74 insertions(+), 109 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2015-04-20 10:36:15 UTC (rev 237780)
+++ PKGBUILD 2015-04-20 10:46:50 UTC (rev 237781)
@@ -1,49 +0,0 @@
-# $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/extra-x86_64/PKGBUILD (from rev 237780, emacs/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2015-04-20 10:46:50 UTC (rev 237781)
@@ -0,0 +1,42 @@
+# $Id$
+# Maintainer: Juergen Hoetzel <juergen at archlinux.org>
+# Contributor: Renchi Raju <renchi at green.tam.uiuc.edu>
+
+pkgname=emacs
+pkgver=24.5
+pkgrel=1
+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' '28D3BED851FDF3AB57FEF93C233587A47C207910')
+source=(ftp://ftp.gnu.org/gnu/emacs/$pkgname-$pkgver.tar.xz{,.sig})
+md5sums=('50560ee00bac9bb9cf0e822764cd0832'
+ 'SKIP')
+
+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
+}
Deleted: emacs.install
===================================================================
--- emacs.install 2015-04-20 10:36:15 UTC (rev 237780)
+++ emacs.install 2015-04-20 10:46:50 UTC (rev 237781)
@@ -1,32 +0,0 @@
-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/extra-x86_64/emacs.install (from rev 237780, emacs/trunk/emacs.install)
===================================================================
--- emacs.install (rev 0)
+++ emacs.install 2015-04-20 10:46:50 UTC (rev 237781)
@@ -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
+}
Deleted: gnupg21.patch
===================================================================
--- gnupg21.patch 2015-04-20 10:36:15 UTC (rev 237780)
+++ gnupg21.patch 2015-04-20 10:46:50 UTC (rev 237781)
@@ -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
More information about the arch-commits
mailing list