diff options
| author | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-08-31 10:45:34 -0300 |
|---|---|---|
| committer | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-08-31 10:45:34 -0300 |
| commit | db6d80995b7f835ba0b581a007bd0040e7d138b0 (patch) | |
| tree | 00d3b174ccb85f692744e12059bcd04cddb2137c /extra/emacs | |
| parent | 8226dd7c223cb14962fe6a76f369b96684563155 (diff) | |
| parent | 68cdc08aec92abf91448a542e06fabbedbb583bf (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
core/glibc/PKGBUILD
extra/telepathy-logger-qt/PKGBUILD
multilib-testing/lib32-glibc/PKGBUILD
testing/openssh/PKGBUILD
testing/openssh/sshd
testing/openssh/sshd.service
testing/spamassassin/PKGBUILD
testing/spamassassin/spamassassin.install
testing/upower/PKGBUILD
Diffstat (limited to 'extra/emacs')
| -rw-r--r-- | extra/emacs/PKGBUILD | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/extra/emacs/PKGBUILD b/extra/emacs/PKGBUILD index 5b1fd0f71..debbd5c2b 100644 --- a/extra/emacs/PKGBUILD +++ b/extra/emacs/PKGBUILD @@ -1,24 +1,24 @@ -# $Id: PKGBUILD 161436 2012-06-11 15:03:29Z juergen $ +# $Id: PKGBUILD 165687 2012-08-29 09:08:38Z juergen $ # Maintainer: Juergen Hoetzel <juergen@archlinux.org> # Contributor: Renchi Raju <renchi@green.tam.uiuc.edu> pkgname=emacs -pkgver=24.1 -pkgrel=2 +pkgver=24.2 +pkgrel=1 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' 'imagemagick') +depends=('librsvg' 'gpm' 'giflib' 'libxpm' 'libotf' 'm17n-lib' 'gtk3' '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}) -md5sums=('8ba0932c498bc8fb10d7ddba52227e5b' 'c303d5c0bd0f7ea28acd14c9738faff4') +md5sums=('1676803a50e8adc817fdaaebb9234f14' 'ca1766337f419ef827dd96d1ff78f158') build() { cd "$srcdir"/$pkgname-$pkgver ./configure --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib \ - --localstatedir=/var --with-x-toolkit=gtk --with-xft + --localstatedir=/var --with-x-toolkit=gtk3 --with-xft make } |