Fix compability with exiv2 >= 0.21 API wrt #349160 by Alexandre Rostovtsev.

Package-Manager: portage-2.2.0_alpha9/cvs/Linux x86_64

4 files changed, 76 insertions, 15 deletions

diff --git a/media-gfx/gthumb/ChangeLog b/media-gfx/gthumb/ChangeLog
index 43a89fce5d11..65a0051119b9 100644
--- a/media-gfx/gthumb/ChangeLog
+++ b/media-gfx/gthumb/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-gfx/gthumb
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gthumb/ChangeLog,v 1.120 2010/12/15 22:20:48 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gthumb/ChangeLog,v 1.121 2010/12/21 14:55:04 ssuominen Exp $
+
+  21 Dec 2010; Samuli Suominen <ssuominen@gentoo.org> gthumb-2.12.1.ebuild,
+  +files/gthumb-2.12.1-new-exiv2.patch:
+  Fix compability with exiv2 >= 0.21 API wrt #349160 by Alexandre Rostovtsev.
 
   15 Dec 2010; Gilles Dartiguelongue <eva@gentoo.org> gthumb-2.12.1.ebuild:
   Fix sed expression with USE=debug.
diff --git a/media-gfx/gthumb/Manifest b/media-gfx/gthumb/Manifest
index 15646721ba17..926adb16a6f8 100644
--- a/media-gfx/gthumb/Manifest
+++ b/media-gfx/gthumb/Manifest
@@ -1,18 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+AUX gthumb-2.12.1-new-exiv2.patch 2317 RMD160 bd9baf2bd9fc1dc9ef7e10c9dc7ae0997dc85ece SHA1 2bbee7528bd6138f9e5fc1238ec483651c4ba750 SHA256 227ec3a133b077d20fbc171300d1df910245de3d6fd389544f66c331be953bda
 DIST gthumb-2.10.11.tar.bz2 2839510 RMD160 ceaef54c96cc6dbea23fe6c461d26b685b13778a SHA1 a9c133f3a652249329da8b5be8ff08dfec0ded9f SHA256 68ac6835afdbe32cba09504b4d61ad4f5d98a97776bfb58698338add56eb520e
 DIST gthumb-2.12.0.tar.bz2 4463039 RMD160 603999152c560e50b2c910dcc47e9f126ab8900a SHA1 5e86d68f24bfe123ea89b2c20b617a5e36ee3ca1 SHA256 9bb32ee44647f3f934d41344e2c1dbbd1546bf4949824030b3b818545758118c
 DIST gthumb-2.12.1.tar.bz2 5186434 RMD160 c0522092b40433db1d4b1bfa51688dea5ff14bf2 SHA1 341ee41661cb2572de4fc473048b0ca5e259cbcc SHA256 94d186db48e4527f1ba1dad41b860fc34b8f13da4228319dc742c91f45ddea64
 EBUILD gthumb-2.10.11.ebuild 1468 RMD160 bbd7996459d485871af46ab5a5d4cfe5338b22d4 SHA1 988673e4afa3be388aa51663017753cd913344b8 SHA256 1e8727bc626ce6f45a9f89725a982172c566c1ad4c5c03e06f60cb35f7d56cbc
 EBUILD gthumb-2.12.0.ebuild 1992 RMD160 95150263372d8a7604a8fa0833af0fb41b971c36 SHA1 70cdfad026d02ceae22dc0a3e17317a591de2a17 SHA256 1b5e533c2da9fed3bb336cdb51264ed27ef88748b2a789cb1d4c6a1a5339f49f
-EBUILD gthumb-2.12.1.ebuild 2016 RMD160 0bbf7467ac82e97dc6c496cf7e55de3a85a0a3a0 SHA1 15462307c7a60bee847c5c1e2adf106ac8f0e736 SHA256 89724f9dd76091378dc874a981690057fa14b28799d41d502ca8a45ec6c9ceb0
-MISC ChangeLog 18414 RMD160 068c5f91bb0c39f836842fc39aa9323e60ab43d0 SHA1 8e651122358b6c54b307de1b72caa892106471a1 SHA256 0d8f576186c66932e7f4c36414116a9e0d03d7d834ccb1b4aa585d4b68b620d0
+EBUILD gthumb-2.12.1.ebuild 2073 RMD160 5f4c3d6dac849592b4592a705f590b29fb7955fe SHA1 c7a7c8e8859dd3d3d093fd7de1138ec2518afb15 SHA256 915fee445d50c05625656fdeed9b3df42af643a7770c4cc3d70265c77323da20
+MISC ChangeLog 18615 RMD160 aa86bd2d46b77366ae737a26290c330850be793f SHA1 f8580029b63a4ef6b9bcdc15d3d1db36315d76cd SHA256 5a93a85a657e88c5743386a94e866428b528f18a928f5050e9e1603196392921
 MISC metadata.xml 380 RMD160 1db419c6ace42704ec134285fae7a01851af9780 SHA1 a159db2e96a5d77bad064cf61757863076bc598a SHA256 2e10ecfe504ae1d22a813720041534aadf04f25e3f6e18d3027910465b8ba4d8
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
-
-iEYEARECAAYFAk0JP0wACgkQ1fmVwcYIWAaD0ACgscab8EOgTEqvAJmECACMh8RD
-pxMAnA7gBkeGWXm8vLYvXbAbgI+lRunH
-=EvVQ
------END PGP SIGNATURE-----
diff --git a/media-gfx/gthumb/files/gthumb-2.12.1-new-exiv2.patch b/media-gfx/gthumb/files/gthumb-2.12.1-new-exiv2.patch
new file mode 100644
index 000000000000..e8499b269cbc
--- /dev/null
+++ b/media-gfx/gthumb/files/gthumb-2.12.1-new-exiv2.patch
@@ -0,0 +1,64 @@
+From 1834cea61050e476e97e3831538169a40af8a72f Mon Sep 17 00:00:00 2001
+From: Alexandre Rostovtsev <tetromino@gmail.com>
+Date: Mon, 20 Dec 2010 03:19:12 +0000
+Subject: Enable building with exiv2-0.21 (#349150)
+
+Due to API changes in exiv2-0.21 (see
+http://dev.exiv2.org/issues/show/0000721), gthumb with exiv2 support
+enabled fails to compile. This patch updates gthumb to allow compilation
+with both exiv2-0.20 and 0.21. Since ifd IDs are no longer part of the
+public API, the patch uses group names instead (which works with
+exiv2-0.20 as well, modulo the fact that 0.21 has isMakerGroup() instead
+of isMakerIfd() in 0.20).
+In addition, instead of numeric comparison with ids1Id (which wouldn't
+work with exiv2-0.21 in any case), isMakerGroup()/isMakerIfd() are now
+used to determine whether or not a tag is a MakerNote.
+
+Signed-off-by: Alexandre Rostovtsev <tetromino@gmail.com>
+---
+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
+--
+cgit v0.8.3.1
diff --git a/media-gfx/gthumb/gthumb-2.12.1.ebuild b/media-gfx/gthumb/gthumb-2.12.1.ebuild
index d9a41fcbb931..6bee38a2f804 100644
--- a/media-gfx/gthumb/gthumb-2.12.1.ebuild
+++ b/media-gfx/gthumb/gthumb-2.12.1.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gthumb/gthumb-2.12.1.ebuild,v 1.2 2010/12/15 22:20:48 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gthumb/gthumb-2.12.1.ebuild,v 1.3 2010/12/21 14:55:04 ssuominen Exp $
 
 EAPI="3"
 GCONF_DEBUG="yes"
 
-inherit gnome2
+inherit eutils gnome2
 
 DESCRIPTION="Image viewer and browser for Gnome"
 HOMEPAGE="http://gthumb.sourceforge.net"
@@ -67,6 +67,8 @@ src_prepare() {
 
 	# Remove unwanted CFLAGS added with USE=debug
 	sed 's/CFLAGS="$CFLAGS -g -O0 -DDEBUG"//' -i configure.ac configure || die
+
+	epatch "${FILESDIR}"/${P}-new-exiv2.patch
 }
 
 src_install() {