[packages/kde4-kdepim/KDEPIM_4_4] - rel 4; fixes from debian
arekm
arekm at pld-linux.org
Wed Sep 26 10:17:21 CEST 2012
commit 930a95069fa4ddd44d698bc6305c1e30f9cebbdb
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date: Wed Sep 26 10:17:17 2012 +0200
- rel 4; fixes from debian
displaying_only_unread_issue.diff | 39 +++++++++++++++++
kde4-kdepim-build.patch | 2 +-
kde4-kdepim.spec | 8 +++-
...Fix-crash-displaying-New-Alarm-dialog-fro.patch | 50 ++++++++++++++++++++++
upstream_Fix-crash-in-Folder-destructor.patch | 36 ++++++++++++++++
5 files changed, 133 insertions(+), 2 deletions(-)
---
diff --git a/kde4-kdepim.spec b/kde4-kdepim.spec
index e8816fd..e7167a9 100644
--- a/kde4-kdepim.spec
+++ b/kde4-kdepim.spec
@@ -8,7 +8,7 @@ Summary(ru.UTF-8): Персональный планировщик (PIM) для
Summary(uk.UTF-8): Персональный планувальник (PIM) для KDE
Name: kde4-kdepim
Version: 4.4.11.1
-Release: 3
+Release: 4
License: GPL
Group: X11/Applications
Source0: ftp://ftp.kde.org/pub/kde/%{_state}/kdepim-%{version}/src/%{orgname}-%{version}.tar.bz2
@@ -17,6 +17,9 @@ Patch100: %{name}-branch.diff
# http://mirrors.ludost.net/gentoo/distfiles/kleopatra-4.4.3-assuan2.patch.bz2
Patch0: kleopatra-4.4.3-assuan2.patch
Patch1: %{name}-build.patch
+Patch2: upstream_Bug-271580-Fix-crash-displaying-New-Alarm-dialog-fro.patch
+Patch3: upstream_Fix-crash-in-Folder-destructor.patch
+Patch4: displaying_only_unread_issue.diff
URL: http://www.kde.org/
BuildRequires: Qt3Support-devel >= %{qtver}
BuildRequires: QtDesigner-devel >= %{qtver}
@@ -675,6 +678,9 @@ libksieve, libmimelib.
#%patch100 -p0
%patch0 -p0
%patch1 -p1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
%build
install -d build
diff --git a/displaying_only_unread_issue.diff b/displaying_only_unread_issue.diff
new file mode 100644
index 0000000..dbb6939
--- /dev/null
+++ b/displaying_only_unread_issue.diff
@@ -0,0 +1,39 @@
+commit 1380ce172e4f98ab433085721f0e8fddef4ba621
+Author: Christophe Giboudeaux <cgiboudeaux at gmx.com>
+Date: Thu Apr 28 11:34:39 2011 +0200
+
+ Revert "Maintain sort order when new articles are added"
+
+ While fixing the new article sorting issue, this introduced regressions
+ when displaying only unread articles.
+
+ Alex, please fix and resubmit to kdepim/4.6.
+ BUG: 271794
+ BUG: 271149
+ CCBUG: 271640
+ FIXED-IN: kdepim 4.6
+
+ This reverts commit e95e0f8e3687137f02e19d3ecf5ea0a9463f5962.
+
+--- a/akregator/src/articlelistview.cpp
++++ b/akregator/src/articlelistview.cpp
+@@ -156,11 +156,9 @@
+ m_proxy->setSourceModel( model );
+ m_proxy->setSortRole( ArticleModel::SortRole );
+ m_proxy->setFilters( m_matchers );
+- m_proxy->setDynamicSortFilter( true );
+ FilterDeletedProxyModel* const proxy2 = new FilterDeletedProxyModel( model );
+ proxy2->setSortRole( ArticleModel::SortRole );
+ proxy2->setSourceModel( m_proxy );
+- proxy2->setDynamicSortFilter( true );
+
+ FilterColumnsProxyModel* const columnsProxy = new FilterColumnsProxyModel( model );
+ columnsProxy->setSortRole( ArticleModel::SortRole );
+@@ -169,7 +167,6 @@
+ columnsProxy->setColumnEnabled( ArticleModel::FeedTitleColumn );
+ columnsProxy->setColumnEnabled( ArticleModel::DateColumn );
+ columnsProxy->setColumnEnabled( ArticleModel::AuthorColumn );
+- columnsProxy->setDynamicSortFilter( true );
+
+ setModel( columnsProxy );
+ header()->setContextMenuPolicy( Qt::CustomContextMenu );
diff --git a/kde4-kdepim-build.patch b/kde4-kdepim-build.patch
index 7a0e2f3..bf53919 100644
--- a/kde4-kdepim-build.patch
+++ b/kde4-kdepim-build.patch
@@ -15,7 +15,7 @@
_value = new unsigned char[n + 3];
_value[0] = 1; // see Init() member
-+ if (n)
++ if (n > 0)
memset(_value + 2, ch, n);
_value[1] = (unsigned char)(n <= 255 ? n : 255);
_value[n + 2] = 0;
diff --git a/upstream_Bug-271580-Fix-crash-displaying-New-Alarm-dialog-fro.patch b/upstream_Bug-271580-Fix-crash-displaying-New-Alarm-dialog-fro.patch
new file mode 100644
index 0000000..e29c9d9
--- /dev/null
+++ b/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
+
diff --git a/upstream_Fix-crash-in-Folder-destructor.patch b/upstream_Fix-crash-in-Folder-destructor.patch
new file mode 100644
index 0000000..5038eb1
--- /dev/null
+++ b/upstream_Fix-crash-in-Folder-destructor.patch
@@ -0,0 +1,36 @@
+From 6ae89eee936159dd7d7ca3405fbe6d9d66d86ddd Mon Sep 17 00:00:00 2001
+From: Christoph Feck <christoph at maxiom.de>
+Date: Mon, 7 Nov 2011 21:29:38 +0100
+Subject: [PATCH] Fix crash in Folder destructor
+
+Especially visible with Qt 4.8.0 qDeleteAll() changes, but might also
+fix older bugs.
+
+BUG: 285938
+CCBUG: 193780
+FIXED-IN: 4.7.4
+REVIEW: 102981
+(cherry picked from commit 3497e5afe51490191825c7b7d475a5fc0702988d)
+---
+ akregator/src/folder.cpp | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/akregator/src/folder.cpp b/akregator/src/folder.cpp
+index f2385b0..249e598 100644
+--- a/akregator/src/folder.cpp
++++ b/akregator/src/folder.cpp
+@@ -65,7 +65,10 @@ Folder::FolderPrivate::FolderPrivate( Folder* qq ) : q( qq ), unread( 0 ), open(
+
+ Folder::FolderPrivate::~FolderPrivate()
+ {
+- qDeleteAll( children );
++ while (!children.isEmpty()) {
++ // child removes itself from list in its destructor
++ delete children.first();
++ }
+ emit q->emitSignalDestroyed();
+ }
+
+--
+1.7.10
+
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/kde4-kdepim.git/commitdiff/930a95069fa4ddd44d698bc6305c1e30f9cebbdb
More information about the pld-cvs-commit
mailing list