[SCM] KDE PIM module packaging branch, master, updated. debian/4.4.11.1+l10n-1-5-gb5cba55

[Pino Toscano]

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

The following commit has been merged in the master branch:
commit b5cba55239cc262cff941410577feb63270290e4
Author: Pino Toscano <pino at debian.org>
Date:   Tue May 22 23:47:38 2012 +0200

    fix KAlarm crashes with Qt 4.8.x (#671619)
    
    backport upstream commit 4b504e760e0c994e676b55bfaca731d74841f1f4
---
 debian/changelog                                   |    4 ++
 debian/patches/series                              |    1 +
 ...Fix-crash-displaying-New-Alarm-dialog-fro.patch |   50 ++++++++++++++++++++
 3 files changed, 55 insertions(+), 0 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 21ce6f3..22d58a3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,10 @@ kdepim (4:4.4.11.1+l10n-2) UNRELEASED; urgency=low
     active) to the official news feed @ debian.org. (Closes: #665985)
   * Override GENERIC_LIB_VERSION and KDE_NON_GENERIC_LIB_VERSION to not depend
     on the kdelibs version. (Closes: #665083)
+  * Backport upstream commit 4b504e760e0c994e676b55bfaca731d74841f1f4 to fix
+    KAlarm crashes with Qt 4.8.x; patch
+    upstream_Bug-271580-Fix-crash-displaying-New-Alarm-dialog-fro.patch.
+    (Closes: #671619)
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Tue, 17 Apr 2012 14:21:49 +0200
 
diff --git a/debian/patches/series b/debian/patches/series
index 04bbd1f..95bba96 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@ debianize_akregator_default.diff
 kdepim_l10n.diff
 displaying_only_unread_issue.diff
 debian_set_library_version.diff
+upstream_Bug-271580-Fix-crash-displaying-New-Alarm-dialog-fro.patch
diff --git a/debian/patches/upstream_Bug-271580-Fix-crash-displaying-New-Alarm-dialog-fro.patch b/debian/patches/upstream_Bug-271580-Fix-crash-displaying-New-Alarm-dialog-fro.patch
new file mode 100644
index 0000000..e29c9d9
--- /dev/null
+++ b/debian/patches/upstream_Bug-271580-Fix-crash-displaying-New-Alarm-dialog-fro.patch
@@ -0,0 +1,50 @@
+From 4b504e760e0c994e676b55bfaca731d74841f1f4 Mon Sep 17 00:00:00 2001
+From: David Jarvie <djarvie at kde.org>
+Date: Tue, 26 Apr 2011 23:29:19 +0100
+Subject: [PATCH] Bug 271580: Fix crash displaying New Alarm dialog from
+ system tray
+
+Fixes a crash on some systems when the New Alarm dialog is displayed
+from the system tray icon menu.
+---
+ kalarm/Changelog        |    4 +++-
+ kalarm/lib/spinbox2.cpp |    9 +++++----
+ 2 files changed, 8 insertions(+), 5 deletions(-)
+
+diff --git a/kalarm/lib/spinbox2.cpp b/kalarm/lib/spinbox2.cpp
+index cc10882..f1e8ab9 100644
+--- a/kalarm/lib/spinbox2.cpp
++++ b/kalarm/lib/spinbox2.cpp
+@@ -1,7 +1,7 @@
+ /*
+  *  spinbox2.cpp  -  spin box with extra pair of spin buttons (for Qt 3)
+  *  Program:  kalarm
+- *  Copyright © 2001-2009 by David Jarvie <djarvie at kde.org>
++ *  Copyright © 2001-2009,2011 by David Jarvie <djarvie at kde.org>
+  *
+  *  This program is free software; you can redistribute it and/or modify
+  *  it under the terms of the GNU General Public License as published by
+@@ -28,7 +28,7 @@
+ #include <QMouseEvent>
+ #include <QStyleOptionSpinBox>
+ #include <QGraphicsPixmapItem>
+-#include <QPaintEngine>
++#include <QPainter>
+ #include <QTimer>
+ #include <QFrame>
+ #include <QBrush>
+@@ -588,8 +588,9 @@ void SpinMirror::setFrame()
+ 		p = grabWidget(mMainSpinbox, QRect(x, 0, 1, height()));
+ 		// Blot out edit field stuff from the middle of the slice
+ 		QPixmap dot = grabWidget(mMainSpinbox, QRect(x, editOffsetY, 1, 1));
+-		QPaintEngine* pe = p.paintEngine();
+-		pe->drawTiledPixmap(QRectF(0, editOffsetY, 1, height() - 2*editOffsetY), dot, QPointF(0, 0));
++		QPainter painter(&p);
++		painter.drawTiledPixmap(0, editOffsetY, 1, height() - 2*editOffsetY, dot, 0, 0);
++		painter.end();
+ 		// Horizontally fill the mirror widget with the vertical slice
+ 		p = p.scaled(size());
+ 		// Grab the left hand border of the main spinbox, and draw it into the mirror widget.
+-- 
+1.7.10
+

-- 
KDE PIM module packaging