rev 20018 - in kde-extras/digikam/trunk/debian: . patches

[Pino Toscano]

Author: pino
Date: 2014-10-14 20:43:23 +0000 (Tue, 14 Oct 2014)
New Revision: 20018

Added:
   kde-extras/digikam/trunk/debian/patches/upstream_fix-libkexiv2-version-for-AltLangStrEdit-textEdit.patch
Modified:
   kde-extras/digikam/trunk/debian/changelog
   kde-extras/digikam/trunk/debian/patches/series
Log:
fix build with libkexiv2 4.14.x

backport upstream commit f6945f23e0ed1e11f26e2c7e62b02baa8cfa640e


Modified: kde-extras/digikam/trunk/debian/changelog
===================================================================
--- kde-extras/digikam/trunk/debian/changelog	2014-10-10 21:47:43 UTC (rev 20017)
+++ kde-extras/digikam/trunk/debian/changelog	2014-10-14 20:43:23 UTC (rev 20018)
@@ -4,6 +4,9 @@
   * New upstream release.
   * Drop upstream_Restore-the-lowercase-path-to-opencv-shared-data.patch,
     backported.
+  * Backport upstream commit f6945f23e0ed1e11f26e2c7e62b02baa8cfa640e to fix
+    build with libkexiv2 4.14.x; patch
+    upstream_fix-libkexiv2-version-for-AltLangStrEdit-textEdit.patch.
 
  -- Pino Toscano <pino at debian.org>  Fri, 10 Oct 2014 23:47:02 +0200
 

Modified: kde-extras/digikam/trunk/debian/patches/series
===================================================================
--- kde-extras/digikam/trunk/debian/patches/series	2014-10-10 21:47:43 UTC (rev 20017)
+++ kde-extras/digikam/trunk/debian/patches/series	2014-10-14 20:43:23 UTC (rev 20018)
@@ -1 +1,2 @@
+upstream_fix-libkexiv2-version-for-AltLangStrEdit-textEdit.patch
 sendimages-icedove.diff

Added: kde-extras/digikam/trunk/debian/patches/upstream_fix-libkexiv2-version-for-AltLangStrEdit-textEdit.patch
===================================================================
--- kde-extras/digikam/trunk/debian/patches/upstream_fix-libkexiv2-version-for-AltLangStrEdit-textEdit.patch	                        (rev 0)
+++ kde-extras/digikam/trunk/debian/patches/upstream_fix-libkexiv2-version-for-AltLangStrEdit-textEdit.patch	2014-10-14 20:43:23 UTC (rev 20018)
@@ -0,0 +1,59 @@
+From f6945f23e0ed1e11f26e2c7e62b02baa8cfa640e Mon Sep 17 00:00:00 2001
+From: Pino Toscano <pino at kde.org>
+Date: Tue, 14 Oct 2014 22:26:19 +0200
+Subject: [PATCH] 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)
+---
+ libs/imageproperties/captionedit.cpp      | 2 +-
+ libs/imageproperties/imagedescedittab.cpp | 6 +++---
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+
+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
+ }
+-- 
+2.1.1
+