summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorobache <obache@pkgsrc.org>2014-05-25 08:24:24 +0000
committerobache <obache@pkgsrc.org>2014-05-25 08:24:24 +0000
commitf227d5bb714c68c65ac6f06f21e0ed9ccd4ce3a2 (patch)
treebb055ea5921c890e0538211cfc4d5ac094f73c38
parent2dda3d2e7cc5892a021578d58017aac43db936b3 (diff)
downloadpkgsrc-f227d5bb714c68c65ac6f06f21e0ed9ccd4ce3a2.tar.gz
Fixes build with giflib-5.1.
-rw-r--r--lang/kaffe/distinfo4
-rw-r--r--lang/kaffe/patches/patch-libraries_clib_awt_X_imggif.c22
2 files changed, 20 insertions, 6 deletions
diff --git a/lang/kaffe/distinfo b/lang/kaffe/distinfo
index 3c88b6d4cc5..865ec3594b6 100644
--- a/lang/kaffe/distinfo
+++ b/lang/kaffe/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.32 2014/04/19 15:00:52 joerg Exp $
+$NetBSD: distinfo,v 1.33 2014/05/25 08:24:24 obache Exp $
SHA1 (kaffe-1.1.7.tar.gz) = 5951d16a4a7b11689932583d134520ca6de00817
RMD160 (kaffe-1.1.7.tar.gz) = 7523a3470cd06cf60dbade8ea2f464dc9d85277b
@@ -17,6 +17,6 @@ SHA1 (patch-bc) = f00d541613db81540bcd21ddc68f7b27232024b6
SHA1 (patch-ca) = 0dc783a8e78016ef5e5e2f3392644690e3a2de9a
SHA1 (patch-cb) = c698b0a2e078cc035dfd7401617fc8d4c2ef5fbe
SHA1 (patch-cc) = df48315c9470d433e33fd80136d7bf7f60f83e1d
-SHA1 (patch-libraries_clib_awt_X_imggif.c) = f886133219216af242839bb7af90ce45f8599db0
+SHA1 (patch-libraries_clib_awt_X_imggif.c) = c4da4eb55282b5c616612182e247f2080f6f249f
SHA1 (patch-libraries_clib_awt_X_imgpng.c) = 0cb5d6ef9349c1f6e1ac1d5885f574f4e2a0aac9
SHA1 (patch-libraries_javalib_external_classpath_native_jni_gtk-peer_gnu__java__awt__peer__gtk__GdkTextLayout.c) = 8a8fa9ca6811f225022aa89521b8efd8933138ea
diff --git a/lang/kaffe/patches/patch-libraries_clib_awt_X_imggif.c b/lang/kaffe/patches/patch-libraries_clib_awt_X_imggif.c
index 06ebbb25e9a..5124b9b1823 100644
--- a/lang/kaffe/patches/patch-libraries_clib_awt_X_imggif.c
+++ b/lang/kaffe/patches/patch-libraries_clib_awt_X_imggif.c
@@ -1,8 +1,10 @@
-$NetBSD: patch-libraries_clib_awt_X_imggif.c,v 1.1 2013/08/31 14:50:32 joerg Exp $
+$NetBSD: patch-libraries_clib_awt_X_imggif.c,v 1.2 2014/05/25 08:24:24 obache Exp $
---- libraries/clib/awt/X/imggif.c.orig 2013-08-31 13:19:32.000000000 +0000
+* Adapt to giflib>=5 API changes
+
+--- libraries/clib/awt/X/imggif.c.orig 2005-07-22 11:42:55.000000000 +0000
+++ libraries/clib/awt/X/imggif.c
-@@ -255,7 +255,7 @@ readGifFile ( int infile )
+@@ -255,12 +255,12 @@ readGifFile ( int infile )
fileSrc.fd = infile;
@@ -11,7 +13,13 @@ $NetBSD: patch-libraries_clib_awt_X_imggif.c,v 1.1 2013/08/31 14:50:32 joerg Exp
return 0;
img = readGif( gf);
-@@ -278,7 +278,7 @@ readGifData ( unsigned char* buf, long l
+
+- DGifCloseFile( gf);
++ DGifCloseFile( gf, NULL);
+ #endif
+
+ return img;
+@@ -278,12 +278,12 @@ readGifData ( unsigned char* buf, long l
bufSrc.buf = bufSrc.p = buf;
bufSrc.remain = len;
@@ -20,3 +28,9 @@ $NetBSD: patch-libraries_clib_awt_X_imggif.c,v 1.1 2013/08/31 14:50:32 joerg Exp
return 0;
img = readGif( gf);
+
+- DGifCloseFile( gf);
++ DGifCloseFile( gf, NULL);
+
+ #endif /* INCLUDE_GIF */
+