diff options
| author | wiz <wiz> | 2011-01-20 23:37:36 +0000 |
|---|---|---|
| committer | wiz <wiz> | 2011-01-20 23:37:36 +0000 |
| commit | 9e32fabd6b8f2cf3123e707e5fbe078b99130d71 (patch) | |
| tree | a60f5e90e67052ff8ac4c768af2b940b4787808f /graphics/digikam | |
| parent | fb035058a7c501e132aa07513455377f9d6a8ee8 (diff) | |
| download | pkgsrc-9e32fabd6b8f2cf3123e707e5fbe078b99130d71.tar.gz | |
Fix build with png-1.5.
Diffstat (limited to 'graphics/digikam')
| -rw-r--r-- | graphics/digikam/distinfo | 3 | ||||
| -rw-r--r-- | graphics/digikam/patches/patch-aa | 25 |
2 files changed, 27 insertions, 1 deletions
diff --git a/graphics/digikam/distinfo b/graphics/digikam/distinfo index 856b6cc54f5..b12fbaa6dd9 100644 --- a/graphics/digikam/distinfo +++ b/graphics/digikam/distinfo @@ -1,5 +1,6 @@ -$NetBSD: distinfo,v 1.33 2011/01/10 15:19:43 wiz Exp $ +$NetBSD: distinfo,v 1.34 2011/01/20 23:37:36 wiz Exp $ SHA1 (digikam-1.6.0.tar.bz2) = 7daf9606468e5a9ada55fac3a68820703adac48e RMD160 (digikam-1.6.0.tar.bz2) = b277e96a95aca2b85e42bfd614542c389c394c52 Size (digikam-1.6.0.tar.bz2) = 13243516 bytes +SHA1 (patch-aa) = 92886333220bec9135bafd0be76820982a3c32c9 diff --git a/graphics/digikam/patches/patch-aa b/graphics/digikam/patches/patch-aa new file mode 100644 index 00000000000..fb24d69dba9 --- /dev/null +++ b/graphics/digikam/patches/patch-aa @@ -0,0 +1,25 @@ +$NetBSD: patch-aa,v 1.11 2011/01/20 23:37:36 wiz Exp $ + +Fix build with png-1.5. + +--- libs/dimg/loaders/pngloader.cpp.orig 2010-11-22 17:47:36.000000000 +0000 ++++ libs/dimg/loaders/pngloader.cpp +@@ -494,7 +494,8 @@ bool PNGLoader::load(const QString& file + + if (m_loadFlags & LoadICCData) + { +- png_charp profile_name, profile_data=NULL; ++ png_charp profile_name; ++ png_bytep profile_data=NULL; + png_uint_32 profile_size; + int compression_type; + +@@ -730,7 +731,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()); + } + + // ------------------------------------------------------------------- |