diff options
| -rw-r--r-- | abs/extra/emacs/PKGBUILD | 18 | ||||
| -rw-r--r-- | abs/extra/emacs/emacs.install | 32 |
2 files changed, 9 insertions, 41 deletions
diff --git a/abs/extra/emacs/PKGBUILD b/abs/extra/emacs/PKGBUILD index bc223a0..9b1aaeb 100644 --- a/abs/extra/emacs/PKGBUILD +++ b/abs/extra/emacs/PKGBUILD @@ -3,23 +3,24 @@ # Contributor: Renchi Raju <renchi@green.tam.uiuc.edu> pkgname=emacs -pkgver=24.5 -pkgrel=2 +pkgver=25.3 +pkgrel=3 pkgdesc="The extensible, customizable, self-documenting real-time display editor" -arch=('i686' 'x86_64') +arch=('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 +depends=('librsvg' 'gpm' 'giflib' 'libxpm' 'libotf' 'm17n-lib' 'gtk3' 'hicolor-icon-theme' 'gconf' 'desktop-file-utils' 'alsa-lib' 'libmagick6' 'gnutls') validpgpkeys=('B29426DEFB07724C3C35E5D36592E9A3A0B0F199' '28D3BED851FDF3AB57FEF93C233587A47C207910') source=(ftp://ftp.gnu.org/gnu/emacs/$pkgname-$pkgver.tar.xz{,.sig}) -md5sums=('50560ee00bac9bb9cf0e822764cd0832' +sha1sums=('1cb4f39e9c0a3305fd62f936c7c95ff8e2924323' 'SKIP') build() { cd "$srcdir"/$pkgname-$pkgver + PKG_CONFIG_PATH="/usr/lib/imagemagick6/pkgconfig" \ ac_cv_lib_gif_EGifPutExtensionLast=yes ./configure --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib \ - --localstatedir=/var --with-x-toolkit=gtk3 --with-xft + --localstatedir=/var --with-x-toolkit=gtk3 --with-xft \ + --with-modules make } @@ -30,8 +31,7 @@ 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 deleted file mode 100644 index 6712f44..0000000 --- a/abs/extra/emacs/emacs.install +++ /dev/null @@ -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 -} |