From ccb34b25c7b0ca0968a906bcd7283e31a8031387 Mon Sep 17 00:00:00 2001 From: Pietro Cerutti Date: Thu, 8 Nov 2012 10:45:13 +0000 Subject: [PATCH] - remove obsolete patch Reported by: PH (via beat@) Approved by: portmgr@ (implicit) Feature safe: yes --- graphics/gexiv2/files/patch-exiv2-0.21 | 35 -------------------------- 1 file changed, 35 deletions(-) delete mode 100644 graphics/gexiv2/files/patch-exiv2-0.21 diff --git a/graphics/gexiv2/files/patch-exiv2-0.21 b/graphics/gexiv2/files/patch-exiv2-0.21 deleted file mode 100644 index f4ad1128a038..000000000000 --- a/graphics/gexiv2/files/patch-exiv2-0.21 +++ /dev/null @@ -1,35 +0,0 @@ -diff -ur gexiv2/gexiv2-metadata-exif.cpp.orig gexiv2/gexiv2-metadata-exif.cpp ---- gexiv2/gexiv2-metadata-exif.cpp.orig 2010-09-10 17:52:54.000000000 -0400 -+++ gexiv2/gexiv2-metadata-exif.cpp 2010-12-19 19:44:49.883274002 -0500 -@@ -235,10 +235,13 @@ - const gchar* gexiv2_metadata_get_exif_tag_label (const gchar* tag) { - g_return_val_if_fail(tag != NULL, NULL); - -- Exiv2::ExifKey key(tag); -- - try { -+ Exiv2::ExifKey key(tag); -+#if EXIV2_TEST_VERSION(0, 21, 0) -+ return g_intern_string(key.tagLabel().c_str()); -+#else - return Exiv2::ExifTags::tagLabel (key.tag (), key.ifdId ()); -+#endif - } catch (Exiv2::Error& e) { - LOG_ERROR(e); - } -@@ -249,10 +252,13 @@ - const gchar* gexiv2_metadata_get_exif_tag_description (const gchar* tag) { - g_return_val_if_fail(tag != NULL, NULL); - -- Exiv2::ExifKey key(tag); -- - try { -+ Exiv2::ExifKey key(tag); -+#if EXIV2_TEST_VERSION(0, 21, 0) -+ return g_intern_string(key.tagDesc().c_str()); -+#else - return Exiv2::ExifTags::tagDesc (key.tag (), key.ifdId ()); -+#endif - } catch (Exiv2::Error& e) { - LOG_ERROR(e); - }