Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Bor Kraljič (d3f5cad9bc6d6537c9d14add1edab867d6b53e5a)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Bor Kraljič <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Bor Kraljič (d3f5cad9bc6d6537c9d14add1edab867d6b53e5a)
  • Date: Sat, 4 Feb 2012 05:04:00 -0600

GIT changes to master grimoire by Bor Kraljič <pyrobor AT ver.si>:

kde4-apps/digikam4/DETAILS | 6 +--
kde4-apps/digikam4/HISTORY | 4 ++
kde4-apps/digikam4/PRE_BUILD | 3 +
kde4-apps/digikam4/boost148.patch | 65
++++++++++++++++++++++++++++++++++++
kde4-apps/digikam4/libkipi140.patch | 63 ++++++++++++++++++++++++++++++++++
5 files changed, 138 insertions(+), 3 deletions(-)

New commits:
commit d3f5cad9bc6d6537c9d14add1edab867d6b53e5a
Author: Bor Kraljič <pyrobor AT ver.si>
Commit: Bor Kraljič <pyrobor AT ver.si>

digikam4: updated spell to 2.5.0 (Fixed SOURCE_URL[0])

diff --git a/kde4-apps/digikam4/DETAILS b/kde4-apps/digikam4/DETAILS
index b587dce..e4e5d51 100755
--- a/kde4-apps/digikam4/DETAILS
+++ b/kde4-apps/digikam4/DETAILS
@@ -1,9 +1,9 @@
SPELL=digikam4
SPELLX=${SPELL//4}
- VERSION=2.4.1
-
SOURCE_HASH=sha512:89ade31299880b946fdd340e1466153d1069ba88829544e86a34dcc227acd07e74479e7b37cde56a06dfd6a02bc5e73875cce85e6a7f00652bceed35f5bf188f
+ VERSION=2.5.0
+
SOURCE_HASH=sha512:e3d500e7719c059a425d77a09005906361fee8ea584002b172393e6156e0d79d5c59a2498e84329b5e42e92dda2850a76c636524392a113a489207b57d0b7ee7
SOURCE=${SPELLX}-$VERSION.tar.bz2
- SOURCE_URL[0]=$SOURCEFORGE_URL/digikam/$SOURCE
+ SOURCE_URL[0]=http://downloads.sourceforge.net/digikam/$SOURCE
SOURCE_DIRECTORY=$BUILD_DIRECTORY/${SPELLX}-${VERSION}
WEB_SITE=http://digikam.org
ENTERED=20080501
diff --git a/kde4-apps/digikam4/HISTORY b/kde4-apps/digikam4/HISTORY
index cc2534f..d06a26b 100644
--- a/kde4-apps/digikam4/HISTORY
+++ b/kde4-apps/digikam4/HISTORY
@@ -1,3 +1,7 @@
+2012-02-04 Bor Kraljič <pyrobor AT ver.si>
+ * DETAILS: updated spell to 2.5.0 (Fixed SOURCE_URL[0])
+ * PRE_BUILD, libkipi140.patch, boost148.patch: added patch to fix
compile
+
2011-12-19 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 2.4.1

diff --git a/kde4-apps/digikam4/PRE_BUILD b/kde4-apps/digikam4/PRE_BUILD
new file mode 100755
index 0000000..48600f3
--- /dev/null
+++ b/kde4-apps/digikam4/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+patch -p1 -d $SOURCE_DIRECTORY < $SPELL_DIRECTORY/boost148.patch &&
+patch -p1 -d $SOURCE_DIRECTORY < $SPELL_DIRECTORY/libkipi140.patch
diff --git a/kde4-apps/digikam4/boost148.patch
b/kde4-apps/digikam4/boost148.patch
new file mode 100644
index 0000000..6779d1a
--- /dev/null
+++ b/kde4-apps/digikam4/boost148.patch
@@ -0,0 +1,65 @@
+--- a/core/libs/database/imagehistory/imagehistorygraph_boost.h
2012-01-05 08:32:19.837388059 -0500
++++ b/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/kde4-apps/digikam4/libkipi140.patch
b/kde4-apps/digikam4/libkipi140.patch
new file mode 100644
index 0000000..c22d8f8
--- /dev/null
+++ b/kde4-apps/digikam4/libkipi140.patch
@@ -0,0 +1,63 @@
+diff --git a/core/utilities/setup/setupplugins.cpp
b/core/utilities/setup/setupplugins.cpp
+index 0f4030a..b8efb35 100644
+--- a/core/utilities/setup/setupplugins.cpp
++++ b/core/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/core/utilities/setup/setupplugins.h
b/core/utilities/setup/setupplugins.h
+index 271a569..114e0fa 100644
+--- a/core/utilities/setup/setupplugins.h
++++ b/core/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
+
+



  • [SM-Commit] GIT changes to master grimoire by Bor Kraljič (d3f5cad9bc6d6537c9d14add1edab867d6b53e5a), Bor Kraljič, 02/04/2012

Archive powered by MHonArc 2.6.24.

Top of Page