Hello community, here is the log from the commit of package digikam for openSUSE:Factory checked in at 2012-04-02 19:53:35 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/digikam (Old) and /work/SRC/openSUSE:Factory/.digikam.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "digikam", Maintainer is "kde-maintain...@suse.de" Changes: -------- --- /work/SRC/openSUSE:Factory/digikam/digikam.changes 2012-02-08 15:37:39.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.digikam.new/digikam.changes 2012-04-02 19:54:22.000000000 +0200 @@ -1,0 +2,5 @@ +Mon Apr 2 08:48:32 UTC 2012 - idon...@suse.com + +- Add digikam-boost-1.48.patch to fix build with new boost + +------------------------------------------------------------------- New: ---- digikam-boost-1.48.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ digikam.spec ++++++ --- /var/tmp/diff_new_pack.aKNPOY/_old 2012-04-02 19:54:29.000000000 +0200 +++ /var/tmp/diff_new_pack.aKNPOY/_new 2012-04-02 19:54:29.000000000 +0200 @@ -15,6 +15,7 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + Name: digikam Version: 2.5.0 Release: 0 @@ -37,6 +38,8 @@ Patch5: fix-broken-icon-reference.diff # PATCH-FIX-OPENSUSE digikam_no_build_vkontakte.diff tittiatc...@gmail.com -- Don't build libvkontakte (use external one) Patch6: digikam_no_build_vkontakte.diff +# PATCH-FIX-UPSTREAM digikam-boost-1.48.patch idoen...@suse.de -- Compile with Boost 1.48+, upstream commit d18ea6da2d3e2359f411 +Patch7: digikam-boost-1.48.patch BuildRequires: ImageMagick BuildRequires: boost-devel BuildRequires: doxygen @@ -51,20 +54,20 @@ BuildRequires: libkdepimlibs4-devel %if 0%{?kde_updatedapps} %if 0%{?suse_version} == 1140 -BuildRequires: sane-backends-devel BuildRequires: libexiv2-devel >= 0.21 +BuildRequires: sane-backends-devel %endif %if 0%{?suse_version} > 1140 -BuildRequires: libkvkontakte-devel BuildRequires: libkexiv2-devel BuildRequires: libkipi-devel BuildRequires: libksane-devel +BuildRequires: libkvkontakte-devel %endif %else -BuildRequires: libkvkontakte-devel BuildRequires: libkexiv2-devel BuildRequires: libkipi-devel BuildRequires: libksane-devel +BuildRequires: libkvkontakte-devel %endif BuildRequires: liblcms-devel BuildRequires: liblqr-devel @@ -86,8 +89,8 @@ %endif Requires: kipi-plugins >= 2.5.0 %requires_ge libkipi8 -Requires: libqt4-sql-sqlite Requires: libqt4-sql-mysql +Requires: libqt4-sql-sqlite Recommends: %{name}-doc Recommends: %{name}-lang BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -257,6 +260,7 @@ %patch4 %patch5 %patch6 -p0 +%patch7 -p1 # Remove build time references so build-compare can do its work FAKE_BUILDDATE=$(LC_ALL=C date -u -r %{_sourcedir}/%{name}.changes '+%%b %%e %%Y') ++++++ digikam-boost-1.48.patch ++++++ commit d18ea6da2d3e2359f4113e83c3fd40c18a29ddab Author: Gilles Caulier <caulier.gil...@gmail.com> Date: Fri Jan 6 11:23:48 2012 +0100 Apply patch #67483 from Jeremiah Willcock to compile fine digiKam boost graph interface with libboost 1.48 BUGS: 287772 CCBUGS: 267777 diff --git a/core/libs/database/imagehistory/imagehistorygraph_boost.h b/core/libs/database/imagehistory/imagehistorygraph_boost.h index 4017c4f..76c764a 100644 --- a/core/libs/database/imagehistory/imagehistorygraph_boost.h +++ b/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) -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
