Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=xfcetesting.git;a=commitdiff;h=d5229c71b41e11fb6b8b2d531d0622eef52831c7
commit d5229c71b41e11fb6b8b2d531d0622eef52831c7
Author: Michel Hermier <herm...@frugalware.org>
Date: Mon Feb 7 12:56:11 2011 +0100
kphotoalbum-4.1.1-5-i686
* Rebuild with new exiv version.
diff --git a/source/kde-extra/kphotoalbum/FrugalBuild
b/source/kde-extra/kphotoalbum/FrugalBuild
index d045d1e..26046b5 100644
--- a/source/kde-extra/kphotoalbum/FrugalBuild
+++ b/source/kde-extra/kphotoalbum/FrugalBuild
@@ -3,17 +3,26 @@
pkgname=kphotoalbum
pkgver=4.1.1
-pkgrel=4
+pkgrel=5
pkgdesc="KDE Image Database (KPhotoAlbum) is a tool for indexing, searching,
and viewing images."
archs=('i686' 'x86_64')
groups=('kde-extra')
Finclude kde
-depends=("${depends[@]}" "kdelibs>=$_F_kde_ver" "qt4>=4.6.2-3" "libxi"
"libstdc++" "libxmu" "libkipi" "exiv2>=0.21" "libkdcraw")
-makedepends=("${makedepends[@]}" 'kdelibs-compiletime' 'docbook-xsl')
+depends=("${depends[@]}" "kdelibs>=$_F_kde_ver" "qt4>=4.7.0" "libxi"
"libstdc++" "libxmu" "libkipi" "exiv2>=0.21" "libkdcraw")
+makedepends=("${makedepends[@]}" 'kdelibs-compiletime' 'ksgmltools2'
'docbook-xml')
url="http://kphotoalbum.org";
Fconfopts="$Fconfopts --disable-debug --without-debug"
up2date="lynx -dump $url/index.php?page=download-source |grep -om1
'kphotoalbum-\(.*\).tar.bz2'|sed 's/.*-\(.*\).t.*/\1/'"
-source=($url/data/download/$pkgname-$pkgver.tar.bz2)
-sha1sums=('14b9374e0c18a5ada225e6cc059eda54ec0ee49e')
+source=("$url/data/download/$pkgname-$pkgver.tar.bz2" \
+ "exiv-0.21.patch")
+sha1sums=('14b9374e0c18a5ada225e6cc059eda54ec0ee49e' \
+ 'cff03d6bf74deebc93f369016e38521e21a3f21e')
+
+build() {
+ Fcd
+ # Disable documentation generation till it's repaired
+ Fsed 'add_subdirectory( doc-translations )' '' CMakeLists.txt
+ KDE_build
+}
# optimization OK
diff --git a/source/kde-extra/kphotoalbum/exiv-0.21.patch
b/source/kde-extra/kphotoalbum/exiv-0.21.patch
new file mode 100644
index 0000000..79080ca
--- /dev/null
+++ b/source/kde-extra/kphotoalbum/exiv-0.21.patch
@@ -0,0 +1,52 @@
+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
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
