Author: arekm Date: Fri Jan 29 20:18:55 2010 GMT Module: packages Tag: HEAD ---- Log message: - rel 3; libpng fix
---- Files affected: packages/digikam: digikam.spec (1.112 -> 1.113) , digikam-libpng.patch (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: packages/digikam/digikam.spec diff -u packages/digikam/digikam.spec:1.112 packages/digikam/digikam.spec:1.113 --- packages/digikam/digikam.spec:1.112 Fri Jan 29 20:59:51 2010 +++ packages/digikam/digikam.spec Fri Jan 29 21:18:49 2010 @@ -7,13 +7,14 @@ Summary(pl.UTF-8): Interfejs KDE do gphoto2 Name: digikam Version: 1.0.0 -Release: 2 +Release: 3 License: GPL Group: X11/Applications/Graphics Source0: http://dl.sourceforge.net/digikam/%{name}-%{version}.tar.bz2 # Source0-md5: 6169deb68a3d712a0c6539b09c5f8c0c URL: http://www.digikam.org/ Patch0: %{name}-link.patch +Patch1: %{name}-libpng.patch BuildRequires: Qt3Support-devel >= %{qtver} BuildRequires: QtCore-devel >= %{qtver} BuildRequires: QtDesigner-devel >= %{qtver} @@ -61,6 +62,7 @@ %prep %setup -q %patch0 -p0 +%patch1 -p1 %build # explicitely remove hne language support (re-add when glibc supports it) @@ -153,6 +155,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.113 2010/01/29 20:18:49 arekm +- rel 3; libpng fix + Revision 1.112 2010/01/29 19:59:51 arekm - release 2 ================================================================ Index: packages/digikam/digikam-libpng.patch diff -u /dev/null packages/digikam/digikam-libpng.patch:1.1 --- /dev/null Fri Jan 29 21:18:55 2010 +++ packages/digikam/digikam-libpng.patch Fri Jan 29 21:18:49 2010 @@ -0,0 +1,42 @@ +diff -Nur digikam-1.0.0.orig/libs/dimg/loaders/pngloader.cpp digikam-1.0.0/libs/dimg/loaders/pngloader.cpp +--- digikam-1.0.0.orig/libs/dimg/loaders/pngloader.cpp 2009-12-21 11:20:36.000000000 +0200 ++++ digikam-1.0.0/libs/dimg/loaders/pngloader.cpp 2010-01-20 20:18:51.000000000 +0200 +@@ -105,7 +105,7 @@ + unsigned char buf[PNG_BYTES_TO_CHECK]; + + size_t membersRead = fread(buf, 1, PNG_BYTES_TO_CHECK, f); +- if ((membersRead != PNG_BYTES_TO_CHECK) || !png_check_sig(buf, PNG_BYTES_TO_CHECK)) ++ if ((membersRead != PNG_BYTES_TO_CHECK) || png_sig_cmp(buf, 0, PNG_BYTES_TO_CHECK)) + { + kDebug() << "Not a PNG image file."; + fclose(f); +@@ -322,7 +322,7 @@ + #ifdef ENABLE_DEBUG_MESSAGES + kDebug() << "PNG in PNG_COLOR_TYPE_GRAY"; + #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 (QSysInfo::ByteOrder == QSysInfo::LittleEndian) // Intel +diff -Nur digikam-1.0.0.orig/libs/threadimageio/thumbnailbasic.cpp digikam-1.0.0/libs/threadimageio/thumbnailbasic.cpp +--- digikam-1.0.0.orig/libs/threadimageio/thumbnailbasic.cpp 2009-12-21 11:20:45.000000000 +0200 ++++ digikam-1.0.0/libs/threadimageio/thumbnailbasic.cpp 2010-01-20 20:19:20.000000000 +0200 +@@ -137,7 +137,7 @@ + unsigned char buf[PNG_BYTES_TO_CHECK]; + + size_t itemsRead = fread(buf, 1, PNG_BYTES_TO_CHECK, f); +- if (itemsRead != 1 || !png_check_sig(buf, PNG_BYTES_TO_CHECK)) ++ if (itemsRead != 1 || png_sig_cmp(buf, 0, PNG_BYTES_TO_CHECK)) + { + fclose(f); + return qimage; +@@ -232,7 +232,7 @@ + { + png_set_gray_to_rgb(png_ptr); + if (png_get_bit_depth(png_ptr, info_ptr) < 8) +- png_set_gray_1_2_4_to_8(png_ptr); ++ png_set_expand_gray_1_2_4_to_8(png_ptr); + } + + int sizeOfUint = sizeof(unsigned int); ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/digikam/digikam.spec?r1=1.112&r2=1.113&f=u _______________________________________________ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit