diff options
| author | adam <adam> | 2010-12-04 21:15:00 +0000 |
|---|---|---|
| committer | adam <adam> | 2010-12-04 21:15:00 +0000 |
| commit | e5fae52d6ab24e94f1e3792529a73fab80ab644f (patch) | |
| tree | de41f1e35bc4cf9a77ded5a73ef79de1ad223624 /graphics/gthumb/patches/patch-aa | |
| parent | 586f4828bf2e05f4ea8eb63fb12e9be639e82bb1 (diff) | |
| download | pkgsrc-e5fae52d6ab24e94f1e3792529a73fab80ab644f.tar.gz | |
* Fix building on Mac OS X
* Fix building with Exiv2 0.21
Diffstat (limited to 'graphics/gthumb/patches/patch-aa')
| -rw-r--r-- | graphics/gthumb/patches/patch-aa | 42 |
1 files changed, 42 insertions, 0 deletions
diff --git a/graphics/gthumb/patches/patch-aa b/graphics/gthumb/patches/patch-aa new file mode 100644 index 00000000000..b73bfaebd19 --- /dev/null +++ b/graphics/gthumb/patches/patch-aa @@ -0,0 +1,42 @@ +$NetBSD: patch-aa,v 1.9 2010/12/04 21:15:00 adam Exp $ + +--- extensions/exiv2_tools/exiv2-utils.cpp.orig 2010-09-15 19:07:15.000000000 +0000 ++++ extensions/exiv2_tools/exiv2-utils.cpp +@@ -497,6 +497,17 @@ set_attributes_from_tagsets (GFileInfo * + static const char * + get_exif_default_category (const Exiv2::Exifdatum &md) + { ++#if (EXIV2_TEST_VERSION(0,21,0)) ++ const char *ifdName = md.ifdName(); ++ if (strcmp(ifdName, "Makernote") == 0) ++ return "Exif::MakerNotes"; ++ if (strcmp(ifdName, "IFD1") == 0) ++ return "Exif::Thumbnail"; ++ if (strcmp(ifdName, "GPSInfo") == 0) ++ return "Exif::GPS"; ++ if (strcmp(ifdName, "Iop") == 0) ++ return "Exif::Versions"; ++#else + if (Exiv2::ExifTags::isMakerIfd(md.ifdId())) + return "Exif::MakerNotes"; + +@@ -510,6 +521,7 @@ get_exif_default_category (const Exiv2:: + default: + break; + } ++#endif + + return "Exif::Other"; + } +@@ -531,7 +543,11 @@ exiv2_read_metadata (Exiv2::Image::AutoP + stringstream description; + if (! md->tagLabel().empty()) + description << md->tagLabel(); ++#if (EXIV2_TEST_VERSION(0,21,0)) ++ else if (strcmp(md->ifdName(), "Makernote") == 0) ++#else + else if (md->ifdId () > Exiv2::ifd1Id) ++#endif + // Must be a MakerNote - include group name + description << md->groupName() << "." << md->tagName(); + else |