Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=fe7320ff0cfce378afd3551906c76186718b88a4
commit fe7320ff0cfce378afd3551906c76186718b88a4 Author: Melko <[email protected]> Date: Sun Apr 29 22:52:35 2012 +0200 kphotoalbum-4.2-1-i686 * drop patch diff --git a/source/kde-extra/kphotoalbum/exiv-0.21.patch b/source/kde-extra/kphotoalbum/exiv-0.21.patch deleted file mode 100644 index 79080ca..0000000 --- a/source/kde-extra/kphotoalbum/exiv-0.21.patch +++ /dev/null @@ -1,52 +0,0 @@ -Revision 1213128 - -Fixed bug #262127, compile fails with exiv2-0.21 - ---- kphotoalbum/Exif/Info.cpp 2010/08/16 08:04:32 1164187 -+++ 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 ); - _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
