Date: Thursday, January 5, 2012 @ 13:42:30 Author: ronald Revision: 146188
add couple of build fixes for libkipi 1.4.0 and boost 1.48 Added: digikam/trunk/boost148.patch digikam/trunk/libkipi140.patch Modified: digikam/trunk/PKGBUILD ------------------+ PKGBUILD | 19 +++++++--- boost148.patch | 65 ++++++++++++++++++++++++++++++++++ libkipi140.patch | 99 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 178 insertions(+), 5 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2012-01-05 17:01:24 UTC (rev 146187) +++ PKGBUILD 2012-01-05 18:42:30 UTC (rev 146188) @@ -1,12 +1,12 @@ # $Id$ -# Maintainer: Andrea Scarpino <ron...@archlinux.org> +# 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.3.0 -pkgrel=2 +pkgver=2.5.0 +pkgrel=1 pkgdesc="Digital photo management application for KDE" arch=('i686' 'x86_64') license=('GPL') @@ -14,11 +14,20 @@ 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') +source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2" + "boost148.patch" "libkipi140.patch") +sha1sums=('6cadb838669d1bdcbd6abb677889f7d68d696383' + '93853084905b21309c46ce7d585021e76283d429' + '3447ce950948d1871cf69be4eadfc95168df7c86') build() { cd "${srcdir}" + + pushd ${pkgname}-${pkgver}/core + patch -Np0 -i ${srcdir}/boost148.patch + patch -Np0 -i ${srcdir}/libkipi140.patch + popd + mkdir build cd build # Use internal lensfun (FS#21816) Added: boost148.patch =================================================================== --- boost148.patch (rev 0) +++ boost148.patch 2012-01-05 18:42:30 UTC (rev 146188) @@ -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) Added: libkipi140.patch =================================================================== --- libkipi140.patch (rev 0) +++ libkipi140.patch 2012-01-05 18:42:30 UTC (rev 146188) @@ -0,0 +1,99 @@ +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 + + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index f09b85c..9d07415 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -6,7 +6,7 @@ + # @date 2004-02-01 + # @brief KDE Image Plugin Interface + # +-# @author Copyright (C) 2004-2011 by Gilles Caulier ++# @author Copyright (C) 2004-2012 by Gilles Caulier + # <a href="mailto:caulier dot gilles at gmail dot com">caulier dot gilles at gmail dot com</a> + # + # This program is free software; you can redistribute it +@@ -61,10 +61,11 @@ ADD_DEFINITIONS(-DKDE_DEFAULT_DEBUG_AREA=${LIBKIPI_AREA_CODE_GENERAL}) + # 1.1.0 => 7.1.0 (released with KDE 4.5.0) + # 1.2.0 => 8.0.0 (released with KDE 4.6.0) + # 1.3.0 => 8.0.1 (released with KDE 4.7.1 - Set deprecated ImageInfo::title() and ImageInfo::setTitle(). Add ImageInfo::name() and ImageInfo::setName(). ++# 1.4.0 => 8.0.2 (released with KDE 4.8.0 - Add 2 new slots in ConfigWidget class). + + # Library API version + SET(KIPI_LIB_MAJOR_VERSION "1") +-SET(KIPI_LIB_MINOR_VERSION "3") ++SET(KIPI_LIB_MINOR_VERSION "4") + SET(KIPI_LIB_PATCH_VERSION "0") + + # Suffix to add at end of version string. Usual values are: +@@ -80,7 +81,7 @@ SET(KIPI_LIB_SUFFIX_VERSION "") + # For details : http://www.gnu.org/software/libtool/manual/libtool.html#Updating-version-info + SET(KIPI_LIB_SO_CUR_VERSION "8") + SET(KIPI_LIB_SO_REV_VERSION "0") +-SET(KIPI_LIB_SO_AGE_VERSION "1") ++SET(KIPI_LIB_SO_AGE_VERSION "2") + + # ======================================================= + # Set env. variables accordinly. +