diff options
| author | Dirk Meyer <dinoex@FreeBSD.org> | 2012-06-01 05:26:28 +0000 |
|---|---|---|
| committer | Dirk Meyer <dinoex@FreeBSD.org> | 2012-06-01 05:26:28 +0000 |
| commit | 2b74a89bc8342f0b9b737c37d87737caf7b0ea1e (patch) | |
| tree | c04604583d8be53b3ed7f10975be828c731f87cb /x11/gnome-libs | |
| parent | 24315159daa0089f08acea4ba1b130fb6721ad5c (diff) | |
| download | ports-2b74a89bc8342f0b9b737c37d87737caf7b0ea1e.tar.gz ports-2b74a89bc8342f0b9b737c37d87737caf7b0ea1e.zip | |
- update png to 1.5.10
Notes
Notes:
svn path=/head/; revision=297915
Diffstat (limited to 'x11/gnome-libs')
| -rw-r--r-- | x11/gnome-libs/Makefile | 5 | ||||
| -rw-r--r-- | x11/gnome-libs/files/patch-gtk-xmhtml-readPNG.c | 28 | ||||
| -rw-r--r-- | x11/gnome-libs/files/patch-tools-convertrgb-loadpng.c | 21 |
3 files changed, 50 insertions, 4 deletions
diff --git a/x11/gnome-libs/Makefile b/x11/gnome-libs/Makefile index 26a363f05bef..1d163b2380ad 100644 --- a/x11/gnome-libs/Makefile +++ b/x11/gnome-libs/Makefile @@ -8,7 +8,7 @@ PORTNAME= gnome-libs PORTVERSION= 1.4.2 -PORTREVISION= 17 +PORTREVISION= 18 CATEGORIES?= x11 gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome @@ -17,6 +17,7 @@ MAINTAINER?= gnome@FreeBSD.org COMMENT= Libraries for GNOME, a GNU desktop environment BUILD_DEPENDS= rarian-sk-config:${PORTSDIR}/textproc/rarian +LIB_DEPENDS= png15:${PORTSDIR}/graphics/png RUN_DEPENDS= rarian-sk-config:${PORTSDIR}/textproc/rarian USE_BZIP2= yes @@ -29,7 +30,7 @@ USE_LDCONFIG= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --disable-test-gnome CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib" -CPPFLAGS+= -I${LOCALBASE}/include +CPPFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/libpng15 MAN1= dns-helper.1 gconfigger.1 gnome-bug.1 gnome-config.1 \ gnome-doc.1 gnome-dump-metadata.1 gnome-gen-mimedb.1 \ diff --git a/x11/gnome-libs/files/patch-gtk-xmhtml-readPNG.c b/x11/gnome-libs/files/patch-gtk-xmhtml-readPNG.c new file mode 100644 index 000000000000..d3c6f8bbcb0d --- /dev/null +++ b/x11/gnome-libs/files/patch-gtk-xmhtml-readPNG.c @@ -0,0 +1,28 @@ +--- gtk-xmhtml/readPNG.c.orig 2002-08-06 23:25:46.000000000 +0200 ++++ gtk-xmhtml/readPNG.c 2012-05-11 18:06:35.000000000 +0200 +@@ -158,6 +158,7 @@ + + #ifdef HAVE_LIBPNG + #include <png.h> ++#include <pngpriv.h> + #include <setjmp.h> + #include <math.h> /* required for full alpha channel processing */ + #endif +@@ -208,7 +209,7 @@ + + _XmHTMLWarning(__WFUNC__(NULL, "png_error"), + "libpng error on image %s: %s", ib->file, msg); +- longjmp(png_ptr->jmpbuf, 1); ++ longjmp(png_jmpbuf(png_ptr), 1); + } + + /***** +@@ -308,7 +309,7 @@ + return((XmHTMLRawImageData*)NULL); + } + /* now set error handler */ +- if(setjmp(png_ptr->jmpbuf)) ++ if(setjmp(png_jmpbuf(png_ptr))) + { + /* + * PNG signalled an error. Destroy image data, free any allocated diff --git a/x11/gnome-libs/files/patch-tools-convertrgb-loadpng.c b/x11/gnome-libs/files/patch-tools-convertrgb-loadpng.c index 029d3bfffa9c..8307927f80b6 100644 --- a/x11/gnome-libs/files/patch-tools-convertrgb-loadpng.c +++ b/x11/gnome-libs/files/patch-tools-convertrgb-loadpng.c @@ -1,6 +1,23 @@ --- tools/convertrgb/loadpng.c.orig 1998-09-25 17:33:59.000000000 +0200 -+++ tools/convertrgb/loadpng.c 2010-03-29 09:05:19.000000000 +0200 -@@ -161,7 +161,7 @@ ++++ tools/convertrgb/loadpng.c 2012-05-09 13:02:52.000000000 +0200 +@@ -3,6 +3,7 @@ + */ + + #include "convertrgb.h" ++#include "pngpriv.h" + + static int transp; + +@@ -29,7 +30,7 @@ + return NULL; + } + +- if (setjmp(png_ptr->jmpbuf)) ++ if (setjmp(png_jmpbuf(png_ptr))) + { + png_destroy_read_struct(&png_ptr, &info_ptr, NULL); + return NULL; +@@ -161,7 +162,7 @@ return 0; fread(buf, 1, 8, f); fclose(f); |