Sat Aug 17 11:15:58 2013 UTC ()
Fix build with new giflib.


(joerg)
diff -r1.21 -r1.22 pkgsrc/graphics/imlib/distinfo
diff -r1.1 -r1.2 pkgsrc/graphics/imlib/patches/patch-ak
cvs diff -r1.21 -r1.22 pkgsrc/graphics/imlib/distinfo (expand / switch to unified diff)

--- pkgsrc/graphics/imlib/distinfo 2013/08/15 16:26:36 1.21
+++ pkgsrc/graphics/imlib/distinfo 2013/08/17 11:15:58 1.22
@@ -1,19 +1,19 @@ @@ -1,19 +1,19 @@
1$NetBSD: distinfo,v 1.21 2013/08/15 16:26:36 joerg Exp $ 1$NetBSD: distinfo,v 1.22 2013/08/17 11:15:58 joerg Exp $
2 2
3SHA1 (imlib-1.9.15.tar.bz2) = c9a732a354fbb3c7e1a426e5d19fc92d73f8f720 3SHA1 (imlib-1.9.15.tar.bz2) = c9a732a354fbb3c7e1a426e5d19fc92d73f8f720
4RMD160 (imlib-1.9.15.tar.bz2) = 195b80833167134ba2d9a9574d420279f9cf55f4 4RMD160 (imlib-1.9.15.tar.bz2) = 195b80833167134ba2d9a9574d420279f9cf55f4
5Size (imlib-1.9.15.tar.bz2) = 683242 bytes 5Size (imlib-1.9.15.tar.bz2) = 683242 bytes
6SHA1 (patch-aa) = fc990bb2278e6a848034f9c7be0170e1843b67b2 6SHA1 (patch-aa) = fc990bb2278e6a848034f9c7be0170e1843b67b2
7SHA1 (patch-ab) = e4b0348a1e9d421128714ff2c97c8934ad2ab5f1 7SHA1 (patch-ab) = e4b0348a1e9d421128714ff2c97c8934ad2ab5f1
8SHA1 (patch-ac) = 7dd08bde4e97614777bf4327db2e6045db04692d 8SHA1 (patch-ac) = 7dd08bde4e97614777bf4327db2e6045db04692d
9SHA1 (patch-ad) = 1fc310d57c12337cc8ccddb7dd907330127b7112 9SHA1 (patch-ad) = 1fc310d57c12337cc8ccddb7dd907330127b7112
10SHA1 (patch-ae) = 3ed6fff2e73f04ec83c27dc6e3f2db2fa446abbb 10SHA1 (patch-ae) = 3ed6fff2e73f04ec83c27dc6e3f2db2fa446abbb
11SHA1 (patch-ag) = 7ef3980a6a3eccba41895ef86eae727cd7dfb1e2 11SHA1 (patch-ag) = 7ef3980a6a3eccba41895ef86eae727cd7dfb1e2
12SHA1 (patch-ah) = edee5311a47d552f9d1b9dcb96f256518040c538 12SHA1 (patch-ah) = edee5311a47d552f9d1b9dcb96f256518040c538
13SHA1 (patch-ai) = df13b72272f754375348437b99d962cb17732619 13SHA1 (patch-ai) = df13b72272f754375348437b99d962cb17732619
14SHA1 (patch-aj) = 60171b7341c65fb6eb0a93738fef4b2c31692bdf 14SHA1 (patch-aj) = 60171b7341c65fb6eb0a93738fef4b2c31692bdf
15SHA1 (patch-ak) = 4d7ae79f23bf0c64fd85ffebc086b7bb43207718 15SHA1 (patch-ak) = f9f9644a3a93d4e4992e2205c30de5769730bb38
16SHA1 (patch-al) = 4ad51c7128f7d6a5ecc67f51c745caf53a4def06 16SHA1 (patch-al) = 4ad51c7128f7d6a5ecc67f51c745caf53a4def06
17SHA1 (patch-am) = 73c62e11f5b6ac6774e51f8183987b2b4db01465 17SHA1 (patch-am) = 73c62e11f5b6ac6774e51f8183987b2b4db01465
18SHA1 (patch-an) = 260aeece3eb74d3ec11deed4e38fd46d3f1cde79 18SHA1 (patch-an) = 260aeece3eb74d3ec11deed4e38fd46d3f1cde79
19SHA1 (patch-ao) = d4e3df56d2f743e53e73d72551ccd03491bf1c44 19SHA1 (patch-ao) = d4e3df56d2f743e53e73d72551ccd03491bf1c44
cvs diff -r1.1 -r1.2 pkgsrc/graphics/imlib/patches/patch-ak (expand / switch to unified diff)

--- pkgsrc/graphics/imlib/patches/patch-ak 2004/12/10 09:30:42 1.1
+++ pkgsrc/graphics/imlib/patches/patch-ak 2013/08/17 11:15:58 1.2
@@ -1,13 +1,56 @@ @@ -1,13 +1,56 @@
1$NetBSD: patch-ak,v 1.1 2004/12/10 09:30:42 salo Exp $ 1$NetBSD: patch-ak,v 1.2 2013/08/17 11:15:58 joerg Exp $
2 2
3--- gdk_imlib/io-gif.c.orig 2002-03-04 18:06:29.000000000 +0100 3--- gdk_imlib/io-gif.c.orig 2002-03-04 17:06:29.000000000 +0000
4+++ gdk_imlib/io-gif.c 2004-12-10 10:00:56.000000000 +0100 4+++ gdk_imlib/io-gif.c
5@@ -55,7 +55,7 @@ 5@@ -10,6 +10,16 @@ unsigned char loader_gif (FILE *f, int *
6 } 6 #else
7 *w = gif->Image.Width; 7 #include <gif_lib.h>
8 *h = gif->Image.Height; 8
9- if(*h > 32767 || *w > 32767) 9+static void
10+ if(*h <= 0 || *h > 32767 || *w <= 0 || *w > 32767) 10+PrintGifError(int ErrorCode) {
 11+ char *Err = GifErrorString(ErrorCode);
 12+
 13+ if (Err != NULL)
 14+ fprintf(stderr, "GIF-LIB error: %s.\n", Err);
 15+ else
 16+ fprintf(stderr, "GIF-LIB undefined error %d.\n", ErrorCode);
 17+}
 18+
 19 unsigned char *
 20 loader_gif(FILE *f, int *w, int *h, int *t)
 21 {
 22@@ -22,7 +32,7 @@ loader_gif(FILE *f, int *w, int *h, int
 23 int intoffset[] = {0, 4, 2, 1};
 24 int intjump[] = {8, 8, 4, 2};
 25 int istransp, transp;
 26- int fd;
 27+ int fd, giferror = 0;
 28
 29 done = 0;
 30 istransp = 0;
 31@@ -30,7 +40,7 @@ loader_gif(FILE *f, int *w, int *h, int
 32 fd = fileno(f);
 33 /* Apparently rewind(f) isn't sufficient */
 34 lseek(fd, (long) 0, 0);
 35- gif = DGifOpenFileHandle(fd);
 36+ gif = DGifOpenFileHandle(fd, &giferror);
 37
 38 transp = -1;
 39 data = NULL;
 40@@ -43,14 +53,14 @@ loader_gif(FILE *f, int *w, int *h, int
 41 {
 42 if (DGifGetRecordType(gif, &rec) == GIF_ERROR)
 43 {
 44- PrintGifError();
 45+ PrintGifError(giferror);
 46 rec = TERMINATE_RECORD_TYPE;
 47 }
 48 if ((rec == IMAGE_DESC_RECORD_TYPE) && (!done))
 49 {
 50 if (DGifGetImageDesc(gif) == GIF_ERROR)
11 { 51 {
12 return NULL; 52- PrintGifError();
 53+ PrintGifError(giferror);
 54 rec = TERMINATE_RECORD_TYPE;
13 } 55 }
 56 *w = gif->Image.Width;