[digikam/f20] fix panorama crasher rhbz#1040922

[Jaroslav Reznik]

commit ebd338de11ddfee7156e2d31f963ed52d2712959
Author: Jaroslav Reznik <jreznik at redhat.com>
Date:   Thu Dec 12 12:30:32 2013 +0100

    fix panorama crasher rhbz#1040922

 digikam-3.5.0-panorama-crasher.patch |   28 ++++++++++++++++++++++++++++
 digikam.spec                         |    9 ++++++++-
 2 files changed, 36 insertions(+), 1 deletions(-)
---
diff --git a/digikam-3.5.0-panorama-crasher.patch b/digikam-3.5.0-panorama-crasher.patch
new file mode 100644
index 0000000..1d6901b
--- /dev/null
+++ b/digikam-3.5.0-panorama-crasher.patch
@@ -0,0 +1,28 @@
+diff -up digikam-3.5.0/extra/kipi-plugins/panorama/importwizard/lastpage.cpp.panorama-crasher digikam-3.5.0/extra/kipi-plugins/panorama/importwizard/lastpage.cpp
+--- digikam-3.5.0/extra/kipi-plugins/panorama/importwizard/lastpage.cpp.panorama-crasher	2013-10-01 08:23:09.000000000 +0200
++++ digikam-3.5.0/extra/kipi-plugins/panorama/importwizard/lastpage.cpp	2013-12-12 11:50:14.199493306 +0100
+@@ -91,11 +91,7 @@ LastPage::LastPage(Manager* const mngr,
+ 
+     QLabel *fileTemplateLabel = new QLabel(i18n("File name template:"), d->saveSettingsGroupBox);
+     formatVBox->addWidget(fileTemplateLabel);
+-    QString first = d->mngr->itemsList().front().fileName();
+-    QString last = d->mngr->itemsList().back().fileName();
+-//     QString file = "panorama";
+-    QString file = QString("%1-%2").arg(first.left(first.lastIndexOf('.'))).arg(last.left(last.lastIndexOf('.')));
+-    d->fileTemplateKLineEdit  = new KLineEdit(file, d->saveSettingsGroupBox);
++    d->fileTemplateKLineEdit  = new KLineEdit("panorama", d->saveSettingsGroupBox);
+     d->fileTemplateKLineEdit->setToolTip(i18n("Name of the panorama file (without its extension)."));
+     d->fileTemplateKLineEdit->setWhatsThis(i18n("<b>File name template</b>: Set here the base name of the files that "
+                                                 "will be saved. For example, if your template is <i>panorama</i> and if "
+@@ -146,6 +142,11 @@ LastPage::~LastPage()
+ 
+ void LastPage::resetTitle()
+ {
++    QString first = d->mngr->itemsList().front().fileName();
++    QString last = d->mngr->itemsList().back().fileName();
++    QString file = QString("%1-%2").arg(first.left(first.lastIndexOf('.'))).arg(last.left(last.lastIndexOf('.')));
++    d->fileTemplateKLineEdit->setText(file);
++
+     slotTemplateChanged(d->fileTemplateKLineEdit->text());
+     checkFiles();
+ }
diff --git a/digikam.spec b/digikam.spec
index 4259159..0c13b7c 100644
--- a/digikam.spec
+++ b/digikam.spec
@@ -6,7 +6,7 @@
 
 Name:    digikam
 Version: 3.5.0
-Release: 1%{?pre}%{?dist}
+Release: 2%{?pre}%{?dist}
 Summary: A digital camera accessing & photo management application
 
 License: GPLv2+
@@ -23,6 +23,8 @@ Source1: digikam-import.desktop
 Patch51:  digikam-3.1.0-opencv20.patch
 
 ## upstream patches
+# git 3d1a27f9
+Patch100: digikam-3.5.0-panorama-crasher.patch
 
 BuildRequires: eigen3-devel
 BuildRequires: desktop-file-utils
@@ -228,6 +230,8 @@ BuildArch: noarch
 %patch51 -p1 -b .opencv20
 %endif
 
+%patch100 -p1 -b .panaroma-crasher
+
 # don't use bundled/old FindKipi.cmake in favor of kdelibs' version
 # see http:/bugs.kde.org/307213
 mv cmake/modules/FindKipi.cmake cmake/modules/FindKipi.cmake.ORIG
@@ -528,6 +532,9 @@ update-desktop-database -q &> /dev/null
 
 
 %changelog
+* Thu Dec 12 2013 Jaroslav Reznik <jreznik at redhat.com> - 3.5.0-2
+- fix panorama crasher rhbz#1040922
+
 * Wed Oct  9 2013 Alexey Kurov <nucleo at fedoraproject.org> - 3.5.0-1
 - digikam-3.5.0