diff options
| author | markd <markd> | 2011-01-03 20:45:27 +0000 |
|---|---|---|
| committer | markd <markd> | 2011-01-03 20:45:27 +0000 |
| commit | d4233314e93f346b9874e4096d088277db67f1fb (patch) | |
| tree | 8a7cdf736a9ac4b9b33ab4989c58db53f4c950e6 /graphics/libkexiv2 | |
| parent | cc99c0379759bc1bab7ec70a8ca3a3c409400ae5 (diff) | |
| download | pkgsrc-d4233314e93f346b9874e4096d088277db67f1fb.tar.gz | |
Fix build with exiv2-0.21
Diffstat (limited to 'graphics/libkexiv2')
| -rw-r--r-- | graphics/libkexiv2/Makefile | 4 | ||||
| -rw-r--r-- | graphics/libkexiv2/distinfo | 4 | ||||
| -rw-r--r-- | graphics/libkexiv2/patches/patch-aa | 30 |
3 files changed, 31 insertions, 7 deletions
diff --git a/graphics/libkexiv2/Makefile b/graphics/libkexiv2/Makefile index 3d41faedcf1..e7c117a97e7 100644 --- a/graphics/libkexiv2/Makefile +++ b/graphics/libkexiv2/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.20 2010/12/23 11:44:41 dsainty Exp $ +# $NetBSD: Makefile,v 1.21 2011/01/03 20:45:27 markd Exp $ # DISTNAME= libkexiv2-0.1.9 -PKGREVISION= 4 +PKGREVISION= 5 CATEGORIES= graphics MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=kipi/} EXTRACT_SUFX= .tar.bz2 diff --git a/graphics/libkexiv2/distinfo b/graphics/libkexiv2/distinfo index d8f34d840d2..55f534afe20 100644 --- a/graphics/libkexiv2/distinfo +++ b/graphics/libkexiv2/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.8 2009/12/15 10:43:03 wiz Exp $ +$NetBSD: distinfo,v 1.9 2011/01/03 20:45:27 markd Exp $ SHA1 (libkexiv2-0.1.9.tar.bz2) = 252243b105f0f0e0565219b61aed6f223cbb4000 RMD160 (libkexiv2-0.1.9.tar.bz2) = c4d68e36a69de29b31eb2ceecac6d7e370d68213 Size (libkexiv2-0.1.9.tar.bz2) = 432834 bytes -SHA1 (patch-aa) = 93769bbf613df12f11494bcdaf98d09c617d5035 +SHA1 (patch-aa) = da9d931b52bebb21148e3445051fa5b19baa164c diff --git a/graphics/libkexiv2/patches/patch-aa b/graphics/libkexiv2/patches/patch-aa index 9f821117ef4..1d3d0407c57 100644 --- a/graphics/libkexiv2/patches/patch-aa +++ b/graphics/libkexiv2/patches/patch-aa @@ -1,8 +1,8 @@ -$NetBSD: patch-aa,v 1.6 2009/01/07 13:26:30 drochner Exp $ +$NetBSD: patch-aa,v 1.7 2011/01/03 20:45:28 markd Exp $ ---- libkexiv2/libkexiv2/kexiv2.cpp.orig 2008-12-13 11:35:51.000000000 +0100 +--- libkexiv2/libkexiv2/kexiv2.cpp.orig 2009-02-27 08:39:37.000000000 +0000 +++ libkexiv2/libkexiv2/kexiv2.cpp -@@ -48,6 +48,20 @@ extern "C" +@@ -49,6 +49,20 @@ extern "C" #include "kexiv2private.h" #include "kexiv2.h" @@ -23,3 +23,27 @@ $NetBSD: patch-aa,v 1.6 2009/01/07 13:26:30 drochner Exp $ namespace KExiv2Iface { +@@ -1603,7 +1617,11 @@ QString KExiv2::getExifTagTitle(const ch + { + 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 +1637,11 @@ QString KExiv2::getExifTagDescription(co + { + 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) + { |