head	1.2;
access;
symbols
	pkgsrc-2017Q3:1.1.1.1.0.48
	pkgsrc-2017Q3-base:1.1.1.1
	pkgsrc-2017Q2:1.1.1.1.0.44
	pkgsrc-2017Q2-base:1.1.1.1
	pkgsrc-2017Q1:1.1.1.1.0.42
	pkgsrc-2017Q1-base:1.1.1.1
	pkgsrc-2016Q4:1.1.1.1.0.40
	pkgsrc-2016Q4-base:1.1.1.1
	pkgsrc-2016Q3:1.1.1.1.0.38
	pkgsrc-2016Q3-base:1.1.1.1
	pkgsrc-2016Q2:1.1.1.1.0.36
	pkgsrc-2016Q2-base:1.1.1.1
	pkgsrc-2016Q1:1.1.1.1.0.34
	pkgsrc-2016Q1-base:1.1.1.1
	pkgsrc-2015Q4:1.1.1.1.0.32
	pkgsrc-2015Q4-base:1.1.1.1
	pkgsrc-2015Q3:1.1.1.1.0.30
	pkgsrc-2015Q3-base:1.1.1.1
	pkgsrc-2015Q2:1.1.1.1.0.28
	pkgsrc-2015Q2-base:1.1.1.1
	pkgsrc-2015Q1:1.1.1.1.0.26
	pkgsrc-2015Q1-base:1.1.1.1
	pkgsrc-2014Q4:1.1.1.1.0.24
	pkgsrc-2014Q4-base:1.1.1.1
	pkgsrc-2014Q3:1.1.1.1.0.22
	pkgsrc-2014Q3-base:1.1.1.1
	pkgsrc-2014Q2:1.1.1.1.0.20
	pkgsrc-2014Q2-base:1.1.1.1
	pkgsrc-2014Q1:1.1.1.1.0.18
	pkgsrc-2014Q1-base:1.1.1.1
	pkgsrc-2013Q4:1.1.1.1.0.16
	pkgsrc-2013Q4-base:1.1.1.1
	pkgsrc-2013Q3:1.1.1.1.0.14
	pkgsrc-2013Q3-base:1.1.1.1
	pkgsrc-2013Q2:1.1.1.1.0.12
	pkgsrc-2013Q2-base:1.1.1.1
	pkgsrc-2013Q1:1.1.1.1.0.10
	pkgsrc-2013Q1-base:1.1.1.1
	pkgsrc-2012Q4:1.1.1.1.0.8
	pkgsrc-2012Q4-base:1.1.1.1
	pkgsrc-2012Q3:1.1.1.1.0.6
	pkgsrc-2012Q3-base:1.1.1.1
	pkgsrc-2012Q2:1.1.1.1.0.4
	pkgsrc-2012Q2-base:1.1.1.1
	pkgsrc-2012Q1:1.1.1.1.0.2
	pkgsrc-2012Q1-base:1.1.1.1
	pkgsrc-base:1.1.1.1
	TNF:1.1.1;
locks; strict;
comment	@# @;


1.2
date	2017.09.26.10.27.02;	author wiz;	state dead;
branches;
next	1.1;
commitid	9ARpkXTuh9Wg2H8A;

1.1
date	2012.03.19.23.19.06;	author markd;	state Exp;
branches
	1.1.1.1;
next	;

1.1.1.1
date	2012.03.19.23.19.06;	author markd;	state Exp;
branches;
next	;


desc
@@


1.2
log
@*: remove qt3 and the packages using it, including KDE3

Announced in https://mail-index.netbsd.org/pkgsrc-users/2017/09/10/msg025556.html
@
text
@$NetBSD: patch-ab,v 1.1 2012/03/19 23:19:06 markd Exp $

Fix build with png-1.5.
https://bugs.kde.org/show_bug.cgi?id=266319

--- src/gvcore/pngformattype.cpp.orig	2007-09-15 13:46:13.000000000 +0000
+++ src/gvcore/pngformattype.cpp
@@@@ -211,7 +211,7 @@@@ void setup_qt( QImage& image, png_struct
 
     if ( color_type == PNG_COLOR_TYPE_GRAY ) {
 	// Black & White or 8-bit grayscale
-	if ( bit_depth == 1 && info_ptr->channels == 1 ) {
+      if ( bit_depth == 1 && png_get_channels(png_ptr, info_ptr) == 1 ) {
 	    png_set_invert_mono( png_ptr );
 	    png_read_update_info( png_ptr, info_ptr );
 	    if (!image.create( width, height, 1, 2, QImage::BigEndian ))
@@@@ -245,16 +245,24 @@@@ void setup_qt( QImage& image, png_struct
 		image.setColor( i, qRgba(c,c,c,0xff) );
 	    }
 	    if ( png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS) ) {
-		const int g = info_ptr->trans_values.gray;
+		png_bytep trans_alpha;
+		int num_trans;
+		png_color_16p trans_color;
+		png_get_tRNS(png_ptr, info_ptr, &trans_alpha, &num_trans, &trans_color);
+		const int g = trans_color->gray;
 		if (g < ncols) {
 		    image.setAlphaBuffer(TRUE);
 		    image.setColor(g, image.color(g) & RGB_MASK);
 		}
 	    }
 	}
-    } else if ( color_type == PNG_COLOR_TYPE_PALETTE
+    } else {
+     png_colorp palette;
+     int num_palette;
+     png_get_PLTE(png_ptr, info_ptr, &palette, &num_palette);
+     if ( color_type == PNG_COLOR_TYPE_PALETTE
      && png_get_valid(png_ptr, info_ptr, PNG_INFO_PLTE)
-     && info_ptr->num_palette <= 256 )
+     && num_palette <= 256 )
     {
 	// 1-bit and 8-bit color
 	if ( bit_depth != 1 )
@@@@ -262,28 +270,32 @@@@ void setup_qt( QImage& image, png_struct
 	png_read_update_info( png_ptr, info_ptr );
 	png_get_IHDR(png_ptr, info_ptr,
 	    &width, &height, &bit_depth, &color_type, 0, 0, 0);
-	if (!image.create(width, height, bit_depth, info_ptr->num_palette,
+	if (!image.create(width, height, bit_depth, num_palette,
 	    QImage::BigEndian))
 	    return;
 	int i = 0;
 	if ( png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS) ) {
+	    png_bytep trans_alpha;
+	    int num_trans;
+	    png_color_16p trans_color;
+	    png_get_tRNS(png_ptr, info_ptr, &trans_alpha, &num_trans, &trans_color);
 	    image.setAlphaBuffer( TRUE );
-	    while ( i < info_ptr->num_trans ) {
+	    while ( i < num_trans ) {
 		image.setColor(i, qRgba(
-		    info_ptr->palette[i].red,
-		    info_ptr->palette[i].green,
-		    info_ptr->palette[i].blue,
-		    info_ptr->trans[i]
+		    palette[i].red,
+		    palette[i].green,
+		    palette[i].blue,
+		    trans_alpha[i]
 		    )
 		);
 		i++;
 	    }
 	}
-	while ( i < info_ptr->num_palette ) {
+	while ( i < num_palette ) {
 	    image.setColor(i, qRgba(
-		info_ptr->palette[i].red,
-		info_ptr->palette[i].green,
-		info_ptr->palette[i].blue,
+		palette[i].red,
+		palette[i].green,
+		palette[i].blue,
 		0xff
 		)
 	    );
@@@@ -318,12 +330,13 @@@@ void setup_qt( QImage& image, png_struct
 	}
 
 	png_read_update_info(png_ptr, info_ptr);
-    }
+      }
 
     // Qt==ARGB==Big(ARGB)==Little(BGRA)
     if ( QImage::systemByteOrder() == QImage::LittleEndian ) {
 	png_set_bgr(png_ptr);
     }
+    }
 }
 
 
@@@@ -381,7 +394,7 @@@@ int PNGFormat::decode(QImage& img, QImag
 	    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 +422,7 @@@@ int PNGFormat::decode(QImage& img, QImag
 
     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;
@@@@ -476,7 +489,7 @@@@ void PNGFormat::end(png_structp png, png
     consumer->frameDone(QPoint(offx,offy),r);
     consumer->end();
     state = FrameStart;
-    unused_data = (int)png->buffer_size; // Since libpng doesn't tell us
+    unused_data = png_process_data_pause(png, 1);
 }
 
 #ifdef PNG_USER_CHUNKS_SUPPORTED
@


1.1
log
@Initial revision
@
text
@d1 1
a1 1
$NetBSD: patch-ab,v 1.6 2011/02/14 18:24:00 wiz Exp $
@


1.1.1.1
log
@Reimport gwenview 1.4.2nb15 as gwenview-kde3
@
text
@@