head 1.3; access; symbols pkgsrc-2017Q3:1.2.0.56 pkgsrc-2017Q3-base:1.2 pkgsrc-2017Q2:1.2.0.52 pkgsrc-2017Q2-base:1.2 pkgsrc-2017Q1:1.2.0.50 pkgsrc-2017Q1-base:1.2 pkgsrc-2016Q4:1.2.0.48 pkgsrc-2016Q4-base:1.2 pkgsrc-2016Q3:1.2.0.46 pkgsrc-2016Q3-base:1.2 pkgsrc-2016Q2:1.2.0.44 pkgsrc-2016Q2-base:1.2 pkgsrc-2016Q1:1.2.0.42 pkgsrc-2016Q1-base:1.2 pkgsrc-2015Q4:1.2.0.40 pkgsrc-2015Q4-base:1.2 pkgsrc-2015Q3:1.2.0.38 pkgsrc-2015Q3-base:1.2 pkgsrc-2015Q2:1.2.0.36 pkgsrc-2015Q2-base:1.2 pkgsrc-2015Q1:1.2.0.34 pkgsrc-2015Q1-base:1.2 pkgsrc-2014Q4:1.2.0.32 pkgsrc-2014Q4-base:1.2 pkgsrc-2014Q3:1.2.0.30 pkgsrc-2014Q3-base:1.2 pkgsrc-2014Q2:1.2.0.28 pkgsrc-2014Q2-base:1.2 pkgsrc-2014Q1:1.2.0.26 pkgsrc-2014Q1-base:1.2 pkgsrc-2013Q4:1.2.0.24 pkgsrc-2013Q4-base:1.2 pkgsrc-2013Q3:1.2.0.22 pkgsrc-2013Q3-base:1.2 pkgsrc-2013Q2:1.2.0.20 pkgsrc-2013Q2-base:1.2 pkgsrc-2013Q1:1.2.0.18 pkgsrc-2013Q1-base:1.2 pkgsrc-2012Q4:1.2.0.16 pkgsrc-2012Q4-base:1.2 pkgsrc-2012Q3:1.2.0.14 pkgsrc-2012Q3-base:1.2 pkgsrc-2012Q2:1.2.0.12 pkgsrc-2012Q2-base:1.2 pkgsrc-2012Q1:1.2.0.10 pkgsrc-2012Q1-base:1.2 pkgsrc-2011Q4:1.2.0.8 pkgsrc-2011Q4-base:1.2 pkgsrc-2011Q3:1.2.0.6 pkgsrc-2011Q3-base:1.2 pkgsrc-2011Q2:1.2.0.4 pkgsrc-2011Q2-base:1.2 pkgsrc-2011Q1:1.2.0.2 pkgsrc-2011Q1-base:1.2 pkgsrc-2010Q4:1.1.0.6 pkgsrc-2010Q4-base:1.1 pkgsrc-2010Q3:1.1.0.4 pkgsrc-2010Q3-base:1.1 pkgsrc-2010Q2:1.1.0.2 pkgsrc-2010Q2-base:1.1; locks; strict; comment @# @; 1.3 date 2017.09.26.10.27.02; author wiz; state dead; branches; next 1.2; commitid 9ARpkXTuh9Wg2H8A; 1.2 date 2011.02.06.17.35.05; author wiz; state Exp; branches; next 1.1; 1.1 date 2010.06.13.22.44.29; author wiz; state Exp; branches; next ; desc @@ 1.3 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-aa,v 1.2 2011/02/06 17:35:05 wiz Exp $ Fix build with png-1.5. --- digikam/libs/dimg/loaders/pngloader.cpp.orig 2009-07-03 05:19:41.000000000 +0000 +++ digikam/libs/dimg/loaders/pngloader.cpp @@@@ -120,7 +120,7 @@@@ bool PNGLoader::load(const QString& file // PNG error handling. If an error occurs during reading, libpng // will jump here - if (setjmp(png_ptr->jmpbuf)) + if (setjmp(png_jmpbuf(png_ptr))) { DDebug() << k_funcinfo << "Internal libPNG error during reading file. Process aborted!" << endl; png_destroy_read_struct(&png_ptr, &info_ptr, NULL); @@@@ -252,7 +252,7 @@@@ bool PNGLoader::load(const QString& file #ifdef ENABLE_DEBUG_MESSAGES DDebug() << "PNG in PNG_COLOR_TYPE_GRAY" << endl; #endif - png_set_gray_1_2_4_to_8(png_ptr); + png_set_expand_gray_1_2_4_to_8(png_ptr); png_set_gray_to_rgb(png_ptr); if (QImage::systemByteOrder() == QImage::LittleEndian) // Intel @@@@ -403,7 +403,8 @@@@ bool PNGLoader::load(const QString& file QMap& metaData = imageMetaData(); - png_charp profile_name, profile_data=NULL; + png_charp profile_name; + png_bytep profile_data=NULL; png_uint_32 profile_size; int compression_type; @@@@ -526,7 +527,7 @@@@ bool PNGLoader::save(const QString& file // PNG error handling. If an error occurs during writing, libpng // will jump here - if (setjmp(png_ptr->jmpbuf)) + if (setjmp(png_jmpbuf(png_ptr))) { DDebug() << k_funcinfo << "Internal libPNG error during writing file. Process aborted!" << endl; fclose(f); @@@@ -599,7 +600,7 @@@@ bool PNGLoader::save(const QString& file if (!profile_rawdata.isEmpty()) { - png_set_iCCP(png_ptr, info_ptr, (png_charp)"icc", PNG_COMPRESSION_TYPE_BASE, profile_rawdata.data(), profile_rawdata.size()); + png_set_iCCP(png_ptr, info_ptr, (png_charp)"icc", PNG_COMPRESSION_TYPE_BASE, (png_bytep)profile_rawdata.data(), profile_rawdata.size()); } // ------------------------------------------------------------------- @ 1.2 log @Fix build with png-1.5. @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.1 2010/06/13 22:44:29 wiz Exp $ @ 1.1 log @Bump PKGREVISION for libpng shlib name change. Also add some patches to remove use of deprecated symbols and fix other problems when looking for or compiling against libpng-1.4.x. @ text @d1 3 a3 1 $NetBSD$ d7 9 d25 28 @