diff options
| author | Nicolás Reynolds <fauno@endefensadelsl.org> | 2014-06-17 03:27:11 +0000 |
|---|---|---|
| committer | Nicolás Reynolds <fauno@endefensadelsl.org> | 2014-06-17 03:27:11 +0000 |
| commit | 6459b84bf754eda5323f40eb7af76dde65b63251 (patch) | |
| tree | 81947a270848520d4cf2f9d1c5ce91ced54fcdff /extra/emacs | |
| parent | 942111e62628e9a5c4729563215b1cfb8911735e (diff) | |
Tue Jun 17 03:23:47 UTC 2014
Diffstat (limited to 'extra/emacs')
| -rw-r--r-- | extra/emacs/PKGBUILD | 6 | ||||
| -rw-r--r-- | extra/emacs/emacs-24.3-giflib5.patch | 71 |
2 files changed, 74 insertions, 3 deletions
diff --git a/extra/emacs/PKGBUILD b/extra/emacs/PKGBUILD index b2149a2f1..be31a3ec9 100644 --- a/extra/emacs/PKGBUILD +++ b/extra/emacs/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 204839 2014-01-28 14:14:20Z juergen $ +# $Id: PKGBUILD 215157 2014-06-14 19:17:04Z andyrtr $ # Maintainer: Juergen Hoetzel <juergen@archlinux.org> # Contributor: Renchi Raju <renchi@green.tam.uiuc.edu> pkgname=emacs pkgver=24.3 -pkgrel=6 +pkgrel=7 pkgdesc="The extensible, customizable, self-documenting real-time display editor" arch=('i686' 'x86_64') url="http://www.gnu.org/software/emacs/emacs.html" @@ -15,7 +15,7 @@ source=(ftp://ftp.gnu.org/gnu/emacs/$pkgname-$pkgver.tar.xz{,.sig} emacs-24.3-giflib5.patch) md5sums=('ea9ed000ca165280265aabb55b9afbd7' 'SKIP' - '560cdf463299e059c5fadf474bcba218') + 'ccbe4e77440ff6ea56c8532ebc960446') prepare() { cd $pkgname-$pkgver diff --git a/extra/emacs/emacs-24.3-giflib5.patch b/extra/emacs/emacs-24.3-giflib5.patch index b8571abb2..f58c31907 100644 --- a/extra/emacs/emacs-24.3-giflib5.patch +++ b/extra/emacs/emacs-24.3-giflib5.patch @@ -24,3 +24,74 @@ if (!gif) { image_error ("Cannot open memory source `%s'", img->spec, Qnil); +@@ -7225,7 +7225,11 @@ + if (!check_image_size (f, gif->SWidth, gif->SHeight)) + { + image_error ("Invalid image size (see `max-image-size')", Qnil, Qnil); ++#if GIFLIB_MAJOR >= 5 && GIFLIB_MINOR >= 1 ++ fn_DGifCloseFile (gif, NULL); ++#else + fn_DGifCloseFile (gif); ++#endif + return 0; + } + +@@ -7234,7 +7238,11 @@ + if (rc == GIF_ERROR || gif->ImageCount <= 0) + { + image_error ("Error reading `%s'", img->spec, Qnil); ++#if GIFLIB_MAJOR >= 5 && GIFLIB_MINOR >= 1 ++ fn_DGifCloseFile (gif, NULL); ++#else + fn_DGifCloseFile (gif); ++#endif + return 0; + } + +@@ -7246,7 +7254,11 @@ + { + image_error ("Invalid image number `%s' in image `%s'", + image_number, img->spec); ++#if GIFLIB_MAJOR >= 5 && GIFLIB_MINOR >= 1 ++ fn_DGifCloseFile (gif, NULL); ++#else + fn_DGifCloseFile (gif); ++#endif + return 0; + } + } +@@ -7264,14 +7276,22 @@ + if (!check_image_size (f, width, height)) + { + image_error ("Invalid image size (see `max-image-size')", Qnil, Qnil); ++#if GIFLIB_MAJOR >= 5 && GIFLIB_MINOR >= 1 ++ fn_DGifCloseFile (gif, NULL); ++#else + fn_DGifCloseFile (gif); ++#endif + return 0; + } + + /* Create the X image and pixmap. */ + if (!x_create_x_image_and_pixmap (f, width, height, 0, &ximg, &img->pixmap)) + { ++#if GIFLIB_MAJOR >= 5 && GIFLIB_MINOR >= 1 ++ fn_DGifCloseFile (gif, NULL); ++#else + fn_DGifCloseFile (gif); ++#endif + return 0; + } + +@@ -7447,7 +7467,11 @@ + Fcons (make_number (gif->ImageCount), + img->lisp_data)); + ++#if GIFLIB_MAJOR >= 5 && GIFLIB_MINOR >= 1 ++ fn_DGifCloseFile (gif, NULL); ++#else + fn_DGifCloseFile (gif); ++#endif + + /* Maybe fill in the background field while we have ximg handy. */ + if (NILP (image_spec_value (img->spec, QCbackground, NULL))) |