- up to 1.2.0

Changed files:
    digikam-libpng.patch -> 1.2
    digikam.spec -> 1.119

diff --git a/digikam-libpng.patch b/digikam-libpng.patch
deleted file mode 100644 (file)
index 6d9af2a..0000000
--- a/digikam-libpng.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-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);

diff --git a/digikam.spec b/digikam.spec
index 178bf9e5a1c2d801b3fa17abfa02a8f92af096fe..545ca0175c6502b1cb77e3ec7e7f8aa051a92949 100644 (file)
--- a/digikam.spec
+++ b/digikam.spec
@@ -5,15 +5,14 @@
 Summary:       A KDE frontend for gphoto2
 Summary(pl.UTF-8):     Interfejs KDE do gphoto2
 Name:          digikam
-Version:       1.1.0
-Release:       4
+Version:       1.2.0
+Release:       1
 License:       GPL
 Group:         X11/Applications/Graphics
 Source0:       http://dl.sourceforge.net/digikam/%{name}-%{version}.tar.bz2
-# Source0-md5: 94a536e7387325c7b73ab2ac7b0a9a62
+# Source0-md5: 8f68022008cf1650924cc8688f176572
 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}
@@ -65,7 +64,6 @@ Interfejs KDE do gphoto2 - pliki nagłówkowe.
 %prep
 %setup -q
 %patch0 -p0
-%patch1 -p1
 
 %build
 # explicitely remove hne language support (re-add when glibc supports it)