[digikam] switch to lcms2, fix dkCmsTakeProfileID allocation size (kde#299886)

[nucleo]

commit b132ec3800866ec17fdec23c79d448dba966e7fe
Author: nucleo <nucleo at fedoraproject.org>
Date:   Wed May 16 01:30:59 2012 +0300

    switch to lcms2, fix dkCmsTakeProfileID allocation size (kde#299886)

 digikam-2.6.0-rc-lcms2.patch |   22 ++++++++++++++++++++++
 digikam.spec                 |   11 ++++++++++-
 2 files changed, 32 insertions(+), 1 deletions(-)
---
diff --git a/digikam-2.6.0-rc-lcms2.patch b/digikam-2.6.0-rc-lcms2.patch
new file mode 100644
index 0000000..5c35651
--- /dev/null
+++ b/digikam-2.6.0-rc-lcms2.patch
@@ -0,0 +1,22 @@
+commit 6c1db4afb98e1718fa237c6310170b5980d4af81
+Author: Francesco Riosa <francesco+kde at pnpitalia.it>
+Date:   Wed May 16 00:09:09 2012 +0200
+
+    dkCmsTakeProfileID allocate right size
+    
+    Thanks Kevin Kofler and Nucleo(Fedora) for squashing it.
+    BUG: 299886
+
+diff --git a/libs/dklcms/digikam-lcms.cpp b/libs/dklcms/digikam-lcms.cpp
+index 468eab6..f8542d6 100644
+--- a/libs/dklcms/digikam-lcms.cpp
++++ b/libs/dklcms/digikam-lcms.cpp
+@@ -491,7 +491,7 @@ LCMSAPI DWORD LCMSEXPORT dkCmsTakeHeaderFlags(cmsHPROFILE hProfile)
+ 
+ LCMSAPI const BYTE* LCMSEXPORT dkCmsTakeProfileID(cmsHPROFILE hProfile)
+ {
+-    cmsUInt8Number* ProfileID = new cmsUInt8Number();
++    cmsUInt8Number* ProfileID = new cmsUInt8Number[16];
+     cmsGetHeaderProfileID(hProfile, ProfileID);
+     return static_cast<BYTE*>( ProfileID );
+ }
diff --git a/digikam.spec b/digikam.spec
index 140a9c1..8cdc5e9 100644
--- a/digikam.spec
+++ b/digikam.spec
@@ -2,7 +2,7 @@
 
 Name:	 digikam
 Version: 2.6.0
-Release: 0.8.%{?pre}%{?dist}
+Release: 0.9.%{?pre}%{?dist}
 Summary: A digital camera accessing & photo management application
 
 License: GPLv2+
@@ -23,6 +23,9 @@ Patch0: digikam-2.5.0-clapack-atlas.patch
 ## upstreamable patches
 
 ## upstream patches
+# dkCmsTakeProfileID allocate right size (kde#299886)
+# http://commits.kde.org/digikam/6c1db4afb98e1718fa237c6310170b5980d4af81
+Patch100: digikam-2.6.0-rc-lcms2.patch
 
 # for clapack, see also the clapack-atlas patch
 BuildRequires: atlas-devel
@@ -218,6 +221,9 @@ BuildArch: noarch
 
 %patch0 -p1 -b .clapack-atlas
 
+pushd core
+%patch100 -p1 -b .lcms2
+popd
 
 %build
 
@@ -505,6 +511,9 @@ update-desktop-database -q &> /dev/null
 
 
 %changelog
+* Wed May 16 2012 Alexey Kurov <nucleo at fedoraproject.org> - 2.6.0-0.9.rc
+- switch to lcms2, fix dkCmsTakeProfileID allocation size (kde#299886)
+
 * Tue May 15 2012 Alexey Kurov <nucleo at fedoraproject.org> - 2.6.0-0.8.rc
 - switch back to lcms1 for now (kde#299886)