diff --git a/digikam/PKGBUILD b/digikam/PKGBUILD index 1fc0a4b7b..451e7a169 100644 --- a/digikam/PKGBUILD +++ b/digikam/PKGBUILD @@ -5,29 +5,19 @@ kgbase=digikam pkgname=('digikam' 'kipi-plugins' 'libkvkontakte') -pkgver=2.5.0 +pkgver=2.6.0 pkgrel=2 url="http://digikam.sourceforge.net" arch=('i686' 'x86_64') license=('GPL') -makedepends=('kde-runtime' 'kdegraphics-kgamma' 'kdepimlibs' 'lensfun' 'kdeedu-marble' 'liblqr' 'opencv' 'lapack' 'libgpod' +screenshot=('http://i.imgur.com/6YnUM.png') +makedepends=('kde-runtime' 'kdegraphics-kgamma' 'kdepimlibs' 'lensfun' 'kdeedu-marble' 'liblqr' 'opencv' 'atlas-lapack' 'libgpod' 'pkgconfig' 'cmake' 'automoc4' 'doxygen' 'docbook-xsl' 'qjson') -source=("http://sourceforge.net/projects/digikam/files/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.bz2" - 'boost148.patch' - 'libkipi140.patch' - 'gcc-4.7.diff') -md5sums=('770355060d2033a044c21b0f155be00c' - '91e89dc3abc5dd88e2e161f66b3d3f87' - '39f96ab48c829c01f1d6e522510b043e' - 'cc442743ca9a0eb17f30ecbf0f240330') +source=("http://sourceforge.net/projects/digikam/files/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.bz2") +md5sums=('5caf799b9a74d3bed3490d2cf66021dd') build() { cd ${srcdir} - pushd ${pkgname}-${pkgver}/core - patch -p0 -i ${srcdir}/boost148.patch - patch -Np1 -i ${srcdir}/libkipi140.patch - popd - patch -p0 -i $srcdir/gcc-4.7.diff mkdir -p build cd build diff --git a/digikam/boost148.patch b/digikam/boost148.patch deleted file mode 100644 index 722d60759..000000000 --- a/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(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 @@ - { - 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 @@ - 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 @@ - { - 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/digikam/gcc-4.7.diff b/digikam/gcc-4.7.diff deleted file mode 100644 index a34b77dbf..000000000 --- a/digikam/gcc-4.7.diff +++ /dev/null @@ -1,70 +0,0 @@ -commit 19e3844535fee6b258ee8c20e8565eb0a231cae9 -Author: Gilles Caulier -Date: Thu Jan 5 09:18:15 2012 +0100 - - apply patch #67471 to compile fine with GCC 4.7.0 - BUGS: 290642 - ---- 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)); -+ this->append(AlbumPointer(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 - void discover_vertex(VertexType u, const GraphType&) const - { -- record(u); -+ this->record(u); - } - }; - -@@ -1373,7 +1373,7 @@ - template - 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 -+#include - } - - // 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/digikam/libkipi140.patch b/digikam/libkipi140.patch deleted file mode 100644 index f7e41111b..000000000 --- a/digikam/libkipi140.patch +++ /dev/null @@ -1,61 +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 -- * 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 diff --git a/k3b/PKGBUILD b/k3b/PKGBUILD index 8d79d21f0..e3bc11341 100644 --- a/k3b/PKGBUILD +++ b/k3b/PKGBUILD @@ -4,15 +4,12 @@ # maintainer (i686): Phil Miller # maintainer (x86_64): Manuel Tortosa -# include global config -source ../_buildscripts/${current_repo}-${_arch}-cfg.conf - pkgname=k3b pkgver=2.0.2 -pkgrel=4 -depends=('kde-runtime' 'kdemultimedia-common' 'libsamplerate' 'libmad' +pkgrel=5 +depends=('kde-runtime' 'libkcddb' 'libkcompactdisc' 'libsamplerate' 'libmad' 'ffmpeg>=0.5' 'taglib>=1.4' 'libmpcdec>=1.2.5' 'libdvdread>=4.1.3' - 'cdrdao' 'cdrkit' 'shared-mime-info' 'libxft' 'musicbrainz' 'docbook-xsl') + 'cdrdao' 'cdrkit' 'shared-mime-info' 'libxft' 'libmusicbrainz3' 'docbook-xsl') makedepends=('cmake' 'pkgconfig' 'automoc4' 'dvd+rw-tools') pkgdesc="Feature-rich and easy to handle CD burning application" arch=("i686" "x86_64")