From bded29ac618d5450c6aa6d272706af87b4ca7fd9 Mon Sep 17 00:00:00 2001
From: bapt <bapt@FreeBSD.org>
Date: Tue, 12 Apr 2011 08:24:32 +0000
Subject: - chase exiv2 library bump - while here remove some MD5 - fix some
 forgottern desktop-file-utils dependencies

---
 graphics/libkexiv2/Makefile                        |  4 ++--
 graphics/libkexiv2/distinfo                        |  1 -
 .../files/patch-libkexiv2__libkexiv2__kexiv2.cpp   | 26 ++++++++++++++++++++++
 3 files changed, 28 insertions(+), 3 deletions(-)
 create mode 100644 graphics/libkexiv2/files/patch-libkexiv2__libkexiv2__kexiv2.cpp

(limited to 'graphics/libkexiv2')

diff --git a/graphics/libkexiv2/Makefile b/graphics/libkexiv2/Makefile
index 2f82643034cd..ef9dbfd18bb6 100644
--- a/graphics/libkexiv2/Makefile
+++ b/graphics/libkexiv2/Makefile
@@ -6,14 +6,14 @@
 
 PORTNAME=	libkexiv2
 PORTVERSION=	0.1.9
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	graphics devel
 MASTER_SITES=	SF/kipi/${PORTNAME}/${PORTVERSION}
 
 MAINTAINER=	ale@FreeBSD.org
 COMMENT=	A wrapper library to manipulate pictures metadata
 
-LIB_DEPENDS=	exiv2.9:${PORTSDIR}/graphics/exiv2
+LIB_DEPENDS=	exiv2.10:${PORTSDIR}/graphics/exiv2
 
 USE_BZIP2=	yes
 USE_KDELIBS_VER=3
diff --git a/graphics/libkexiv2/distinfo b/graphics/libkexiv2/distinfo
index 8e430cad8b98..cdb94ad6ec1b 100644
--- a/graphics/libkexiv2/distinfo
+++ b/graphics/libkexiv2/distinfo
@@ -1,3 +1,2 @@
-MD5 (libkexiv2-0.1.9.tar.bz2) = 6e6fc9edbfad4506f6f59508d9aa45d6
 SHA256 (libkexiv2-0.1.9.tar.bz2) = 004bacd4ae4574c0862342d6c4f7fdccb6fac01e50c77a4673487b96af9a0fad
 SIZE (libkexiv2-0.1.9.tar.bz2) = 432834
diff --git a/graphics/libkexiv2/files/patch-libkexiv2__libkexiv2__kexiv2.cpp b/graphics/libkexiv2/files/patch-libkexiv2__libkexiv2__kexiv2.cpp
new file mode 100644
index 000000000000..beb1972ce786
--- /dev/null
+++ b/graphics/libkexiv2/files/patch-libkexiv2__libkexiv2__kexiv2.cpp
@@ -0,0 +1,26 @@
+--- ./libkexiv2/libkexiv2/kexiv2.cpp.orig	2009-02-27 09:39:37.000000000 +0100
++++ ./libkexiv2/libkexiv2/kexiv2.cpp	2011-04-12 00:45:19.851801624 +0200
+@@ -1603,7 +1603,11 @@
+     {
+         std::string exifkey(exifTagName);
+         Exiv2::ExifKey ek(exifkey);
++#if (EXIV2_TEST_VERSION(0,21,0))
++	return QString::fromLocal8Bit( ek.tagLabel().c_str() );
++#else
+         return QString::fromLocal8Bit( Exiv2::ExifTags::tagTitle(ek.tag(), ek.ifdId()) );
++#endif
+     }
+     catch (Exiv2::Error& e)
+     {
+@@ -1619,7 +1623,11 @@
+     {
+         std::string exifkey(exifTagName);
+         Exiv2::ExifKey ek(exifkey);
++#if (EXIV2_TEST_VERSION(0,21,0))
++	return QString::fromLocal8Bit( ek.tagDesc().c_str() );
++#else
+         return QString::fromLocal8Bit( Exiv2::ExifTags::tagDesc(ek.tag(), ek.ifdId()) );
++#endif
+     }
+     catch (Exiv2::Error& e)
+     {
-- 
cgit