Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=openjava.git;a=commitdiff;h=6a0f05d9352afe89608efbaff153869d32eac6dd
commit 6a0f05d9352afe89608efbaff153869d32eac6dd
Author: Melko <me...@frugalware.org>
Date: Tue Jun 5 23:48:02 2012 +0200
digikam-2.6.0-1-i686
* version bump
diff --git
a/source/kde-extra/digikam/0001-apply-patch-67471-to-compile-fine-with-GCC-4.7.0.patch
b/source/kde-extra/digikam/0001-apply-patch-67471-to-compile-fine-with-GCC-4.7.0.patch
deleted file mode 100644
index ed553ff..0000000
---
a/source/kde-extra/digikam/0001-apply-patch-67471-to-compile-fine-with-GCC-4.7.0.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-From 4b7be9b72c11503104ba1d3a4843a9b69c76c0e4 Mon Sep 17 00:00:00 2001
-From: Gilles Caulier <caulier.gil...@gmail.com>
-Date: Thu, 5 Jan 2012 09:16:27 +0100
-Subject: [PATCH] apply patch #67471 to compile fine with GCC 4.7.0 CCBUGS:
- 290642
-
----
- digikam/album/albummanager.h | 2 +-
- .../imagehistory/imagehistorygraph_boost.h | 4 ++--
- utilities/cameragui/devices/gpcamera.cpp | 1 +
- 3 files changed, 4 insertions(+), 3 deletions(-)
-
-diff --git a/digikam/album/albummanager.h b/digikam/album/albummanager.h
-index 1c97263..ce0c554 100644
---- a/core/digikam/album/albummanager.h
-+++ b/core/digikam/album/albummanager.h
-@@ -831,7 +831,7 @@ public:
- {
- foreach(T* t, list)
- {
-- append(AlbumPointer<T>(t));
-+ this->append(AlbumPointer<T>(t));
- }
- return *this;
- }
-diff --git a/libs/database/imagehistory/imagehistorygraph_boost.h
b/libs/database/imagehistory/imagehistorygraph_boost.h
-index 6ffccce..4017c4f 100644
---- a/core/libs/database/imagehistory/imagehistorygraph_boost.h
-+++ b/core/libs/database/imagehistory/imagehistorygraph_boost.h
-@@ -1362,7 +1362,7 @@ protected:
- template <typename VertexType, typename GraphType>
- void discover_vertex(VertexType u, const GraphType&) const
- {
-- record(u);
-+ this->record(u);
- }
- };
-
-@@ -1373,7 +1373,7 @@ protected:
- template <typename VertexType, typename GraphType>
- void discover_vertex(VertexType u, const GraphType&) const
- {
-- record(u);
-+ this->record(u);
- }
- };
-
-diff --git a/utilities/cameragui/devices/gpcamera.cpp
b/utilities/cameragui/devices/gpcamera.cpp
-index 0b56203..d55dcfa 100644
---- a/core/utilities/cameragui/devices/gpcamera.cpp
-+++ b/core/utilities/cameragui/devices/gpcamera.cpp
-@@ -30,6 +30,7 @@
- extern "C"
- {
- #include <utime.h>
-+#include <unistd.h>
- }
-
- // C++ includes
---
-1.7.8.2
-
diff --git a/source/kde-extra/digikam/FrugalBuild
b/source/kde-extra/digikam/FrugalBuild
index d0a2496..bb3d993 100644
--- a/source/kde-extra/digikam/FrugalBuild
+++ b/source/kde-extra/digikam/FrugalBuild
@@ -3,8 +3,8 @@
# Contributor: Bence Nagy <nagybe...@tipogral.hu>
pkgname=digikam
-pkgver=2.5.0
-pkgrel=4
+pkgver=2.6.0
+pkgrel=1
pkgdesc="Digital photo management application for kde"
_F_sourceforge_ext=".tar.bz2"
_F_archive_grepv="\-[a-z]"
@@ -16,10 +16,7 @@ makedepends=("${makedepends[@]}"
"kdepimlibs-compiletime>=$_F_kde_ver" 'boost' '
groups=('kde-extra' 'kde-apps')
archs=('i686' 'x86_64')
options=('scriptlet')
-source=(${source[@]} enable-checkall-and-cleanall.patch
0001-apply-patch-67471-to-compile-fine-with-GCC-4.7.0.patch)
-sha1sums=('6cadb838669d1bdcbd6abb677889f7d68d696383' \
- '61791662c27ab1de31b6914e30f9495214236f54' \
- 'd934202eabb3ce978fa94c220a2963991e0a1f94')
+sha1sums=('a7a9e4e342f118b603a11539c98a01c9970254df')
subpkgs=("${subpkgs[@]}" "libkface")
subdescs=("${subdescs[@]}" "Library to perform face recognition and detection
over pictures.")
diff --git a/source/kde-extra/digikam/enable-checkall-and-cleanall.patch
b/source/kde-extra/digikam/enable-checkall-and-cleanall.patch
deleted file mode 100644
index d219ab7..0000000
--- a/source/kde-extra/digikam/enable-checkall-and-cleanall.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-commit 25cc9c9876a5233bd630105d0110319892d4e18c
-Author: Gilles Caulier <caulier.gil...@gmail.com>
-Date: Tue Jan 3 15:16:37 2012 +0100
-
- enable checkall and clearall buttons only with libkipi version 1.4.0
- BUGS: 290496
-
-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
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
