diff options
| -rw-r--r-- | abs/extra/emacs/PKGBUILD | 19 | ||||
| -rw-r--r-- | abs/extra/emacs/emacs.install | 10 |
2 files changed, 16 insertions, 13 deletions
diff --git a/abs/extra/emacs/PKGBUILD b/abs/extra/emacs/PKGBUILD index f22828a..1d87274 100644 --- a/abs/extra/emacs/PKGBUILD +++ b/abs/extra/emacs/PKGBUILD @@ -1,23 +1,24 @@ -# $Id: PKGBUILD 171502 2012-11-18 08:01:29Z eric $ +# $Id$ # Maintainer: Juergen Hoetzel <juergen@archlinux.org> # Contributor: Renchi Raju <renchi@green.tam.uiuc.edu> pkgname=emacs -pkgver=24.2 -pkgrel=3 +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') +depends=('librsvg' 'gpm' 'giflib' 'libxpm' 'libotf' 'm17n-lib' 'gtk3' 'hicolor-icon-theme' 'gconf' 'desktop-file-utils' 'alsa-lib' 'imagemagick' 'gnutls') install=emacs.install -source=(ftp://ftp.gnu.org/gnu/emacs/$pkgname-$pkgver.tar.bz2{,.sig}) -md5sums=('1676803a50e8adc817fdaaebb9234f14' 'ca1766337f419ef827dd96d1ff78f158') - +validpgpkeys=('B29426DEFB07724C3C35E5D36592E9A3A0B0F199' '28D3BED851FDF3AB57FEF93C233587A47C207910') +source=(ftp://ftp.gnu.org/gnu/emacs/$pkgname-$pkgver.tar.xz{,.sig}) +md5sums=('50560ee00bac9bb9cf0e822764cd0832' + 'SKIP') build() { cd "$srcdir"/$pkgname-$pkgver - ./configure --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib \ + ac_cv_lib_gif_EGifPutExtensionLast=yes ./configure --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib \ --localstatedir=/var --with-x-toolkit=gtk3 --with-xft make } @@ -29,6 +30,8 @@ package() { # 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 diff --git a/abs/extra/emacs/emacs.install b/abs/extra/emacs/emacs.install index fa9ffee..6712f44 100644 --- a/abs/extra/emacs/emacs.install +++ b/abs/extra/emacs/emacs.install @@ -1,11 +1,11 @@ ICON_PATH=usr/share/icons/hicolor INFO_DIR=usr/share/info -INFO_FILES=(ada-mode auth autotype calc ccmode cl dbus dired-x ebrowse +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 idlwave info mairix-el message mh-e newsticker nxml-mode +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 tramp url vip viper widget woman) +speedbar srecode tramp url vip viper widget wisent woman) post_install() { gtk-update-icon-cache -q -t -f ${ICON_PATH} @@ -13,7 +13,7 @@ post_install() { [[ -x usr/bin/install-info ]] || return 0 for f in ${INFO_FILES[@]}; do - install-info ${INFO_DIR}/$f.gz ${INFO_DIR}/dir 2> /dev/null + install-info ${INFO_DIR}/$f.info.gz ${INFO_DIR}/dir 2> /dev/null done } @@ -27,6 +27,6 @@ pre_remove() { [[ -x usr/bin/install-info ]] || return 0 for f in ${INFO_FILES[@]}; do - install-info --delete ${INFO_DIR}/$f.gz ${INFO_DIR}/dir 2> /dev/null + install-info --delete ${INFO_DIR}/$f.info.gz ${INFO_DIR}/dir 2> /dev/null done } |