[arch-commits] Commit in digikam/trunk (PKGBUILD digikam-2.5.0-gcc-4.7.0.patch)
Evangelos Foutras
foutrelis at archlinux.org
Thu May 3 02:26:13 UTC 2012
Date: Wednesday, May 2, 2012 @ 22:26:13
Author: foutrelis
Revision: 158118
upgpkg: digikam 2.5.0-6
opencv 2.4.0 rebuild.
Added:
digikam/trunk/digikam-2.5.0-gcc-4.7.0.patch
Modified:
digikam/trunk/PKGBUILD
-------------------------------+
PKGBUILD | 9 +++--
digikam-2.5.0-gcc-4.7.0.patch | 63 ++++++++++++++++++++++++++++++++++++++++
2 files changed, 69 insertions(+), 3 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2012-05-03 02:17:28 UTC (rev 158117)
+++ PKGBUILD 2012-05-03 02:26:13 UTC (rev 158118)
@@ -6,7 +6,7 @@
pkgbase=digikam
pkgname=('digikam' 'kipi-plugins' 'libkface' 'libkgeomap' 'libkvkontakte' 'libmediawiki')
pkgver=2.5.0
-pkgrel=5
+pkgrel=6
pkgdesc="Digital photo management application for KDE"
arch=('i686' 'x86_64')
license=('GPL')
@@ -15,10 +15,11 @@
'kdeedu-marble' 'opencv' 'boost' 'libgpod' 'qjson' 'hugin'
'cmake' 'automoc4' 'doxygen')
source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2"
- "boost148.patch" "libkipi140.patch")
+ "boost148.patch" "libkipi140.patch" "digikam-2.5.0-gcc-4.7.0.patch")
sha1sums=('6cadb838669d1bdcbd6abb677889f7d68d696383'
'93853084905b21309c46ce7d585021e76283d429'
- '8a8f624fd0ca768a9dcd706405eb6e4944892d87')
+ '8a8f624fd0ca768a9dcd706405eb6e4944892d87'
+ '5058831a4f1209468d0249c03f0e243f176f995a')
build() {
cd "${srcdir}"
@@ -27,6 +28,8 @@
patch -Np1 -i ${srcdir}/libkipi140.patch
popd
+ patch -Np0 -i ${srcdir}/digikam-2.5.0-gcc-4.7.0.patch
+
mkdir build
cd build
# Use internal lensfun (FS#21816)
Added: digikam-2.5.0-gcc-4.7.0.patch
===================================================================
--- digikam-2.5.0-gcc-4.7.0.patch (rev 0)
+++ digikam-2.5.0-gcc-4.7.0.patch 2012-05-03 02:26:13 UTC (rev 158118)
@@ -0,0 +1,63 @@
+--- 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>(t));
++ this->append(AlbumPointer<T>(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 <typename VertexType, typename GraphType>
+ void discover_vertex(VertexType u, const GraphType&) const
+ {
+- record(u);
++ this->record(u);
+ }
+ };
+
+@@ -1373,7 +1373,7 @@
+ template <typename VertexType, typename GraphType>
+ 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 <utime.h>
++#include <unistd.h>
+ }
+
+ // 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 );
+ }
More information about the arch-commits
mailing list