From b2438c2a21caff8fabe1a7631c0b29c69eb35585 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jan=20R=C4=99korajski?= Date: Tue, 13 Feb 2018 20:50:00 +0100 Subject: [PATCH] - icedove is long gone, remove patch --- digikam.spec | 2 -- sendimages-icedove.diff | 41 ----------------------------------------- 2 files changed, 43 deletions(-) delete mode 100644 sendimages-icedove.diff diff --git a/digikam.spec b/digikam.spec index 86e08a5..4dc3a19 100644 --- a/digikam.spec +++ b/digikam.spec @@ -11,7 +11,6 @@ License: GPL Group: X11/Applications/Graphics Source0: http://download.kde.org/stable/digikam/%{name}-%{version}.tar.xz # Source0-md5: 39ae21083ab47acbb8ca89f73716fecb -Patch0: sendimages-icedove.diff URL: http://www.digikam.org/ BuildRequires: ImageMagick-devel BuildRequires: clapack-devel @@ -74,7 +73,6 @@ Interfejs KDE do gphoto2 - pliki nagłówkowe. %prep %setup -q -%patch0 -p1 %build install -d build diff --git a/sendimages-icedove.diff b/sendimages-icedove.diff deleted file mode 100644 index dbfc428..0000000 --- a/sendimages-icedove.diff +++ /dev/null @@ -1,41 +0,0 @@ ---- digikam-5.6.0/extra/kipi-plugins/sendimages/settingswidget.cpp~ 2017-06-13 09:48:26.000000000 +0200 -+++ digikam-5.6.0/extra/kipi-plugins/sendimages/settingswidget.cpp 2017-09-12 23:52:48.161863338 +0200 -@@ -101,6 +101,7 @@ SettingsWidget::SettingsWidget(QWidget* - d->mailAgentName->insertItem(EmailSettings::SYLPHEED, QLatin1String("Sylpheed")); - d->mailAgentName->insertItem(EmailSettings::SYLPHEEDCLAWS, QLatin1String("Sylpheed-Claws")); - d->mailAgentName->insertItem(EmailSettings::THUNDERBIRD, QLatin1String("Thunderbird")); -+ d->mailAgentName->insertItem(EmailSettings::ICEDOVE, QLatin1String("Icedove")); - #endif - d->mailAgentName->setCurrentIndex(EmailSettings::DEFAULT); - d->mailAgentName->setWhatsThis(i18n("Select your preferred external email program here. " ---- digikam-5.6.0/extra/kipi-plugins/sendimages/sendimages.cpp~ 2017-09-12 23:51:31.000000000 +0200 -+++ digikam-5.6.0/extra/kipi-plugins/sendimages/sendimages.cpp 2017-09-12 23:54:12.504522808 +0200 -@@ -614,6 +614,7 @@ bool SendImages::invokeMailAgent() - - case EmailSettings::NETSCAPE: - case EmailSettings::THUNDERBIRD: -+ case EmailSettings::ICEDOVE - { - QString prog; - -@@ -621,6 +622,10 @@ bool SendImages::invokeMailAgent() - { - prog = QLatin1String("netscape"); - } -+ else if (d->settings.emailProgram == EmailSettings::ICEDOVE) -+ { -+ prog = QLatin1String("icedove"); -+ } - else - { - prog = QLatin1String("thunderbird"); ---- digikam-5.6.0/./extra/kipi-plugins/sendimages/emailsettings.h.orig 2017-06-13 09:48:26.000000000 +0200 -+++ digikam-5.6.0/./extra/kipi-plugins/sendimages/emailsettings.h 2017-09-12 23:51:31.722786416 +0200 -@@ -67,6 +67,7 @@ public: - NETSCAPE, - SYLPHEED, - SYLPHEEDCLAWS, -+ ICEDOVE, - THUNDERBIRD - }; - -- 2.43.0