diff options
Diffstat (limited to 'extra/digikam')
| -rw-r--r-- | extra/digikam/PKGBUILD | 14 | ||||
| -rw-r--r-- | extra/digikam/digikam-2.5.0-gcc-4.7.0.patch | 63 |
2 files changed, 70 insertions, 7 deletions
diff --git a/extra/digikam/PKGBUILD b/extra/digikam/PKGBUILD index 8f9780a19..3d5274616 100644 --- a/extra/digikam/PKGBUILD +++ b/extra/digikam/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 147976 2012-01-29 10:54:04Z ronald $ +# $Id: PKGBUILD 158119 2012-05-03 02:26:57Z foutrelis $ # Maintainer: Ronald van Haren <ronald@archlinux.org> # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Tobias Powalowski <tpowa@archlinux.org> @@ -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 @@ 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") + "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 @@ build() { 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) @@ -52,9 +55,6 @@ package_digikam() { 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() { diff --git a/extra/digikam/digikam-2.5.0-gcc-4.7.0.patch b/extra/digikam/digikam-2.5.0-gcc-4.7.0.patch new file mode 100644 index 000000000..535387b92 --- /dev/null +++ b/extra/digikam/digikam-2.5.0-gcc-4.7.0.patch @@ -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 ); + } |