3 files changed, 47 insertions, 1 deletions

diff --git a/graphics/digikam/Makefile b/graphics/digikam/Makefile
index 1bbf41121b16..99f9d3c38b8a 100644
--- a/graphics/digikam/Makefile
+++ b/graphics/digikam/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	digikam
 DISTVERSION=	0.9.3
+PORTREVISION=	1
 CATEGORIES=	graphics kde
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -19,7 +20,7 @@ LIB_DEPENDS=	tiff.4:${PORTSDIR}/graphics/tiff \
 		gphoto2.2:${PORTSDIR}/graphics/libgphoto2 \
 		kexiv2.3:${PORTSDIR}/graphics/libkexiv2 \
 		lcms.1:${PORTSDIR}/graphics/lcms \
-		kdcraw.2:${PORTSDIR}/graphics/libkdcraw \
+		kdcraw.3:${PORTSDIR}/graphics/libkdcraw \
 		png.5:${PORTSDIR}/graphics/png \
 		sqlite3.8:${PORTSDIR}/databases/sqlite3 \
 		jasper.4:${PORTSDIR}/graphics/jasper
diff --git a/graphics/digikam/files/patch-digikam_utilities_imageeditor_editor_editorwindow.cpp b/graphics/digikam/files/patch-digikam_utilities_imageeditor_editor_editorwindow.cpp
new file mode 100644
index 000000000000..2d528b387f9e
--- /dev/null
+++ b/graphics/digikam/files/patch-digikam_utilities_imageeditor_editor_editorwindow.cpp
@@ -0,0 +1,17 @@
+--- digikam/utilities/imageeditor/editor/editorwindow.cpp.orig	2008-03-15 12:21:58.000000000 +0100
++++ digikam/utilities/imageeditor/editor/editorwindow.cpp	2008-03-15 12:36:19.000000000 +0100
+@@ -885,8 +885,12 @@
+         m_IOFileSettings->rawDecodingSettings.outputColorSpace = KDcrawIface::RawDecodingSettings::SRGB;
+ 
+     m_IOFileSettings->rawDecodingSettings.sixteenBitsImage        = config->readBoolEntry("SixteenBitsImage", false);
+-    m_IOFileSettings->rawDecodingSettings.automaticColorBalance   = config->readBoolEntry("AutomaticColorBalance", true);
+-    m_IOFileSettings->rawDecodingSettings.cameraColorBalance      = config->readBoolEntry("CameraColorBalance", true);
++    if (config->readBoolEntry("CameraColorBalance", true))
++        m_IOFileSettings->rawDecodingSettings.whiteBalance        = KDcrawIface::RawDecodingSettings::CAMERA;
++    else if (config->readBoolEntry("AutomaticColorBalance", true)) 
++        m_IOFileSettings->rawDecodingSettings.whiteBalance        = KDcrawIface::RawDecodingSettings::AUTO;
++    else
++        m_IOFileSettings->rawDecodingSettings.whiteBalance        = KDcrawIface::RawDecodingSettings::NONE;
+     m_IOFileSettings->rawDecodingSettings.RGBInterpolate4Colors   = config->readBoolEntry("RGBInterpolate4Colors", false);
+     m_IOFileSettings->rawDecodingSettings.DontStretchPixels = config->readBoolEntry("DontStretchPixels", false);
+     m_IOFileSettings->rawDecodingSettings.enableNoiseReduction    = config->readBoolEntry("EnableNoiseReduction", false);
diff --git a/graphics/digikam/files/patch-digikam_utilities_setup_setupdcraw.cpp b/graphics/digikam/files/patch-digikam_utilities_setup_setupdcraw.cpp
new file mode 100644
index 000000000000..73af8e12ac4e
--- /dev/null
+++ b/graphics/digikam/files/patch-digikam_utilities_setup_setupdcraw.cpp
@@ -0,0 +1,28 @@
+--- digikam/utilities/setup/setupdcraw.cpp.orig	2008-03-15 13:24:50.000000000 +0100
++++ digikam/utilities/setup/setupdcraw.cpp	2008-03-15 13:32:56.000000000 +0100
+@@ -89,8 +89,8 @@
+     KConfig* config = kapp->config();
+     config->setGroup("ImageViewer Settings");
+     config->writeEntry("SixteenBitsImage", d->dcrawSettings->sixteenBits());
+-    config->writeEntry("CameraColorBalance", d->dcrawSettings->useCameraWB());
+-    config->writeEntry("AutomaticColorBalance", d->dcrawSettings->useAutoColorBalance());
++    config->writeEntry("CameraColorBalance", d->dcrawSettings->whiteBalance() == KDcrawIface::RawDecodingSettings::CAMERA);
++    config->writeEntry("AutomaticColorBalance", d->dcrawSettings->whiteBalance() == KDcrawIface::RawDecodingSettings::AUTO);
+     config->writeEntry("RGBInterpolate4Colors", d->dcrawSettings->useFourColor());
+     config->writeEntry("DontStretchPixels", d->dcrawSettings->useDontStretchPixels());
+     config->writeEntry("EnableNoiseReduction", d->dcrawSettings->useNoiseReduction());
+@@ -116,8 +116,12 @@
+     d->dcrawSettings->setcaBlueMultiplier(config->readDoubleNumEntry("caBlueMultiplier", 1.0));
+     d->dcrawSettings->setDontStretchPixels(config->readBoolEntry("DontStretchPixels", false));
+     d->dcrawSettings->setUnclipColor(config->readNumEntry("UnclipColors", 0));
+-    d->dcrawSettings->setCameraWB(config->readBoolEntry("CameraColorBalance", true));
+-    d->dcrawSettings->setAutoColorBalance(config->readBoolEntry("AutomaticColorBalance", true));
++    if (config->readBoolEntry("CameraColorBalance", true))
++        d->dcrawSettings->setWhiteBalance(KDcrawIface::RawDecodingSettings::CAMERA);
++    else if (config->readBoolEntry("AutomaticColorBalance", true))
++        d->dcrawSettings->setWhiteBalance(KDcrawIface::RawDecodingSettings::AUTO);
++    else
++        d->dcrawSettings->setWhiteBalance(KDcrawIface::RawDecodingSettings::NONE);
+     d->dcrawSettings->setFourColor(config->readBoolEntry("RGBInterpolate4Colors", false));
+     d->dcrawSettings->setQuality((KDcrawIface::RawDecodingSettings::DecodingQuality)
+                                   config->readNumEntry("RAWQuality",