[89258] trunk/dports/kde/digikam
ryandesign at macports.org
ryandesign at macports.org
Sun Jan 22 02:17:02 PST 2012
Revision: 89258
http://trac.macports.org/changeset/89258
Author: ryandesign at macports.org
Date: 2012-01-22 02:17:02 -0800 (Sun, 22 Jan 2012)
Log Message:
-----------
digikam: update to 2.5.0; add patches to fix build with boost 1.48+ (#32524) and current libkipi version
Modified Paths:
--------------
trunk/dports/kde/digikam/Portfile
Added Paths:
-----------
trunk/dports/kde/digikam/files/patch-core-libs-database-imagehistory-imagehistorygraph_boost.h.diff
trunk/dports/kde/digikam/files/patch-core-utilities-setup-setupplugins.cpp.diff
Removed Paths:
-------------
trunk/dports/kde/digikam/files/patch-CMakeLists.txt.diff
Modified: trunk/dports/kde/digikam/Portfile
===================================================================
--- trunk/dports/kde/digikam/Portfile 2012-01-22 09:37:45 UTC (rev 89257)
+++ trunk/dports/kde/digikam/Portfile 2012-01-22 10:17:02 UTC (rev 89258)
@@ -5,8 +5,7 @@
PortGroup kde4 1.1
name digikam
-version 2.1.1
-revision 1
+version 2.5.0
categories kde kde4
maintainers hyper-world.de:jan openmaintainer
platforms darwin
@@ -17,8 +16,8 @@
homepage http://www.digikam.org/
master_sites sourceforge:project/digikam/digikam/${version}
-checksums rmd160 16a78310c9a3020de0f4d447a959b98535ce4e04 \
- sha256 cc25fda2408227fb2c3ce35216530fe050f4ef6d7f71a2456b9a08d51ae2053f
+checksums rmd160 4ff1b5fbc2cc4a8cb9994f7c7796086418dd43fb \
+ sha256 55292c79b41fd2c20ce0a821f388645436acb18b3b06b486747e17129114851a
use_bzip2 yes
@@ -63,9 +62,8 @@
depends_run-append port:oxygen-icons
-if {![variant_isset doc]} {
- patchfiles patch-CMakeLists.txt.diff
-}
+patchfiles patch-core-libs-database-imagehistory-imagehistorygraph_boost.h.diff \
+ patch-core-utilities-setup-setupplugins.cpp.diff
if {${configure.compiler} == "clang"} {
configure.compiler llvm-gcc-4.2
Deleted: trunk/dports/kde/digikam/files/patch-CMakeLists.txt.diff
===================================================================
--- trunk/dports/kde/digikam/files/patch-CMakeLists.txt.diff 2012-01-22 09:37:45 UTC (rev 89257)
+++ trunk/dports/kde/digikam/files/patch-CMakeLists.txt.diff 2012-01-22 10:17:02 UTC (rev 89258)
@@ -1,10 +0,0 @@
---- CMakeLists.txt.orig 2011-08-17 21:00:22.000000000 -0400
-+++ CMakeLists.txt 2011-08-17 21:00:26.000000000 -0400
-@@ -79,7 +79,6 @@
-
- ADD_SUBDIRECTORY(extra)
- ADD_SUBDIRECTORY(core)
--ADD_SUBDIRECTORY(doc)
-
- add_subdirectory( po )
-
Added: trunk/dports/kde/digikam/files/patch-core-libs-database-imagehistory-imagehistorygraph_boost.h.diff
===================================================================
--- trunk/dports/kde/digikam/files/patch-core-libs-database-imagehistory-imagehistorygraph_boost.h.diff (rev 0)
+++ trunk/dports/kde/digikam/files/patch-core-libs-database-imagehistory-imagehistorygraph_boost.h.diff 2012-01-22 10:17:02 UTC (rev 89258)
@@ -0,0 +1,66 @@
+https://bugs.kde.org/show_bug.cgi?id=287772
+https://projects.kde.org/projects/extragear/graphics/digikam/repository/revisions/d18ea6da2d3e2359f4113e83c3fd40c18a29ddab
+--- core/libs/database/imagehistory/imagehistorygraph_boost.h.orig
++++ core/libs/database/imagehistory/imagehistorygraph_boost.h
+@@ -1198,7 +1198,7 @@ protected:
+ {
+ 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 @@ protected:
+ {
+ 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 @@ protected:
+ 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 @@ protected:
+ {
+ 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: trunk/dports/kde/digikam/files/patch-core-utilities-setup-setupplugins.cpp.diff
===================================================================
--- trunk/dports/kde/digikam/files/patch-core-utilities-setup-setupplugins.cpp.diff (rev 0)
+++ trunk/dports/kde/digikam/files/patch-core-utilities-setup-setupplugins.cpp.diff 2012-01-22 10:17:02 UTC (rev 89258)
@@ -0,0 +1,35 @@
+https://bugs.kde.org/show_bug.cgi?id=290496
+https://projects.kde.org/projects/extragear/graphics/digikam/repository/revisions/25cc9c9876a5233bd630105d0110319892d4e18c
+--- core/utilities/setup/setupplugins.cpp.orig 2012-01-22 03:10:01.000000000 -0600
++++ core/utilities/setup/setupplugins.cpp 2012-01-22 03:11:43.000000000 -0600
+@@ -100,6 +100,11 @@
+
+ panel->setLayout(mainLayout);
+
++#if KIPI_VERSION < 0x010400
++ d->checkAllBtn->setVisible(false);
++ d->clearBtn->setVisible(false);
++#endif
++
+ initPlugins();
+
+ // --------------------------------------------------------
+@@ -158,14 +163,18 @@
+ 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();
+ }
+ } // namespace Digikam
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120122/4b85c134/attachment.html>
More information about the macports-changes
mailing list