Fix compile problems due to an incompatibility in error reporting,

introduced by exiv2-0.14.
Require exiv2>=0.14.
Ride on recent PKGREVISION bumps.
Approved by gdt and wiz.

5 files changed, 129 insertions, 1 deletions

diff --git a/graphics/digikam/distinfo b/graphics/digikam/distinfo
index 55bd55c3961..414ff8e5eff 100644
--- a/graphics/digikam/distinfo
+++ b/graphics/digikam/distinfo
@@ -1,6 +1,10 @@
-$NetBSD: distinfo,v 1.17 2007/03/13 10:07:03 drochner Exp $
+$NetBSD: distinfo,v 1.18 2007/04/03 09:32:08 drochner Exp $
 
 SHA1 (digikam-0.9.1.tar.bz2) = 92c9c9a943ad5a806be900758dbdc02ad94b8061
 RMD160 (digikam-0.9.1.tar.bz2) = 920cb49315dfbbe8c9944209568a8430b5e0404f
 Size (digikam-0.9.1.tar.bz2) = 6781756 bytes
 SHA1 (patch-ac) = 0b43ae33d303778f564131d7d869f178503b74f8
+SHA1 (patch-ad) = 459ba5c81d04c5956424885bd8f5f3194c1ec7f5
+SHA1 (patch-ae) = e8af5f0c15ec57349134438eb5c6bf4f98d4a531
+SHA1 (patch-af) = 1aac93622747f7d9ee6d6b29da95e1f85c335f9b
+SHA1 (patch-ag) = 6dd683c12d35b175ced66d1b8ddcdfcd67ffa9be
diff --git a/graphics/digikam/patches/patch-ad b/graphics/digikam/patches/patch-ad
new file mode 100644
index 00000000000..c149cebd0c6
--- /dev/null
+++ b/graphics/digikam/patches/patch-ad
@@ -0,0 +1,31 @@
+$NetBSD: patch-ad,v 1.1 2007/04/03 09:32:08 drochner Exp $
+
+--- digikam/libs/widgets/metadata/iptcwidget.cpp.orig	2007-03-30 12:12:32.000000000 +0200
++++ digikam/libs/widgets/metadata/iptcwidget.cpp
+@@ -156,7 +156,7 @@ bool IptcWidget::decodeMetadata()
+     catch (Exiv2::Error& e)
+     {
+         DDebug() << "Cannot parse IPTC metadata using Exiv2 ("
+-                  << QString::fromAscii(e.what().c_str())
++                  << QString::fromAscii(e.what())
+                   << ")" << endl;
+         return false;
+     }
+@@ -185,7 +185,7 @@ QString IptcWidget::getTagTitle(const QS
+     catch (Exiv2::Error& e) 
+     {
+         DDebug() << "Cannot get metadata tag title using Exiv2 ("
+-                  << QString::fromAscii(e.what().c_str())
++                  << QString::fromAscii(e.what())
+                   << ")" << endl;
+         return i18n("Unknow");
+     }
+@@ -202,7 +202,7 @@ QString IptcWidget::getTagDescription(co
+     catch (Exiv2::Error& e) 
+     {
+         DDebug() << "Cannot get metadata tag description using Exiv2 ("
+-                  << QString::fromAscii(e.what().c_str())
++                  << QString::fromAscii(e.what())
+                   << ")" << endl;
+         return i18n("No description available");
+     }
diff --git a/graphics/digikam/patches/patch-ae b/graphics/digikam/patches/patch-ae
new file mode 100644
index 00000000000..ab6527df39c
--- /dev/null
+++ b/graphics/digikam/patches/patch-ae
@@ -0,0 +1,31 @@
+$NetBSD: patch-ae,v 1.1 2007/04/03 09:32:08 drochner Exp $
+
+--- digikam/libs/widgets/metadata/exifwidget.cpp.orig	2007-03-30 12:17:43.000000000 +0200
++++ digikam/libs/widgets/metadata/exifwidget.cpp
+@@ -181,7 +181,7 @@ bool ExifWidget::decodeMetadata()
+     catch (Exiv2::Error& e)
+     {
+         DDebug() << "Cannot parse EXIF metadata using Exiv2 ("
+-                  << QString::fromAscii(e.what().c_str())
++                  << QString::fromAscii(e.what())
+                   << ")" << endl;
+         return false;
+     }
+@@ -211,7 +211,7 @@ QString ExifWidget::getTagTitle(const QS
+     catch (Exiv2::Error& e) 
+     {
+         DDebug() << "Cannot get metadata tag title using Exiv2 ("
+-                  << QString::fromAscii(e.what().c_str())
++                  << QString::fromAscii(e.what())
+                   << ")" << endl;
+         return i18n("Unknown");
+     }
+@@ -228,7 +228,7 @@ QString ExifWidget::getTagDescription(co
+     catch (Exiv2::Error& e) 
+     {
+         DDebug() << "Cannot get metadata tag description using Exiv2 ("
+-                  << QString::fromAscii(e.what().c_str())
++                  << QString::fromAscii(e.what())
+                   << ")" << endl;
+         return i18n("No description available");
+     }
diff --git a/graphics/digikam/patches/patch-af b/graphics/digikam/patches/patch-af
new file mode 100644
index 00000000000..8b35ba39f7d
--- /dev/null
+++ b/graphics/digikam/patches/patch-af
@@ -0,0 +1,31 @@
+$NetBSD: patch-af,v 1.1 2007/04/03 09:32:08 drochner Exp $
+
+--- digikam/libs/widgets/metadata/makernotewidget.cpp.orig	2007-03-30 12:23:15.000000000 +0200
++++ digikam/libs/widgets/metadata/makernotewidget.cpp
+@@ -198,7 +198,7 @@ bool MakerNoteWidget::decodeMetadata()
+     catch (Exiv2::Error& e)
+     {
+         DDebug() << "Cannot parse MAKERNOTE metadata using Exiv2 ("
+-                  << QString::fromAscii(e.what().c_str())
++                  << QString::fromAscii(e.what())
+                   << ")" << endl;
+         return false;
+     }
+@@ -227,7 +227,7 @@ QString MakerNoteWidget::getTagTitle(con
+     catch (Exiv2::Error& e) 
+     {
+         DDebug() << "Cannot get metadata tag title using Exiv2 ("
+-                  << QString::fromAscii(e.what().c_str())
++                  << QString::fromAscii(e.what())
+                   << ")" << endl;
+         return i18n("Unknown");
+     }
+@@ -244,7 +244,7 @@ QString MakerNoteWidget::getTagDescripti
+     catch (Exiv2::Error& e) 
+     {
+         DDebug() << "Cannot get metadata tag description using Exiv2 ("
+-                  << QString::fromAscii(e.what().c_str())
++                  << QString::fromAscii(e.what())
+                   << ")" << endl;
+         return i18n("No description available");
+     }
diff --git a/graphics/digikam/patches/patch-ag b/graphics/digikam/patches/patch-ag
new file mode 100644
index 00000000000..0f8260d1b4d
--- /dev/null
+++ b/graphics/digikam/patches/patch-ag
@@ -0,0 +1,31 @@
+$NetBSD: patch-ag,v 1.1 2007/04/03 09:32:09 drochner Exp $
+
+--- digikam/libs/widgets/metadata/gpswidget.cpp.orig	2007-03-30 12:24:59.000000000 +0200
++++ digikam/libs/widgets/metadata/gpswidget.cpp
+@@ -305,7 +305,7 @@ bool GPSWidget::decodeMetadata()
+     {
+         setMetadataEmpty();
+         DDebug() << "Cannot parse EXIF metadata using Exiv2 ("
+-                  << QString::fromAscii(e.what().c_str())
++                  << QString::fromAscii(e.what())
+                   << ")" << endl;
+         return false;
+     }
+@@ -343,7 +343,7 @@ QString GPSWidget::getTagTitle(const QSt
+     catch (Exiv2::Error& e) 
+     {
+         DDebug() << "Cannot get metadata tag title using Exiv2 ("
+-                  << QString::fromAscii(e.what().c_str())
++                  << QString::fromAscii(e.what())
+                   << ")" << endl;
+         return i18n("Unknown");
+     }
+@@ -360,7 +360,7 @@ QString GPSWidget::getTagDescription(con
+     catch (Exiv2::Error& e) 
+     {   
+         DDebug() << "Cannot get metadata tag description using Exiv2 ("
+-                  << QString::fromAscii(e.what().c_str())
++                  << QString::fromAscii(e.what())
+                   << ")" << endl;
+         return i18n("No description available");
+     }