diff options
| author | dinoex <dinoex@FreeBSD.org> | 2012-06-01 13:26:28 +0800 |
|---|---|---|
| committer | dinoex <dinoex@FreeBSD.org> | 2012-06-01 13:26:28 +0800 |
| commit | 530706893f31269bbfa303e069f2e76cbbe2fce7 (patch) | |
| tree | a8077a0d6e20d70b39e6a7fe3e57a6dafe7c7f33 /graphics/digikam | |
| parent | 9d262811a145d3e715edefd1d5d64ceac41de547 (diff) | |
| download | freebsd-ports-gnome-530706893f31269bbfa303e069f2e76cbbe2fce7.tar.gz freebsd-ports-gnome-530706893f31269bbfa303e069f2e76cbbe2fce7.tar.zst freebsd-ports-gnome-530706893f31269bbfa303e069f2e76cbbe2fce7.zip | |
- update png to 1.5.10
Diffstat (limited to 'graphics/digikam')
| -rw-r--r-- | graphics/digikam/Makefile | 5 | ||||
| -rw-r--r-- | graphics/digikam/files/patch-kioslave__digikamthumbnail.cpp | 23 | ||||
| -rw-r--r-- | graphics/digikam/files/patch-libs__dimg__loaders__pngloader.cpp | 23 |
3 files changed, 44 insertions, 7 deletions
diff --git a/graphics/digikam/Makefile b/graphics/digikam/Makefile index c2822fb780c7..a4336fd8dc5d 100644 --- a/graphics/digikam/Makefile +++ b/graphics/digikam/Makefile @@ -7,7 +7,7 @@ PORTNAME= digikam DISTVERSION= 0.9.6 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= graphics kde MASTER_SITES= SF @@ -20,7 +20,7 @@ LIB_DEPENDS= tiff.4:${PORTSDIR}/graphics/tiff \ kexiv2.5:${PORTSDIR}/graphics/libkexiv2 \ lcms.1:${PORTSDIR}/graphics/lcms \ kdcraw.4:${PORTSDIR}/graphics/libkdcraw \ - png.6:${PORTSDIR}/graphics/png \ + png15:${PORTSDIR}/graphics/png \ sqlite3.8:${PORTSDIR}/databases/sqlite3 \ jasper.4:${PORTSDIR}/graphics/jasper @@ -34,6 +34,7 @@ USE_GETTEXT= yes USE_LDCONFIG= yes INSTALLS_ICONS= yes +CFLAGS+= -I${LOCALBASE}/include/libpng15 CONFIGURE_ARGS= --without-included-sqlite3 MAN1= digitaglinktree.1 diff --git a/graphics/digikam/files/patch-kioslave__digikamthumbnail.cpp b/graphics/digikam/files/patch-kioslave__digikamthumbnail.cpp index 6309033f8f68..2f5bb7f5202c 100644 --- a/graphics/digikam/files/patch-kioslave__digikamthumbnail.cpp +++ b/graphics/digikam/files/patch-kioslave__digikamthumbnail.cpp @@ -1,6 +1,14 @@ --- digikam/kioslave/digikamthumbnail.cpp.orig 2009-07-03 07:19:41.000000000 +0200 -+++ digikam/kioslave/digikamthumbnail.cpp 2010-03-29 19:04:20.000000000 +0200 -@@ -370,7 +370,7 @@ ++++ digikam/kioslave/digikamthumbnail.cpp 2012-05-04 00:15:30.000000000 +0200 +@@ -94,6 +94,7 @@ + #include <sys/shm.h> + #include <sys/time.h> + #include <png.h> ++#include <pngpriv.h> + } + + using namespace KIO; +@@ -370,7 +371,7 @@ unsigned char buf[PNG_BYTES_TO_CHECK]; fread(buf, 1, PNG_BYTES_TO_CHECK, f); @@ -9,7 +17,16 @@ { fclose(f); return qimage; -@@ -465,7 +465,7 @@ +@@ -392,7 +393,7 @@ + return qimage; + } + +- if (setjmp(png_ptr->jmpbuf)) ++ if (setjmp(png_jmpbuf(png_ptr))) + { + png_destroy_read_struct(&png_ptr, &info_ptr, NULL); + fclose(f); +@@ -465,7 +466,7 @@ { png_set_gray_to_rgb(png_ptr); if (png_get_bit_depth(png_ptr, info_ptr) < 8) diff --git a/graphics/digikam/files/patch-libs__dimg__loaders__pngloader.cpp b/graphics/digikam/files/patch-libs__dimg__loaders__pngloader.cpp index 6e0baf03bb97..df06684da2ad 100644 --- a/graphics/digikam/files/patch-libs__dimg__loaders__pngloader.cpp +++ b/graphics/digikam/files/patch-libs__dimg__loaders__pngloader.cpp @@ -1,5 +1,5 @@ --- digikam/libs/dimg/loaders/pngloader.cpp.orig 2009-07-03 07:19:41.000000000 +0200 -+++ digikam/libs/dimg/loaders/pngloader.cpp 2010-03-29 18:35:49.000000000 +0200 ++++ digikam/libs/dimg/loaders/pngloader.cpp 2012-05-05 08:00:13.000000000 +0200 @@ -88,7 +88,11 @@ unsigned char buf[PNG_BYTES_TO_CHECK]; @@ -36,7 +36,17 @@ png_set_gray_to_rgb(png_ptr); if (QImage::systemByteOrder() == QImage::LittleEndian) // Intel -@@ -526,7 +538,11 @@ +@@ -403,7 +415,8 @@ + + QMap<int, QByteArray>& metaData = imageMetaData(); + +- png_charp profile_name, profile_data=NULL; ++ png_charp profile_name=NULL; ++ png_byte *profile_data=NULL; + png_uint_32 profile_size; + int compression_type; + +@@ -526,7 +539,11 @@ // PNG error handling. If an error occurs during writing, libpng // will jump here @@ -49,3 +59,12 @@ { DDebug() << k_funcinfo << "Internal libPNG error during writing file. Process aborted!" << endl; fclose(f); +@@ -599,7 +616,7 @@ + + 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_byte*) profile_rawdata.data(), profile_rawdata.size()); + } + + // ------------------------------------------------------------------- |