Sun Feb 6 17:35:05 2011 UTC ()
Fix build with png-1.5.


(wiz)
diff -r1.3 -r1.4 pkgsrc/graphics/digikam-kde3/distinfo
diff -r1.1 -r1.2 pkgsrc/graphics/digikam-kde3/patches/patch-aa
diff -r1.1 -r1.2 pkgsrc/graphics/digikam-kde3/patches/patch-ab
cvs diff -r1.3 -r1.4 pkgsrc/graphics/digikam-kde3/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/graphics/digikam-kde3/Attic/distinfo 2011/01/29 22:39:27 1.3
+++ pkgsrc/graphics/digikam-kde3/Attic/distinfo 2011/02/06 17:35:05 1.4
@@ -1,12 +1,12 @@ @@ -1,12 +1,12 @@
1$NetBSD: distinfo,v 1.3 2011/01/29 22:39:27 markd Exp $ 1$NetBSD: distinfo,v 1.4 2011/02/06 17:35:05 wiz Exp $
2 2
3SHA1 (digikam-0.9.6.tar.bz2) = e63148a13c40e87957eeb8b17dc8047dffa2a1a5 3SHA1 (digikam-0.9.6.tar.bz2) = e63148a13c40e87957eeb8b17dc8047dffa2a1a5
4RMD160 (digikam-0.9.6.tar.bz2) = 3abc8d6d7dc4a95473b00eacc8800c044b110215 4RMD160 (digikam-0.9.6.tar.bz2) = 3abc8d6d7dc4a95473b00eacc8800c044b110215
5Size (digikam-0.9.6.tar.bz2) = 11517637 bytes 5Size (digikam-0.9.6.tar.bz2) = 11517637 bytes
6SHA1 (patch-aa) = 818a8ae95459dd8fb25ace8210af0a0576084aba 6SHA1 (patch-aa) = ea96fcddbf2b729f394ebe31d0f61d328596a898
7SHA1 (patch-ab) = 50636e14be0b183ac8ee2147a3b3a8227cef10d5 7SHA1 (patch-ab) = 63e2d31a3c0732315c7e9ef4465357c412143d87
8SHA1 (patch-ac) = ec8cfcb1c400f13ebc9e92cc807eb179e5fc6a56 8SHA1 (patch-ac) = ec8cfcb1c400f13ebc9e92cc807eb179e5fc6a56
9SHA1 (patch-ad) = 59fb7af989b7e32978444d1d2e13493e821cc10e 9SHA1 (patch-ad) = 59fb7af989b7e32978444d1d2e13493e821cc10e
10SHA1 (patch-ae) = 8f19dd6698647434bb20f222ef25024473a7ff2d 10SHA1 (patch-ae) = 8f19dd6698647434bb20f222ef25024473a7ff2d
11SHA1 (patch-af) = d34710baea502e96cd8254164157ef68a4ef276f 11SHA1 (patch-af) = d34710baea502e96cd8254164157ef68a4ef276f
12SHA1 (patch-ag) = 3dc532aa36451f7df8d10aa35149db767b295d8c 12SHA1 (patch-ag) = 3dc532aa36451f7df8d10aa35149db767b295d8c
cvs diff -r1.1 -r1.2 pkgsrc/graphics/digikam-kde3/patches/Attic/patch-aa (expand / switch to unified diff)

--- pkgsrc/graphics/digikam-kde3/patches/Attic/patch-aa 2010/06/13 22:44:29 1.1
+++ pkgsrc/graphics/digikam-kde3/patches/Attic/patch-aa 2011/02/06 17:35:05 1.2
@@ -1,13 +1,52 @@ @@ -1,13 +1,52 @@
1$NetBSD: patch-aa,v 1.1 2010/06/13 22:44:29 wiz Exp $ 1$NetBSD: patch-aa,v 1.2 2011/02/06 17:35:05 wiz Exp $
 2
 3Fix build with png-1.5.
2 4
3--- digikam/libs/dimg/loaders/pngloader.cpp.orig 2009-07-03 05:19:41.000000000 +0000 5--- digikam/libs/dimg/loaders/pngloader.cpp.orig 2009-07-03 05:19:41.000000000 +0000
4+++ digikam/libs/dimg/loaders/pngloader.cpp 6+++ digikam/libs/dimg/loaders/pngloader.cpp
 7@@ -120,7 +120,7 @@ bool PNGLoader::load(const QString& file
 8 // PNG error handling. If an error occurs during reading, libpng
 9 // will jump here
 10
 11- if (setjmp(png_ptr->jmpbuf))
 12+ if (setjmp(png_jmpbuf(png_ptr)))
 13 {
 14 DDebug() << k_funcinfo << "Internal libPNG error during reading file. Process aborted!" << endl;
 15 png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
5@@ -252,7 +252,7 @@ bool PNGLoader::load(const QString& file 16@@ -252,7 +252,7 @@ bool PNGLoader::load(const QString& file
6 #ifdef ENABLE_DEBUG_MESSAGES 17 #ifdef ENABLE_DEBUG_MESSAGES
7 DDebug() << "PNG in PNG_COLOR_TYPE_GRAY" << endl; 18 DDebug() << "PNG in PNG_COLOR_TYPE_GRAY" << endl;
8 #endif 19 #endif
9- png_set_gray_1_2_4_to_8(png_ptr); 20- png_set_gray_1_2_4_to_8(png_ptr);
10+ png_set_expand_gray_1_2_4_to_8(png_ptr); 21+ png_set_expand_gray_1_2_4_to_8(png_ptr);
11 png_set_gray_to_rgb(png_ptr); 22 png_set_gray_to_rgb(png_ptr);
12  23
13 if (QImage::systemByteOrder() == QImage::LittleEndian) // Intel 24 if (QImage::systemByteOrder() == QImage::LittleEndian) // Intel
 25@@ -403,7 +403,8 @@ bool PNGLoader::load(const QString& file
 26
 27 QMap<int, QByteArray>& metaData = imageMetaData();
 28
 29- png_charp profile_name, profile_data=NULL;
 30+ png_charp profile_name;
 31+ png_bytep profile_data=NULL;
 32 png_uint_32 profile_size;
 33 int compression_type;
 34
 35@@ -526,7 +527,7 @@ bool PNGLoader::save(const QString& file
 36 // PNG error handling. If an error occurs during writing, libpng
 37 // will jump here
 38
 39- if (setjmp(png_ptr->jmpbuf))
 40+ if (setjmp(png_jmpbuf(png_ptr)))
 41 {
 42 DDebug() << k_funcinfo << "Internal libPNG error during writing file. Process aborted!" << endl;
 43 fclose(f);
 44@@ -599,7 +600,7 @@ bool PNGLoader::save(const QString& file
 45
 46 if (!profile_rawdata.isEmpty())
 47 {
 48- png_set_iCCP(png_ptr, info_ptr, (png_charp)"icc", PNG_COMPRESSION_TYPE_BASE, profile_rawdata.data(), profile_rawdata.size());
 49+ png_set_iCCP(png_ptr, info_ptr, (png_charp)"icc", PNG_COMPRESSION_TYPE_BASE, (png_bytep)profile_rawdata.data(), profile_rawdata.size());
 50 }
 51
 52 // -------------------------------------------------------------------
cvs diff -r1.1 -r1.2 pkgsrc/graphics/digikam-kde3/patches/Attic/patch-ab (expand / switch to unified diff)

--- pkgsrc/graphics/digikam-kde3/patches/Attic/patch-ab 2010/06/13 22:44:29 1.1
+++ pkgsrc/graphics/digikam-kde3/patches/Attic/patch-ab 2011/02/06 17:35:05 1.2
@@ -1,13 +1,44 @@ @@ -1,13 +1,44 @@
1$NetBSD: patch-ab,v 1.1 2010/06/13 22:44:29 wiz Exp $ 1$NetBSD: patch-ab,v 1.2 2011/02/06 17:35:05 wiz Exp $
 2
 3Fix build with png-1.5.
2 4
3--- digikam/kioslave/digikamthumbnail.cpp.orig 2009-07-03 05:19:41.000000000 +0000 5--- digikam/kioslave/digikamthumbnail.cpp.orig 2009-07-03 05:19:41.000000000 +0000
4+++ digikam/kioslave/digikamthumbnail.cpp 6+++ digikam/kioslave/digikamthumbnail.cpp
 7@@ -392,7 +392,7 @@ QImage kio_digikamthumbnailProtocol::loa
 8 return qimage;
 9 }
 10
 11- if (setjmp(png_ptr->jmpbuf))
 12+ if (setjmp(png_jmpbuf(png_ptr)))
 13 {
 14 png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
 15 fclose(f);
 16@@ -413,16 +413,16 @@ QImage kio_digikamthumbnailProtocol::loa
 17 if (color_type == PNG_COLOR_TYPE_PALETTE)
 18 png_set_expand(png_ptr);
 19
 20- if (info_ptr->color_type == PNG_COLOR_TYPE_RGB_ALPHA)
 21+ if (png_get_color_type(png_ptr, info_ptr) == PNG_COLOR_TYPE_RGB_ALPHA)
 22 has_alpha = 1;
 23
 24- if (info_ptr->color_type == PNG_COLOR_TYPE_GRAY_ALPHA)
 25+ if (png_get_color_type(png_ptr, info_ptr) == PNG_COLOR_TYPE_GRAY_ALPHA)
 26 {
 27 has_alpha = 1;
 28 has_grey = 1;
 29 }
 30
 31- if (info_ptr->color_type == PNG_COLOR_TYPE_GRAY)
 32+ if (png_get_color_type(png_ptr, info_ptr) == PNG_COLOR_TYPE_GRAY)
 33 has_grey = 1;
 34
 35 unsigned char **lines;
5@@ -465,7 +465,7 @@ QImage kio_digikamthumbnailProtocol::loa 36@@ -465,7 +465,7 @@ QImage kio_digikamthumbnailProtocol::loa
6 { 37 {
7 png_set_gray_to_rgb(png_ptr); 38 png_set_gray_to_rgb(png_ptr);
8 if (png_get_bit_depth(png_ptr, info_ptr) < 8) 39 if (png_get_bit_depth(png_ptr, info_ptr) < 8)
9- png_set_gray_1_2_4_to_8(png_ptr); 40- png_set_gray_1_2_4_to_8(png_ptr);
10+ png_set_expand_gray_1_2_4_to_8(png_ptr); 41+ png_set_expand_gray_1_2_4_to_8(png_ptr);
11 } 42 }
12  43
13 int sizeOfUint = sizeof(unsigned int); 44 int sizeOfUint = sizeof(unsigned int);