aboutsummaryrefslogtreecommitdiff
path: root/graphics/digikam-kde4/files
diff options
context:
space:
mode:
authorAlex Dupre <ale@FreeBSD.org>2008-10-12 17:03:58 +0000
committerAlex Dupre <ale@FreeBSD.org>2008-10-12 17:03:58 +0000
commit69ed67684210d0771adcd69e4cd039e68a53f56b (patch)
tree8795253d12377e005a3b3cb71c1a397edc4afed0 /graphics/digikam-kde4/files
parentfab5affbe22b01dd8170ebf6ea0ad389dce18ffa (diff)
downloadports-69ed67684210d0771adcd69e4cd039e68a53f56b.tar.gz
ports-69ed67684210d0771adcd69e4cd039e68a53f56b.zip
Notes
Diffstat (limited to 'graphics/digikam-kde4/files')
-rw-r--r--graphics/digikam-kde4/files/patch-digikam_digikam_albumfiletip.cpp20
-rw-r--r--graphics/digikam-kde4/files/patch-digikam_digikam_albumiconview.cpp18
-rw-r--r--graphics/digikam-kde4/files/patch-digikam_digikam_albumsettings.cpp20
-rw-r--r--graphics/digikam-kde4/files/patch-digikam_digikam_digikamapp.cpp34
-rw-r--r--graphics/digikam-kde4/files/patch-digikam_digikam_main.cpp28
-rw-r--r--graphics/digikam-kde4/files/patch-digikam_digikam_scanlib.cpp10
-rw-r--r--graphics/digikam-kde4/files/patch-digikam_kioslave_digikamalbums.cpp20
-rw-r--r--graphics/digikam-kde4/files/patch-digikam_kioslave_digikamthumbnail.cpp19
-rw-r--r--graphics/digikam-kde4/files/patch-digikam_libs_dialogs_imagedialog.cpp33
-rw-r--r--graphics/digikam-kde4/files/patch-digikam_libs_dialogs_rawcameradlg.cpp30
-rw-r--r--graphics/digikam-kde4/files/patch-digikam_libs_dimg_dimg.cpp19
-rw-r--r--graphics/digikam-kde4/files/patch-digikam_libs_imageproperties_imagepropertiestab.cpp20
-rw-r--r--graphics/digikam-kde4/files/patch-digikam_libs_thumbbar_thumbbar.cpp20
-rw-r--r--graphics/digikam-kde4/files/patch-digikam_showfoto_main.cpp28
-rw-r--r--graphics/digikam-kde4/files/patch-digikam_showfoto_showfoto.cpp36
-rw-r--r--graphics/digikam-kde4/files/patch-digikam_utilities_cameragui_cameraui.cpp28
-rw-r--r--graphics/digikam-kde4/files/patch-digikam_utilities_lighttable_lighttablewindow.cpp18
17 files changed, 396 insertions, 5 deletions
diff --git a/graphics/digikam-kde4/files/patch-digikam_digikam_albumfiletip.cpp b/graphics/digikam-kde4/files/patch-digikam_digikam_albumfiletip.cpp
new file mode 100644
index 000000000000..58621ce26eb8
--- /dev/null
+++ b/graphics/digikam-kde4/files/patch-digikam_digikam_albumfiletip.cpp
@@ -0,0 +1,20 @@
+--- digikam/digikam/albumfiletip.cpp.orig 2008-10-12 15:02:22.000000000 +0200
++++ digikam/digikam/albumfiletip.cpp 2008-10-12 15:02:50.000000000 +0200
+@@ -48,7 +48,7 @@
+
+ // LibKDcraw includes.
+
+-#include <libkdcraw/dcrawbinary.h>
++#include <libkdcraw/kdcraw.h>
+
+ // Local includes.
+
+@@ -366,7 +366,7 @@ void AlbumFileTip::updateText()
+ }
+
+ QSize dims;
+- QString rawFilesExt(KDcrawIface::DcrawBinary::instance()->rawFiles());
++ QString rawFilesExt(KDcrawIface::KDcraw::rawFiles());
+ QString ext = fileInfo.extension(false).upper();
+
+ if (!ext.isEmpty() && rawFilesExt.upper().contains(ext))
diff --git a/graphics/digikam-kde4/files/patch-digikam_digikam_albumiconview.cpp b/graphics/digikam-kde4/files/patch-digikam_digikam_albumiconview.cpp
new file mode 100644
index 000000000000..71dd220e1956
--- /dev/null
+++ b/graphics/digikam-kde4/files/patch-digikam_digikam_albumiconview.cpp
@@ -0,0 +1,18 @@
+--- digikam/digikam/albumiconview.cpp.orig 2008-10-12 15:01:31.000000000 +0200
++++ digikam/digikam/albumiconview.cpp 2008-10-12 15:02:03.000000000 +0200
+@@ -96,7 +96,6 @@ extern "C"
+
+ // LibKDcraw includes.
+
+-#include <libkdcraw/dcrawbinary.h>
+
+ // Local includes.
+
+@@ -1098,7 +1097,6 @@ void AlbumIconView::slotDisplayItem(Albu
+ QString imagefilter = settings->getImageFileFilter().lower() +
+ settings->getImageFileFilter().upper();
+
+- if (KDcrawIface::DcrawBinary::instance()->versionIsRight())
+ {
+ // add raw files only if dcraw is available
+ imagefilter += settings->getRawFileFilter().lower() +
diff --git a/graphics/digikam-kde4/files/patch-digikam_digikam_albumsettings.cpp b/graphics/digikam-kde4/files/patch-digikam_digikam_albumsettings.cpp
new file mode 100644
index 000000000000..cbce4b610719
--- /dev/null
+++ b/graphics/digikam-kde4/files/patch-digikam_digikam_albumsettings.cpp
@@ -0,0 +1,20 @@
+--- digikam/digikam/albumsettings.cpp.orig 2008-10-12 15:02:59.000000000 +0200
++++ digikam/digikam/albumsettings.cpp 2008-10-12 15:03:20.000000000 +0200
+@@ -36,7 +36,7 @@
+
+ // LibKDcraw includes.
+
+-#include <libkdcraw/dcrawbinary.h>
++#include <libkdcraw/kdcraw.h>
+
+ // Local includes.
+
+@@ -184,7 +184,7 @@ void AlbumSettings::init()
+
+ // RAW files estentions supported by dcraw program and
+ // defines to digikam/libs/dcraw/rawfiles.h
+- d->defaultRawFilefilter = QString(KDcrawIface::DcrawBinary::instance()->rawFiles());
++ d->defaultRawFilefilter = QString(KDcrawIface::KDcraw::rawFiles());
+
+ d->imageFilefilter = d->defaultImageFilefilter;
+ d->movieFilefilter = d->defaultMovieFilefilter;
diff --git a/graphics/digikam-kde4/files/patch-digikam_digikam_digikamapp.cpp b/graphics/digikam-kde4/files/patch-digikam_digikam_digikamapp.cpp
new file mode 100644
index 000000000000..263bcac94ed8
--- /dev/null
+++ b/graphics/digikam-kde4/files/patch-digikam_digikam_digikamapp.cpp
@@ -0,0 +1,34 @@
+--- digikam/digikam/digikamapp.cpp.orig 2008-10-12 14:53:14.000000000 +0200
++++ digikam/digikam/digikamapp.cpp 2008-10-12 14:55:23.000000000 +0200
+@@ -62,7 +62,6 @@
+
+ // LibKDcraw includes.
+
+-#include <libkdcraw/dcrawbinary.h>
+
+ // Local includes.
+
+@@ -163,7 +162,6 @@ DigikamApp::DigikamApp()
+ if(d->splashScreen)
+ d->splashScreen->message(i18n("Checking dcraw version"), AlignLeft, white);
+
+- KDcrawIface::DcrawBinary::instance()->checkSystem();
+
+ if(d->splashScreen)
+ d->splashScreen->message(i18n("Scan Albums"), AlignLeft, white);
+@@ -221,7 +219,6 @@ DigikamApp::~DigikamApp()
+
+ ImageAttributesWatch::cleanUp();
+ LoadingCacheInterface::cleanUp();
+- KDcrawIface::DcrawBinary::cleanUp();
+ AlbumThumbnailLoader::cleanUp();
+
+ m_instance = 0;
+@@ -276,7 +273,6 @@ void DigikamApp::show()
+ }
+
+ // Report errors from dcraw detection.
+- KDcrawIface::DcrawBinary::instance()->checkReport();
+
+ // Init album icon view zoom factor.
+ slotThumbSizeChanged(d->albumSettings->getDefaultIconSize());
diff --git a/graphics/digikam-kde4/files/patch-digikam_digikam_main.cpp b/graphics/digikam-kde4/files/patch-digikam_digikam_main.cpp
new file mode 100644
index 000000000000..64915434d2dc
--- /dev/null
+++ b/graphics/digikam-kde4/files/patch-digikam_digikam_main.cpp
@@ -0,0 +1,28 @@
+--- digikam/digikam/main.cpp.orig 2008-10-12 14:55:41.000000000 +0200
++++ digikam/digikam/main.cpp 2008-10-12 15:00:03.000000000 +0200
+@@ -58,7 +58,6 @@
+ // Libkdcraw includes.
+
+ #include <libkdcraw/kdcraw.h>
+-#include <libkdcraw/dcrawbinary.h>
+
+ // C Ansi includes.
+
+@@ -84,7 +83,7 @@ static KCmdLineOptions options[] =
+
+ int main(int argc, char *argv[])
+ {
+- QString DcrawVer = KDcrawIface::DcrawBinary::internalVersion();
++ QString DcrawVer = KDcrawIface::KDcraw::librawVersion();
+
+ QString Exiv2Ver = KExiv2Iface::KExiv2::Exiv2Version();
+
+@@ -112,8 +111,8 @@ int main(int argc, char *argv[])
+ QString("\n") +
+ QString(I18N_NOOP("Using KDcraw library version %1")).arg(KDcrawIface::KDcraw::version()) +
+ QString("\n") +
+- QString(I18N_NOOP("Using Dcraw program version %1")).arg(DcrawVer) +
++ QString(I18N_NOOP("Using LibRaw library version %1")).arg(DcrawVer) +
+ QString("\n") +
+ QString(I18N_NOOP("Using PNG library version %1")).arg(PNG_LIBPNG_VER_STRING) +
+ QString("\n") +
diff --git a/graphics/digikam-kde4/files/patch-digikam_digikam_scanlib.cpp b/graphics/digikam-kde4/files/patch-digikam_digikam_scanlib.cpp
index 04c1843669e2..a80ded1fbe8e 100644
--- a/graphics/digikam-kde4/files/patch-digikam_digikam_scanlib.cpp
+++ b/graphics/digikam-kde4/files/patch-digikam_digikam_scanlib.cpp
@@ -1,6 +1,6 @@
---- digikam/digikam/scanlib.cpp.orig Tue Apr 11 13:48:55 2006
-+++ digikam/digikam/scanlib.cpp Tue Apr 11 13:50:28 2006
-@@ -260,7 +260,7 @@
+--- digikam/digikam/scanlib.cpp.orig 2008-07-16 21:05:55.000000000 +0200
++++ digikam/digikam/scanlib.cpp 2008-10-12 09:57:53.000000000 +0200
+@@ -299,7 +299,7 @@
int items = 0;
QDir dir( directory );
@@ -9,12 +9,12 @@
return 0;
const QFileInfoList *list = dir.entryInfoList();
-@@ -287,7 +287,7 @@
+@@ -326,7 +326,7 @@
void ScanLib::allFiles(const QString& directory)
{
QDir dir( directory );
- if ( !dir.exists() or !dir.isReadable() )
+ if ( !dir.exists() || !dir.isReadable() )
{
- kdWarning() << "Folder does not exist or is not readable: "
+ DWarning() << "Folder does not exist or is not readable: "
<< directory << endl;
diff --git a/graphics/digikam-kde4/files/patch-digikam_kioslave_digikamalbums.cpp b/graphics/digikam-kde4/files/patch-digikam_kioslave_digikamalbums.cpp
new file mode 100644
index 000000000000..c6a9fd200db8
--- /dev/null
+++ b/graphics/digikam-kde4/files/patch-digikam_kioslave_digikamalbums.cpp
@@ -0,0 +1,20 @@
+--- digikam/kioslave/digikamalbums.cpp.orig 2008-10-12 14:51:40.000000000 +0200
++++ digikam/kioslave/digikamalbums.cpp 2008-10-12 14:52:08.000000000 +0200
+@@ -72,7 +72,7 @@ extern "C"
+
+ // LibKDcraw includes.
+
+-#include <libkdcraw/dcrawbinary.h>
++#include <libkdcraw/kdcraw.h>
+
+ // Local includes.
+
+@@ -269,7 +269,7 @@ void kio_digikamalbums::special(const QB
+ if (getDimensions)
+ {
+ QFileInfo fileInfo(base + name);
+- QString rawFilesExt(KDcrawIface::DcrawBinary::instance()->rawFiles());
++ QString rawFilesExt(KDcrawIface::KDcraw::rawFiles());
+ QString ext = fileInfo.extension(false).upper();
+
+ if (!ext.isEmpty() && rawFilesExt.upper().contains(ext))
diff --git a/graphics/digikam-kde4/files/patch-digikam_kioslave_digikamthumbnail.cpp b/graphics/digikam-kde4/files/patch-digikam_kioslave_digikamthumbnail.cpp
new file mode 100644
index 000000000000..d73ca7a1a4b7
--- /dev/null
+++ b/graphics/digikam-kde4/files/patch-digikam_kioslave_digikamthumbnail.cpp
@@ -0,0 +1,19 @@
+--- digikam/kioslave/digikamthumbnail.cpp.orig 2008-10-12 14:52:20.000000000 +0200
++++ digikam/kioslave/digikamthumbnail.cpp 2008-10-12 14:52:51.000000000 +0200
+@@ -69,7 +69,6 @@
+
+ // LibKDcraw includes.
+
+-#include <libkdcraw/dcrawbinary.h>
+ #include <libkdcraw/kdcraw.h>
+
+ // Local includes
+@@ -264,7 +263,7 @@ bool kio_digikamthumbnailProtocol::loadB
+
+ // Else, use the right way depending of image file extension.
+ QString ext = fileInfo.extension(false).upper();
+- QString rawFilesExt(KDcrawIface::DcrawBinary::instance()->rawFiles());
++ QString rawFilesExt(KDcrawIface::KDcraw::rawFiles());
+
+ if (!ext.isEmpty())
+ {
diff --git a/graphics/digikam-kde4/files/patch-digikam_libs_dialogs_imagedialog.cpp b/graphics/digikam-kde4/files/patch-digikam_libs_dialogs_imagedialog.cpp
new file mode 100644
index 000000000000..28b76d221629
--- /dev/null
+++ b/graphics/digikam-kde4/files/patch-digikam_libs_dialogs_imagedialog.cpp
@@ -0,0 +1,33 @@
+--- digikam/libs/dialogs/imagedialog.cpp.orig 2008-10-12 14:50:22.000000000 +0200
++++ digikam/libs/dialogs/imagedialog.cpp 2008-10-12 14:51:29.000000000 +0200
+@@ -39,7 +39,7 @@
+
+ // LibKDcraw includes.
+
+-#include <libkdcraw/dcrawbinary.h>
++#include <libkdcraw/kdcraw.h>
+
+ // Local includes.
+
+@@ -267,9 +267,8 @@ ImageDialog::ImageDialog(QWidget* parent
+ QString allPictures = patternList[0];
+
+ // Add other files format witch are missing to All Images" type mime provided by KDE and remplace current.
+- if (KDcrawIface::DcrawBinary::instance()->versionIsRight())
+ {
+- allPictures.insert(allPictures.find("|"), QString(KDcrawIface::DcrawBinary::instance()->rawFiles()) + QString(" *.JPE *.TIF"));
++ allPictures.insert(allPictures.find("|"), QString(KDcrawIface::KDcraw::rawFiles()) + QString(" *.JPE *.TIF"));
+ patternList.remove(patternList[0]);
+ patternList.prepend(allPictures);
+ }
+@@ -277,9 +276,8 @@ ImageDialog::ImageDialog(QWidget* parent
+ // Added RAW file formats supported by dcraw program like a type mime.
+ // Nota: we cannot use here "image/x-raw" type mime from KDE because it uncomplete
+ // or unavailable(dcraw_0)(see file #121242 in B.K.O).
+- if (KDcrawIface::DcrawBinary::instance()->versionIsRight())
+ {
+- patternList.append(i18n("\n%1|Camera RAW files").arg(QString(KDcrawIface::DcrawBinary::instance()->rawFiles())));
++ patternList.append(i18n("\n%1|Camera RAW files").arg(QString(KDcrawIface::KDcraw::rawFiles())));
+ }
+
+ d->fileformats = patternList.join("\n");
diff --git a/graphics/digikam-kde4/files/patch-digikam_libs_dialogs_rawcameradlg.cpp b/graphics/digikam-kde4/files/patch-digikam_libs_dialogs_rawcameradlg.cpp
new file mode 100644
index 000000000000..38bcac52aa7e
--- /dev/null
+++ b/graphics/digikam-kde4/files/patch-digikam_libs_dialogs_rawcameradlg.cpp
@@ -0,0 +1,30 @@
+--- digikam/libs/dialogs/rawcameradlg.cpp.orig 2008-07-16 21:05:55.000000000 +0200
++++ digikam/libs/dialogs/rawcameradlg.cpp 2008-10-12 15:18:00.000000000 +0200
+@@ -40,7 +40,6 @@
+ // LibKDcraw includes.
+
+ #include <libkdcraw/kdcraw.h>
+-#include <libkdcraw/dcrawbinary.h>
+
+ // Local includes.
+
+@@ -77,8 +76,8 @@
+ QWidget *page = makeMainWidget();
+ QGridLayout* grid = new QGridLayout(page, 2, 2, 0, spacingHint());
+
+- QStringList list = KDcrawIface::DcrawBinary::instance()->supportedCamera();
+- QString dcrawVer = KDcrawIface::DcrawBinary::instance()->internalVersion();
++ QStringList list = KDcrawIface::KDcraw::supportedCamera();
++ QString dcrawVer = KDcrawIface::KDcraw::librawVersion();
+ QString KDcrawVer = KDcrawIface::KDcraw::version();
+
+ // --------------------------------------------------------
+@@ -95,7 +94,7 @@
+
+ QLabel *header = new QLabel(page);
+ header->setText(i18n("<p>Using KDcraw library version %1"
+- "<p>Using Dcraw program version %2"
++ "<p>Using LibRaw library version %2"
+ "<p>%3 models in the list")
+ .arg(KDcrawVer).arg(dcrawVer).arg(list.count()));
+
diff --git a/graphics/digikam-kde4/files/patch-digikam_libs_dimg_dimg.cpp b/graphics/digikam-kde4/files/patch-digikam_libs_dimg_dimg.cpp
new file mode 100644
index 000000000000..67037fc560a7
--- /dev/null
+++ b/graphics/digikam-kde4/files/patch-digikam_libs_dimg_dimg.cpp
@@ -0,0 +1,19 @@
+--- digikam/libs/dimg/dimg.cpp.orig 2008-10-12 10:03:41.000000000 +0200
++++ digikam/libs/dimg/dimg.cpp 2008-10-12 10:07:25.000000000 +0200
+@@ -42,7 +42,6 @@
+
+ // LibKDcraw includes.
+
+-#include <libkdcraw/dcrawbinary.h>
+ #include <libkdcraw/kdcraw.h>
+
+ // Local includes.
+@@ -493,7 +492,7 @@
+ return NONE;
+ }
+
+- QString rawFilesExt(KDcrawIface::DcrawBinary::instance()->rawFiles());
++ QString rawFilesExt(KDcrawIface::KDcraw::rawFiles());
+ QString ext = fileInfo.extension(false).upper();
+
+ if (!ext.isEmpty())
diff --git a/graphics/digikam-kde4/files/patch-digikam_libs_imageproperties_imagepropertiestab.cpp b/graphics/digikam-kde4/files/patch-digikam_libs_imageproperties_imagepropertiestab.cpp
new file mode 100644
index 000000000000..cb4605498e7c
--- /dev/null
+++ b/graphics/digikam-kde4/files/patch-digikam_libs_imageproperties_imagepropertiestab.cpp
@@ -0,0 +1,20 @@
+--- digikam/libs/imageproperties/imagepropertiestab.cpp.orig 2008-10-12 14:48:42.000000000 +0200
++++ digikam/libs/imageproperties/imagepropertiestab.cpp 2008-10-12 14:49:11.000000000 +0200
+@@ -42,7 +42,7 @@
+
+ // LibKDcraw includes.
+
+-#include <libkdcraw/dcrawbinary.h>
++#include <libkdcraw/kdcraw.h>
+
+ // Local includes.
+
+@@ -424,7 +424,7 @@ void ImagePropertiesTab::setCurrentURL(c
+
+ QSize dims;
+ QString compression, bitDepth, colorMode;
+- QString rawFilesExt(KDcrawIface::DcrawBinary::instance()->rawFiles());
++ QString rawFilesExt(KDcrawIface::KDcraw::rawFiles());
+ QString ext = fileInfo.extension(false).upper();
+
+ if (!ext.isEmpty() && rawFilesExt.upper().contains(ext))
diff --git a/graphics/digikam-kde4/files/patch-digikam_libs_thumbbar_thumbbar.cpp b/graphics/digikam-kde4/files/patch-digikam_libs_thumbbar_thumbbar.cpp
new file mode 100644
index 000000000000..d1c59f4fa7fb
--- /dev/null
+++ b/graphics/digikam-kde4/files/patch-digikam_libs_thumbbar_thumbbar.cpp
@@ -0,0 +1,20 @@
+--- digikam/libs/thumbbar/thumbbar.cpp.orig 2008-10-12 14:49:37.000000000 +0200
++++ digikam/libs/thumbbar/thumbbar.cpp 2008-10-12 14:50:05.000000000 +0200
+@@ -59,7 +59,7 @@ extern "C"
+
+ // LibKDcraw includes.
+
+-#include <libkdcraw/dcrawbinary.h>
++#include <libkdcraw/kdcraw.h>
+
+ // Local includes.
+
+@@ -957,7 +957,7 @@ QString ThumbBarToolTip::tipContent(Thum
+ }
+
+ QSize dims;
+- QString rawFilesExt(KDcrawIface::DcrawBinary::instance()->rawFiles());
++ QString rawFilesExt(KDcrawIface::KDcraw::rawFiles());
+ QString ext = fileInfo.extension(false).upper();
+
+ if (!ext.isEmpty() && rawFilesExt.upper().contains(ext))
diff --git a/graphics/digikam-kde4/files/patch-digikam_showfoto_main.cpp b/graphics/digikam-kde4/files/patch-digikam_showfoto_main.cpp
new file mode 100644
index 000000000000..2069051b1412
--- /dev/null
+++ b/graphics/digikam-kde4/files/patch-digikam_showfoto_main.cpp
@@ -0,0 +1,28 @@
+--- digikam/showfoto/main.cpp.orig 2008-10-12 15:05:29.000000000 +0200
++++ digikam/showfoto/main.cpp 2008-10-12 15:06:03.000000000 +0200
+@@ -45,7 +45,6 @@
+ // Libkdcraw includes.
+
+ #include <libkdcraw/kdcraw.h>
+-#include <libkdcraw/dcrawbinary.h>
+
+ // C Ansi includes.
+
+@@ -66,7 +65,7 @@ static KCmdLineOptions options[] =
+
+ int main(int argc, char *argv[])
+ {
+- QString DcrawVer = KDcrawIface::DcrawBinary::internalVersion();
++ QString DcrawVer = KDcrawIface::KDcraw::librawVersion();
+
+ QString Exiv2Ver = KExiv2Iface::KExiv2::Exiv2Version();
+
+@@ -84,7 +83,7 @@ int main(int argc, char *argv[])
+ QString("\n") +
+ QString(I18N_NOOP("Using KDcraw library version %1")).arg(KDcrawIface::KDcraw::version()) +
+ QString("\n") +
+- QString(I18N_NOOP("Using Dcraw program version %1")).arg(DcrawVer) +
++ QString(I18N_NOOP("Using LibRaw library version %1")).arg(DcrawVer) +
+ QString("\n") +
+ QString(I18N_NOOP("Using PNG library version %1")).arg(PNG_LIBPNG_VER_STRING);
+
diff --git a/graphics/digikam-kde4/files/patch-digikam_showfoto_showfoto.cpp b/graphics/digikam-kde4/files/patch-digikam_showfoto_showfoto.cpp
new file mode 100644
index 000000000000..ff44d74528be
--- /dev/null
+++ b/graphics/digikam-kde4/files/patch-digikam_showfoto_showfoto.cpp
@@ -0,0 +1,36 @@
+--- digikam/showfoto/showfoto.cpp.orig 2008-10-12 15:04:49.000000000 +0200
++++ digikam/showfoto/showfoto.cpp 2008-10-12 15:05:20.000000000 +0200
+@@ -73,7 +73,7 @@ extern "C"
+
+ // LibKDcraw includes.
+
+-#include <libkdcraw/dcrawbinary.h>
++#include <libkdcraw/kdcraw.h>
+
+ // Local includes.
+
+@@ -179,7 +179,6 @@ ShowFoto::ShowFoto(const KURL::List& url
+ if(d->splash)
+ d->splash->message(i18n("Checking dcraw version"), AlignLeft, white);
+
+- KDcrawIface::DcrawBinary::instance()->checkSystem();
+
+ // Populate Themes
+
+@@ -370,7 +369,6 @@ void ShowFoto::show()
+
+ // Report errors from dcraw detection.
+
+- KDcrawIface::DcrawBinary::instance()->checkReport();
+ }
+
+ void ShowFoto::setupConnections()
+@@ -832,7 +830,7 @@ void ShowFoto::openFolder(const KURL& ur
+ // Added RAW files estentions supported by dcraw program and
+ // defines to digikam/libs/dcraw/rawfiles.h
+ filter.append (" ");
+- filter.append ( QString(KDcrawIface::DcrawBinary::instance()->rawFiles()) );
++ filter.append ( QString(KDcrawIface::KDcraw::rawFiles()) );
+ filter.append (" ");
+
+ QString patterns = filter.lower();
diff --git a/graphics/digikam-kde4/files/patch-digikam_utilities_cameragui_cameraui.cpp b/graphics/digikam-kde4/files/patch-digikam_utilities_cameragui_cameraui.cpp
new file mode 100644
index 000000000000..82bbc0e1beaf
--- /dev/null
+++ b/graphics/digikam-kde4/files/patch-digikam_utilities_cameragui_cameraui.cpp
@@ -0,0 +1,28 @@
+--- digikam/utilities/cameragui/cameraui.cpp.orig 2008-10-12 15:04:12.000000000 +0200
++++ digikam/utilities/cameragui/cameraui.cpp 2008-10-12 15:04:41.000000000 +0200
+@@ -76,7 +76,7 @@
+
+ // LibKDcraw includes.
+
+-#include <libkdcraw/dcrawbinary.h>
++#include <libkdcraw/kdcraw.h>
+
+ // Local includes.
+
+@@ -944,14 +944,14 @@ void CameraUI::slotUpload()
+ QString allPictures = patternList[0];
+
+ // Add RAW file format to All Images" type mime and remplace current.
+- allPictures.insert(allPictures.find("|"), QString(KDcrawIface::DcrawBinary::instance()->rawFiles()));
++ allPictures.insert(allPictures.find("|"), QString(KDcrawIface::KDcraw::rawFiles()));
+ patternList.remove(patternList[0]);
+ patternList.prepend(allPictures);
+
+ // Added RAW file formats supported by dcraw program like a type mime.
+ // Nota: we cannot use here "image/x-raw" type mime from KDE because it uncomplete
+ // or unavailable(dcraw_0)(see file #121242 in B.K.O).
+- patternList.append(QString("\n%1|Camera RAW files").arg(QString(KDcrawIface::DcrawBinary::instance()->rawFiles())));
++ patternList.append(QString("\n%1|Camera RAW files").arg(QString(KDcrawIface::KDcraw::rawFiles())));
+
+ fileformats = patternList.join("\n");
+
diff --git a/graphics/digikam-kde4/files/patch-digikam_utilities_lighttable_lighttablewindow.cpp b/graphics/digikam-kde4/files/patch-digikam_utilities_lighttable_lighttablewindow.cpp
new file mode 100644
index 000000000000..c9475220dc4b
--- /dev/null
+++ b/graphics/digikam-kde4/files/patch-digikam_utilities_lighttable_lighttablewindow.cpp
@@ -0,0 +1,18 @@
+--- digikam/utilities/lighttable/lighttablewindow.cpp.orig 2008-10-12 15:03:34.000000000 +0200
++++ digikam/utilities/lighttable/lighttablewindow.cpp 2008-10-12 15:03:58.000000000 +0200
+@@ -40,7 +40,6 @@
+
+ // LibKDcraw includes.
+
+-#include <libkdcraw/dcrawbinary.h>
+
+ // Local includes.
+
+@@ -575,7 +574,6 @@ void LightTableWindow::loadImageInfos(co
+ QString imagefilter = settings->getImageFileFilter().lower() +
+ settings->getImageFileFilter().upper();
+
+- if (KDcrawIface::DcrawBinary::instance()->versionIsRight())
+ {
+ // add raw files only if dcraw is available
+ imagefilter += settings->getRawFileFilter().lower() +