diff options
Diffstat (limited to 'extra/emacs')
| -rw-r--r-- | extra/emacs/PKGBUILD | 17 | ||||
| -rw-r--r-- | extra/emacs/emacs-24.3-giflib5.patch | 26 |
2 files changed, 38 insertions, 5 deletions
diff --git a/extra/emacs/PKGBUILD b/extra/emacs/PKGBUILD index fa87e2265..9ed569b3b 100644 --- a/extra/emacs/PKGBUILD +++ b/extra/emacs/PKGBUILD @@ -1,23 +1,30 @@ -# $Id: PKGBUILD 184371 2013-05-06 19:36:58Z foutrelis $ +# $Id: PKGBUILD 191914 2013-08-01 06:59:43Z bpiotrowski $ # Maintainer: Juergen Hoetzel <juergen@archlinux.org> # Contributor: Renchi Raju <renchi@green.tam.uiuc.edu> pkgname=emacs pkgver=24.3 -pkgrel=2 +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') install=emacs.install -source=(ftp://ftp.gnu.org/gnu/emacs/$pkgname-$pkgver.tar.xz{,.sig}) +source=(ftp://ftp.gnu.org/gnu/emacs/$pkgname-$pkgver.tar.xz{,.sig} + emacs-24.3-giflib5.patch) md5sums=('ea9ed000ca165280265aabb55b9afbd7' - '3f6990fabfbe1d5f3cd58bace4eb20f1') + 'SKIP' + '560cdf463299e059c5fadf474bcba218') + +prepare() { + cd $pkgname-$pkgver + patch -Np0 -i ../emacs-24.3-giflib5.patch +} 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 } diff --git a/extra/emacs/emacs-24.3-giflib5.patch b/extra/emacs/emacs-24.3-giflib5.patch new file mode 100644 index 000000000..b8571abb2 --- /dev/null +++ b/extra/emacs/emacs-24.3-giflib5.patch @@ -0,0 +1,26 @@ +--- src/image.c ++++ src/image.c 2013-05-21 15:49:41.945819346 +0000 +@@ -7192,7 +7192,11 @@ gif_load (struct frame *f, struct image + } + + /* Open the GIF file. */ ++#if GIFLIB_MAJOR < 5 + gif = fn_DGifOpenFileName (SSDATA (file)); ++#else ++ gif = fn_DGifOpenFileName (SSDATA (file), NULL); ++#endif + if (gif == NULL) + { + image_error ("Cannot open `%s'", file, Qnil); +@@ -7213,7 +7217,11 @@ gif_load (struct frame *f, struct image + memsrc.len = SBYTES (specified_data); + memsrc.index = 0; + ++#if GIFLIB_MAJOR < 5 + gif = fn_DGifOpen (&memsrc, gif_read_from_memory); ++#else ++ gif = fn_DGifOpen (&memsrc, gif_read_from_memory, NULL); ++#endif + if (!gif) + { + image_error ("Cannot open memory source `%s'", img->spec, Qnil); |