Date: Friday, November 14, 2014 @ 14:41:17 Author: ronald Revision: 226241
upgpkg: digikam 4.5.0-1 update to 4.5.0; remove upstream patch Modified: digikam/trunk/PKGBUILD Deleted: digikam/trunk/digikam_libkexiv2.patch -------------------------+ PKGBUILD | 8 ++++-- digikam_libkexiv2.patch | 53 ---------------------------------------------- 2 files changed, 5 insertions(+), 56 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2014-11-14 13:30:12 UTC (rev 226240) +++ PKGBUILD 2014-11-14 13:41:17 UTC (rev 226241) @@ -14,7 +14,7 @@ makedepends=('kdepimlibs' 'libkexiv2' 'libkdcraw' 'libkipi' 'libksane' 'liblqr' 'kdeedu-marble' 'opencv' 'boost' 'libgpod' 'qjson' 'hugin' 'libgphoto2' 'cmake' 'automoc4' 'doxygen' 'lensfun' 'qt-gstreamer' 'imagemagick' 'eigen' - 'libbaloo4') + 'libbaloo4' 'libpgf') source=("http://download.kde.org/stable/${pkgname}/${pkgname}-${pkgver}.tar.bz2") sha1sums=('ba735f4b7bb0437c1676141ab78ea958e46f135e') @@ -26,7 +26,8 @@ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_SKIP_RPATH=ON \ -DBUILD_tests=OFF \ - -DDIGIKAMSC_USE_PRIVATE_KDEGRAPHICS=OFF + -DDIGIKAMSC_USE_PRIVATE_KDEGRAPHICS=OFF \ + -DDIGIKAMSC_USE_PRIVATE_SHAREDLIBS=ON make } @@ -33,7 +34,8 @@ package_digikam() { pkgdesc="Digital photo management application for KDE" depends=('kdebase-runtime' 'kdepimlibs' 'libgphoto2' 'opencv' 'liblqr' - 'libkipi' 'libkexiv2' 'libkdcraw' 'libkface' 'libkgeomap' 'lensfun' 'libbaloo4') + 'libkipi' 'libkexiv2' 'libkdcraw' 'libkface' 'libkgeomap' 'lensfun' + 'libpgf' 'libbaloo4') optdepends=('kipi-plugins: more tools and plugins' 'kdebase-workspace: Theme configuration dialog') install=digikam.install Deleted: digikam_libkexiv2.patch =================================================================== --- digikam_libkexiv2.patch 2014-11-14 13:30:12 UTC (rev 226240) +++ digikam_libkexiv2.patch 2014-11-14 13:41:17 UTC (rev 226241) @@ -1,53 +0,0 @@ -commit f6945f23e0ed1e11f26e2c7e62b02baa8cfa640e -Author: Pino Toscano <p...@kde.org> -Date: Tue Oct 14 22:26:19 2014 +0200 - - fix libkexiv2 version for AltLangStrEdit::textEdit() - - it is part of current libkexiv2/master only (i.e. post 4.14.x, which - is 2.3.x) - -diff --git a/libs/imageproperties/captionedit.cpp b/libs/imageproperties/captionedit.cpp -index 88413fc..70bdb6d 100644 ---- a/libs/imageproperties/captionedit.cpp -+++ b/libs/imageproperties/captionedit.cpp -@@ -202,7 +202,7 @@ void CaptionEdit::slotAuthorChanged(const QString& text) - - MsgTextEdit* CaptionEdit::textEdit() const - { --#if KEXIV2_VERSION >= 0x020302 -+#if KEXIV2_VERSION >= 0x020400 - return d->altLangStrEdit->textEdit(); - #else - return 0; -diff --git a/libs/imageproperties/imagedescedittab.cpp b/libs/imageproperties/imagedescedittab.cpp -index ebfbae1..3d12777 100644 ---- a/libs/imageproperties/imagedescedittab.cpp -+++ b/libs/imageproperties/imagedescedittab.cpp -@@ -429,7 +429,7 @@ ImageDescEditTab::ImageDescEditTab(QWidget* const parent) - - // Initialize --------------------------------------------- - --#if KEXIV2_VERSION >= 0x020302 -+#if KEXIV2_VERSION >= 0x020400 - d->titleEdit->textEdit()->installEventFilter(this); - d->captionsEdit->textEdit()->installEventFilter(this); - #endif -@@ -532,7 +532,7 @@ void ImageDescEditTab::setFocusToNewTagEdit() - void ImageDescEditTab::setFocusToTitlesEdit() - { - d->tabWidget->setCurrentIndex(Private::DESCRIPTIONS); --#if KEXIV2_VERSION >= 0x020302 -+#if KEXIV2_VERSION >= 0x020400 - d->titleEdit->textEdit()->setFocus(); - #endif - } -@@ -540,7 +540,7 @@ void ImageDescEditTab::setFocusToTitlesEdit() - void ImageDescEditTab::setFocusToCommentsEdit() - { - d->tabWidget->setCurrentIndex(Private::DESCRIPTIONS); --#if KEXIV2_VERSION >= 0x020302 -+#if KEXIV2_VERSION >= 0x020400 - d->captionsEdit->textEdit()->setFocus(); - #endif - }