Package: digikam / 4:4.4.0-1.1

upstream_fix-libkexiv2-version-for-AltLangStrEdit-textEdit.patch Patch series | download
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
From f6945f23e0ed1e11f26e2c7e62b02baa8cfa640e Mon Sep 17 00:00:00 2001
From: Pino Toscano <pino@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)
---
 core/libs/imageproperties/captionedit.cpp      | 2 +-
 core/libs/imageproperties/imagedescedittab.cpp | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/core/libs/imageproperties/captionedit.cpp b/core/libs/imageproperties/captionedit.cpp
index 88413fc..70bdb6d 100644
--- a/core/libs/imageproperties/captionedit.cpp
+++ b/core/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/core/libs/imageproperties/imagedescedittab.cpp b/core/libs/imageproperties/imagedescedittab.cpp
index ebfbae1..3d12777 100644
--- a/core/libs/imageproperties/imagedescedittab.cpp
+++ b/core/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