Added upstream patch to fix compilation with exiv2-0.21, bug 349535

(Portage version: 2.1.9.41/cvs/Linux x86_64)

4 files changed, 104 insertions, 3 deletions

diff --git a/media-gfx/kphotoalbum/ChangeLog b/media-gfx/kphotoalbum/ChangeLog
index 705ccef8cdec..12781c7af53f 100644
--- a/media-gfx/kphotoalbum/ChangeLog
+++ b/media-gfx/kphotoalbum/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-gfx/kphotoalbum
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/kphotoalbum/ChangeLog,v 1.49 2011/02/26 18:15:20 signals Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/kphotoalbum/ChangeLog,v 1.50 2011/02/27 13:54:03 dilfridge Exp $
+
+*kphotoalbum-4.1.1-r1 (27 Feb 2011)
+
+  27 Feb 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  kphotoalbum-4.1.1.ebuild, +kphotoalbum-4.1.1-r1.ebuild,
+  +files/kphotoalbum-4.1.1-exiv2.patch:
+  Added upstream patch to fix compilation with exiv2-0.21, bug 349535
 
   26 Feb 2011; Kevin McCarthy <signals@gentoo.org> kphotoalbum-4.1.1.ebuild:
   Updated depends from media-libs/jpeg to virtual/jpeg
diff --git a/media-gfx/kphotoalbum/files/kphotoalbum-4.1.1-exiv2.patch b/media-gfx/kphotoalbum/files/kphotoalbum-4.1.1-exiv2.patch
new file mode 100644
index 000000000000..89283fd3f509
--- /dev/null
+++ b/media-gfx/kphotoalbum/files/kphotoalbum-4.1.1-exiv2.patch
@@ -0,0 +1,47 @@
+--- trunk/extragear/graphics/kphotoalbum/Exif/Info.cpp	2011/01/09 06:47:21	1213127
++++ trunk/extragear/graphics/kphotoalbum/Exif/Info.cpp	2011/01/09 06:50:40	1213128
+@@ -106,6 +106,28 @@
+         return res;
+ 
+     QList<const Exiv2::TagInfo*> tags;
++    std::ostringstream s;
++
++#if (EXIV2_TEST_VERSION(0,21,0))
++    const Exiv2::GroupInfo* gi = Exiv2::ExifTags::groupList();
++    while (gi->tagList_ != 0) {
++	    Exiv2::TagListFct tl     = gi->tagList_;
++	    const Exiv2::TagInfo* ti = tl();
++
++	    while (ti->tag_ != 0xFFFF) {
++		    tags << ti;
++		    ++ti;
++	    }
++        ++gi;
++    }
++
++    for (QList<const Exiv2::TagInfo*>::iterator it = tags.begin(); it != tags.end(); ++it) {
++        while ( (*it)->tag_ != 0xffff ) {
++            res.insert(QString::fromLatin1(Exiv2::ExifKey(**it).key().c_str()));
++            ++(*it);
++        }
++    }
++#else
+     tags <<
+         Exiv2::ExifTags::ifdTagList() <<
+         Exiv2::ExifTags::exifTagList() <<
+@@ -121,7 +143,6 @@
+     // Now the ugly part -- exiv2 doesn't have any way to get a list of
+     // MakerNote tags in a reasonable form, so we have to parse it from strings
+ 
+-    std::ostringstream s;
+     for ( Exiv2::IfdId kind = Exiv2::canonIfdId; kind < Exiv2::lastIfdId;
+             kind = static_cast<Exiv2::IfdId>( kind + 1 ) ) {
+ #if EXIV2_TEST_VERSION(0,17,0)
+@@ -130,6 +151,7 @@
+         Exiv2::ExifTags::makerTaglist( s, kind );
+ #endif
+     }
++#endif
+ 
+     // IPTC tags use yet another format...
+     Exiv2::IptcDataSets::dataSetList( s );
diff --git a/media-gfx/kphotoalbum/kphotoalbum-4.1.1-r1.ebuild b/media-gfx/kphotoalbum/kphotoalbum-4.1.1-r1.ebuild
new file mode 100644
index 000000000000..5b53deea378b
--- /dev/null
+++ b/media-gfx/kphotoalbum/kphotoalbum-4.1.1-r1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/kphotoalbum/kphotoalbum-4.1.1-r1.ebuild,v 1.1 2011/02/27 13:54:02 dilfridge Exp $
+
+EAPI=3
+KDE_LINGUAS="ar be bg ca cs da de el en_GB eo es et fi fr ga gl hi hne is it ja
+km lt nb nds nl nn pa pl pt pt_BR ro se sk sv tr uk vi zh_CN zh_TW"
+inherit kde4-base
+
+DESCRIPTION="KDE Photo Album is a tool for indexing, searching, and viewing images."
+HOMEPAGE="http://www.kphotoalbum.org/"
+SRC_URI="http://www.kphotoalbum.org/data/download/${P}.tar.bz2"
+
+LICENSE="GPL-2 FDL-1.2"
+KEYWORDS="~amd64 ~x86"
+SLOT="4"
+IUSE="debug +exif +geolocation +kipi +raw +semantic-desktop"
+
+DEPEND="
+	$(add_kdebase_dep kdelibs 'semantic-desktop?')
+	virtual/jpeg
+	>=x11-libs/qt-sql-4.4:4[sqlite]
+	exif? ( >=media-gfx/exiv2-0.17 )
+	geolocation? ( $(add_kdebase_dep marble) )
+	kipi? ( $(add_kdebase_dep libkipi) )
+	raw? ( $(add_kdebase_dep libkdcraw) )
+"
+RDEPEND="${DEPEND}
+	semantic-desktop? ( $(add_kdebase_dep nepomuk) )
+"
+src_configure() {
+	mycmakeargs=(
+		$(cmake-utils_use_with exif Exiv2)
+		$(cmake-utils_use_with raw Kdcraw)
+		$(cmake-utils_use_with kipi)
+		$(cmake-utils_use_with geolocation Marble)
+		$(cmake-utils_use_with semantic-desktop Nepomuk)
+		$(cmake-utils_use_with semantic-desktop Soprano)
+	)
+
+	kde4-base_src_configure
+}
+
+DOCS="ChangeLog README TODO"
+
+PATCHES=( "${FILESDIR}/${P}"-{docbook_fix,exiv2}.patch )
diff --git a/media-gfx/kphotoalbum/kphotoalbum-4.1.1.ebuild b/media-gfx/kphotoalbum/kphotoalbum-4.1.1.ebuild
index 01e4501a268b..f5903ffdd0d1 100644
--- a/media-gfx/kphotoalbum/kphotoalbum-4.1.1.ebuild
+++ b/media-gfx/kphotoalbum/kphotoalbum-4.1.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/kphotoalbum/kphotoalbum-4.1.1.ebuild,v 1.6 2011/02/26 18:15:20 signals Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/kphotoalbum/kphotoalbum-4.1.1.ebuild,v 1.7 2011/02/27 13:54:03 dilfridge Exp $
 
 EAPI=3
 KDE_LINGUAS="ar be bg ca cs da de el en_GB eo es et fi fr ga gl hi hne is it ja
@@ -20,7 +20,8 @@ DEPEND="
 	$(add_kdebase_dep kdelibs 'semantic-desktop?')
 	virtual/jpeg
 	>=x11-libs/qt-sql-4.4:4[sqlite]
-	exif? ( >=media-gfx/exiv2-0.17 )
+	exif? ( >=media-gfx/exiv2-0.17 
+		<media-gfx/exiv2-0.21 )
 	geolocation? ( $(add_kdebase_dep marble) )
 	kipi? ( $(add_kdebase_dep libkipi) )
 	raw? ( $(add_kdebase_dep libkdcraw) )