pkgsrc-Bugs archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
pkg/44419: imlib not compiling with png-1.5.1beta01
>Number: 44419
>Category: pkg
>Synopsis: imlib not compiling with png-1.5.1beta01
>Confidential: no
>Severity: serious
>Priority: high
>Responsible: pkg-manager
>State: open
>Class: change-request
>Submitter-Id: net
>Arrival-Date: Wed Jan 19 19:15:00 +0000 2011
>Originator: Marko Schuetz Schmuck
>Release: NetBSD/amd64 5.0.2
>Organization:
individual
>Environment:
NetBSD prpad.dyndns.org 5.0.2 NetBSD 5.0.2 (PRPAD) #0: Mon May 3 15:16:09 AST
2010 root%prpad.dyndns.org@localhost:/usr/obj/sys/arch/amd64/compile/PRPAD
amd64
>Description:
imlib does not compile with png-1.5.1beta01
>How-To-Repeat:
cd $PREFIX/graphics/imlib
make
>Fix:
Add patches/patch-ad:
$NetBSD$
--- Imlib/save.c.orig 2004-09-20 20:22:59.000000000 -0400
+++ Imlib/save.c
@@ -342,7 +342,7 @@ Imlib_save_image(ImlibData * id, ImlibIm
png_destroy_write_struct(&png_ptr, (png_infopp) NULL);
return 0;
}
- if (setjmp(png_ptr->jmpbuf))
+ if (setjmp(png_jmpbuf(png_ptr)))
{
fclose(f);
png_destroy_write_struct(&png_ptr, (png_infopp) NULL);
and patch with:
Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/graphics/imlib/Makefile,v
retrieving revision 1.107
diff -c -b -r1.107 Makefile
*** Makefile 13 Jan 2011 13:36:07 -0000 1.107
--- Makefile 19 Jan 2011 19:06:44 -0000
***************
*** 1,7 ****
# $NetBSD: Makefile,v 1.107 2011/01/13 13:36:07 wiz Exp $
DISTNAME= imlib-1.9.15
! PKGREVISION= 8
CATEGORIES= graphics
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/imlib/1.9/}
EXTRACT_SUFX= .tar.bz2
--- 1,7 ----
# $NetBSD: Makefile,v 1.107 2011/01/13 13:36:07 wiz Exp $
DISTNAME= imlib-1.9.15
! PKGREVISION= 9
CATEGORIES= graphics
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/imlib/1.9/}
EXTRACT_SUFX= .tar.bz2
Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/graphics/imlib/distinfo,v
retrieving revision 1.19
diff -c -b -r1.19 distinfo
*** distinfo 8 Nov 2005 10:58:00 -0000 1.19
--- distinfo 19 Jan 2011 19:06:44 -0000
***************
*** 3,18 ****
SHA1 (imlib-1.9.15.tar.bz2) = c9a732a354fbb3c7e1a426e5d19fc92d73f8f720
RMD160 (imlib-1.9.15.tar.bz2) = 195b80833167134ba2d9a9574d420279f9cf55f4
Size (imlib-1.9.15.tar.bz2) = 683242 bytes
! SHA1 (patch-aa) = 185a5229af781d3dbc57978a3f4acd8308ca4c14
! SHA1 (patch-ab) = d1daff101bec77680f3e17cb776285976a7b5c7a
! SHA1 (patch-ac) = 7dd08bde4e97614777bf4327db2e6045db04692d
! SHA1 (patch-ae) = 3ed6fff2e73f04ec83c27dc6e3f2db2fa446abbb
! SHA1 (patch-ag) = 7ef3980a6a3eccba41895ef86eae727cd7dfb1e2
! SHA1 (patch-ah) = edee5311a47d552f9d1b9dcb96f256518040c538
! SHA1 (patch-ai) = df13b72272f754375348437b99d962cb17732619
! SHA1 (patch-aj) = 2769e304deb93dd413fa3c44d53d1d67e92d5d00
! SHA1 (patch-ak) = 4d7ae79f23bf0c64fd85ffebc086b7bb43207718
! SHA1 (patch-al) = 4ad51c7128f7d6a5ecc67f51c745caf53a4def06
! SHA1 (patch-am) = 73c62e11f5b6ac6774e51f8183987b2b4db01465
! SHA1 (patch-an) = 260aeece3eb74d3ec11deed4e38fd46d3f1cde79
! SHA1 (patch-ao) = d4e3df56d2f743e53e73d72551ccd03491bf1c44
--- 3,19 ----
SHA1 (imlib-1.9.15.tar.bz2) = c9a732a354fbb3c7e1a426e5d19fc92d73f8f720
RMD160 (imlib-1.9.15.tar.bz2) = 195b80833167134ba2d9a9574d420279f9cf55f4
Size (imlib-1.9.15.tar.bz2) = 683242 bytes
! SHA1 (patch-aa) = b3e02fecd39a2bdb34f90a5f4131d2dfa07b9e3e
! SHA1 (patch-ab) = 9d1df32d70262bdfd240007b823bdd94a9c44cac
! SHA1 (patch-ac) = aa8503c606a00ba6b0f881c2be9697d07f2b737e
! SHA1 (patch-ad) = 3b77f81ad030a643f6e361b10ddc6d3d8ebc96dc
! SHA1 (patch-ae) = 5b3e50b6453500f089ebcfc3024a16ed376b61c3
! SHA1 (patch-ag) = 7cd558dd4e44a51c65db4895cd5f7121cc127a37
! SHA1 (patch-ah) = bde745f79d4968c27b66f645d99f739aa92a45c7
! SHA1 (patch-ai) = 8b83ecff7fbc75ea4efbdd281ea60e9a273938e1
! SHA1 (patch-aj) = 8f5569838a5524f39f43c1f2d489d1b3ea1850b3
! SHA1 (patch-ak) = a0adc56694fd8b7b571cd34e0bd8947384f7d10f
! SHA1 (patch-al) = 159f416562d138bfc2f73534e0c7341078691876
! SHA1 (patch-am) = bcb44a3bdcb319838a0e715111a0d3f9a8ed0820
! SHA1 (patch-an) = 0a693703c4daf3361269ca6e61e142df8197603f
! SHA1 (patch-ao) = 644e0d234694d4aae0a40e02415d5c7605018ab6
Index: patches/patch-aa
===================================================================
RCS file: /cvsroot/pkgsrc/graphics/imlib/patches/patch-aa,v
retrieving revision 1.13
diff -c -b -r1.13 patch-aa
*** patches/patch-aa 19 Mar 2002 16:16:08 -0000 1.13
--- patches/patch-aa 19 Jan 2011 19:06:44 -0000
***************
*** 1,8 ****
$NetBSD: patch-aa,v 1.13 2002/03/19 16:16:08 wiz Exp $
! --- gdk_imlib/io-png.c.orig Mon Mar 4 17:26:51 2002
+++ gdk_imlib/io-png.c
! @@ -301,6 +301,9 @@
/* Setup Translators */
if (color_type == PNG_COLOR_TYPE_PALETTE)
png_set_expand(png_ptr);
--- 1,40 ----
$NetBSD: patch-aa,v 1.13 2002/03/19 16:16:08 wiz Exp $
! --- gdk_imlib/io-png.c.orig 2002-03-04 13:06:29.000000000 -0400
+++ gdk_imlib/io-png.c
! @@ -40,13 +40,13 @@ loader_png (FILE * f, int *w, int *h, in
! return NULL;
! }
!
! - if (setjmp(png_ptr->jmpbuf))
! + if (setjmp(png_jmpbuf(png_ptr)))
! {
! png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
! return NULL;
! }
!
! - if (info_ptr->color_type == PNG_COLOR_TYPE_RGB_ALPHA)
! + if (png_get_color_type(png_ptr, info_ptr) == PNG_COLOR_TYPE_RGB_ALPHA)
! {
! png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
! return NULL;
! @@ -275,13 +275,13 @@ inline_png(unsigned char *data, int data
! return NULL;
! }
!
! - if (setjmp(png_ptr->jmpbuf))
! + if (setjmp(png_jmpbuf(png_ptr)))
! {
! png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
! return NULL;
! }
!
! - if (info_ptr->color_type == PNG_COLOR_TYPE_RGB_ALPHA)
! + if (png_get_color_type(png_ptr, info_ptr) == PNG_COLOR_TYPE_RGB_ALPHA)
! {
! png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
! return NULL;
! @@ -301,6 +301,9 @@ inline_png(unsigned char *data, int data
/* Setup Translators */
if (color_type == PNG_COLOR_TYPE_PALETTE)
png_set_expand(png_ptr);
***************
*** 12,14 ****
--- 44,71 ----
png_set_strip_16(png_ptr);
png_set_packing(png_ptr);
if (png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS))
+ @@ -440,13 +443,13 @@ _loader_alpha_png (FILE * f, int *w, int
+ return NULL;
+ }
+
+ - if (setjmp(png_ptr->jmpbuf))
+ + if (setjmp(png_jmpbuf(png_ptr)))
+ {
+ png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
+ return NULL;
+ }
+
+ - if (info_ptr->color_type == PNG_COLOR_TYPE_RGB_ALPHA)
+ + if (png_get_color_type(png_ptr, info_ptr) == PNG_COLOR_TYPE_RGB_ALPHA)
+ {
+ png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
+ return NULL;
+ @@ -635,7 +638,7 @@ saver_png (GdkImlibImage *im, char *file
+ png_destroy_write_struct(&png_ptr, (png_infopp) NULL);
+ return 0;
+ }
+ - if (setjmp(png_ptr->jmpbuf))
+ + if (setjmp(png_jmpbuf(png_ptr)))
+ {
+ fclose(f);
+ png_destroy_write_struct(&png_ptr, (png_infopp) NULL);
Index: patches/patch-ab
===================================================================
RCS file: /cvsroot/pkgsrc/graphics/imlib/patches/patch-ab,v
retrieving revision 1.6
diff -c -b -r1.6 patch-ab
*** patches/patch-ab 10 Dec 2004 09:30:42 -0000 1.6
--- patches/patch-ab 19 Jan 2011 19:06:44 -0000
***************
*** 1,7 ****
$NetBSD: patch-ab,v 1.6 2004/12/10 09:30:42 salo Exp $
! --- Imlib/load.c.orig 2004-09-21 02:23:20.000000000 +0200
! +++ Imlib/load.c 2004-12-10 09:58:18.000000000 +0100
@@ -4,6 +4,8 @@
#include "Imlib_private.h"
#include <setjmp.h>
--- 1,7 ----
$NetBSD: patch-ab,v 1.6 2004/12/10 09:30:42 salo Exp $
! --- Imlib/load.c.orig 2004-09-20 20:23:20.000000000 -0400
! +++ Imlib/load.c
@@ -4,6 +4,8 @@
#include "Imlib_private.h"
#include <setjmp.h>
***************
*** 11,17 ****
/* Split the ID - damages input */
static char *
! @@ -41,13 +43,17 @@
/*
* Make sure we don't wrap on our memory allocations
--- 11,17 ----
/* Split the ID - damages input */
static char *
! @@ -41,13 +43,17 @@ _GetExtension(char *file)
/*
* Make sure we don't wrap on our memory allocations
***************
*** 31,37 ****
}
#ifdef HAVE_LIBJPEG
! @@ -254,7 +260,8 @@
png_read_image(png_ptr, lines);
png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
ptr = data;
--- 31,52 ----
}
#ifdef HAVE_LIBJPEG
! @@ -191,12 +197,12 @@ _LoadPNG(ImlibData * id, FILE * f, int *
! png_destroy_read_struct(&png_ptr, NULL, NULL);
! return NULL;
! }
! - if (setjmp(png_ptr->jmpbuf))
! + if (setjmp(png_jmpbuf(png_ptr)))
! {
! png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
! return NULL;
! }
! - if (info_ptr->color_type == PNG_COLOR_TYPE_RGB_ALPHA)
! + if (png_get_color_type(png_ptr, info_ptr) == PNG_COLOR_TYPE_RGB_ALPHA)
! {
! png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
! return NULL;
! @@ -254,7 +260,8 @@ _LoadPNG(ImlibData * id, FILE * f, int *
png_read_image(png_ptr, lines);
png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
ptr = data;
***************
*** 41,47 ****
{
for (y = 0; y < *h; y++)
{
! @@ -279,6 +286,7 @@
}
}
}
--- 56,62 ----
{
for (y = 0; y < *h; y++)
{
! @@ -279,6 +286,7 @@ _LoadPNG(ImlibData * id, FILE * f, int *
}
}
}
***************
*** 49,55 ****
else if (color_type == PNG_COLOR_TYPE_GRAY)
{
for (y = 0; y < *h; y++)
! @@ -294,6 +302,7 @@
}
}
}
--- 64,70 ----
else if (color_type == PNG_COLOR_TYPE_GRAY)
{
for (y = 0; y < *h; y++)
! @@ -294,6 +302,7 @@ _LoadPNG(ImlibData * id, FILE * f, int *
}
}
}
***************
*** 57,63 ****
else
{
for (y = 0; y < *h; y++)
! @@ -360,7 +369,9 @@
npix = ww * hh;
*w = (int)ww;
*h = (int)hh;
--- 72,78 ----
else
{
for (y = 0; y < *h; y++)
! @@ -360,7 +369,9 @@ _LoadTIFF(ImlibData * id, FILE *f, char
npix = ww * hh;
*w = (int)ww;
*h = (int)hh;
***************
*** 68,74 ****
{
TIFFClose(tif);
return NULL;
! @@ -463,7 +474,7 @@
}
*w = gif->Image.Width;
*h = gif->Image.Height;
--- 83,89 ----
{
TIFFClose(tif);
return NULL;
! @@ -463,7 +474,7 @@ _LoadGIF(ImlibData * id, FILE *f, int *w
}
*w = gif->Image.Width;
*h = gif->Image.Height;
***************
*** 77,83 ****
{
return NULL;
}
! @@ -1000,7 +1011,12 @@
comment = 0;
quote = 0;
context = 0;
--- 92,98 ----
{
return NULL;
}
! @@ -1000,7 +1011,12 @@ _LoadXPM(ImlibData * id, FILE *file, int
comment = 0;
quote = 0;
context = 0;
***************
*** 90,96 ****
while (!done)
{
pc = c;
! @@ -1029,25 +1045,25 @@
{
/* Header */
sscanf(line, "%i %i %i %i", w, h, &ncolors, &cpp);
--- 105,111 ----
while (!done)
{
pc = c;
! @@ -1029,25 +1045,25 @@ _LoadXPM(ImlibData * id, FILE *file, int
{
/* Header */
sscanf(line, "%i %i %i %i", w, h, &ncolors, &cpp);
***************
*** 120,126 ****
{
fprintf(stderr, "IMLIB ERROR: Image height > 32767 pixels
for file\n");
free(line);
! @@ -1080,11 +1096,13 @@
{
int slen;
int hascolor, iscolor;
--- 135,141 ----
{
fprintf(stderr, "IMLIB ERROR: Image height > 32767 pixels
for file\n");
free(line);
! @@ -1080,11 +1096,13 @@ _LoadXPM(ImlibData * id, FILE *file, int
{
int slen;
int hascolor, iscolor;
***************
*** 134,140 ****
s[0] = 0;
len = strlen(line);
strncpy(cmap[j].str, line, cpp);
! @@ -1107,10 +1125,10 @@
{
if (k >= len)
{
--- 149,155 ----
s[0] = 0;
len = strlen(line);
strncpy(cmap[j].str, line, cpp);
! @@ -1107,10 +1125,10 @@ _LoadXPM(ImlibData * id, FILE *file, int
{
if (k >= len)
{
***************
*** 149,155 ****
}
if (col[0])
{
! @@ -1140,14 +1158,17 @@
}
}
}
--- 164,170 ----
}
if (col[0])
{
! @@ -1140,14 +1158,17 @@ _LoadXPM(ImlibData * id, FILE *file, int
}
}
}
***************
*** 170,176 ****
}
}
}
! @@ -1376,12 +1397,12 @@
sscanf(s, "%i %i", w, h);
a = *w;
b = *h;
--- 185,191 ----
}
}
}
! @@ -1376,12 +1397,12 @@ _LoadPPM(ImlibData * id, FILE * f, int *
sscanf(s, "%i %i", w, h);
a = *w;
b = *h;
Index: patches/patch-ac
===================================================================
RCS file: /cvsroot/pkgsrc/graphics/imlib/patches/patch-ac,v
retrieving revision 1.13
diff -c -b -r1.13 patch-ac
*** patches/patch-ac 27 Apr 2005 09:05:12 -0000 1.13
--- patches/patch-ac 19 Jan 2011 19:06:44 -0000
***************
*** 1,6 ****
$NetBSD: patch-ac,v 1.13 2005/04/27 09:05:12 wiz Exp $
! --- imlib.m4.orig 2004-08-27 18:03:11.000000000 +0200
+++ imlib.m4
@@ -6,7 +6,7 @@
dnl AM_PATH_IMLIB([MINIMUM-VERSION, [ACTION-IF-FOUND [,
ACTION-IF-NOT-FOUND]]])
--- 1,6 ----
$NetBSD: patch-ac,v 1.13 2005/04/27 09:05:12 wiz Exp $
! --- imlib.m4.orig 2004-08-27 12:03:11.000000000 -0400
+++ imlib.m4
@@ -6,7 +6,7 @@
dnl AM_PATH_IMLIB([MINIMUM-VERSION, [ACTION-IF-FOUND [,
ACTION-IF-NOT-FOUND]]])
Index: patches/patch-ae
===================================================================
RCS file: /cvsroot/pkgsrc/graphics/imlib/patches/patch-ae,v
retrieving revision 1.5
diff -c -b -r1.5 patch-ae
*** patches/patch-ae 25 Aug 2002 18:39:12 -0000 1.5
--- patches/patch-ae 19 Jan 2011 19:06:44 -0000
***************
*** 1,8 ****
$NetBSD: patch-ae,v 1.5 2002/08/25 18:39:12 jlam Exp $
! --- imlib-config.in.orig Tue Mar 27 22:18:40 2001
+++ imlib-config.in
! @@ -58,11 +58,11 @@
echo `@GTK_CONFIG@ --cflags` $includes @X_CFLAGS@
;;
--libs)
--- 1,8 ----
$NetBSD: patch-ae,v 1.5 2002/08/25 18:39:12 jlam Exp $
! --- imlib-config.in.orig 2004-08-27 12:03:11.000000000 -0400
+++ imlib-config.in
! @@ -58,11 +58,11 @@ while test $# -gt 0; do
echo `@GTK_CONFIG@ --cflags` $includes @X_CFLAGS@
;;
--libs)
Index: patches/patch-ag
===================================================================
RCS file: /cvsroot/pkgsrc/graphics/imlib/patches/patch-ag,v
retrieving revision 1.6
diff -c -b -r1.6 patch-ag
*** patches/patch-ag 8 Nov 2005 10:58:00 -0000 1.6
--- patches/patch-ag 19 Jan 2011 19:06:44 -0000
***************
*** 1,6 ****
$NetBSD: patch-ag,v 1.6 2005/11/08 10:58:00 joerg Exp $
! --- configure.orig 2004-09-23 01:15:44.000000000 +0000
+++ configure
@@ -3434,13 +3434,13 @@ darwin* | rhapsody*)
lt_cv_deplibs_check_method=pass_all
--- 1,6 ----
$NetBSD: patch-ag,v 1.6 2005/11/08 10:58:00 joerg Exp $
! --- configure.orig 2004-09-22 21:15:44.000000000 -0400
+++ configure
@@ -3434,13 +3434,13 @@ darwin* | rhapsody*)
lt_cv_deplibs_check_method=pass_all
***************
*** 110,112 ****
--- 110,127 ----
cat >>confdefs.h <<\_ACEOF
#define HAVE_LIBTIFF 1
_ACEOF
+ @@ -25270,6 +25270,14 @@ do
+ _ACEOF
+ cat >>$CONFIG_STATUS <<\_ACEOF
+ -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
+ + : Avoid regenerating within pkgsrc
+ + exit 0
+ + : Avoid regenerating within pkgsrc
+ + exit 0
+ + : Avoid regenerating within pkgsrc
+ + exit 0
+ + : Avoid regenerating within pkgsrc
+ + exit 0
+ ac_cs_recheck=: ;;
+ --version | --vers* | -V )
+ echo "$ac_cs_version"; exit 0 ;;
Index: patches/patch-ah
===================================================================
RCS file: /cvsroot/pkgsrc/graphics/imlib/patches/patch-ah,v
retrieving revision 1.2
diff -c -b -r1.2 patch-ah
*** patches/patch-ah 3 Dec 2004 13:42:47 -0000 1.2
--- patches/patch-ah 19 Jan 2011 19:06:44 -0000
***************
*** 1,6 ****
$NetBSD: patch-ah,v 1.2 2004/12/03 13:42:47 adam Exp $
! --- config/Makefile.in.orig 2004-09-23 01:16:17.000000000 +0000
+++ config/Makefile.in
@@ -158,7 +158,8 @@ prefix = @prefix@
program_transform_name = @program_transform_name@
--- 1,6 ----
$NetBSD: patch-ah,v 1.2 2004/12/03 13:42:47 adam Exp $
! --- config/Makefile.in.orig 2004-09-22 21:16:17.000000000 -0400
+++ config/Makefile.in
@@ -158,7 +158,8 @@ prefix = @prefix@
program_transform_name = @program_transform_name@
Index: patches/patch-ai
===================================================================
RCS file: /cvsroot/pkgsrc/graphics/imlib/patches/patch-ai,v
retrieving revision 1.2
diff -c -b -r1.2 patch-ai
*** patches/patch-ai 10 Dec 2004 09:30:42 -0000 1.2
--- patches/patch-ai 19 Jan 2011 19:06:44 -0000
***************
*** 1,8 ****
$NetBSD: patch-ai,v 1.2 2004/12/10 09:30:42 salo Exp $
! --- gdk_imlib/io-ppm.c.orig 2002-03-04 18:06:29.000000000 +0100
! +++ gdk_imlib/io-ppm.c 2004-12-10 10:00:56.000000000 +0100
! @@ -50,15 +50,15 @@
if (s[0] != '#')
{
done = 0;
--- 1,8 ----
$NetBSD: patch-ai,v 1.2 2004/12/10 09:30:42 salo Exp $
! --- gdk_imlib/io-ppm.c.orig 2002-03-04 13:06:29.000000000 -0400
! +++ gdk_imlib/io-ppm.c
! @@ -50,15 +50,15 @@ loader_ppm (FILE * f, int *w, int *h, in
if (s[0] != '#')
{
done = 0;
***************
*** 21,27 ****
{
fprintf(stderr, "gdk_imlib ERROR: Image height > 32767 pixels for
file\n");
return NULL;
! @@ -66,7 +66,7 @@
if (!bw)
{
fgets(s, 256, f);
--- 21,27 ----
{
fprintf(stderr, "gdk_imlib ERROR: Image height > 32767 pixels for
file\n");
return NULL;
! @@ -66,7 +66,7 @@ loader_ppm (FILE * f, int *w, int *h, in
if (!bw)
{
fgets(s, 256, f);
Index: patches/patch-aj
===================================================================
RCS file: /cvsroot/pkgsrc/graphics/imlib/patches/patch-aj,v
retrieving revision 1.1
diff -c -b -r1.1 patch-aj
*** patches/patch-aj 10 Dec 2004 09:30:42 -0000 1.1
--- patches/patch-aj 19 Jan 2011 19:06:44 -0000
***************
*** 1,8 ****
$NetBSD: patch-aj,v 1.1 2004/12/10 09:30:42 salo Exp $
! --- Imlib/utils.c.orig 2004-09-21 02:22:59.000000000 +0200
! +++ Imlib/utils.c 2004-12-10 09:58:18.000000000 +0100
! @@ -1496,36 +1496,56 @@
context = 0;
ptr = NULL;
end = NULL;
--- 1,8 ----
$NetBSD: patch-aj,v 1.1 2004/12/10 09:30:42 salo Exp $
! --- Imlib/utils.c.orig 2004-09-20 20:22:59.000000000 -0400
! +++ Imlib/utils.c
! @@ -1496,36 +1496,56 @@ Imlib_create_image_from_xpm_data(ImlibDa
context = 0;
ptr = NULL;
end = NULL;
***************
*** 63,69 ****
return NULL;
}
cmap = malloc(sizeof(struct _cmap) * ncolors);
! @@ -1533,6 +1553,7 @@
if (!cmap)
{
free(im);
--- 63,69 ----
return NULL;
}
cmap = malloc(sizeof(struct _cmap) * ncolors);
! @@ -1533,6 +1553,7 @@ Imlib_create_image_from_xpm_data(ImlibDa
if (!cmap)
{
free(im);
***************
*** 71,77 ****
return NULL;
}
im->rgb_width = w;
! @@ -1542,6 +1563,7 @@
{
free(cmap);
free(im);
--- 71,77 ----
return NULL;
}
im->rgb_width = w;
! @@ -1542,6 +1563,7 @@ Imlib_create_image_from_xpm_data(ImlibDa
{
free(cmap);
free(im);
***************
*** 79,85 ****
return NULL;
}
im->alpha_data = NULL;
! @@ -1817,6 +1839,7 @@
}
if ((ptr) && ((ptr - im->rgb_data) >= w * h * 3))
done = 1;
--- 79,85 ----
return NULL;
}
im->alpha_data = NULL;
! @@ -1817,6 +1839,7 @@ Imlib_create_image_from_xpm_data(ImlibDa
}
if ((ptr) && ((ptr - im->rgb_data) >= w * h * 3))
done = 1;
***************
*** 87,89 ****
--- 87,105 ----
}
if (!transp)
{
+ @@ -1959,13 +1982,13 @@ Imlib_inlined_png_to_image(ImlibData *id
+ return NULL;
+ }
+
+ - if (setjmp(png_ptr->jmpbuf))
+ + if (setjmp(png_jmpbuf(png_ptr)))
+ {
+ png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
+ return NULL;
+ }
+
+ - if (info_ptr->color_type == PNG_COLOR_TYPE_RGB_ALPHA)
+ + if (png_get_color_type(png_ptr, info_ptr) == PNG_COLOR_TYPE_RGB_ALPHA)
+ {
+ png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
+ return NULL;
Index: patches/patch-ak
===================================================================
RCS file: /cvsroot/pkgsrc/graphics/imlib/patches/patch-ak,v
retrieving revision 1.1
diff -c -b -r1.1 patch-ak
*** patches/patch-ak 10 Dec 2004 09:30:42 -0000 1.1
--- patches/patch-ak 19 Jan 2011 19:06:44 -0000
***************
*** 1,8 ****
$NetBSD: patch-ak,v 1.1 2004/12/10 09:30:42 salo Exp $
! --- gdk_imlib/io-gif.c.orig 2002-03-04 18:06:29.000000000 +0100
! +++ gdk_imlib/io-gif.c 2004-12-10 10:00:56.000000000 +0100
! @@ -55,7 +55,7 @@
}
*w = gif->Image.Width;
*h = gif->Image.Height;
--- 1,8 ----
$NetBSD: patch-ak,v 1.1 2004/12/10 09:30:42 salo Exp $
! --- gdk_imlib/io-gif.c.orig 2002-03-04 13:06:29.000000000 -0400
! +++ gdk_imlib/io-gif.c
! @@ -55,7 +55,7 @@ loader_gif(FILE *f, int *w, int *h, int
}
*w = gif->Image.Width;
*h = gif->Image.Height;
Index: patches/patch-al
===================================================================
RCS file: /cvsroot/pkgsrc/graphics/imlib/patches/patch-al,v
retrieving revision 1.1
diff -c -b -r1.1 patch-al
*** patches/patch-al 10 Dec 2004 09:30:42 -0000 1.1
--- patches/patch-al 19 Jan 2011 19:06:44 -0000
***************
*** 1,8 ****
$NetBSD: patch-al,v 1.1 2004/12/10 09:30:42 salo Exp $
! --- gdk_imlib/io-tiff.c.orig 2002-03-04 18:06:29.000000000 +0100
! +++ gdk_imlib/io-tiff.c 2004-12-10 10:00:56.000000000 +0100
! @@ -36,7 +36,9 @@
npix = ww * hh;
*w = (int)ww;
*h = (int)hh;
--- 1,8 ----
$NetBSD: patch-al,v 1.1 2004/12/10 09:30:42 salo Exp $
! --- gdk_imlib/io-tiff.c.orig 2002-03-04 13:06:29.000000000 -0400
! +++ gdk_imlib/io-tiff.c
! @@ -36,7 +36,9 @@ loader_tiff(FILE *f, char *file, int *w,
npix = ww * hh;
*w = (int)ww;
*h = (int)hh;
Index: patches/patch-am
===================================================================
RCS file: /cvsroot/pkgsrc/graphics/imlib/patches/patch-am,v
retrieving revision 1.1
diff -c -b -r1.1 patch-am
*** patches/patch-am 10 Dec 2004 09:30:42 -0000 1.1
--- patches/patch-am 19 Jan 2011 19:06:44 -0000
***************
*** 1,8 ****
$NetBSD: patch-am,v 1.1 2004/12/10 09:30:42 salo Exp $
! --- gdk_imlib/io-xpm.c.orig 2002-03-04 18:06:29.000000000 +0100
! +++ gdk_imlib/io-xpm.c 2004-12-10 10:00:56.000000000 +0100
! @@ -40,8 +40,12 @@
context = 0;
i = j = 0;
cmap = NULL;
--- 1,8 ----
$NetBSD: patch-am,v 1.1 2004/12/10 09:30:42 salo Exp $
! --- gdk_imlib/io-xpm.c.orig 2002-03-04 13:06:29.000000000 -0400
! +++ gdk_imlib/io-xpm.c
! @@ -40,8 +40,12 @@ loader_xpm(FILE *file, int *w, int *h, i
context = 0;
i = j = 0;
cmap = NULL;
***************
*** 15,21 ****
while (!done)
{
pc = c;
! @@ -70,25 +74,25 @@
{
/* Header */
sscanf(line, "%i %i %i %i", w, h, &ncolors, &cpp);
--- 15,21 ----
while (!done)
{
pc = c;
! @@ -70,25 +74,25 @@ loader_xpm(FILE *file, int *w, int *h, i
{
/* Header */
sscanf(line, "%i %i %i %i", w, h, &ncolors, &cpp);
***************
*** 45,51 ****
{
fprintf(stderr, "gdk_imlib ERROR: Image height > 32767
pixels for file\n");
free(line);
! @@ -120,11 +124,13 @@
{
int slen;
int hascolor, iscolor;
--- 45,51 ----
{
fprintf(stderr, "gdk_imlib ERROR: Image height > 32767
pixels for file\n");
free(line);
! @@ -120,11 +124,13 @@ loader_xpm(FILE *file, int *w, int *h, i
{
int slen;
int hascolor, iscolor;
***************
*** 59,65 ****
s[0] = 0;
len = strlen(line);
strncpy(cmap[j].str, line, cpp);
! @@ -147,10 +153,10 @@
{
if (k >= len)
{
--- 59,65 ----
s[0] = 0;
len = strlen(line);
strncpy(cmap[j].str, line, cpp);
! @@ -147,10 +153,10 @@ loader_xpm(FILE *file, int *w, int *h, i
{
if (k >= len)
{
***************
*** 74,80 ****
}
if (col[0])
{
! @@ -180,14 +186,17 @@
}
}
}
--- 74,80 ----
}
if (col[0])
{
! @@ -180,14 +186,17 @@ loader_xpm(FILE *file, int *w, int *h, i
}
}
}
Index: patches/patch-an
===================================================================
RCS file: /cvsroot/pkgsrc/graphics/imlib/patches/patch-an,v
retrieving revision 1.1
diff -c -b -r1.1 patch-an
*** patches/patch-an 10 Dec 2004 09:30:42 -0000 1.1
--- patches/patch-an 19 Jan 2011 19:06:44 -0000
***************
*** 1,8 ****
$NetBSD: patch-an,v 1.1 2004/12/10 09:30:42 salo Exp $
! --- gdk_imlib/misc.c.orig 2002-03-04 18:06:32.000000000 +0100
! +++ gdk_imlib/misc.c 2004-12-10 10:15:22.000000000 +0100
! @@ -1355,11 +1355,16 @@
/*
* Make sure we don't wrap on our memory allocations
--- 1,8 ----
$NetBSD: patch-an,v 1.1 2004/12/10 09:30:42 salo Exp $
! --- gdk_imlib/misc.c.orig 2002-03-04 13:06:32.000000000 -0400
! +++ gdk_imlib/misc.c
! @@ -1355,11 +1355,16 @@ gdk_imlib_get_sysconfig()
/*
* Make sure we don't wrap on our memory allocations
Index: patches/patch-ao
===================================================================
RCS file: /cvsroot/pkgsrc/graphics/imlib/patches/patch-ao,v
retrieving revision 1.1
diff -c -b -r1.1 patch-ao
*** patches/patch-ao 10 Dec 2004 09:30:42 -0000 1.1
--- patches/patch-ao 19 Jan 2011 19:06:44 -0000
***************
*** 1,8 ****
$NetBSD: patch-ao,v 1.1 2004/12/10 09:30:42 salo Exp $
! --- gdk_imlib/utils.c.orig 2002-03-22 15:43:29.000000000 +0100
! +++ gdk_imlib/utils.c 2004-12-10 10:15:22.000000000 +0100
! @@ -1236,36 +1236,56 @@
context = 0;
ptr = NULL;
end = NULL;
--- 1,8 ----
$NetBSD: patch-ao,v 1.1 2004/12/10 09:30:42 salo Exp $
! --- gdk_imlib/utils.c.orig 2002-03-22 10:43:29.000000000 -0400
! +++ gdk_imlib/utils.c
! @@ -1236,36 +1236,56 @@ gdk_imlib_create_image_from_xpm_data(cha
context = 0;
ptr = NULL;
end = NULL;
***************
*** 63,69 ****
return NULL;
}
cmap = malloc(sizeof(struct _cmap) * ncolors);
! @@ -1273,6 +1293,7 @@
if (!cmap)
{
free(im);
--- 63,69 ----
return NULL;
}
cmap = malloc(sizeof(struct _cmap) * ncolors);
! @@ -1273,6 +1293,7 @@ gdk_imlib_create_image_from_xpm_data(cha
if (!cmap)
{
free(im);
***************
*** 71,77 ****
return NULL;
}
im->rgb_width = w;
! @@ -1282,6 +1303,7 @@
{
free(cmap);
free(im);
--- 71,77 ----
return NULL;
}
im->rgb_width = w;
! @@ -1282,6 +1303,7 @@ gdk_imlib_create_image_from_xpm_data(cha
{
free(cmap);
free(im);
***************
*** 79,85 ****
return NULL;
}
im->alpha_data = NULL;
! @@ -1355,7 +1377,7 @@
strcpy(col + colptr, " ");
colptr++;
}
--- 79,85 ----
return NULL;
}
im->alpha_data = NULL;
! @@ -1355,7 +1377,7 @@ gdk_imlib_create_image_from_xpm_data(cha
strcpy(col + colptr, " ");
colptr++;
}
***************
*** 88,94 ****
{
strcpy(col + colptr, s);
colptr += ls;
! @@ -1558,6 +1580,7 @@
}
if ((ptr) && ((ptr - im->rgb_data) >= w * h * 3))
done = 1;
--- 88,94 ----
{
strcpy(col + colptr, s);
colptr += ls;
! @@ -1558,6 +1580,7 @@ gdk_imlib_create_image_from_xpm_data(cha
}
if ((ptr) && ((ptr - im->rgb_data) >= w * h * 3))
done = 1;
Home |
Main Index |
Thread Index |
Old Index