diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2012-06-14 18:16:51 +0200 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-06-14 18:16:51 +0200 |
| commit | b32e36625b44b5c002c417ab4faf6311258c7671 (patch) | |
| tree | 87f91f6f7d9ccb229f9c7613f5411534bd504f5e /extra/emacs | |
| parent | 1a274201c465801ed2271018f426f0eaf7098215 (diff) | |
| parent | 35c30674b2b901077a809a6f1d8e5a0115098c8b (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community-staging/mplayer2/PKGBUILD
community/pcmanfm/PKGBUILD
extra/liblrdf/PKGBUILD
extra/php-apc/PKGBUILD
extra/sqlite/PKGBUILD
kde-unstable/libkgapi/PKGBUILD
kde-unstable/soprano/PKGBUILD
multilib/lib32-libphobos-ldc/PKGBUILD
multilib/lib32-pixman/PKGBUILD
multilib/lib32-sqlite3/PKGBUILD
Diffstat (limited to 'extra/emacs')
| -rw-r--r-- | extra/emacs/PKGBUILD | 20 |
1 files changed, 7 insertions, 13 deletions
diff --git a/extra/emacs/PKGBUILD b/extra/emacs/PKGBUILD index 0bc839ac8..5b1fd0f71 100644 --- a/extra/emacs/PKGBUILD +++ b/extra/emacs/PKGBUILD @@ -1,28 +1,22 @@ -# $Id: PKGBUILD 156054 2012-04-12 12:20:45Z juergen $ +# $Id: PKGBUILD 161436 2012-06-11 15:03:29Z juergen $ # Maintainer: Juergen Hoetzel <juergen@archlinux.org> # Contributor: Renchi Raju <renchi@green.tam.uiuc.edu> pkgname=emacs -pkgver=23.4 +pkgver=24.1 pkgrel=2 pkgdesc="The extensible, customizable, self-documenting real-time display editor" arch=('i686' 'x86_64' 'mips64el') url="http://www.gnu.org/software/emacs/emacs.html" license=('GPL3') -depends=('librsvg' 'gpm' 'giflib' 'libxpm' 'gtk2' 'hicolor-icon-theme' 'gconf' 'desktop-file-utils' 'alsa-lib') +depends=('librsvg' 'gpm' 'giflib' 'libxpm' 'gtk2' 'hicolor-icon-theme' 'gconf' 'desktop-file-utils' 'alsa-lib' 'imagemagick') install=emacs.install -source=(ftp://ftp.gnu.org/gnu/emacs/$pkgname-$pkgver.tar.bz2{,.sig} - emacs-subversion17.patch - emacs-23.3-xgselect_init.patch) -md5sums=('070c68ad8e3c31fb3cb2414feaf5e6f0' - '55eb16eb48b44987693c0e3ea5ab8075' - '12e2e7a66df5cc5ded54e1d30083a1fb' - '0d3b3d701ba1295613ace30e8d67ca88') +source=(ftp://ftp.gnu.org/gnu/emacs/$pkgname-$pkgver.tar.bz2{,.sig}) +md5sums=('8ba0932c498bc8fb10d7ddba52227e5b' 'c303d5c0bd0f7ea28acd14c9738faff4') + build() { cd "$srcdir"/$pkgname-$pkgver - patch -p1 -i ../emacs-subversion17.patch - patch -p1 -i ../emacs-23.3-xgselect_init.patch ./configure --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib \ --localstatedir=/var --with-x-toolkit=gtk --with-xft make @@ -34,7 +28,7 @@ package() { # remove conflict with ctags package mv "$pkgdir"/usr/bin/{ctags,ctags.emacs} - mv "$pkgdir"/usr/share/man/man1/{ctags.1,ctags.emacs.1} + mv "$pkgdir"/usr/share/man/man1/{ctags.1.gz,ctags.emacs.1} # fix all the 777 perms on directories find "$pkgdir"/usr/share/emacs/$_majorver -type d -exec chmod 755 {} \; # fix user/root permissions on usr/share files |