diff options
author | root <root@rshg054.dnsready.net> | 2013-02-10 01:12:52 -0800 |
---|---|---|
committer | root <root@rshg054.dnsready.net> | 2013-02-10 01:12:52 -0800 |
commit | 1bb2648cde916ac27d3dd75d7b64a4ddc89787b7 (patch) | |
tree | 016bfa1969323404c37dbef29cfc7242a5a8e9f3 /extra/digikam | |
parent | e9c244cac8e5dc1c59c7e8b7bc885fef04224b70 (diff) |
Sun Feb 10 01:12:35 PST 2013
Diffstat (limited to 'extra/digikam')
-rw-r--r-- | extra/digikam/boost148.patch | 65 | ||||
-rw-r--r-- | extra/digikam/digikam-2.5.0-gcc-4.7.0.patch | 63 | ||||
-rw-r--r-- | extra/digikam/libkipi140.patch | 63 |
3 files changed, 0 insertions, 191 deletions
diff --git a/extra/digikam/boost148.patch b/extra/digikam/boost148.patch deleted file mode 100644 index 6d3ff585b..000000000 --- a/extra/digikam/boost148.patch +++ /dev/null @@ -1,65 +0,0 @@ -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) diff --git a/extra/digikam/digikam-2.5.0-gcc-4.7.0.patch b/extra/digikam/digikam-2.5.0-gcc-4.7.0.patch deleted file mode 100644 index 535387b92..000000000 --- a/extra/digikam/digikam-2.5.0-gcc-4.7.0.patch +++ /dev/null @@ -1,63 +0,0 @@ ---- digikam-2.5.0/core/digikam/album/albummanager.h 2012-01-03 02:32:41.000000000 +0200 -+++ digikam-2.5.0/core/digikam/album/albummanager.h 2012-01-05 03:18:16.291639995 +0200 -@@ -831,7 +831,7 @@ - { - foreach(T* t, list) - { -- append(AlbumPointer<T>(t)); -+ this->append(AlbumPointer<T>(t)); - } - return *this; - } ---- digikam-2.5.0/core/libs/database/imagehistory/imagehistorygraph_boost.h 2012-01-03 02:32:26.000000000 +0200 -+++ digikam-2.5.0/core/libs/database/imagehistory/imagehistorygraph_boost.h 2012-01-05 03:01:56.965609602 +0200 -@@ -1362,7 +1362,7 @@ - template <typename VertexType, typename GraphType> - void discover_vertex(VertexType u, const GraphType&) const - { -- record(u); -+ this->record(u); - } - }; - -@@ -1373,7 +1373,7 @@ - template <typename VertexType, typename GraphType> - void discover_vertex(VertexType u, const GraphType&) const - { -- record(u); -+ this->record(u); - } - }; - ---- digikam-2.5.0/core/utilities/cameragui/devices/gpcamera.cpp 2012-01-03 02:32:04.000000000 +0200 -+++ digikam-2.5.0/core/utilities/cameragui/devices/gpcamera.cpp 2012-01-05 01:22:34.009352997 +0200 -@@ -30,6 +30,7 @@ - extern "C" - { - #include <utime.h> -+#include <unistd.h> - } - - // C++ includes ---- digikam-2.5.0/extra/kipi-plugins/htmlexport/wizard.cpp 2012-01-03 02:31:42.000000000 +0200 -+++ digikam-2.5.0/extra/kipi-plugins/htmlexport/wizard.cpp 2012-01-05 02:35:01.061054821 +0200 -@@ -78,7 +78,7 @@ - public: - WizardPage(KAssistantDialog* dialog, const QString& title) - : QWidget(dialog) { -- setupUi(this); -+ this->setupUi(this); - layout()->setMargin(0); - mPage = dialog->addPage(this, title); - } ---- digikam-2.5.0/extra/kipi-plugins/printimages/wizard/wizard.cpp 2012-01-03 02:31:34.000000000 +0200 -+++ digikam-2.5.0/extra/kipi-plugins/printimages/wizard/wizard.cpp 2012-01-05 02:17:15.249914790 +0200 -@@ -88,7 +88,7 @@ - WizardPage ( KAssistantDialog* dialog, const QString& title ) - : QWidget ( dialog ) - { -- setupUi ( this ); -+ this->setupUi ( this ); - layout()->setMargin ( 0 ); - mPage = dialog->addPage ( this, title ); - } diff --git a/extra/digikam/libkipi140.patch b/extra/digikam/libkipi140.patch deleted file mode 100644 index a221b5847..000000000 --- a/extra/digikam/libkipi140.patch +++ /dev/null @@ -1,63 +0,0 @@ -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 - - |