From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id AD185138010 for ; Wed, 19 Sep 2012 19:13:48 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4F048E0486; Wed, 19 Sep 2012 19:13:40 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 090DFE0486 for ; Wed, 19 Sep 2012 19:13:39 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 4C0B833D107 for ; Wed, 19 Sep 2012 19:13:39 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 0D2E9E5444 for ; Wed, 19 Sep 2012 19:13:38 +0000 (UTC) From: "Andreas Hüttel" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Hüttel" Message-ID: <1348082192.e15e2ca4ccad12cd5218ec802b1ece9025711fc5.dilfridge@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: media-gfx/digikam/, media-gfx/digikam/files/ X-VCS-Repository: proj/kde X-VCS-Files: media-gfx/digikam/digikam-3.0.0_beta1.ebuild media-gfx/digikam/files/digikam-2.5.0-boost148.patch media-gfx/digikam/files/digikam-2.5.0-libkipi.patch X-VCS-Directories: media-gfx/digikam/ media-gfx/digikam/files/ X-VCS-Committer: dilfridge X-VCS-Committer-Name: Andreas Hüttel X-VCS-Revision: e15e2ca4ccad12cd5218ec802b1ece9025711fc5 X-VCS-Branch: master Date: Wed, 19 Sep 2012 19:13:38 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 1c21c386-bb6b-4353-86e2-c1ade431675d X-Archives-Hash: bdd96886e73b2144b6c4d9dbf4ee6718 commit: e15e2ca4ccad12cd5218ec802b1ece9025711fc5 Author: Andreas K. Huettel (dilfridge) akhuettel de> AuthorDate: Wed Sep 19 19:16:32 2012 +0000 Commit: Andreas Hüttel gentoo org> CommitDate: Wed Sep 19 19:16:32 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=e15e2ca4 [media-gfx/digikam] Cleanup, remove keywords because of libkipi (Portage version: 2.2.0_alpha124/git/Linux x86_64, unsigned Manifest commit) --- media-gfx/digikam/digikam-3.0.0_beta1.ebuild | 2 +- .../digikam/files/digikam-2.5.0-boost148.patch | 74 ------------------- .../digikam/files/digikam-2.5.0-libkipi.patch | 75 -------------------- 3 files changed, 1 insertions(+), 150 deletions(-) diff --git a/media-gfx/digikam/digikam-3.0.0_beta1.ebuild b/media-gfx/digikam/digikam-3.0.0_beta1.ebuild index 0935801..a6efd1e 100644 --- a/media-gfx/digikam/digikam-3.0.0_beta1.ebuild +++ b/media-gfx/digikam/digikam-3.0.0_beta1.ebuild @@ -25,7 +25,7 @@ SRC_URI="mirror://kde/unstable/${PN}/${MY_P}.tar.bz2" LICENSE="GPL-2 handbook? ( FDL-1.2 )" -KEYWORDS="~amd64 ~x86" +KEYWORDS="" SLOT="4" IUSE="addressbook debug doc gphoto2 mysql semantic-desktop themedesigner +thumbnails video" diff --git a/media-gfx/digikam/files/digikam-2.5.0-boost148.patch b/media-gfx/digikam/files/digikam-2.5.0-boost148.patch deleted file mode 100644 index 8119839..0000000 --- a/media-gfx/digikam/files/digikam-2.5.0-boost148.patch +++ /dev/null @@ -1,74 +0,0 @@ -commit d18ea6da2d3e2359f4113e83c3fd40c18a29ddab -Author: Gilles Caulier -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/libs/database/imagehistory/imagehistorygraph_boost.h b/libs/database/imagehistory/imagehistorygraph_boost.h -index 4017c4f..76c764a 100644 ---- a/libs/database/imagehistory/imagehistorygraph_boost.h -+++ b/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(weight)). -+ weight_map(boost::ref_property_map::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(weight)). -+ weight_map(boost::ref_property_map::edge_descriptor,int>(weight)). - // Invert the default compare method: With greater, we get the longest path - distance_compare(std::greater()). - // will be returned if a node is unreachable -@@ -1384,14 +1384,15 @@ protected: - template - class lessThanMapEdgeToTarget - { -+ typedef typename boost::graph_traits::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 > VertexInfo; - -- QList outEdges; -+ typedef typename boost::graph_traits::edge_descriptor edge_descriptor; -+ QList outEdges; - std::vector stack; - - boost::put(color, u, boost::gray_color); - vis.discover_vertex(u, g); - -- outEdges = toEdgeList(boost::out_edges(u, g)); -+ outEdges = toList(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(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/media-gfx/digikam/files/digikam-2.5.0-libkipi.patch b/media-gfx/digikam/files/digikam-2.5.0-libkipi.patch deleted file mode 100644 index fbbac97..0000000 --- a/media-gfx/digikam/files/digikam-2.5.0-libkipi.patch +++ /dev/null @@ -1,75 +0,0 @@ -From 25cc9c9876a5233bd630105d0110319892d4e18c Mon Sep 17 00:00:00 2001 -From: Gilles Caulier -Date: Tue, 3 Jan 2012 15:16:37 +0100 -Subject: [PATCH] enable checkall and clearall buttons only with libkipi version 1.4.0 - BUGS: 290496 - ---- - utilities/setup/setupplugins.cpp | 13 +++++++++++-- - utilities/setup/setupplugins.h | 4 ++-- - 2 files changed, 13 insertions(+), 4 deletions(-) - -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 -- * Copyright (C) 2011 by Andi Clemens -+ * Copyright (C) 2004-2012 by Gilles Caulier -+ * Copyright (C) 2011-2012 by Andi Clemens - * - * 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 -- * Copyright (C) 2011 by Andi Clemens -+ * Copyright (C) 2004-2012 by Gilles Caulier -+ * Copyright (C) 2011-2012 by Andi Clemens - * - * This program is free software; you can redistribute it - * and/or modify it under the terms of the GNU General --- -1.7.3.4 -