Fix build with new libkdcraw release.

8 files changed, 139 insertions, 1 deletions

diff --git a/graphics/kipi-plugins/Makefile b/graphics/kipi-plugins/Makefile
index 3af95e98a342..3043bcd6d76c 100644
--- a/graphics/kipi-plugins/Makefile
+++ b/graphics/kipi-plugins/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	kipi-plugins
 PORTVERSION=	0.1.5
-PORTREVISION=	3
+PORTREVISION=	4
 PORTEPOCH=	1
 CATEGORIES=	graphics kde
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
diff --git a/graphics/kipi-plugins/files/patch-kipi-plugins_imageviewer_texture.cpp b/graphics/kipi-plugins/files/patch-kipi-plugins_imageviewer_texture.cpp
new file mode 100644
index 000000000000..d96b063b7b5c
--- /dev/null
+++ b/graphics/kipi-plugins/files/patch-kipi-plugins_imageviewer_texture.cpp
@@ -0,0 +1,19 @@
+--- kipi-plugins/imageviewer/texture.cpp.orig	2008-10-12 10:08:40.000000000 +0200
++++ kipi-plugins/imageviewer/texture.cpp	2008-10-12 10:09:00.000000000 +0200
+@@ -28,7 +28,6 @@
+ #include <kdebug.h>
+ 
+ // LibKDcraw includes
+-#include <libkdcraw/dcrawbinary.h>
+ #include <libkdcraw/kdcraw.h>
+ 
+ // Local includes
+@@ -89,7 +88,7 @@
+ 	_texnr=tn;
+ 
+ 	// check if its a RAW file.
+-	QString rawFilesExt(KDcrawIface::DcrawBinary::instance()->rawFiles());
++	QString rawFilesExt(KDcrawIface::KDcraw::rawFiles());
+ 	QFileInfo fileInfo(fn);
+ 	if (rawFilesExt.upper().contains( fileInfo.extension(false).upper() )) {
+ 		// it's a RAW file, use the libkdcraw loader
diff --git a/graphics/kipi-plugins/files/patch-kipi-plugins_jpeglossless_utils.cpp b/graphics/kipi-plugins/files/patch-kipi-plugins_jpeglossless_utils.cpp
new file mode 100644
index 000000000000..35ba113ecd49
--- /dev/null
+++ b/graphics/kipi-plugins/files/patch-kipi-plugins_jpeglossless_utils.cpp
@@ -0,0 +1,20 @@
+--- ./kipi-plugins/jpeglossless/utils.cpp.orig	2008-10-12 10:10:46.000000000 +0200
++++ ./kipi-plugins/jpeglossless/utils.cpp	2008-10-12 10:11:24.000000000 +0200
+@@ -57,7 +57,7 @@
+ 
+ // LibKDcraw includes.
+ 
+-#include <libkdcraw/dcrawbinary.h>
++#include <libkdcraw/kdcraw.h>
+ 
+ // Local includes.
+ 
+@@ -187,7 +187,7 @@
+ 
+ bool Utils::isRAW(const QString& file)
+ {
+-    QString rawFilesExt(KDcrawIface::DcrawBinary::instance()->rawFiles());
++    QString rawFilesExt(KDcrawIface::KDcraw::rawFiles());
+ 
+     QFileInfo fileInfo(file);
+     if (rawFilesExt.upper().contains( fileInfo.extension(false).upper() ))
diff --git a/graphics/kipi-plugins/files/patch-kipi-plugins_printwizard_tphoto.cpp b/graphics/kipi-plugins/files/patch-kipi-plugins_printwizard_tphoto.cpp
new file mode 100644
index 000000000000..773d8b22401a
--- /dev/null
+++ b/graphics/kipi-plugins/files/patch-kipi-plugins_printwizard_tphoto.cpp
@@ -0,0 +1,19 @@
+--- ./kipi-plugins/printwizard/tphoto.cpp.orig	2008-10-12 10:14:50.000000000 +0200
++++ ./kipi-plugins/printwizard/tphoto.cpp	2008-10-12 10:15:08.000000000 +0200
+@@ -40,7 +40,6 @@
+ 
+ // LibKDcraw includes.
+ 
+-#include <libkdcraw/dcrawbinary.h>
+ #include <libkdcraw/kdcraw.h>
+ 
+ 
+@@ -103,7 +102,7 @@
+   QImage photo;
+ 
+   // Check if RAW file.
+-  QString rawFilesExt(KDcrawIface::DcrawBinary::instance()->rawFiles());
++  QString rawFilesExt(KDcrawIface::KDcraw::rawFiles());
+   QFileInfo fileInfo(filename.path());
+   if (rawFilesExt.upper().contains( fileInfo.extension(false).upper() ))
+     KDcrawIface::KDcraw::loadDcrawPreview(photo, filename.path());
diff --git a/graphics/kipi-plugins/files/patch-kipi-plugins_rawconverter_rawconverter.cpp b/graphics/kipi-plugins/files/patch-kipi-plugins_rawconverter_rawconverter.cpp
new file mode 100644
index 000000000000..ac7cdd9ece79
--- /dev/null
+++ b/graphics/kipi-plugins/files/patch-kipi-plugins_rawconverter_rawconverter.cpp
@@ -0,0 +1,31 @@
+--- ./kipi-plugins/rawconverter/plugin_rawconverter.cpp.orig	2008-10-12 10:15:43.000000000 +0200
++++ ./kipi-plugins/rawconverter/plugin_rawconverter.cpp	2008-10-12 10:18:27.000000000 +0200
+@@ -53,7 +53,7 @@
+ 
+ // LibKDcraw includes.
+ 
+-#include <libkdcraw/dcrawbinary.h>
++#include <libkdcraw/kdcraw.h>
+ 
+ // Local includes.
+ 
+@@ -116,7 +116,7 @@
+ 
+ bool Plugin_RawConverter::isRAWFile(const QString& filePath)
+ {
+-    QString rawFilesExt(KDcrawIface::DcrawBinary::instance()->rawFiles());
++    QString rawFilesExt(KDcrawIface::KDcraw::rawFiles());
+ 
+     QFileInfo fileInfo(filePath);
+     if (rawFilesExt.upper().contains( fileInfo.extension(false).upper() ))
+@@ -127,9 +127,7 @@
+ 
+ bool Plugin_RawConverter::checkBinaries()
+ {
+-    KDcrawIface::DcrawBinary::instance()->checkSystem();
+-    KDcrawIface::DcrawBinary::instance()->checkReport();
+-    return KDcrawIface::DcrawBinary::instance()->isAvailable();
++    return true;
+ }
+ 
+ void Plugin_RawConverter::slotActivateSingle()
diff --git a/graphics/kipi-plugins/files/patch-kipi-plugins_rawconverter_rawdecodingiface.cpp b/graphics/kipi-plugins/files/patch-kipi-plugins_rawconverter_rawdecodingiface.cpp
new file mode 100644
index 000000000000..28de4caad4ff
--- /dev/null
+++ b/graphics/kipi-plugins/files/patch-kipi-plugins_rawconverter_rawdecodingiface.cpp
@@ -0,0 +1,11 @@
+--- kipi-plugins/rawconverter/rawdecodingiface.cpp.orig	2008-10-12 10:28:10.000000000 +0200
++++ kipi-plugins/rawconverter/rawdecodingiface.cpp	2008-10-12 10:28:31.000000000 +0200
+@@ -63,7 +63,7 @@
+ // LibKDcraw includes.
+ 
+ #include <libkdcraw/rawfiles.h>
+-#include <libkdcraw/dcrawbinary.h>
++#include <libkdcraw/kdcraw.h>
+ 
+ // Local includes.
+ 
diff --git a/graphics/kipi-plugins/files/patch-kipi-plugins_sendimages_sendimages.cpp b/graphics/kipi-plugins/files/patch-kipi-plugins_sendimages_sendimages.cpp
new file mode 100644
index 000000000000..8ff1e2eed481
--- /dev/null
+++ b/graphics/kipi-plugins/files/patch-kipi-plugins_sendimages_sendimages.cpp
@@ -0,0 +1,19 @@
+--- ./kipi-plugins/sendimages/sendimages.cpp.orig	2008-10-12 10:11:59.000000000 +0200
++++ ./kipi-plugins/sendimages/sendimages.cpp	2008-10-12 10:12:19.000000000 +0200
+@@ -59,7 +59,6 @@
+ 
+ // LibKDcraw includes.
+ 
+-#include <libkdcraw/dcrawbinary.h>
+ #include <libkdcraw/kdcraw.h>
+ 
+ // Local includes.
+@@ -789,7 +788,7 @@
+     QImage img;
+ 
+     // Check if RAW file.
+-    QString rawFilesExt(KDcrawIface::DcrawBinary::instance()->rawFiles());
++    QString rawFilesExt(KDcrawIface::KDcraw::rawFiles());
+     QFileInfo fileInfo(SourcePath);
+     if (rawFilesExt.upper().contains( fileInfo.extension(false).upper() ))
+         KDcrawIface::KDcraw::loadDcrawPreview(img, SourcePath);
diff --git a/graphics/kipi-plugins/files/patch-kipi-plugins_simpleviewerexport_simpleviewerexport.cpp b/graphics/kipi-plugins/files/patch-kipi-plugins_simpleviewerexport_simpleviewerexport.cpp
new file mode 100644
index 000000000000..d884608a7b7a
--- /dev/null
+++ b/graphics/kipi-plugins/files/patch-kipi-plugins_simpleviewerexport_simpleviewerexport.cpp
@@ -0,0 +1,19 @@
+--- ./kipi-plugins/simpleviewerexport/simpleviewerexport.cpp.orig	2008-10-12 10:13:11.000000000 +0200
++++ ./kipi-plugins/simpleviewerexport/simpleviewerexport.cpp	2008-10-12 10:13:42.000000000 +0200
+@@ -52,7 +52,6 @@
+ 
+ // LibKDcraw includes.
+ 
+-#include <libkdcraw/dcrawbinary.h>
+ #include <libkdcraw/kdcraw.h>
+ 
+ // LibKExiv2 includes.
+@@ -376,7 +375,7 @@
+             m_progressDlg->addedAction(i18n("Processing %1").arg(url.filename()), KIPI::StartingMessage);
+ 
+             // Check if RAW file.
+-            QString rawFilesExt(KDcrawIface::DcrawBinary::instance()->rawFiles());
++            QString rawFilesExt(KDcrawIface::KDcraw::rawFiles());
+             if (rawFilesExt.upper().contains( fileInfo.extension(false).upper() ))
+                 KDcrawIface::KDcraw::loadDcrawPreview(image, url.path());
+             else