From f435f93516d1fdd743bdd58bc34a614cd10f3465 Mon Sep 17 00:00:00 2001 From: dsomero Date: Fri, 1 Apr 2011 01:34:33 -0400 Subject: graphics/kphotoalbum: Added docbook and exiv2 fixes. # Update docbook files to XML V4.2-Based Variant. # Upstream patch to fix compilation with exiv2-0.21. Signed-off-by: dsomero --- .../kphotoalbum-4.1.1-docbook_fix.patch | 236 +++++++++++++++++++++ graphics/kphotoalbum/kphotoalbum-4.1.1-exiv2.patch | 47 ++++ graphics/kphotoalbum/kphotoalbum.SlackBuild | 7 +- 3 files changed, 289 insertions(+), 1 deletion(-) create mode 100644 graphics/kphotoalbum/kphotoalbum-4.1.1-docbook_fix.patch create mode 100644 graphics/kphotoalbum/kphotoalbum-4.1.1-exiv2.patch (limited to 'graphics/kphotoalbum') diff --git a/graphics/kphotoalbum/kphotoalbum-4.1.1-docbook_fix.patch b/graphics/kphotoalbum/kphotoalbum-4.1.1-docbook_fix.patch new file mode 100644 index 0000000000..575a4271eb --- /dev/null +++ b/graphics/kphotoalbum/kphotoalbum-4.1.1-docbook_fix.patch @@ -0,0 +1,236 @@ +diff -up kphotoalbum-4.1.1/doc/index.docbook.docbook_fix kphotoalbum-4.1.1/doc/index.docbook +--- kphotoalbum-4.1.1/doc/index.docbook.docbook_fix 2009-11-15 15:16:29.000000000 -0600 ++++ kphotoalbum-4.1.1/doc/index.docbook 2010-06-13 13:03:02.815174744 -0500 +@@ -1,5 +1,5 @@ + +-KPhotoAlbum"> + + +@@ -41,12 +41,6 @@ + 2004-08-06 + 2.0 + +- +- KDE +- kdeextragear-2 +- KPhotoAlbum +- Image Database +- + + This is the user manual for &kphotoalbum;. If you are + not the type who likes reading documentation, but rather just want to try +@@ -64,6 +58,12 @@ menu and select Run &kphoto + on long HTML document at &kphotoalbum;'s Homepage + ++ ++ KDE ++ kdeextragear-2 ++ KPhotoAlbum ++ Image Database ++ + + + &introduction; +diff -up kphotoalbum-4.1.1/doc-translations/de_kphotoalbum/kphotoalbum/index.docbook.docbook_fix kphotoalbum-4.1.1/doc-translations/de_kphotoalbum/kphotoalbum/index.docbook +--- kphotoalbum-4.1.1/doc-translations/de_kphotoalbum/kphotoalbum/index.docbook.docbook_fix 2009-11-15 15:17:07.000000000 -0600 ++++ kphotoalbum-4.1.1/doc-translations/de_kphotoalbum/kphotoalbum/index.docbook 2010-06-13 13:10:06.145165665 -0500 +@@ -1,5 +1,5 @@ + +-KPhotoAlbum"> +@@ -65,16 +65,6 @@ + 2.0 + +- +- KDE +- kdeextragear-2 +- KPhotoAlbum +- Bilddatenbank +- + Dies ist das Benutzerhandbuch für &kphotoalbum;. Wenn Sie nicht gerne Handbücher lesen, sondern lieber gleich Funktionen ausprobieren möchten, haben Sie folgende Alternativen zu diesem Handbuch: +@@ -102,6 +92,12 @@ + >HTML-Dokument zum Herunterladen. + ++ ++ KDE ++ kdeextragear-2 ++ KPhotoAlbum ++ Bilddatenbank ++ + + + &introduction; +diff -up kphotoalbum-4.1.1/doc-translations/et_kphotoalbum/kphotoalbum/index.docbook.docbook_fix kphotoalbum-4.1.1/doc-translations/et_kphotoalbum/kphotoalbum/index.docbook +--- kphotoalbum-4.1.1/doc-translations/et_kphotoalbum/kphotoalbum/index.docbook.docbook_fix 2009-11-15 15:17:20.000000000 -0600 ++++ kphotoalbum-4.1.1/doc-translations/et_kphotoalbum/kphotoalbum/index.docbook 2010-06-13 13:11:18.860165964 -0500 +@@ -1,5 +1,5 @@ + +-KPhotoAlbum"> +@@ -65,16 +65,6 @@ + 2.0 + +- +- KDE +- kdeextragear-2 +- KPhotoAlbum +- Piltide andmebaas +- + See on &kphotoalbum;i käsiraamat. Kui sa ei armasta eriti käsiraamatuid lugeda, vaid soovid lihtsalt proovida, mis mida teeb, siis on sinu ees lahti mitu võimalust: +@@ -100,6 +90,12 @@ + >&kphotoalbum;i koduleheküljelt. + ++ ++ KDE ++ kdeextragear-2 ++ KPhotoAlbum ++ Piltide andmebaas ++ + + + &introduction; +diff -up kphotoalbum-4.1.1/doc-translations/it_kphotoalbum/kphotoalbum/index.docbook.docbook_fix kphotoalbum-4.1.1/doc-translations/it_kphotoalbum/kphotoalbum/index.docbook +--- kphotoalbum-4.1.1/doc-translations/it_kphotoalbum/kphotoalbum/index.docbook.docbook_fix 2009-11-15 15:17:57.000000000 -0600 ++++ kphotoalbum-4.1.1/doc-translations/it_kphotoalbum/kphotoalbum/index.docbook 2010-06-13 13:12:00.978165382 -0500 +@@ -1,5 +1,5 @@ + +-KPhotoAlbum"> +@@ -65,16 +65,6 @@ + 2.0 + +- +- KDE +- kdeextragear-2 +- KPhotoAlbum +- Banca dati immagini +- + Questo è il manuale utente di &kphotoalbum;. Se non sei il tipo a cui piace leggere la documentazione, ma che preferisce provare a far funzionare le cose, eccoti delle alternative: +@@ -100,6 +90,12 @@ + >homepage di &kphotoalbum; + ++ ++ KDE ++ kdeextragear-2 ++ KPhotoAlbum ++ Banca dati immagini ++ + + + &introduction; +diff -up kphotoalbum-4.1.1/doc-translations/sv_kphotoalbum/kphotoalbum/index.docbook.docbook_fix kphotoalbum-4.1.1/doc-translations/sv_kphotoalbum/kphotoalbum/index.docbook +--- kphotoalbum-4.1.1/doc-translations/sv_kphotoalbum/kphotoalbum/index.docbook.docbook_fix 2009-11-15 15:19:13.000000000 -0600 ++++ kphotoalbum-4.1.1/doc-translations/sv_kphotoalbum/kphotoalbum/index.docbook 2010-06-13 13:12:45.765165840 -0500 +@@ -1,5 +1,5 @@ + +-KPhotoAlbum"> +@@ -65,16 +65,6 @@ + 2.0 + +- +- KDE +- kdeextragear-2 +- Kfotoalbum +- Bilddatabas +- + Det här är användarmanualen för Kfotoalbum. Om du inte är den som gillar att läsa dokumentation, utan istället bara vill försöka dig på saker och ting, ges här några alternativ: +@@ -100,6 +90,12 @@ + >Kfotoalbums hemsida + ++ ++ KDE ++ kdeextragear-2 ++ Kfotoalbum ++ Bilddatabas ++ + + + &introduction; +diff -up kphotoalbum-4.1.1/doc-translations/uk_kphotoalbum/kphotoalbum/index.docbook.docbook_fix kphotoalbum-4.1.1/doc-translations/uk_kphotoalbum/kphotoalbum/index.docbook +--- kphotoalbum-4.1.1/doc-translations/uk_kphotoalbum/kphotoalbum/index.docbook.docbook_fix 2009-11-15 15:19:26.000000000 -0600 ++++ kphotoalbum-4.1.1/doc-translations/uk_kphotoalbum/kphotoalbum/index.docbook 2010-06-13 13:13:28.217166055 -0500 +@@ -1,5 +1,5 @@ + +-KPhotoAlbum"> +@@ -65,16 +65,6 @@ + 2.0 + +- +- KDE +- kdeextragear-2 +- KPhotoAlbum +- База даних зображень +- + Це інструкція користувача для &kphotoalbum;. Якщо ви не любитель або любителька читання документації і надаєте перевагу самостійному вивченню програми шляхом експериментів, ви можете піти одним з таких шляхів: +@@ -100,6 +90,12 @@ + >домашній сторінці &kphotoalbum; + ++ ++ KDE ++ kdeextragear-2 ++ KPhotoAlbum ++ База даних зображень ++ + + + &introduction; diff --git a/graphics/kphotoalbum/kphotoalbum-4.1.1-exiv2.patch b/graphics/kphotoalbum/kphotoalbum-4.1.1-exiv2.patch new file mode 100644 index 0000000000..ca8e210054 --- /dev/null +++ b/graphics/kphotoalbum/kphotoalbum-4.1.1-exiv2.patch @@ -0,0 +1,47 @@ +--- kphotoalbum/Exif/Info.cpp 2011/01/09 06:47:21 1213127 ++++ kphotoalbum/Exif/Info.cpp 2011/01/09 06:50:40 1213128 +@@ -106,6 +106,28 @@ + return res; + + QList 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::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( 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/graphics/kphotoalbum/kphotoalbum.SlackBuild b/graphics/kphotoalbum/kphotoalbum.SlackBuild index abba1c7124..d573924941 100644 --- a/graphics/kphotoalbum/kphotoalbum.SlackBuild +++ b/graphics/kphotoalbum/kphotoalbum.SlackBuild @@ -5,7 +5,7 @@ PRGNAM=kphotoalbum VERSION=${VERSION:-4.1.1} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} TAG=${TAG:-_SBo} # Automatically determine the architecture we're building on: @@ -56,6 +56,11 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; +# Update docbook files to XML V4.2-Based Variant. +patch -p1 < $CWD/kphotoalbum-4.1.1-docbook_fix.patch +# Upstream patch to fix compilation with exiv2-0.21. +patch -p1 < $CWD/kphotoalbum-4.1.1-exiv2.patch + mkdir build && cd build cmake \ -DCMAKE_C_FLAGS="$SLKCFLAGS" \ -- cgit v1.2.3-65-gdbad