kipi-plugins-4.4.0-1.parabola1{,.nonprism1}: updating version

2 files changed, 61 insertions, 5 deletions

diff --git a/libre/kipi-plugins/PKGBUILD b/libre/kipi-plugins/PKGBUILD
index 7b030d79c..ab0e0f6a3 100644
--- a/libre/kipi-plugins/PKGBUILD
+++ b/libre/kipi-plugins/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 223759 2014-10-02 12:15:07Z andrea $
+# $Id: PKGBUILD 225564 2014-11-03 12:36:10Z ronald $
 # Maintainer (Arch): Ronald van Haren <ronald@archlinux.org>
 # Contributor (Arch): Andrea Scarpino <andrea@archlinux.org>
 # Contributor (Arch): Tobias Powalowski <tpowa@archlinux.org>
@@ -7,8 +7,8 @@
 
 pkgbase=digikam
 pkgname=kipi-plugins
-pkgver=4.2.0
-pkgrel=3.parabola1
+pkgver=4.4.0
+pkgrel=1.parabola1
 pkgdesc="A collection of plugins extending the KDE graphics and image applications as digiKam, without nonfree jAlbum and SimpleViewer support"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
@@ -28,8 +28,9 @@ optdepends=('libkgeomap: Geolocalize tool'
             'qt-gstreamer: Video SlideShow plugin')
 options=('staticlibs')
 install=kipi-plugins.install
-source=("http://download.kde.org/stable/${pkgbase}/${pkgbase}-${pkgver}.tar.bz2")
-sha1sums=('4a54136629bed3b30cf4e9355e8d5b498b0d4e54')
+source=("http://download.kde.org/stable/${pkgbase}/${pkgbase}-${pkgver}.tar.bz2" "digikam_libkexiv2.patch")
+sha1sums=('1feb43120addda314e09761440ec2058e430171c'
+          '39a09a8e7de1612eb47f3ef0966c6fa02b7e3284')
 
 prepare() {
   cd ${srcdir}/${pkgbase}-${pkgver}
@@ -38,6 +39,8 @@ prepare() {
          ' extra/kipi-plugins/CMakeLists.txt
   cd ..
   mkdir build
+  cd ${pkgbase}-${pkgver}/core
+  patch -Np1 -i "${srcdir}/digikam_libkexiv2.patch"
 }
 
 build() {
diff --git a/libre/kipi-plugins/digikam_libkexiv2.patch b/libre/kipi-plugins/digikam_libkexiv2.patch
new file mode 100644
index 000000000..018ce67a5
--- /dev/null
+++ b/libre/kipi-plugins/digikam_libkexiv2.patch
@@ -0,0 +1,53 @@
+commit f6945f23e0ed1e11f26e2c7e62b02baa8cfa640e
+Author: Pino Toscano <pino@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
+ }