summaryrefslogtreecommitdiff
path: root/staging/digikam
diff options
context:
space:
mode:
Diffstat (limited to 'staging/digikam')
-rw-r--r--staging/digikam/PKGBUILD104
-rw-r--r--staging/digikam/boost148.patch65
-rw-r--r--staging/digikam/digikam.install12
-rw-r--r--staging/digikam/kipi-plugins.install12
-rw-r--r--staging/digikam/libkipi140.patch63
5 files changed, 0 insertions, 256 deletions
diff --git a/staging/digikam/PKGBUILD b/staging/digikam/PKGBUILD
deleted file mode 100644
index 8f9780a19..000000000
--- a/staging/digikam/PKGBUILD
+++ /dev/null
@@ -1,104 +0,0 @@
-# $Id: PKGBUILD 147976 2012-01-29 10:54:04Z ronald $
-# Maintainer: Ronald van Haren <ronald@archlinux.org>
-# Contributor: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Tobias Powalowski <tpowa@archlinux.org>
-
-pkgbase=digikam
-pkgname=('digikam' 'kipi-plugins' 'libkface' 'libkgeomap' 'libkvkontakte' 'libmediawiki')
-pkgver=2.5.0
-pkgrel=5
-pkgdesc="Digital photo management application for KDE"
-arch=('i686' 'x86_64')
-license=('GPL')
-url="http://www.digikam.org/"
-makedepends=('kdepimlibs' 'libkexiv2' 'libkdcraw' 'libkipi' 'libksane' 'liblqr'
- 'kdeedu-marble' 'opencv' 'boost' 'libgpod' 'qjson' 'hugin'
- 'cmake' 'automoc4' 'doxygen')
-source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2"
- "boost148.patch" "libkipi140.patch")
-sha1sums=('6cadb838669d1bdcbd6abb677889f7d68d696383'
- '93853084905b21309c46ce7d585021e76283d429'
- '8a8f624fd0ca768a9dcd706405eb6e4944892d87')
-build() {
- cd "${srcdir}"
-
- pushd ${pkgname}-${pkgver}/core
- patch -Np0 -i ${srcdir}/boost148.patch
- patch -Np1 -i ${srcdir}/libkipi140.patch
- popd
-
- mkdir build
- cd build
- # Use internal lensfun (FS#21816)
- cmake ../${pkgname}-${pkgver} \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_SKIP_RPATH=ON \
- -DLENSFUN_LIBRARY="" \
- -DLENSFUN_INCLUDE_DIR=""
- make
-}
-
-package_digikam() {
- pkgdesc="Digital photo management application for KDE"
- depends=('kdebase-runtime' 'kdepimlibs' 'libgphoto2' 'opencv' 'liblqr'
- 'libkipi' 'libkexiv2' 'libkdcraw' 'libkface' 'libkgeomap')
- optdepends=('kipi-plugins: for more extras and plugins')
- install=digikam.install
-
- cd "${srcdir}"/build/core
- make DESTDIR="${pkgdir}" install
- cd "${srcdir}"/build/doc
- make DESTDIR="${pkgdir}" install
- cd "${srcdir}"/build/po
- make DESTDIR="${pkgdir}" install
-
- # these are in oxygen-icons
- rm -rf ${pkgdir}/usr/share/icons
-}
-
-package_libkface() {
- pkgdesc="A Qt/C++ wrapper around LibFace library to perform face recognition and detection over pictures"
- depends=('kdelibs' 'opencv')
-
- cd "${srcdir}"/build/extra/libkface
- make DESTDIR="${pkgdir}" install
-}
-
-package_libkgeomap() {
- pkgdesc="A wrapper around world map components for browsing and arranging photos on a map"
- depends=('kdelibs' 'kdeedu-marble' 'libkexiv2')
-
- cd "${srcdir}"/build/extra/libkgeomap
- make DESTDIR="${pkgdir}" install
-}
-
-package_libkvkontakte() {
- pkgdesc="KDE C++ library for asynchronous interaction with vkontakte.rusocial network"
- depends=('kdelibs' 'qjson')
-
- cd "${srcdir}"/build/extra/libkvkontakte
- make DESTDIR="${pkgdir}" install
-}
-
-package_libmediawiki() {
- pkgdesc="A KDE C++ interface for MediaWiki based web service as wikipedia.org"
- depends=('kdelibs')
-
- cd "${srcdir}"/build/extra/libmediawiki
- make DESTDIR="${pkgdir}" install
-}
-
-package_kipi-plugins() {
- pkgdesc="A collection of plugins extending the KDE graphics and image applications as digiKam"
- depends=('kdebase-runtime' 'kdepimlibs' 'libkdcraw' 'libkipi' 'libksane'
- 'opencv' 'qjson' 'libkvkontakte' 'libkexiv2')
- optdepends=('libkgeomap'
- 'libmediawiki'
- 'libgpod'
- 'hugin')
- install=kipi-plugins.install
-
- cd "${srcdir}"/build/extra/kipi-plugins
- make DESTDIR="${pkgdir}" install
-}
diff --git a/staging/digikam/boost148.patch b/staging/digikam/boost148.patch
deleted file mode 100644
index 6d3ff585b..000000000
--- a/staging/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<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/staging/digikam/digikam.install b/staging/digikam/digikam.install
deleted file mode 100644
index 81ce5c4b0..000000000
--- a/staging/digikam/digikam.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
- xdg-icon-resource forceupdate --theme hicolor &> /dev/null
- update-desktop-database -q
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
diff --git a/staging/digikam/kipi-plugins.install b/staging/digikam/kipi-plugins.install
deleted file mode 100644
index 81ce5c4b0..000000000
--- a/staging/digikam/kipi-plugins.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
- xdg-icon-resource forceupdate --theme hicolor &> /dev/null
- update-desktop-database -q
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
diff --git a/staging/digikam/libkipi140.patch b/staging/digikam/libkipi140.patch
deleted file mode 100644
index a221b5847..000000000
--- a/staging/digikam/libkipi140.patch
+++ /dev/null
@@ -1,63 +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 <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/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 <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
-
-
generated by cgit v1.2.3-54-g00ecf (git 2.45.2) at 2024-07-13 19:21:06 +0000