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 /graphics/gwenview | |
| parent | 24315159daa0089f08acea4ba1b130fb6721ad5c (diff) | |
Notes
Diffstat (limited to 'graphics/gwenview')
| -rw-r--r-- | graphics/gwenview/Makefile | 4 | ||||
| -rw-r--r-- | graphics/gwenview/files/patch-src_gvcore_pngformattype.cpp | 32 |
2 files changed, 32 insertions, 4 deletions
diff --git a/graphics/gwenview/Makefile b/graphics/gwenview/Makefile index 24348ad762a6..f352d2d09cb2 100644 --- a/graphics/gwenview/Makefile +++ b/graphics/gwenview/Makefile @@ -7,7 +7,7 @@ PORTNAME= gwenview PORTVERSION= 1.4.2 -PORTREVISION= 9 +PORTREVISION= 10 CATEGORIES= graphics kde MASTER_SITES= SF @@ -15,6 +15,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= An image viewer and browser for the KDE environment LIB_DEPENDS= kipi.2:${PORTSDIR}/graphics/libkipi \ + png15:${PORTSDIR}/graphics/png \ exiv2.10:${PORTSDIR}/graphics/exiv2 USE_BZIP2= yes @@ -22,6 +23,7 @@ USE_GMAKE= yes USE_KDELIBS_VER=3 USE_AUTOTOOLS= libtool +CFLAGS+=-I${LOCALBASE}/include/libpng15 CONFIGURE_ARGS+=--enable-kipi MAN1= gwenview.1 diff --git a/graphics/gwenview/files/patch-src_gvcore_pngformattype.cpp b/graphics/gwenview/files/patch-src_gvcore_pngformattype.cpp index a7c10d008337..443d390a083b 100644 --- a/graphics/gwenview/files/patch-src_gvcore_pngformattype.cpp +++ b/graphics/gwenview/files/patch-src_gvcore_pngformattype.cpp @@ -1,6 +1,14 @@ --- src/gvcore/pngformattype.cpp.orig 2007-09-15 15:46:13.000000000 +0200 -+++ src/gvcore/pngformattype.cpp 2010-03-30 10:12:59.000000000 +0200 -@@ -245,7 +245,7 @@ ++++ src/gvcore/pngformattype.cpp 2012-05-09 12:32:26.000000000 +0200 +@@ -41,6 +41,7 @@ + #include "pngformattype.h" + + #include <png.h> ++#include <pngpriv.h> + + namespace Gwenview { + +@@ -245,7 +246,7 @@ image.setColor( i, qRgba(c,c,c,0xff) ); } if ( png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS) ) { @@ -9,7 +17,7 @@ if (g < ncols) { image.setAlphaBuffer(TRUE); image.setColor(g, image.color(g) & RGB_MASK); -@@ -273,7 +273,7 @@ +@@ -273,7 +274,7 @@ info_ptr->palette[i].red, info_ptr->palette[i].green, info_ptr->palette[i].blue, @@ -18,3 +26,21 @@ ) ); i++; +@@ -381,7 +382,7 @@ + return -1; + } + +- if (setjmp((png_ptr)->jmpbuf)) { ++ if (setjmp(png_jmpbuf((png_ptr)))) { + png_destroy_read_struct(&png_ptr, &info_ptr, 0); + image = 0; + return -1; +@@ -409,7 +410,7 @@ + + if ( !png_ptr ) return 0; + +- if (setjmp(png_ptr->jmpbuf)) { ++ if (setjmp(png_jmpbuf(png_ptr))) { + png_destroy_read_struct(&png_ptr, &info_ptr, 0); + image = 0; + state = MovieStart; |