Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Robin Cook (f6c67ddc13c5865a65c7791e26b6af30b52d97bf)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Robin Cook <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Robin Cook (f6c67ddc13c5865a65c7791e26b6af30b52d97bf)
  • Date: Fri, 7 Jan 2011 18:36:56 -0600

GIT changes to master grimoire by Robin Cook <rcook AT wyrms.net>:

gnome2-apps/gthumb2/HISTORY | 4 ++
gnome2-apps/gthumb2/PRE_BUILD | 4 ++
gnome2-apps/gthumb2/gthumb-exiv2.patch | 45
+++++++++++++++++++++++++++++++++
3 files changed, 53 insertions(+)

New commits:
commit f6c67ddc13c5865a65c7791e26b6af30b52d97bf
Author: Robin Cook <rcook AT wyrms.net>
Commit: Robin Cook <rcook AT wyrms.net>

gthumb2: PRE_BUILD added to apply exiv2 patch until next release.

diff --git a/gnome2-apps/gthumb2/HISTORY b/gnome2-apps/gthumb2/HISTORY
index 8340899..eae2f9c 100644
--- a/gnome2-apps/gthumb2/HISTORY
+++ b/gnome2-apps/gthumb2/HISTORY
@@ -1,3 +1,7 @@
+2011-01-07 Robin Cook <rcook AT wyrms.net>
+ * PRE_BUILD: added to apply exiv2 patch until next release
+ http://bugs.gentoo.org/show_bug.cgi?id=349160
+
2010-11-16 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 2.12.1

diff --git a/gnome2-apps/gthumb2/PRE_BUILD b/gnome2-apps/gthumb2/PRE_BUILD
new file mode 100755
index 0000000..ea10785
--- /dev/null
+++ b/gnome2-apps/gthumb2/PRE_BUILD
@@ -0,0 +1,4 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+
+patch -p1 < $SPELL_DIRECTORY/gthumb-exiv2.patch
diff --git a/gnome2-apps/gthumb2/gthumb-exiv2.patch
b/gnome2-apps/gthumb2/gthumb-exiv2.patch
new file mode 100644
index 0000000..5bcb206
--- /dev/null
+++ b/gnome2-apps/gthumb2/gthumb-exiv2.patch
@@ -0,0 +1,45 @@
+diff --git a/extensions/exiv2_tools/exiv2-utils.cpp
b/extensions/exiv2_tools/exiv2-utils.cpp
+index 780bf29..f24b50d 100644
+--- a/extensions/exiv2_tools/exiv2-utils.cpp
++++ b/extensions/exiv2_tools/exiv2-utils.cpp
+@@ -497,19 +497,19 @@ set_attributes_from_tagsets (GFileInfo *info)
+ static const char *
+ get_exif_default_category (const Exiv2::Exifdatum &md)
+ {
++#if EXIV2_TEST_VERSION(0, 21, 0)
++ if (Exiv2::ExifTags::isMakerGroup(md.groupName()))
++#else
+ if (Exiv2::ExifTags::isMakerIfd(md.ifdId()))
++#endif
+ return "Exif::MakerNotes";
+
+- switch (md.ifdId()) {
+- case Exiv2::ifd1Id:
++ if (md.groupName().compare("Thumbnail") == 0)
+ return "Exif::Thumbnail";
+- case Exiv2::gpsIfdId:
++ else if (md.groupName().compare("GPSInfo") == 0)
+ return "Exif::GPS";
+- case Exiv2::iopIfdId:
++ else if (md.groupName().compare("Iop") == 0)
+ return "Exif::Versions";
+- default:
+- break;
+- }
+
+ return "Exif::Other";
+ }
+@@ -531,7 +531,11 @@ exiv2_read_metadata (Exiv2::Image::AutoPtr image,
+ stringstream description;
+ if (! md->tagLabel().empty())
+ description << md->tagLabel();
+- else if (md->ifdId () > Exiv2::ifd1Id)
++#if EXIV2_TEST_VERSION(0, 21, 0)
++ else if
(Exiv2::ExifTags::isMakerGroup(md->groupName()))
++#else
++ else if (Exiv2::ExifTags::isMakerIfd(md->ifdId()))
++#endif
+ // Must be a MakerNote - include group name
+ description << md->groupName() << "." <<
md->tagName();
+ else
+



  • [SM-Commit] GIT changes to master grimoire by Robin Cook (f6c67ddc13c5865a65c7791e26b6af30b52d97bf), Robin Cook, 01/07/2011

Archive powered by MHonArc 2.6.24.

Top of Page