Date: Thursday, January 5, 2012 @ 15:00:07 Author: ronald Revision: 146190
archrelease: copy trunk to extra-i686, extra-x86_64 Added: digikam/repos/extra-i686/PKGBUILD (from rev 146189, digikam/trunk/PKGBUILD) digikam/repos/extra-i686/boost148.patch (from rev 146189, digikam/trunk/boost148.patch) digikam/repos/extra-i686/digikam.install (from rev 146189, digikam/trunk/digikam.install) digikam/repos/extra-i686/kipi-plugins.install (from rev 146189, digikam/trunk/kipi-plugins.install) digikam/repos/extra-i686/libkipi140.patch (from rev 146189, digikam/trunk/libkipi140.patch) digikam/repos/extra-x86_64/PKGBUILD (from rev 146189, digikam/trunk/PKGBUILD) digikam/repos/extra-x86_64/boost148.patch (from rev 146189, digikam/trunk/boost148.patch) digikam/repos/extra-x86_64/digikam.install (from rev 146189, digikam/trunk/digikam.install) digikam/repos/extra-x86_64/kipi-plugins.install (from rev 146189, digikam/trunk/kipi-plugins.install) digikam/repos/extra-x86_64/libkipi140.patch (from rev 146189, digikam/trunk/libkipi140.patch) Deleted: digikam/repos/extra-i686/PKGBUILD digikam/repos/extra-i686/digikam.install digikam/repos/extra-i686/kipi-plugins.install digikam/repos/extra-x86_64/PKGBUILD digikam/repos/extra-x86_64/digikam.install digikam/repos/extra-x86_64/kipi-plugins.install -----------------------------------+ extra-i686/PKGBUILD | 202 ++++++++++++++++++------------------ extra-i686/boost148.patch | 65 +++++++++++ extra-i686/digikam.install | 24 ++-- extra-i686/kipi-plugins.install | 24 ++-- extra-i686/libkipi140.patch | 63 +++++++++++ extra-x86_64/PKGBUILD | 202 ++++++++++++++++++------------------ extra-x86_64/boost148.patch | 65 +++++++++++ extra-x86_64/digikam.install | 24 ++-- extra-x86_64/kipi-plugins.install | 24 ++-- extra-x86_64/libkipi140.patch | 63 +++++++++++ 10 files changed, 514 insertions(+), 242 deletions(-) Deleted: extra-i686/PKGBUILD =================================================================== --- extra-i686/PKGBUILD 2012-01-05 19:59:03 UTC (rev 146189) +++ extra-i686/PKGBUILD 2012-01-05 20:00:07 UTC (rev 146190) @@ -1,97 +0,0 @@ -# $Id$ -# Maintainer: Andrea Scarpino <ron...@archlinux.org> -# Contributor: Andrea Scarpino <and...@archlinux.org> -# Contributor: Tobias Powalowski <tp...@archlinux.org> - -pkgbase=digikam -pkgname=('digikam' 'kipi-plugins' 'libkface' 'libkgeomap' 'libkvkontakte' 'libmediawiki') -pkgver=2.3.0 -pkgrel=2 -pkgdesc="Digital photo management application for KDE" -arch=('i686' 'x86_64') -license=('GPL') -url="http://www.digikam.org/" -makedepends=('kdepimlibs' 'libkexiv2' 'libkdcraw' 'libkipi' 'libksane' 'liblqr' - 'kdeedu-marble' 'opencv' 'boost' 'libgpod' 'qjson' 'hugin' - 'cmake' 'automoc4' 'doxygen') -source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2") -sha1sums=('15b8b16d7cce6ac50fb958d30166214f2f2b83ee') - -build() { - cd "${srcdir}" - mkdir build - cd build - # Use internal lensfun (FS#21816) - cmake ../${pkgname}-${pkgver} \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_SKIP_RPATH=ON \ - -DLENSFUN_LIBRARY="" \ - -DLENSFUN_INCLUDE_DIR="" - make -} - -package_digikam() { - pkgdesc="Digital photo management application for KDE" - depends=('kdebase-runtime' 'kdepimlibs' 'libgphoto2' 'opencv' 'liblqr' - 'libkipi' 'libkexiv2' 'libkdcraw' 'libkface' 'libkgeomap') - optdepends=('kipi-plugins: for more extras and plugins') - install=digikam.install - - cd "${srcdir}"/build/core - make DESTDIR="${pkgdir}" install - cd "${srcdir}"/build/doc - make DESTDIR="${pkgdir}" install - cd "${srcdir}"/build/po - make DESTDIR="${pkgdir}" install - - # these are in oxygen-icons - rm -rf ${pkgdir}/usr/share/icons - -} - -package_libkface() { - pkgdesc="A Qt/C++ wrapper around LibFace library to perform face recognition and detection over pictures" - depends=('kdelibs' 'opencv') - - cd "${srcdir}"/build/extra/libkface - make DESTDIR="${pkgdir}" install -} - -package_libkgeomap() { - pkgdesc="A wrapper around world map components for browsing and arranging photos on a map" - depends=('kdelibs' 'kdeedu-marble' 'libkexiv2') - - cd "${srcdir}"/build/extra/libkgeomap - make DESTDIR="${pkgdir}" install -} - -package_libkvkontakte() { - pkgdesc="KDE C++ library for asynchronous interaction with vkontakte.rusocial network" - depends=('kdelibs') - - cd "${srcdir}"/build/extra/libkvkontakte - make DESTDIR="${pkgdir}" install -} - -package_libmediawiki() { - pkgdesc="A KDE C++ interface for MediaWiki based web service as wikipedia.org" - depends=('kdelibs') - - cd "${srcdir}"/build/extra/libmediawiki - make DESTDIR="${pkgdir}" install -} - -package_kipi-plugins() { - pkgdesc="A collection of plugins extending the KDE graphics and image applications as digiKam" - depends=('kdebase-runtime' 'kdepimlibs' 'libkdcraw' 'libkipi' 'libksane' - 'opencv' 'qjson' 'libkvkontakte' 'libkexiv2') - optdepends=('libkgeomap' - 'libmediawiki' - 'libgpod' - 'hugin') - install=kipi-plugins.install - - cd "${srcdir}"/build/extra/kipi-plugins - make DESTDIR="${pkgdir}" install -} Copied: digikam/repos/extra-i686/PKGBUILD (from rev 146189, digikam/trunk/PKGBUILD) =================================================================== --- extra-i686/PKGBUILD (rev 0) +++ extra-i686/PKGBUILD 2012-01-05 20:00:07 UTC (rev 146190) @@ -0,0 +1,105 @@ +# $Id$ +# Maintainer: Ronald van Haren <ron...@archlinux.org> +# Contributor: Andrea Scarpino <and...@archlinux.org> +# Contributor: Tobias Powalowski <tp...@archlinux.org> + +pkgbase=digikam +pkgname=('digikam' 'kipi-plugins' 'libkface' 'libkgeomap' 'libkvkontakte' 'libmediawiki') +pkgver=2.5.0 +pkgrel=1 +pkgdesc="Digital photo management application for KDE" +arch=('i686' 'x86_64') +license=('GPL') +url="http://www.digikam.org/" +makedepends=('kdepimlibs' 'libkexiv2' 'libkdcraw' 'libkipi' 'libksane' 'liblqr' + 'kdeedu-marble' 'opencv' 'boost' 'libgpod' 'qjson' 'hugin' + 'cmake' 'automoc4' 'doxygen') +source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2" + "boost148.patch" "libkipi140.patch") +sha1sums=('6cadb838669d1bdcbd6abb677889f7d68d696383' + '93853084905b21309c46ce7d585021e76283d429' + '8a8f624fd0ca768a9dcd706405eb6e4944892d87') +build() { + cd "${srcdir}" + + pushd ${pkgname}-${pkgver}/core + patch -Np0 -i ${srcdir}/boost148.patch + patch -Np1 -i ${srcdir}/libkipi140.patch + popd + + mkdir build + cd build + # Use internal lensfun (FS#21816) + cmake ../${pkgname}-${pkgver} \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_SKIP_RPATH=ON \ + -DLENSFUN_LIBRARY="" \ + -DLENSFUN_INCLUDE_DIR="" + make +} + +package_digikam() { + pkgdesc="Digital photo management application for KDE" + depends=('kdebase-runtime' 'kdepimlibs' 'libgphoto2' 'opencv' 'liblqr' + 'libkipi' 'libkexiv2' 'libkdcraw' 'libkface' 'libkgeomap') + optdepends=('kipi-plugins: for more extras and plugins') + install=digikam.install + + cd "${srcdir}"/build/core + make DESTDIR="${pkgdir}" install + cd "${srcdir}"/build/doc + make DESTDIR="${pkgdir}" install + cd "${srcdir}"/build/po + make DESTDIR="${pkgdir}" install + + # these are in oxygen-icons + rm -rf ${pkgdir}/usr/share/icons + +} + +package_libkface() { + pkgdesc="A Qt/C++ wrapper around LibFace library to perform face recognition and detection over pictures" + depends=('kdelibs' 'opencv') + + cd "${srcdir}"/build/extra/libkface + make DESTDIR="${pkgdir}" install +} + +package_libkgeomap() { + pkgdesc="A wrapper around world map components for browsing and arranging photos on a map" + depends=('kdelibs' 'kdeedu-marble' 'libkexiv2') + + cd "${srcdir}"/build/extra/libkgeomap + make DESTDIR="${pkgdir}" install +} + +package_libkvkontakte() { + pkgdesc="KDE C++ library for asynchronous interaction with vkontakte.rusocial network" + depends=('kdelibs') + + cd "${srcdir}"/build/extra/libkvkontakte + make DESTDIR="${pkgdir}" install +} + +package_libmediawiki() { + pkgdesc="A KDE C++ interface for MediaWiki based web service as wikipedia.org" + depends=('kdelibs') + + cd "${srcdir}"/build/extra/libmediawiki + make DESTDIR="${pkgdir}" install +} + +package_kipi-plugins() { + pkgdesc="A collection of plugins extending the KDE graphics and image applications as digiKam" + depends=('kdebase-runtime' 'kdepimlibs' 'libkdcraw' 'libkipi' 'libksane' + 'opencv' 'qjson' 'libkvkontakte' 'libkexiv2') + optdepends=('libkgeomap' + 'libmediawiki' + 'libgpod' + 'hugin') + install=kipi-plugins.install + + cd "${srcdir}"/build/extra/kipi-plugins + make DESTDIR="${pkgdir}" install +} Copied: digikam/repos/extra-i686/boost148.patch (from rev 146189, digikam/trunk/boost148.patch) =================================================================== --- extra-i686/boost148.patch (rev 0) +++ extra-i686/boost148.patch 2012-01-05 20:00:07 UTC (rev 146190) @@ -0,0 +1,65 @@ +diff -u libs/database/imagehistory/imagehistorygraph_boost.h ../../digikam-2.5.0/core/libs/database/imagehistory/imagehistorygraph_boost.h +--- libs/database/imagehistory/imagehistorygraph_boost.h 2012-01-05 08:32:19.837388059 -0500 ++++ ../../digikam-2.5.0/core/libs/database/imagehistory/imagehistorygraph_boost.h 2012-01-05 09:17:27.798341897 -0500 +@@ -1198,7 +1198,7 @@ + { + boost::dag_shortest_paths(graph, v, + // we provide a constant weight of 1 +- weight_map(boost::ref_property_map<edge_t,int>(weight)). ++ weight_map(boost::ref_property_map<typename boost::graph_traits<GraphType>::edge_descriptor,int>(weight)). + // Store distance and predecessors in QMaps, wrapped to serve as property maps + distance_map(VertexIntMapAdaptor(distances)). + predecessor_map(VertexVertexMapAdaptor(predecessors)) +@@ -1218,7 +1218,7 @@ + { + boost::dag_shortest_paths(graph, v, + // we provide a constant weight of 1 +- weight_map(boost::ref_property_map<edge_t,int>(weight)). ++ weight_map(boost::ref_property_map<typename boost::graph_traits<GraphType>::edge_descriptor,int>(weight)). + // Invert the default compare method: With greater, we get the longest path + distance_compare(std::greater<int>()). + // will be returned if a node is unreachable +@@ -1384,14 +1384,15 @@ + template <class GraphType, typename VertexLessThan> + class lessThanMapEdgeToTarget + { ++ typedef typename boost::graph_traits<GraphType>::edge_descriptor edge_descriptor; + public: + lessThanMapEdgeToTarget(const GraphType& g, VertexLessThan vertexLessThan) + : g(g), vertexLessThan(vertexLessThan) {} + const GraphType& g; + VertexLessThan vertexLessThan; +- bool operator()(const Edge& a, const Edge& b) ++ bool operator()(const edge_descriptor& a, const edge_descriptor& b) + { +- return vertexLessThan(boost::target(a.toEdge(), g), boost::target(b.toEdge(), g)); ++ return vertexLessThan(boost::target(a, g), boost::target(b, g)); + } + }; + +@@ -1402,20 +1403,21 @@ + { + typedef std::pair<Vertex, QList<Edge> > VertexInfo; + +- QList<Edge> outEdges; ++ typedef typename boost::graph_traits<IncidenceGraph>::edge_descriptor edge_descriptor; ++ QList<edge_descriptor> outEdges; + std::vector<VertexInfo> stack; + + boost::put(color, u, boost::gray_color); + vis.discover_vertex(u, g); + +- outEdges = toEdgeList(boost::out_edges(u, g)); ++ outEdges = toList<edge_descriptor>(boost::out_edges(u, g)); + // Sort edges. The lessThan we have takes vertices, so we use a lessThan which + // maps the given edges to their targets, and calls our vertex lessThan. + qSort(outEdges.begin(), outEdges.end(), lessThanMapEdgeToTarget<IncidenceGraph, LessThan>(g, lessThan)); + +- foreach(const Edge& e, outEdges) ++ foreach(const edge_descriptor& e, outEdges) + { +- Vertex v = boost::target(e.toEdge(), g); ++ Vertex v = boost::target(e, g); + vis.examine_edge(e, g); + boost::default_color_type v_color = boost::get(color, v); + if (v_color == boost::white_color) Deleted: extra-i686/digikam.install =================================================================== --- extra-i686/digikam.install 2012-01-05 19:59:03 UTC (rev 146189) +++ extra-i686/digikam.install 2012-01-05 20:00:07 UTC (rev 146190) @@ -1,12 +0,0 @@ -post_install() { - xdg-icon-resource forceupdate --theme hicolor &> /dev/null - update-desktop-database -q -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} Copied: digikam/repos/extra-i686/digikam.install (from rev 146189, digikam/trunk/digikam.install) =================================================================== --- extra-i686/digikam.install (rev 0) +++ extra-i686/digikam.install 2012-01-05 20:00:07 UTC (rev 146190) @@ -0,0 +1,12 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} Deleted: extra-i686/kipi-plugins.install =================================================================== --- extra-i686/kipi-plugins.install 2012-01-05 19:59:03 UTC (rev 146189) +++ extra-i686/kipi-plugins.install 2012-01-05 20:00:07 UTC (rev 146190) @@ -1,12 +0,0 @@ -post_install() { - xdg-icon-resource forceupdate --theme hicolor &> /dev/null - update-desktop-database -q -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} Copied: digikam/repos/extra-i686/kipi-plugins.install (from rev 146189, digikam/trunk/kipi-plugins.install) =================================================================== --- extra-i686/kipi-plugins.install (rev 0) +++ extra-i686/kipi-plugins.install 2012-01-05 20:00:07 UTC (rev 146190) @@ -0,0 +1,12 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} Copied: digikam/repos/extra-i686/libkipi140.patch (from rev 146189, digikam/trunk/libkipi140.patch) =================================================================== --- extra-i686/libkipi140.patch (rev 0) +++ extra-i686/libkipi140.patch 2012-01-05 20:00:07 UTC (rev 146190) @@ -0,0 +1,63 @@ +diff --git a/utilities/setup/setupplugins.cpp b/utilities/setup/setupplugins.cpp +index 0f4030a..b8efb35 100644 +--- a/utilities/setup/setupplugins.cpp ++++ b/utilities/setup/setupplugins.cpp +@@ -6,8 +6,8 @@ + * Date : 2004-01-02 + * Description : setup Kipi plugins tab. + * +- * Copyright (C) 2004-2011 by Gilles Caulier <caulier dot gilles at gmail dot com> +- * Copyright (C) 2011 by Andi Clemens <andi dot clemens at googlemail dot com> ++ * Copyright (C) 2004-2012 by Gilles Caulier <caulier dot gilles at gmail dot com> ++ * Copyright (C) 2011-2012 by Andi Clemens <andi dot clemens at googlemail dot com> + * + * This program is free software; you can redistribute it + * and/or modify it under the terms of the GNU General +@@ -100,6 +100,11 @@ SetupPlugins::SetupPlugins(QWidget* parent) + + panel->setLayout(mainLayout); + ++#if KIPI_VERSION < 0x010400 ++ d->checkAllBtn->setVisible(false); ++ d->clearBtn->setVisible(false); ++#endif ++ + initPlugins(); + + // -------------------------------------------------------- +@@ -158,14 +163,18 @@ void SetupPlugins::applyPlugins() + void SetupPlugins::slotCheckAll() + { + QApplication::setOverrideCursor(Qt::WaitCursor); ++#if KIPI_VERSION >= 0x010400 + d->kipiConfig->slotCheckAll(); ++#endif + QApplication::restoreOverrideCursor(); + } + + void SetupPlugins::slotClear() + { + QApplication::setOverrideCursor(Qt::WaitCursor); ++#if KIPI_VERSION >= 0x010400 + d->kipiConfig->slotClear(); ++#endif + QApplication::restoreOverrideCursor(); + } + +diff --git a/utilities/setup/setupplugins.h b/utilities/setup/setupplugins.h +index 271a569..114e0fa 100644 +--- a/utilities/setup/setupplugins.h ++++ b/utilities/setup/setupplugins.h +@@ -6,8 +6,8 @@ + * Date : 2004-01-02 + * Description : setup Kipi plugins tab. + * +- * Copyright (C) 2004-2011 by Gilles Caulier <caulier dot gilles at gmail dot com> +- * Copyright (C) 2011 by Andi Clemens <andi dot clemens at googlemail dot com> ++ * Copyright (C) 2004-2012 by Gilles Caulier <caulier dot gilles at gmail dot com> ++ * Copyright (C) 2011-2012 by Andi Clemens <andi dot clemens at googlemail dot com> + * + * This program is free software; you can redistribute it + * and/or modify it under the terms of the GNU General + + Deleted: extra-x86_64/PKGBUILD =================================================================== --- extra-x86_64/PKGBUILD 2012-01-05 19:59:03 UTC (rev 146189) +++ extra-x86_64/PKGBUILD 2012-01-05 20:00:07 UTC (rev 146190) @@ -1,97 +0,0 @@ -# $Id$ -# Maintainer: Andrea Scarpino <ron...@archlinux.org> -# Contributor: Andrea Scarpino <and...@archlinux.org> -# Contributor: Tobias Powalowski <tp...@archlinux.org> - -pkgbase=digikam -pkgname=('digikam' 'kipi-plugins' 'libkface' 'libkgeomap' 'libkvkontakte' 'libmediawiki') -pkgver=2.3.0 -pkgrel=2 -pkgdesc="Digital photo management application for KDE" -arch=('i686' 'x86_64') -license=('GPL') -url="http://www.digikam.org/" -makedepends=('kdepimlibs' 'libkexiv2' 'libkdcraw' 'libkipi' 'libksane' 'liblqr' - 'kdeedu-marble' 'opencv' 'boost' 'libgpod' 'qjson' 'hugin' - 'cmake' 'automoc4' 'doxygen') -source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2") -sha1sums=('15b8b16d7cce6ac50fb958d30166214f2f2b83ee') - -build() { - cd "${srcdir}" - mkdir build - cd build - # Use internal lensfun (FS#21816) - cmake ../${pkgname}-${pkgver} \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_SKIP_RPATH=ON \ - -DLENSFUN_LIBRARY="" \ - -DLENSFUN_INCLUDE_DIR="" - make -} - -package_digikam() { - pkgdesc="Digital photo management application for KDE" - depends=('kdebase-runtime' 'kdepimlibs' 'libgphoto2' 'opencv' 'liblqr' - 'libkipi' 'libkexiv2' 'libkdcraw' 'libkface' 'libkgeomap') - optdepends=('kipi-plugins: for more extras and plugins') - install=digikam.install - - cd "${srcdir}"/build/core - make DESTDIR="${pkgdir}" install - cd "${srcdir}"/build/doc - make DESTDIR="${pkgdir}" install - cd "${srcdir}"/build/po - make DESTDIR="${pkgdir}" install - - # these are in oxygen-icons - rm -rf ${pkgdir}/usr/share/icons - -} - -package_libkface() { - pkgdesc="A Qt/C++ wrapper around LibFace library to perform face recognition and detection over pictures" - depends=('kdelibs' 'opencv') - - cd "${srcdir}"/build/extra/libkface - make DESTDIR="${pkgdir}" install -} - -package_libkgeomap() { - pkgdesc="A wrapper around world map components for browsing and arranging photos on a map" - depends=('kdelibs' 'kdeedu-marble' 'libkexiv2') - - cd "${srcdir}"/build/extra/libkgeomap - make DESTDIR="${pkgdir}" install -} - -package_libkvkontakte() { - pkgdesc="KDE C++ library for asynchronous interaction with vkontakte.rusocial network" - depends=('kdelibs') - - cd "${srcdir}"/build/extra/libkvkontakte - make DESTDIR="${pkgdir}" install -} - -package_libmediawiki() { - pkgdesc="A KDE C++ interface for MediaWiki based web service as wikipedia.org" - depends=('kdelibs') - - cd "${srcdir}"/build/extra/libmediawiki - make DESTDIR="${pkgdir}" install -} - -package_kipi-plugins() { - pkgdesc="A collection of plugins extending the KDE graphics and image applications as digiKam" - depends=('kdebase-runtime' 'kdepimlibs' 'libkdcraw' 'libkipi' 'libksane' - 'opencv' 'qjson' 'libkvkontakte' 'libkexiv2') - optdepends=('libkgeomap' - 'libmediawiki' - 'libgpod' - 'hugin') - install=kipi-plugins.install - - cd "${srcdir}"/build/extra/kipi-plugins - make DESTDIR="${pkgdir}" install -} Copied: digikam/repos/extra-x86_64/PKGBUILD (from rev 146189, digikam/trunk/PKGBUILD) =================================================================== --- extra-x86_64/PKGBUILD (rev 0) +++ extra-x86_64/PKGBUILD 2012-01-05 20:00:07 UTC (rev 146190) @@ -0,0 +1,105 @@ +# $Id$ +# Maintainer: Ronald van Haren <ron...@archlinux.org> +# Contributor: Andrea Scarpino <and...@archlinux.org> +# Contributor: Tobias Powalowski <tp...@archlinux.org> + +pkgbase=digikam +pkgname=('digikam' 'kipi-plugins' 'libkface' 'libkgeomap' 'libkvkontakte' 'libmediawiki') +pkgver=2.5.0 +pkgrel=1 +pkgdesc="Digital photo management application for KDE" +arch=('i686' 'x86_64') +license=('GPL') +url="http://www.digikam.org/" +makedepends=('kdepimlibs' 'libkexiv2' 'libkdcraw' 'libkipi' 'libksane' 'liblqr' + 'kdeedu-marble' 'opencv' 'boost' 'libgpod' 'qjson' 'hugin' + 'cmake' 'automoc4' 'doxygen') +source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2" + "boost148.patch" "libkipi140.patch") +sha1sums=('6cadb838669d1bdcbd6abb677889f7d68d696383' + '93853084905b21309c46ce7d585021e76283d429' + '8a8f624fd0ca768a9dcd706405eb6e4944892d87') +build() { + cd "${srcdir}" + + pushd ${pkgname}-${pkgver}/core + patch -Np0 -i ${srcdir}/boost148.patch + patch -Np1 -i ${srcdir}/libkipi140.patch + popd + + mkdir build + cd build + # Use internal lensfun (FS#21816) + cmake ../${pkgname}-${pkgver} \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_SKIP_RPATH=ON \ + -DLENSFUN_LIBRARY="" \ + -DLENSFUN_INCLUDE_DIR="" + make +} + +package_digikam() { + pkgdesc="Digital photo management application for KDE" + depends=('kdebase-runtime' 'kdepimlibs' 'libgphoto2' 'opencv' 'liblqr' + 'libkipi' 'libkexiv2' 'libkdcraw' 'libkface' 'libkgeomap') + optdepends=('kipi-plugins: for more extras and plugins') + install=digikam.install + + cd "${srcdir}"/build/core + make DESTDIR="${pkgdir}" install + cd "${srcdir}"/build/doc + make DESTDIR="${pkgdir}" install + cd "${srcdir}"/build/po + make DESTDIR="${pkgdir}" install + + # these are in oxygen-icons + rm -rf ${pkgdir}/usr/share/icons + +} + +package_libkface() { + pkgdesc="A Qt/C++ wrapper around LibFace library to perform face recognition and detection over pictures" + depends=('kdelibs' 'opencv') + + cd "${srcdir}"/build/extra/libkface + make DESTDIR="${pkgdir}" install +} + +package_libkgeomap() { + pkgdesc="A wrapper around world map components for browsing and arranging photos on a map" + depends=('kdelibs' 'kdeedu-marble' 'libkexiv2') + + cd "${srcdir}"/build/extra/libkgeomap + make DESTDIR="${pkgdir}" install +} + +package_libkvkontakte() { + pkgdesc="KDE C++ library for asynchronous interaction with vkontakte.rusocial network" + depends=('kdelibs') + + cd "${srcdir}"/build/extra/libkvkontakte + make DESTDIR="${pkgdir}" install +} + +package_libmediawiki() { + pkgdesc="A KDE C++ interface for MediaWiki based web service as wikipedia.org" + depends=('kdelibs') + + cd "${srcdir}"/build/extra/libmediawiki + make DESTDIR="${pkgdir}" install +} + +package_kipi-plugins() { + pkgdesc="A collection of plugins extending the KDE graphics and image applications as digiKam" + depends=('kdebase-runtime' 'kdepimlibs' 'libkdcraw' 'libkipi' 'libksane' + 'opencv' 'qjson' 'libkvkontakte' 'libkexiv2') + optdepends=('libkgeomap' + 'libmediawiki' + 'libgpod' + 'hugin') + install=kipi-plugins.install + + cd "${srcdir}"/build/extra/kipi-plugins + make DESTDIR="${pkgdir}" install +} Copied: digikam/repos/extra-x86_64/boost148.patch (from rev 146189, digikam/trunk/boost148.patch) =================================================================== --- extra-x86_64/boost148.patch (rev 0) +++ extra-x86_64/boost148.patch 2012-01-05 20:00:07 UTC (rev 146190) @@ -0,0 +1,65 @@ +diff -u libs/database/imagehistory/imagehistorygraph_boost.h ../../digikam-2.5.0/core/libs/database/imagehistory/imagehistorygraph_boost.h +--- libs/database/imagehistory/imagehistorygraph_boost.h 2012-01-05 08:32:19.837388059 -0500 ++++ ../../digikam-2.5.0/core/libs/database/imagehistory/imagehistorygraph_boost.h 2012-01-05 09:17:27.798341897 -0500 +@@ -1198,7 +1198,7 @@ + { + boost::dag_shortest_paths(graph, v, + // we provide a constant weight of 1 +- weight_map(boost::ref_property_map<edge_t,int>(weight)). ++ weight_map(boost::ref_property_map<typename boost::graph_traits<GraphType>::edge_descriptor,int>(weight)). + // Store distance and predecessors in QMaps, wrapped to serve as property maps + distance_map(VertexIntMapAdaptor(distances)). + predecessor_map(VertexVertexMapAdaptor(predecessors)) +@@ -1218,7 +1218,7 @@ + { + boost::dag_shortest_paths(graph, v, + // we provide a constant weight of 1 +- weight_map(boost::ref_property_map<edge_t,int>(weight)). ++ weight_map(boost::ref_property_map<typename boost::graph_traits<GraphType>::edge_descriptor,int>(weight)). + // Invert the default compare method: With greater, we get the longest path + distance_compare(std::greater<int>()). + // will be returned if a node is unreachable +@@ -1384,14 +1384,15 @@ + template <class GraphType, typename VertexLessThan> + class lessThanMapEdgeToTarget + { ++ typedef typename boost::graph_traits<GraphType>::edge_descriptor edge_descriptor; + public: + lessThanMapEdgeToTarget(const GraphType& g, VertexLessThan vertexLessThan) + : g(g), vertexLessThan(vertexLessThan) {} + const GraphType& g; + VertexLessThan vertexLessThan; +- bool operator()(const Edge& a, const Edge& b) ++ bool operator()(const edge_descriptor& a, const edge_descriptor& b) + { +- return vertexLessThan(boost::target(a.toEdge(), g), boost::target(b.toEdge(), g)); ++ return vertexLessThan(boost::target(a, g), boost::target(b, g)); + } + }; + +@@ -1402,20 +1403,21 @@ + { + typedef std::pair<Vertex, QList<Edge> > VertexInfo; + +- QList<Edge> outEdges; ++ typedef typename boost::graph_traits<IncidenceGraph>::edge_descriptor edge_descriptor; ++ QList<edge_descriptor> outEdges; + std::vector<VertexInfo> stack; + + boost::put(color, u, boost::gray_color); + vis.discover_vertex(u, g); + +- outEdges = toEdgeList(boost::out_edges(u, g)); ++ outEdges = toList<edge_descriptor>(boost::out_edges(u, g)); + // Sort edges. The lessThan we have takes vertices, so we use a lessThan which + // maps the given edges to their targets, and calls our vertex lessThan. + qSort(outEdges.begin(), outEdges.end(), lessThanMapEdgeToTarget<IncidenceGraph, LessThan>(g, lessThan)); + +- foreach(const Edge& e, outEdges) ++ foreach(const edge_descriptor& e, outEdges) + { +- Vertex v = boost::target(e.toEdge(), g); ++ Vertex v = boost::target(e, g); + vis.examine_edge(e, g); + boost::default_color_type v_color = boost::get(color, v); + if (v_color == boost::white_color) Deleted: extra-x86_64/digikam.install =================================================================== --- extra-x86_64/digikam.install 2012-01-05 19:59:03 UTC (rev 146189) +++ extra-x86_64/digikam.install 2012-01-05 20:00:07 UTC (rev 146190) @@ -1,12 +0,0 @@ -post_install() { - xdg-icon-resource forceupdate --theme hicolor &> /dev/null - update-desktop-database -q -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} Copied: digikam/repos/extra-x86_64/digikam.install (from rev 146189, digikam/trunk/digikam.install) =================================================================== --- extra-x86_64/digikam.install (rev 0) +++ extra-x86_64/digikam.install 2012-01-05 20:00:07 UTC (rev 146190) @@ -0,0 +1,12 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} Deleted: extra-x86_64/kipi-plugins.install =================================================================== --- extra-x86_64/kipi-plugins.install 2012-01-05 19:59:03 UTC (rev 146189) +++ extra-x86_64/kipi-plugins.install 2012-01-05 20:00:07 UTC (rev 146190) @@ -1,12 +0,0 @@ -post_install() { - xdg-icon-resource forceupdate --theme hicolor &> /dev/null - update-desktop-database -q -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} Copied: digikam/repos/extra-x86_64/kipi-plugins.install (from rev 146189, digikam/trunk/kipi-plugins.install) =================================================================== --- extra-x86_64/kipi-plugins.install (rev 0) +++ extra-x86_64/kipi-plugins.install 2012-01-05 20:00:07 UTC (rev 146190) @@ -0,0 +1,12 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} Copied: digikam/repos/extra-x86_64/libkipi140.patch (from rev 146189, digikam/trunk/libkipi140.patch) =================================================================== --- extra-x86_64/libkipi140.patch (rev 0) +++ extra-x86_64/libkipi140.patch 2012-01-05 20:00:07 UTC (rev 146190) @@ -0,0 +1,63 @@ +diff --git a/utilities/setup/setupplugins.cpp b/utilities/setup/setupplugins.cpp +index 0f4030a..b8efb35 100644 +--- a/utilities/setup/setupplugins.cpp ++++ b/utilities/setup/setupplugins.cpp +@@ -6,8 +6,8 @@ + * Date : 2004-01-02 + * Description : setup Kipi plugins tab. + * +- * Copyright (C) 2004-2011 by Gilles Caulier <caulier dot gilles at gmail dot com> +- * Copyright (C) 2011 by Andi Clemens <andi dot clemens at googlemail dot com> ++ * Copyright (C) 2004-2012 by Gilles Caulier <caulier dot gilles at gmail dot com> ++ * Copyright (C) 2011-2012 by Andi Clemens <andi dot clemens at googlemail dot com> + * + * This program is free software; you can redistribute it + * and/or modify it under the terms of the GNU General +@@ -100,6 +100,11 @@ SetupPlugins::SetupPlugins(QWidget* parent) + + panel->setLayout(mainLayout); + ++#if KIPI_VERSION < 0x010400 ++ d->checkAllBtn->setVisible(false); ++ d->clearBtn->setVisible(false); ++#endif ++ + initPlugins(); + + // -------------------------------------------------------- +@@ -158,14 +163,18 @@ void SetupPlugins::applyPlugins() + void SetupPlugins::slotCheckAll() + { + QApplication::setOverrideCursor(Qt::WaitCursor); ++#if KIPI_VERSION >= 0x010400 + d->kipiConfig->slotCheckAll(); ++#endif + QApplication::restoreOverrideCursor(); + } + + void SetupPlugins::slotClear() + { + QApplication::setOverrideCursor(Qt::WaitCursor); ++#if KIPI_VERSION >= 0x010400 + d->kipiConfig->slotClear(); ++#endif + QApplication::restoreOverrideCursor(); + } + +diff --git a/utilities/setup/setupplugins.h b/utilities/setup/setupplugins.h +index 271a569..114e0fa 100644 +--- a/utilities/setup/setupplugins.h ++++ b/utilities/setup/setupplugins.h +@@ -6,8 +6,8 @@ + * Date : 2004-01-02 + * Description : setup Kipi plugins tab. + * +- * Copyright (C) 2004-2011 by Gilles Caulier <caulier dot gilles at gmail dot com> +- * Copyright (C) 2011 by Andi Clemens <andi dot clemens at googlemail dot com> ++ * Copyright (C) 2004-2012 by Gilles Caulier <caulier dot gilles at gmail dot com> ++ * Copyright (C) 2011-2012 by Andi Clemens <andi dot clemens at googlemail dot com> + * + * This program is free software; you can redistribute it + * and/or modify it under the terms of the GNU General + +