From 9ce329df2c98e61168895181b88141fc224324e9 Mon Sep 17 00:00:00 2001 From: Ben Date: Sun, 22 Apr 2012 12:27:08 -0400 Subject: graphics/kphotoalbum: Updated for version 4.2. Signed-off-by: dsomero --- graphics/kphotoalbum/README | 2 + .../kphotoalbum-4.1.1-docbook_fix.patch | 236 --------------------- graphics/kphotoalbum/kphotoalbum-4.1.1-exiv2.patch | 47 ---- .../kphotoalbum/kphotoalbum-4.2-docbook_xml.patch | 49 +++++ graphics/kphotoalbum/kphotoalbum.SlackBuild | 18 +- graphics/kphotoalbum/kphotoalbum.info | 6 +- 6 files changed, 64 insertions(+), 294 deletions(-) delete mode 100644 graphics/kphotoalbum/kphotoalbum-4.1.1-docbook_fix.patch delete mode 100644 graphics/kphotoalbum/kphotoalbum-4.1.1-exiv2.patch create mode 100644 graphics/kphotoalbum/kphotoalbum-4.2-docbook_xml.patch (limited to 'graphics/kphotoalbum') diff --git a/graphics/kphotoalbum/README b/graphics/kphotoalbum/README index 584b16ee2e..0f90b9c5ce 100644 --- a/graphics/kphotoalbum/README +++ b/graphics/kphotoalbum/README @@ -2,4 +2,6 @@ KPhotoAlbum (previously known as KimDaBa) is an photograh viewer and organizer. Users can search for images based on tags (also called categories). KPhotoAlbum supports KIPI plugins for manipulating images. +Set DEMO=no to exclude the demo pictures and video from the package. + Requires: kipi-plugins available at SlackBuilds.org. diff --git a/graphics/kphotoalbum/kphotoalbum-4.1.1-docbook_fix.patch b/graphics/kphotoalbum/kphotoalbum-4.1.1-docbook_fix.patch deleted file mode 100644 index 575a4271eb..0000000000 --- a/graphics/kphotoalbum/kphotoalbum-4.1.1-docbook_fix.patch +++ /dev/null @@ -1,236 +0,0 @@ -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 deleted file mode 100644 index ca8e210054..0000000000 --- a/graphics/kphotoalbum/kphotoalbum-4.1.1-exiv2.patch +++ /dev/null @@ -1,47 +0,0 @@ ---- 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-4.2-docbook_xml.patch b/graphics/kphotoalbum/kphotoalbum-4.2-docbook_xml.patch new file mode 100644 index 0000000000..45a646e3dd --- /dev/null +++ b/graphics/kphotoalbum/kphotoalbum-4.2-docbook_xml.patch @@ -0,0 +1,49 @@ +Index: git/doc/fr/index.docbook +=================================================================== +--- git.orig/doc/fr/index.docbook 2012-04-01 23:00:28.000000000 +0200 ++++ git/doc/fr/index.docbook 2012-04-01 23:16:07.000000000 +0200 +@@ -34,8 +34,12 @@ + > Pedersen +- +- &traducteurXavierBesnard; ++ ++ ++ Xavier ++ Besnard ++
Übersetzung ++ + + + +Index: git/doc/nl/index.docbook +=================================================================== +--- git.orig/doc/nl/index.docbook 2012-04-01 23:00:28.000000000 +0200 ++++ git/doc/nl/index.docbook 2012-04-01 23:15:56.000000000 +0200 +@@ -42,7 +42,24 @@ + >Turkia + +- &ged.vertaald;&Freek.de.Kruijf; ++ ++ Ged ++ Vertaald ++
Übersetzung ++ ++ ++ Freek.de ++ Kruijf ++
Übersetzung ++ + + + diff --git a/graphics/kphotoalbum/kphotoalbum.SlackBuild b/graphics/kphotoalbum/kphotoalbum.SlackBuild index d573924941..60bb1fc689 100644 --- a/graphics/kphotoalbum/kphotoalbum.SlackBuild +++ b/graphics/kphotoalbum/kphotoalbum.SlackBuild @@ -4,7 +4,7 @@ # By default the demo pictures and movie are packaged. PRGNAM=kphotoalbum -VERSION=${VERSION:-4.1.1} +VERSION=${VERSION:-4.2} BUILD=${BUILD:-2} TAG=${TAG:-_SBo} @@ -25,7 +25,11 @@ OUTPUT=${OUTPUT:-/tmp} # Default is to package the demo pictures and movie, # set DEMO to no to omit them. -DEMO=yes +DEMO=${DEMO:-yes} + +# Default is to apply the docbook patch required for +# KDE versions <4.8 +DOCBOOK_PATCH=${DOCBOOK_PATCH:-yes} if [ "$ARCH" = "i486" ]; then SLKCFLAGS="-O2 -march=i486 -mtune=i686" @@ -56,10 +60,9 @@ 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 +if [ "$DOCBOOK_PATCH" = "yes" ]; then + patch -p1 < $CWD/kphotoalbum-4.2-docbook_xml.patch +fi mkdir build && cd build cmake \ @@ -73,7 +76,7 @@ mkdir build && cd build make install DESTDIR=$PKG cd - -if [ "$DEMO"="no" ]; then +if [ "$DEMO" = "no" ]; then rm -r /$PKG/usr/share/apps/$PRGNAM/demo fi @@ -91,4 +94,3 @@ cat $CWD/doinst.sh > $PKG/install/doinst.sh cd $PKG /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} - diff --git a/graphics/kphotoalbum/kphotoalbum.info b/graphics/kphotoalbum/kphotoalbum.info index fbacfd8ce0..1164765aa0 100644 --- a/graphics/kphotoalbum/kphotoalbum.info +++ b/graphics/kphotoalbum/kphotoalbum.info @@ -1,8 +1,8 @@ PRGNAM="kphotoalbum" -VERSION="4.1.1" +VERSION="4.2" HOMEPAGE="http://kphotoalbum.org" -DOWNLOAD="http://www.kphotoalbum.org/data/download/kphotoalbum-4.1.1.tar.bz2" -MD5SUM="c00a5f179e487ac89fccf8dfb3cd6ef0" +DOWNLOAD="http://download.kde.org/stable/kphotoalbum/4.2/src/kphotoalbum-4.2.tar.bz2" +MD5SUM="7cb484089477f3633657b67ce59b85f2" DOWNLOAD_x86_64="" MD5SUM_x86_64="" MAINTAINER="Ben" -- cgit v1.2.3-65-gdbad