[arch-commits] Commit in emacs/trunk (PKGBUILD emacs-24.3-giflib5.patch)
Date: Tuesday, October 21, 2014 @ 10:28:26
Author: juergen
Revision: 225138
update to 24.4-1
Modified:
emacs/trunk/PKGBUILD
Deleted:
emacs/trunk/emacs-24.3-giflib5.patch
--+
PKGBUILD | 17 ++-
emacs-24.3-giflib5.patch | 97 -
2 files changed, 5 insertions(+), 109 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2014-10-20 19:57:11 UTC (rev 225137)
+++ PKGBUILD2014-10-21 08:28:26 UTC (rev 225138)
@@ -3,8 +3,8 @@
# Contributor: Renchi Raju ren...@green.tam.uiuc.edu
pkgname=emacs
-pkgver=24.3
-pkgrel=7
+pkgver=24.4
+pkgrel=1
pkgdesc=The extensible, customizable, self-documenting real-time display
editor
arch=('i686' 'x86_64')
url=http://www.gnu.org/software/emacs/emacs.html;
@@ -11,17 +11,10 @@
license=('GPL3')
depends=('librsvg' 'gpm' 'giflib' 'libxpm' 'libotf' 'm17n-lib' 'gtk3'
'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')
-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 \
Deleted: emacs-24.3-giflib5.patch
===
--- emacs-24.3-giflib5.patch2014-10-20 19:57:11 UTC (rev 225137)
+++ emacs-24.3-giflib5.patch2014-10-21 08:28:26 UTC (rev 225138)
@@ -1,97 +0,0 @@
src/image.c
-+++ src/image.c2013-05-21 15:49:41.945819346 +
-@@ -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)))
[arch-commits] Commit in emacs/trunk (PKGBUILD emacs-24.3-giflib5.patch)
Date: Wednesday, June 11, 2014 @ 14:00:08
Author: jgc
Revision: 214997
upgpkg: emacs 24.3-7
giflib 5.1 rebuild
Modified:
emacs/trunk/PKGBUILD
emacs/trunk/emacs-24.3-giflib5.patch
--+
PKGBUILD |4 +-
emacs-24.3-giflib5.patch | 71 +
2 files changed, 73 insertions(+), 2 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2014-06-11 11:40:28 UTC (rev 214996)
+++ PKGBUILD2014-06-11 12:00:08 UTC (rev 214997)
@@ -4,7 +4,7 @@
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 @@
emacs-24.3-giflib5.patch)
md5sums=('ea9ed000ca165280265aabb55b9afbd7'
'SKIP'
- '560cdf463299e059c5fadf474bcba218')
+ 'ccbe4e77440ff6ea56c8532ebc960446')
prepare() {
cd $pkgname-$pkgver
Modified: emacs-24.3-giflib5.patch
===
--- emacs-24.3-giflib5.patch2014-06-11 11:40:28 UTC (rev 214996)
+++ emacs-24.3-giflib5.patch2014-06-11 12:00:08 UTC (rev 214997)
@@ -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)))
[arch-commits] Commit in emacs/trunk (PKGBUILD emacs-24.3-giflib5.patch)
Date: Tuesday, July 30, 2013 @ 12:29:42
Author: jgc
Revision: 191764
giflib rebuild
upgpkg: emacs 24.3-3
Added:
emacs/trunk/emacs-24.3-giflib5.patch
Modified:
emacs/trunk/PKGBUILD
--+
PKGBUILD | 15 +++
emacs-24.3-giflib5.patch | 26 ++
2 files changed, 37 insertions(+), 4 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2013-07-30 10:02:50 UTC (rev 191763)
+++ PKGBUILD2013-07-30 10:29:42 UTC (rev 191764)
@@ -4,20 +4,27 @@
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
}
Added: emacs-24.3-giflib5.patch
===
--- emacs-24.3-giflib5.patch(rev 0)
+++ emacs-24.3-giflib5.patch2013-07-30 10:29:42 UTC (rev 191764)
@@ -0,0 +1,26 @@
+--- src/image.c
src/image.c2013-05-21 15:49:41.945819346 +
+@@ -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);
