Gentoo Archives: gentoo-commits

From: "Andreas HAttel (dilfridge)" <dilfridge@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in media-gfx/digikam/files: digikam-4.4.0-libkexiv2.patch
Date: Thu, 30 Oct 2014 20:06:41
Message-Id: 20141030200636.B3A539180@oystercatcher.gentoo.org
1 dilfridge 14/10/30 20:06:36
2
3 Added: digikam-4.4.0-libkexiv2.patch
4 Log:
5 Version bump
6
7 (Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key EBE6A336BE19039C!)
8
9 Revision Changes Path
10 1.1 media-gfx/digikam/files/digikam-4.4.0-libkexiv2.patch
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/digikam/files/digikam-4.4.0-libkexiv2.patch?rev=1.1&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/digikam/files/digikam-4.4.0-libkexiv2.patch?rev=1.1&content-type=text/plain
14
15 Index: digikam-4.4.0-libkexiv2.patch
16 ===================================================================
17 commit f6945f23e0ed1e11f26e2c7e62b02baa8cfa640e
18 Author: Pino Toscano <pino@×××.org>
19 Date: Tue Oct 14 22:26:19 2014 +0200
20
21 fix libkexiv2 version for AltLangStrEdit::textEdit()
22
23 it is part of current libkexiv2/master only (i.e. post 4.14.x, which
24 is 2.3.x)
25
26 diff --git a/libs/imageproperties/captionedit.cpp b/libs/imageproperties/captionedit.cpp
27 index 88413fc..70bdb6d 100644
28 --- a/libs/imageproperties/captionedit.cpp
29 +++ b/libs/imageproperties/captionedit.cpp
30 @@ -202,7 +202,7 @@ void CaptionEdit::slotAuthorChanged(const QString& text)
31
32 MsgTextEdit* CaptionEdit::textEdit() const
33 {
34 -#if KEXIV2_VERSION >= 0x020302
35 +#if KEXIV2_VERSION >= 0x020400
36 return d->altLangStrEdit->textEdit();
37 #else
38 return 0;
39 diff --git a/libs/imageproperties/imagedescedittab.cpp b/libs/imageproperties/imagedescedittab.cpp
40 index ebfbae1..3d12777 100644
41 --- a/libs/imageproperties/imagedescedittab.cpp
42 +++ b/libs/imageproperties/imagedescedittab.cpp
43 @@ -429,7 +429,7 @@ ImageDescEditTab::ImageDescEditTab(QWidget* const parent)
44
45 // Initialize ---------------------------------------------
46
47 -#if KEXIV2_VERSION >= 0x020302
48 +#if KEXIV2_VERSION >= 0x020400
49 d->titleEdit->textEdit()->installEventFilter(this);
50 d->captionsEdit->textEdit()->installEventFilter(this);
51 #endif
52 @@ -532,7 +532,7 @@ void ImageDescEditTab::setFocusToNewTagEdit()
53 void ImageDescEditTab::setFocusToTitlesEdit()
54 {
55 d->tabWidget->setCurrentIndex(Private::DESCRIPTIONS);
56 -#if KEXIV2_VERSION >= 0x020302
57 +#if KEXIV2_VERSION >= 0x020400
58 d->titleEdit->textEdit()->setFocus();
59 #endif
60 }
61 @@ -540,7 +540,7 @@ void ImageDescEditTab::setFocusToTitlesEdit()
62 void ImageDescEditTab::setFocusToCommentsEdit()
63 {
64 d->tabWidget->setCurrentIndex(Private::DESCRIPTIONS);
65 -#if KEXIV2_VERSION >= 0x020302
66 +#if KEXIV2_VERSION >= 0x020400
67 d->captionsEdit->textEdit()->setFocus();
68 #endif
69 }