[packages/digikam] - rel 3; build fix from debian; icedove support from debian
arekm
arekm at pld-linux.org
Fri Oct 17 08:18:23 CEST 2014
commit 2010d8d7a579e3b7f8db3fe2ea0aae9f3173af3d
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date: Fri Oct 17 08:18:09 2014 +0200
- rel 3; build fix from debian; icedove support from debian
digikam.spec | 6 ++-
sendimages-icedove.diff | 47 +++++++++++++++++
...exiv2-version-for-AltLangStrEdit-textEdit.patch | 59 ++++++++++++++++++++++
3 files changed, 111 insertions(+), 1 deletion(-)
---
diff --git a/digikam.spec b/digikam.spec
index 31a3759..d1f3781 100644
--- a/digikam.spec
+++ b/digikam.spec
@@ -6,12 +6,14 @@ Summary: A KDE frontend for gphoto2
Summary(pl.UTF-8): Interfejs KDE do gphoto2
Name: digikam
Version: 4.4.0
-Release: 2
+Release: 3
License: GPL
Group: X11/Applications/Graphics
Source0: http://download.kde.org/stable/digikam/%{name}-%{version}.tar.bz2
# Source0-md5: ffafd3d4fe7e920830fe7a7452852542
Patch0: %{name}-build.patch
+Patch1: sendimages-icedove.diff
+Patch2: upstream_fix-libkexiv2-version-for-AltLangStrEdit-textEdit.patch
URL: http://www.digikam.org/
BuildRequires: ImageMagick-devel
BuildRequires: Qt3Support-devel >= %{qtver}
@@ -83,6 +85,8 @@ Interfejs KDE do gphoto2 - pliki nagłówkowe.
%prep
%setup -q
%patch0 -p1
+%patch1 -p1
+%patch2 -p1
# use kde one
mv cmake/modules/FindKipi.cmake cmake/modules/FindKipi.cmake.ORIG
diff --git a/sendimages-icedove.diff b/sendimages-icedove.diff
new file mode 100644
index 0000000..8f64941
--- /dev/null
+++ b/sendimages-icedove.diff
@@ -0,0 +1,47 @@
+Index: digikam-4.0.0~rc/extra/kipi-plugins/sendimages/sendimages.cpp
+===================================================================
+--- digikam-4.0.0~rc.orig/extra/kipi-plugins/sendimages/sendimages.cpp 2014-04-28 07:20:41.000000000 +1000
++++ digikam-4.0.0~rc/extra/kipi-plugins/sendimages/sendimages.cpp 2014-05-02 21:46:38.989248687 +1000
+@@ -582,6 +582,7 @@
+
+ case EmailSettings::NETSCAPE:
+ case EmailSettings::THUNDERBIRD:
++ case EmailSettings::ICEDOVE:
+ case EmailSettings::GMAILAGENT:
+ {
+ QString prog;
+@@ -594,6 +595,10 @@
+ {
+ prog = QString("thunderbird");
+ }
++ else if (d->settings.emailProgram == EmailSettings::ICEDOVE)
++ {
++ prog = QString("icedove");
++ }
+ else
+ {
+ prog = QString("gmailagent");
+Index: digikam-4.0.0~rc/extra/kipi-plugins/sendimages/emailsettings.h
+===================================================================
+--- digikam-4.0.0~rc.orig/extra/kipi-plugins/sendimages/emailsettings.h 2014-04-28 07:20:41.000000000 +1000
++++ digikam-4.0.0~rc/extra/kipi-plugins/sendimages/emailsettings.h 2014-05-02 21:46:38.989248687 +1000
+@@ -70,6 +70,7 @@
+ NETSCAPE,
+ SYLPHEED,
+ SYLPHEEDCLAWS,
++ ICEDOVE,
+ THUNDERBIRD
+ };
+
+Index: digikam-4.0.0~rc/extra/kipi-plugins/sendimages/settingswidget.cpp
+===================================================================
+--- digikam-4.0.0~rc.orig/extra/kipi-plugins/sendimages/settingswidget.cpp 2014-04-28 07:20:41.000000000 +1000
++++ digikam-4.0.0~rc/extra/kipi-plugins/sendimages/settingswidget.cpp 2014-05-02 21:46:38.993248621 +1000
+@@ -100,6 +100,7 @@
+ d->mailAgentName->insertItem(EmailSettings::SYLPHEED, "Sylpheed");
+ d->mailAgentName->insertItem(EmailSettings::SYLPHEEDCLAWS, "Sylpheed-Claws");
+ d->mailAgentName->insertItem(EmailSettings::THUNDERBIRD, "Thunderbird");
++ d->mailAgentName->insertItem(EmailSettings::ICEDOVE, "Icedove");
+ d->mailAgentName->setCurrentIndex(EmailSettings::DEFAULT);
+ d->mailAgentName->setWhatsThis(i18n("Select your preferred external email program here. "
+ "<b>Default</b> is the current email program set in KDE "
diff --git a/upstream_fix-libkexiv2-version-for-AltLangStrEdit-textEdit.patch b/upstream_fix-libkexiv2-version-for-AltLangStrEdit-textEdit.patch
new file mode 100644
index 0000000..0fc7784
--- /dev/null
+++ b/upstream_fix-libkexiv2-version-for-AltLangStrEdit-textEdit.patch
@@ -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)
+---
+ 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
+
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/digikam.git/commitdiff/2010d8d7a579e3b7f8db3fe2ea0aae9f3173af3d
More information about the pld-cvs-commit
mailing list