summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke Shumaker <lukeshu@sbcglobal.net>2014-11-24 15:03:34 -0500
committerLuke Shumaker <lukeshu@sbcglobal.net>2014-11-24 15:04:43 -0500
commit6fff66ab35ca1146f505347848fd05d5f3ad6930 (patch)
tree6fe53a159e7c4b09e73a7701feac478649988c79
parent86f6b5b4aa49d8dd6d605296b735ab7bd9075459 (diff)
downloadabslibre-6fff66ab35ca1146f505347848fd05d5f3ad6930.tar.gz
abslibre-6fff66ab35ca1146f505347848fd05d5f3ad6930.tar.bz2
abslibre-6fff66ab35ca1146f505347848fd05d5f3ad6930.zip
update pcr/emacs-lucid
-rw-r--r--pcr/emacs-lucid/PKGBUILD19
-rw-r--r--pcr/emacs-lucid/emacs-24.3-giflib5.patch97
2 files changed, 6 insertions, 110 deletions
diff --git a/pcr/emacs-lucid/PKGBUILD b/pcr/emacs-lucid/PKGBUILD
index 92a8def92..7e1b1d362 100644
--- a/pcr/emacs-lucid/PKGBUILD
+++ b/pcr/emacs-lucid/PKGBUILD
@@ -4,29 +4,22 @@
_pkgname=emacs
pkgname=emacs-lucid
-pkgver=24.3
-pkgrel=7
+pkgver=24.4
+pkgrel=1.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' 'libotf' 'm17n-lib' 'hicolor-icon-theme' 'gconf' 'desktop-file-utils' 'alsa-lib' 'imagemagick')
+depends=('librsvg' 'gpm' 'giflib' 'libxpm' 'libotf' 'm17n-lib' 'hicolor-icon-theme' 'gconf' 'desktop-file-utils' 'alsa-lib' 'imagemagick' 'gnutls')
install=emacs.install
-source=(ftp://ftp.gnu.org/gnu/emacs/$_pkgname-$pkgver.tar.xz{,.sig}
- emacs-24.3-giflib5.patch)
-md5sums=('ea9ed000ca165280265aabb55b9afbd7'
- 'SKIP'
- 'ccbe4e77440ff6ea56c8532ebc960446')
+source=(ftp://ftp.gnu.org/gnu/emacs/$_pkgname-$pkgver.tar.xz{,.sig})
+md5sums=('ad487658ad7421ad8d7b5152192eb945'
+ 'SKIP')
pkgdesc+=", with the Lucid X11 toolkit"
provides=("$_pkgname=$pkgver")
conflicts=("$_pkgname")
-prepare() {
- cd $_pkgname-$pkgver
- patch -Np0 -i ../emacs-24.3-giflib5.patch
-}
-
build() {
cd "$srcdir"/$_pkgname-$pkgver
ac_cv_lib_gif_EGifPutExtensionLast=yes ./configure --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib \
diff --git a/pcr/emacs-lucid/emacs-24.3-giflib5.patch b/pcr/emacs-lucid/emacs-24.3-giflib5.patch
deleted file mode 100644
index f58c31907..000000000
--- a/pcr/emacs-lucid/emacs-24.3-giflib5.patch
+++ /dev/null
@@ -1,97 +0,0 @@
---- 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);
-@@ -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)))