[arch-commits] Commit in imlib/trunk (3 files)
Jan de Groot
jgc at nymeria.archlinux.org
Tue May 27 09:50:27 UTC 2014
Date: Tuesday, May 27, 2014 @ 11:50:27
Author: jgc
Revision: 213646
upgpkg: imlib 1.9.15-15
giflib 5.1 rebuild
Added:
imlib/trunk/imlib-giflib51.patch
Modified:
imlib/trunk/PKGBUILD
Deleted:
imlib/trunk/imlib-giflib5.patch
----------------------+
PKGBUILD | 9 +--
imlib-giflib5.patch | 110 ------------------------------------------
imlib-giflib51.patch | 126 +++++++++++++++++++++++++++++++++++++++++++++++++
3 files changed, 131 insertions(+), 114 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2014-05-27 09:23:51 UTC (rev 213645)
+++ PKGBUILD 2014-05-27 09:50:27 UTC (rev 213646)
@@ -3,7 +3,7 @@
pkgname=imlib
pkgver=1.9.15
-pkgrel=14
+pkgrel=15
pkgdesc="General image handling library for X11 and Gtk"
arch=('i686' 'x86_64')
url="http://freshmeat.net/projects/imlib/"
@@ -12,13 +12,13 @@
makedepends=('libxt')
source=(http://ftp.gnome.org/pub/GNOME/sources/imlib/1.9/${pkgname}-${pkgver}.tar.bz2
debian-bug448360.patch CAN-2004-1026.patch aclocal-fixes.patch
- imlib-1.9.15-libpng15.patch imlib-giflib5.patch imlib-gtk.patch)
+ imlib-1.9.15-libpng15.patch imlib-giflib51.patch imlib-gtk.patch)
sha1sums=('c9a732a354fbb3c7e1a426e5d19fc92d73f8f720'
'fe2fd9ce4d7bc62271e724153de39012de8ec5ee'
'ec1b47281c1a7fb21abe841f948ecc56ed13f310'
'af54cb1ee0c8c6122b277284ebdd1022e31df3b5'
'33c3aaa43eb624f2a6ab0406285a8515903333e3'
- '56e9d65e05a347452fd608d2dfc8538f7ce09893'
+ '3c33b3d7f7125a6fbfcf48ca585739b71b1d8ebf'
'7cf962f8d7488200910ba4bdee00473f035b054a')
prepare() {
@@ -27,9 +27,10 @@
patch -p1 -i "${srcdir}/CAN-2004-1026.patch"
patch -p0 -i "${srcdir}/aclocal-fixes.patch"
patch -p0 -i "${srcdir}/imlib-1.9.15-libpng15.patch"
- patch -p1 -i "${srcdir}/imlib-giflib5.patch"
+ patch -p1 -i "${srcdir}/imlib-giflib51.patch"
patch -p1 -i "${srcdir}/imlib-gtk.patch"
sed '/AC_PATH_XTRA/d' -i configure.in
+ mv configure.in configure.ac
libtoolize --force
cp /usr/bin/libtool .
}
Deleted: imlib-giflib5.patch
===================================================================
--- imlib-giflib5.patch 2014-05-27 09:23:51 UTC (rev 213645)
+++ imlib-giflib5.patch 2014-05-27 09:50:27 UTC (rev 213646)
@@ -1,110 +0,0 @@
-diff -Naur imlib-1.9.15-orig/Imlib/load.c imlib-1.9.15/Imlib/load.c
---- imlib-1.9.15-orig/Imlib/load.c 2013-07-29 17:33:54.656601713 -0400
-+++ imlib-1.9.15/Imlib/load.c 2013-07-29 17:39:39.063991823 -0400
-@@ -444,6 +444,7 @@
- int intjump[] = {8, 8, 4, 2};
- int istransp, transp;
- int fd;
-+ int Error;
-
- done = 0;
- istransp = 0;
-@@ -454,7 +455,7 @@
- fd = fileno(f);
- /* Apparently rewind(f) isn't sufficient */
- lseek(fd, (long) 0, 0);
-- gif = DGifOpenFileHandle(fd);
-+ gif = DGifOpenFileHandle(fd, &Error);
-
- if (!gif)
- return NULL;
-diff -Naur imlib-1.9.15-orig/gdk_imlib/io-gif.c imlib-1.9.15/gdk_imlib/io-gif.c
---- imlib-1.9.15-orig/gdk_imlib/io-gif.c 2013-07-29 17:33:54.656601713 -0400
-+++ imlib-1.9.15/gdk_imlib/io-gif.c 2013-07-29 17:37:11.941783903 -0400
-@@ -23,6 +23,7 @@
- int intjump[] = {8, 8, 4, 2};
- int istransp, transp;
- int fd;
-+ int Error;
-
- done = 0;
- istransp = 0;
-@@ -30,7 +31,7 @@
- fd = fileno(f);
- /* Apparently rewind(f) isn't sufficient */
- lseek(fd, (long) 0, 0);
-- gif = DGifOpenFileHandle(fd);
-+ gif = DGifOpenFileHandle(fd, &Error);
-
- transp = -1;
- data = NULL;
-diff -Naur imlib-1.9.15-orig/Imlib/load.c imlib-1.9.15/Imlib/load.c
---- imlib-1.9.15-orig/Imlib/load.c 2013-07-29 22:06:15.111285191 -0400
-+++ imlib-1.9.15/Imlib/load.c 2013-07-29 22:07:36.926673905 -0400
-@@ -6,6 +6,14 @@
-
- #define G_MAXINT ((int) 0x7fffffff)
-
-+static void
-+localPrintGifError(void)
-+{
-+ int ErrorCode=0;
-+ GifErrorString(ErrorCode);
-+ fprintf(stderr, "\nGIF-LIB error: %i.\n", ErrorCode);
-+}
-+
- /* Split the ID - damages input */
-
- static char *
-@@ -462,14 +470,14 @@
- {
- if (DGifGetRecordType(gif, &rec) == GIF_ERROR)
- {
-- PrintGifError();
-+ localPrintGifError();
- rec = TERMINATE_RECORD_TYPE;
- }
- if ((rec == IMAGE_DESC_RECORD_TYPE) && (!done))
- {
- if (DGifGetImageDesc(gif) == GIF_ERROR)
- {
-- PrintGifError();
-+ localPrintGifError();
- rec = TERMINATE_RECORD_TYPE;
- }
- *w = gif->Image.Width;
-diff -Naur imlib-1.9.15-orig/gdk_imlib/io-gif.c imlib-1.9.15/gdk_imlib/io-gif.c
---- imlib-1.9.15-orig/gdk_imlib/io-gif.c 2013-07-29 22:06:15.111285191 -0400
-+++ imlib-1.9.15/gdk_imlib/io-gif.c 2013-07-29 22:08:46.182265058 -0400
-@@ -10,6 +10,14 @@
- #else
- #include <gif_lib.h>
-
-+static void
-+localPrintGifError(void)
-+{
-+ int ErrorCode=0;
-+ GifErrorString(ErrorCode);
-+ fprintf(stderr, "\nGIF-LIB error: %i.\n", ErrorCode);
-+}
-+
- unsigned char *
- loader_gif(FILE *f, int *w, int *h, int *t)
- {
-@@ -43,14 +51,14 @@
- {
- if (DGifGetRecordType(gif, &rec) == GIF_ERROR)
- {
-- PrintGifError();
-+ localPrintGifError();
- rec = TERMINATE_RECORD_TYPE;
- }
- if ((rec == IMAGE_DESC_RECORD_TYPE) && (!done))
- {
- if (DGifGetImageDesc(gif) == GIF_ERROR)
- {
-- PrintGifError();
-+ localPrintGifError();
- rec = TERMINATE_RECORD_TYPE;
- }
- *w = gif->Image.Width;
Added: imlib-giflib51.patch
===================================================================
--- imlib-giflib51.patch (rev 0)
+++ imlib-giflib51.patch 2014-05-27 09:50:27 UTC (rev 213646)
@@ -0,0 +1,126 @@
+diff -ruN imlib-1.9.15.orig/gdk_imlib/io-gif.c imlib-1.9.15/gdk_imlib/io-gif.c
+--- imlib-1.9.15.orig/gdk_imlib/io-gif.c 2014-05-27 09:38:13.210527763 +0000
++++ imlib-1.9.15/gdk_imlib/io-gif.c 2014-05-27 09:43:55.435910398 +0000
+@@ -30,7 +30,7 @@
+ fd = fileno(f);
+ /* Apparently rewind(f) isn't sufficient */
+ lseek(fd, (long) 0, 0);
+- gif = DGifOpenFileHandle(fd);
++ gif = DGifOpenFileHandle(fd, NULL);
+
+ transp = -1;
+ data = NULL;
+@@ -43,14 +43,14 @@
+ {
+ if (DGifGetRecordType(gif, &rec) == GIF_ERROR)
+ {
+- PrintGifError();
++ fprintf(stderr, "giflib error: %s\n", GifErrorString(gif->Error));
+ rec = TERMINATE_RECORD_TYPE;
+ }
+ if ((rec == IMAGE_DESC_RECORD_TYPE) && (!done))
+ {
+ if (DGifGetImageDesc(gif) == GIF_ERROR)
+ {
+- PrintGifError();
++ fprintf(stderr, "giflib error: %s\n", GifErrorString(gif->Error));
+ rec = TERMINATE_RECORD_TYPE;
+ }
+ *w = gif->Image.Width;
+@@ -62,13 +62,13 @@
+ rows = malloc(*h * sizeof(GifRowType *));
+ if (!rows)
+ {
+- DGifCloseFile(gif);
++ DGifCloseFile(gif, NULL);
+ return NULL;
+ }
+ data = _gdk_malloc_image(*w, *h);
+ if (!data)
+ {
+- DGifCloseFile(gif);
++ DGifCloseFile(gif, NULL);
+ free(rows);
+ return NULL;
+ }
+@@ -79,7 +79,7 @@
+ rows[i] = malloc(*w * sizeof(GifPixelType));
+ if (!rows[i])
+ {
+- DGifCloseFile(gif);
++ DGifCloseFile(gif, NULL);
+ for (i = 0; i < *h; i++)
+ if (rows[i])
+ free(rows[i]);
+@@ -168,7 +168,7 @@
+ }
+ }
+ }
+- DGifCloseFile(gif);
++ DGifCloseFile(gif, NULL);
+ for (i = 0; i < *h; i++)
+ free(rows[i]);
+ free(rows);
+diff -ruN imlib-1.9.15.orig/Imlib/load.c imlib-1.9.15/Imlib/load.c
+--- imlib-1.9.15.orig/Imlib/load.c 2014-05-27 09:38:13.220527723 +0000
++++ imlib-1.9.15/Imlib/load.c 2014-05-27 09:45:25.775576104 +0000
+@@ -454,7 +454,7 @@
+ fd = fileno(f);
+ /* Apparently rewind(f) isn't sufficient */
+ lseek(fd, (long) 0, 0);
+- gif = DGifOpenFileHandle(fd);
++ gif = DGifOpenFileHandle(fd, NULL);
+
+ if (!gif)
+ return NULL;
+@@ -462,14 +462,14 @@
+ {
+ if (DGifGetRecordType(gif, &rec) == GIF_ERROR)
+ {
+- PrintGifError();
++ fprintf(stderr, "Imlib ERROR: JPEG uses line buffers > 16. Cannot load.\n");
+ rec = TERMINATE_RECORD_TYPE;
+ }
+ if ((rec == IMAGE_DESC_RECORD_TYPE) && (!done))
+ {
+ if (DGifGetImageDesc(gif) == GIF_ERROR)
+ {
+- PrintGifError();
++ fprintf(stderr, "Imlib ERROR: JPEG uses line buffers > 16. Cannot load.\n");
+ rec = TERMINATE_RECORD_TYPE;
+ }
+ *w = gif->Image.Width;
+@@ -481,13 +481,13 @@
+ rows = malloc(*h * sizeof(GifRowType *));
+ if (!rows)
+ {
+- DGifCloseFile(gif);
++ DGifCloseFile(gif, NULL);
+ return NULL;
+ }
+ data = _imlib_malloc_image(*w, *h);
+ if (!data)
+ {
+- DGifCloseFile(gif);
++ DGifCloseFile(gif, NULL);
+ free(rows);
+ return NULL;
+ }
+@@ -498,7 +498,7 @@
+ rows[i] = malloc(*w * sizeof(GifPixelType));
+ if (!rows[i])
+ {
+- DGifCloseFile(gif);
++ DGifCloseFile(gif, NULL);
+ for (i = 0; i < *h; i++)
+ if (rows[i])
+ free(rows[i]);
+@@ -587,7 +587,7 @@
+ }
+ }
+ }
+- DGifCloseFile(gif);
++ DGifCloseFile(gif, NULL);
+ for (i = 0; i < *h; i++)
+ free(rows[i]);
+ free(rows);
More information about the arch-commits
mailing list