diff options
author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-10-07 17:33:04 -0300 |
---|---|---|
committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-10-07 17:33:04 -0300 |
commit | 2302f1d28510fadb2dcfa119f28ed28f164845bf (patch) | |
tree | e7040e1c743f46bc60a7844275516e4404f6ac30 /community-staging/kphotoalbum | |
parent | 2a9d1292ab60e8a2356fb3eeb36b8c3cfc22759b (diff) | |
parent | 5442e9b8f357932ed5d6cb46e90fcbf6f453469f (diff) |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/fotoxx/PKGBUILD
community/gtkdialog/PKGBUILD
community/hubbub/PKGBUILD
community/libgdamm/PKGBUILD
community/libparserutils/PKGBUILD
community/mingw32-binutils/PKGBUILD
community/mingw32-gcc-base/PKGBUILD
community/mingw32-gcc/PKGBUILD
community/mtpaint/PKGBUILD
community/netsurf/PKGBUILD
community/patchage/PKGBUILD
community/qgo/PKGBUILD
community/tomoyo-tools/PKGBUILD
community/tre/PKGBUILD
community/virtualbox/PKGBUILD
core/net-tools/PKGBUILD
core/openldap/PKGBUILD
extra/epiphany/PKGBUILD
extra/evince/PKGBUILD
extra/evolution-data-server/PKGBUILD
extra/evolution/PKGBUILD
extra/exiv2/PKGBUILD
extra/folks/PKGBUILD
extra/gimp-ufraw/PKGBUILD
extra/gnome-control-center/PKGBUILD
extra/gnome-power-manager/PKGBUILD
extra/gnome-python-desktop/PKGBUILD
extra/gnome-python-extras/PKGBUILD
extra/gvfs/PKGBUILD
extra/jack/PKGBUILD
extra/kdelibs/PKGBUILD
extra/kdepim/PKGBUILD
extra/koffice/PKGBUILD
extra/libreoffice/PKGBUILD
extra/libwebkit/PKGBUILD
extra/mutter/PKGBUILD
extra/nautilus/PKGBUILD
extra/openmpi/PKGBUILD
extra/pavucontrol/PKGBUILD
extra/php/PKGBUILD
extra/pidgin/PKGBUILD
extra/postgresql/PKGBUILD
extra/pulseaudio/PKGBUILD
extra/pygobject2/PKGBUILD
extra/swt/PKGBUILD
extra/tomcat/PKGBUILD
extra/totem/PKGBUILD
extra/vigra/PKGBUILD
extra/vte/PKGBUILD
extra/xulrunner/PKGBUILD
kde-unstable/calligra/PKGBUILD
kde-unstable/kdebase-workspace/PKGBUILD
multilib/lib32-atk/PKGBUILD
multilib/lib32-gdk-pixbuf2/PKGBUILD
multilib/lib32-glew/PKGBUILD
multilib/lib32-glib2/PKGBUILD
multilib/lib32-jack/PKGBUILD
multilib/lib32-libpulse/PKGBUILD
multilib/lib32-pango/PKGBUILD
multilib/wine/PKGBUILD
social/miniupnpc/PKGBUILD
testing/icedtea-web-java7/PKGBUILD
testing/sqlite3/PKGBUILD
~xihh/abiword/PKGBUILD
Diffstat (limited to 'community-staging/kphotoalbum')
-rw-r--r-- | community-staging/kphotoalbum/PKGBUILD | 47 | ||||
-rw-r--r-- | community-staging/kphotoalbum/fix-docbook-build.patch | 236 | ||||
-rw-r--r-- | community-staging/kphotoalbum/fix-with-exiv2-0.21.patch | 47 | ||||
-rw-r--r-- | community-staging/kphotoalbum/kphotoalbum.install | 11 |
4 files changed, 341 insertions, 0 deletions
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 <lordheavym@gmail.com> +# Contributor: Andrea Scarpino <andrea@archlinux.org> +# Contributor: Gilles CHAUVIN <gcnweb ][ gmail ? com> +# Contributor: Jonathan Schaeffer <joschaeffer ][ gmail ? com> +# Contributor: chfoxli <lg ][ romandie ? com> + +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 @@ + <?xml version="1.0" ?> +-<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.1.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [ ++<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [ + <!ENTITY kphotoalbum "<application>KPhotoAlbum</application>"> + <!ENTITY kappname "&kphotoalbum;"> + <!ENTITY package "kdeextragear-2"> +@@ -41,12 +41,6 @@ + <date>2004-08-06</date> + <releaseinfo>2.0</releaseinfo> + +- <keywordset> +- <keyword>KDE</keyword> +- <keyword>kdeextragear-2</keyword> +- <keyword>KPhotoAlbum</keyword> +- <keyword>Image Database</keyword> +- </keywordset> + <abstract><para> + 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 <guimenuitem>Run &kphoto + on long HTML document at <ulink + url="http://www.kphotoalbum.org/">&kphotoalbum;'s Homepage</ulink></para> + </abstract> ++ <keywordset> ++ <keyword>KDE</keyword> ++ <keyword>kdeextragear-2</keyword> ++ <keyword>KPhotoAlbum</keyword> ++ <keyword>Image Database</keyword> ++ </keywordset> + </bookinfo> + + &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 @@ + <?xml version="1.0" ?> +-<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.1.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [ ++<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [ + <!ENTITY kphotoalbum "<application + >KPhotoAlbum</application + >"> +@@ -65,16 +65,6 @@ + <releaseinfo + >2.0</releaseinfo> + +- <keywordset> +- <keyword +->KDE</keyword> +- <keyword +->kdeextragear-2</keyword> +- <keyword +->KPhotoAlbum</keyword> +- <keyword +->Bilddatenbank</keyword> +- </keywordset> + <abstract + ><para + >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: <itemizedlist> +@@ -102,6 +92,12 @@ + >HTML</acronym + >-Dokument zum Herunterladen.</para> + </abstract> ++ <keywordset> ++ <keyword>KDE</keyword> ++ <keyword>kdeextragear-2</keyword> ++ <keyword>KPhotoAlbum</keyword> ++ <keyword>Bilddatenbank</keyword> ++ </keywordset> + </bookinfo> + + &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 @@ + <?xml version="1.0" ?> +-<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.1.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [ ++<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [ + <!ENTITY kphotoalbum "<application + >KPhotoAlbum</application + >"> +@@ -65,16 +65,6 @@ + <releaseinfo + >2.0</releaseinfo> + +- <keywordset> +- <keyword +->KDE</keyword> +- <keyword +->kdeextragear-2</keyword> +- <keyword +->KPhotoAlbum</keyword> +- <keyword +->Piltide andmebaas</keyword> +- </keywordset> + <abstract + ><para + >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: <itemizedlist> +@@ -100,6 +90,12 @@ + >&kphotoalbum;i koduleheküljelt</ulink + >.</para> + </abstract> ++ <keywordset> ++ <keyword>KDE</keyword> ++ <keyword>kdeextragear-2</keyword> ++ <keyword>KPhotoAlbum</keyword> ++ <keyword>Piltide andmebaas</keyword> ++ </keywordset> + </bookinfo> + + &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 @@ + <?xml version="1.0" ?> +-<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.1.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [ ++<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [ + <!ENTITY kphotoalbum "<application + >KPhotoAlbum</application + >"> +@@ -65,16 +65,6 @@ + <releaseinfo + >2.0</releaseinfo> + +- <keywordset> +- <keyword +->KDE</keyword> +- <keyword +->kdeextragear-2</keyword> +- <keyword +->KPhotoAlbum</keyword> +- <keyword +->Banca dati immagini</keyword> +- </keywordset> + <abstract + ><para + >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: <itemizedlist> +@@ -100,6 +90,12 @@ + >homepage di &kphotoalbum;</ulink + ></para> + </abstract> ++ <keywordset> ++ <keyword>KDE</keyword> ++ <keyword>kdeextragear-2</keyword> ++ <keyword>KPhotoAlbum</keyword> ++ <keyword>Banca dati immagini</keyword> ++ </keywordset> + </bookinfo> + + &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 @@ + <?xml version="1.0" ?> +-<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.1.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [ ++<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [ + <!ENTITY kphotoalbum "<application + >KPhotoAlbum</application + >"> +@@ -65,16 +65,6 @@ + <releaseinfo + >2.0</releaseinfo> + +- <keywordset> +- <keyword +->KDE</keyword> +- <keyword +->kdeextragear-2</keyword> +- <keyword +->Kfotoalbum</keyword> +- <keyword +->Bilddatabas</keyword> +- </keywordset> + <abstract + ><para + >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: <itemizedlist> +@@ -100,6 +90,12 @@ + >Kfotoalbums hemsida</ulink + ></para> + </abstract> ++ <keywordset> ++ <keyword>KDE</keyword> ++ <keyword>kdeextragear-2</keyword> ++ <keyword>Kfotoalbum</keyword> ++ <keyword>Bilddatabas</keyword> ++ </keywordset> + </bookinfo> + + &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 @@ + <?xml version="1.0" ?> +-<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.1.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [ ++<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [ + <!ENTITY kphotoalbum "<application + >KPhotoAlbum</application + >"> +@@ -65,16 +65,6 @@ + <releaseinfo + >2.0</releaseinfo> + +- <keywordset> +- <keyword +->KDE</keyword> +- <keyword +->kdeextragear-2</keyword> +- <keyword +->KPhotoAlbum</keyword> +- <keyword +->База даних зображень</keyword> +- </keywordset> + <abstract + ><para + >Це інструкція користувача для &kphotoalbum;. Якщо ви не любитель або любителька читання документації і надаєте перевагу самостійному вивченню програми шляхом експериментів, ви можете піти одним з таких шляхів: <itemizedlist> +@@ -100,6 +90,12 @@ + >домашній сторінці &kphotoalbum;</ulink + ></para> + </abstract> ++ <keywordset> ++ <keyword>KDE</keyword> ++ <keyword>kdeextragear-2</keyword> ++ <keyword>KPhotoAlbum</keyword> ++ <keyword>База даних зображень</keyword> ++ </keywordset> + </bookinfo> + + &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<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 ); 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 +} |