[SCM] KDE PIM Libraries module packaging branch, master, updated. debian/4.8.4-2-16-g5b78dc7

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-sc/kdepimlibs.git;a=commitdiff;h=f4cb2db

The following commit has been merged in the master branch:
commit f4cb2dbe06477da20f94e88a7924a588d0cbd7ad
Author: Maximiliano Curia <maxy at debian.org>
Date:   Fri Jun 28 15:09:14 2013 +0200

    Revert "Remove crash_when_marking_folder_read.diff."
    
    This reverts commit 708254b1f00e8b44525869ec51fc990e08373a85.
    
    Conflicts:
    	debian/patches/series
---
 debian/changelog                                   |    1 -
 debian/patches/crash_when_marking_folder_read.diff |   36 ++++++++++++++++++++
 debian/patches/series                              |    1 +
 3 files changed, 37 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 8427b97..fcffa17 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,7 +4,6 @@ kdepimlibs (4:4.8.5-0r0) UNRELEASED; urgency=low
   * New upstream release.
   * Add myself to Uploaders.
   * Confirm symbols files with 4:4.8.4's build logs.
-  * Remove crash_when_marking_folder_read.diff, already applied upstream.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 29 Sep 2012 16:51:09 -0300
 
diff --git a/debian/patches/crash_when_marking_folder_read.diff b/debian/patches/crash_when_marking_folder_read.diff
new file mode 100644
index 0000000..f25806c
--- /dev/null
+++ b/debian/patches/crash_when_marking_folder_read.diff
@@ -0,0 +1,36 @@
+From e537fb9bdbd9bbbc612d5521d974d64efbcda0a9 Mon Sep 17 00:00:00 2001
+From: Montel Laurent <montel at kde.org>
+Date: Wed, 6 Jun 2012 20:40:30 +0200
+Subject: [PATCH] Try to fix Bug 283272 - crash when marking folder read
+
+I don't know how status can be empty.
+But I fix as it. It will fix crash.
+If somebody which has this crash perhaps it can apply this patch and
+verify if it fixes bug.
+
+FIXED-IN: 4.8.5
+BUG: 283272
+(cherry picked from commit 67cfe2290a8c1817a92c6da65da001d267a0f24f)
+---
+ akonadi/kmime/markascommand.cpp |    5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/akonadi/kmime/markascommand.cpp b/akonadi/kmime/markascommand.cpp
+index 96281d5..e8c5974 100644
+--- a/akonadi/kmime/markascommand.cpp
++++ b/akonadi/kmime/markascommand.cpp
+@@ -104,7 +104,10 @@ void MarkAsCommand::markMessages()
+ 
+   QSet<QByteArray> flags = mTargetStatus.statusFlags();
+   Q_ASSERT( flags.size() == 1 );
+-  const Akonadi::Item::Flag flag = *(flags.begin());
++  Akonadi::Item::Flag flag;
++  if(!flags.isEmpty()) 
++    flag = *(flags.begin());
++
+   Akonadi::Item::List itemsToModify;
+   foreach( const Akonadi::Item &it, mMessages ) {
+     Akonadi::Item item( it );
+-- 
+1.7.10
+
diff --git a/debian/patches/series b/debian/patches/series
index 205a619..a17eb0d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
+crash_when_marking_folder_read.diff
 upstream_b92782580756b3858f0381a5200b79688ab0b0a2.diff
 03_hide_akonadi_progressbar.diff

-- 
KDE PIM Libraries module packaging