From 57d05f7209f022aa99a8850aafbeec4cb85c3b5b Mon Sep 17 00:00:00 2001 From: root Date: Mon, 3 Oct 2011 23:14:36 +0000 Subject: Mon Oct 3 23:14:36 UTC 2011 --- community-staging/kphotoalbum/PKGBUILD | 47 ++++ .../kphotoalbum/fix-docbook-build.patch | 236 +++++++++++++++++++++ .../kphotoalbum/fix-with-exiv2-0.21.patch | 47 ++++ community-staging/kphotoalbum/kphotoalbum.install | 11 + 4 files changed, 341 insertions(+) create mode 100644 community-staging/kphotoalbum/PKGBUILD create mode 100644 community-staging/kphotoalbum/fix-docbook-build.patch create mode 100644 community-staging/kphotoalbum/fix-with-exiv2-0.21.patch create mode 100644 community-staging/kphotoalbum/kphotoalbum.install (limited to 'community-staging/kphotoalbum') diff --git a/community-staging/kphotoalbum/PKGBUILD b/community-staging/kphotoalbum/PKGBUILD new file mode 100644 index 000000000..1ce076b79 --- /dev/null +++ b/community-staging/kphotoalbum/PKGBUILD @@ -0,0 +1,47 @@ +# $Id: PKGBUILD 56162 2011-10-02 13:52:02Z lcarlier $ +# Maintainer: Laurent Carlier +# Contributor: Andrea Scarpino +# Contributor: Gilles CHAUVIN +# Contributor: Jonathan Schaeffer +# Contributor: chfoxli + +pkgname=kphotoalbum +pkgver=4.1.1 +pkgrel=10 +pkgdesc="KDE Photo Album, picture collection manager" +url="http://www.kphotoalbum.org/" +arch=('i686' 'x86_64') +license=('GPL') +depends=('kdebase-runtime' 'libkipi' 'libkexiv2' 'libkdcraw') +makedepends=('cmake' 'automoc4' 'kdeedu-marble' 'kdemultimedia-mplayerthumbs') +optdepends=('kdeedu-marble: integration with Marble' + 'kipi-plugins: add extra functionality' + 'kdemultimedia-mplayerthumbs: video thumbnails') +install=${pkgname}.install +source=("ftp://ftp.archlinux.org/other/community/${pkgname}/${pkgname}-${pkgver}.tar.bz2" + 'fix-docbook-build.patch' + 'fix-with-exiv2-0.21.patch') +md5sums=('c00a5f179e487ac89fccf8dfb3cd6ef0' + '1b48553af74f0488fdad55758e911e3a' + '9238101a2d7450e6dd822778807dd7bd') + +build() { + cd ${srcdir} + + patch -Np0 -i ${srcdir}/fix-docbook-build.patch + patch -Np0 -i ${srcdir}/fix-with-exiv2-0.21.patch + + mkdir build + cd build + + cmake ../${pkgname}-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package() { + cd ${srcdir}/build + + make DESTDIR=${pkgdir} install +} diff --git a/community-staging/kphotoalbum/fix-docbook-build.patch b/community-staging/kphotoalbum/fix-docbook-build.patch new file mode 100644 index 000000000..575a4271e --- /dev/null +++ b/community-staging/kphotoalbum/fix-docbook-build.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/community-staging/kphotoalbum/fix-with-exiv2-0.21.patch b/community-staging/kphotoalbum/fix-with-exiv2-0.21.patch new file mode 100644 index 000000000..65baf235d --- /dev/null +++ b/community-staging/kphotoalbum/fix-with-exiv2-0.21.patch @@ -0,0 +1,47 @@ +--- kphotoalbum-4.1.1/Exif/Info.cpp.orig 2010/08/16 08:04:32 1164187 ++++ kphotoalbum-4.1.1/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/community-staging/kphotoalbum/kphotoalbum.install b/community-staging/kphotoalbum/kphotoalbum.install new file mode 100644 index 000000000..e70c054ec --- /dev/null +++ b/community-staging/kphotoalbum/kphotoalbum.install @@ -0,0 +1,11 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} -- cgit v1.2.3-54-g00ecf