rpms/kdebase-workspace/devel kdebase-workspace-4.3.2-plasmaCrash.patch, NONE, 1.1 kdebase-workspace.spec, 1.293, 1.294
Lukas Tinkl
ltinkl at fedoraproject.org
Wed Sep 23 12:47:08 UTC 2009
- Previous message (by thread): rpms/kdebase-workspace/F-11 kdebase-workspace-4.3.2-plasmaCrash.patch, NONE, 1.1 kdebase-workspace.spec, 1.241, 1.242
- Next message (by thread): rpms/rhnsd/devel import.log, NONE, 1.1 rhnsd.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: ltinkl
Update of /cvs/extras/rpms/kdebase-workspace/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29849/devel
Modified Files:
kdebase-workspace.spec
Added Files:
kdebase-workspace-4.3.2-plasmaCrash.patch
Log Message:
fix plasma crasher
kdebase-workspace-4.3.2-plasmaCrash.patch:
tasks.cpp | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
--- NEW FILE kdebase-workspace-4.3.2-plasmaCrash.patch ---
Index: branches/KDE/4.3/kdebase/workspace/plasma/applets/tasks/tasks.cpp
===================================================================
--- branches/KDE/4.3/kdebase/workspace/plasma/applets/tasks/tasks.cpp (revision 1019864)
+++ branches/KDE/4.3/kdebase/workspace/plasma/applets/tasks/tasks.cpp (revision 1019865)
@@ -76,6 +76,9 @@
{
//kDebug();
+ const KConfigGroup cg = config();
+ m_showTooltip = cg.readEntry("showTooltip", true);
+
m_groupManager = new TaskManager::GroupManager(this);
Plasma::Containment* appletContainment = containment();
if (appletContainment) {
@@ -117,13 +120,10 @@
setLayout(layout);
- KConfigGroup cg = config();
-
m_groupManager->setShowOnlyCurrentDesktop( cg.readEntry("showOnlyCurrentDesktop", false));
m_groupManager->setShowOnlyCurrentScreen( cg.readEntry("showOnlyCurrentScreen", false));
m_groupManager->setShowOnlyMinimized( cg.readEntry("showOnlyMinimized", false));
m_groupManager->setOnlyGroupWhenFull(cg.readEntry("groupWhenFull", true));
- m_showTooltip = cg.readEntry("showTooltip", true);
m_groupManager->setGroupingStrategy( static_cast<TaskManager::GroupManager::TaskGroupingStrategy>(cg.readEntry("groupingStrategy", static_cast<int>(TaskManager::GroupManager::ProgramGrouping))));
Index: branches/KDE/4.3/kdebase/workspace/plasma/applets/tasks/tasks.cpp
===================================================================
--- branches/KDE/4.3/kdebase/workspace/plasma/applets/tasks/tasks.cpp (revision 1019867)
+++ branches/KDE/4.3/kdebase/workspace/plasma/applets/tasks/tasks.cpp (revision 1019868)
@@ -51,6 +51,10 @@
m_topMargin(0),
m_rightMargin(0),
m_bottomMargin(0),
+ m_offscreenLeftMargin(0),
+ m_offscreenTopMargin(0),
+ m_offscreenRightMargin(0),
+ m_offscreenBottomMargin(0),
m_rootGroupItem(0),
m_groupManager(0),
m_groupModifierKey(Qt::AltModifier)
Index: kdebase-workspace.spec
===================================================================
RCS file: /cvs/extras/rpms/kdebase-workspace/devel/kdebase-workspace.spec,v
retrieving revision 1.293
retrieving revision 1.294
diff -u -p -r1.293 -r1.294
--- kdebase-workspace.spec 21 Sep 2009 15:17:46 -0000 1.293
+++ kdebase-workspace.spec 23 Sep 2009 12:47:08 -0000 1.294
@@ -8,7 +8,7 @@ Summary: K Desktop Environment - Workspa
Name: kdebase-workspace
Version: 4.3.1
-Release: 4%{?dist}
+Release: 5%{?dist}
Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdebase-workspace-%{version}.tar.bz2
License: GPLv2
Group: User Interface/Desktops
@@ -34,6 +34,7 @@ Patch16: kdebase-workspace-4.3.0-battery
# upstream patches:
# 4.3 branch
+Patch100: kdebase-workspace-4.3.2-plasmaCrash.patch
# trunk
@@ -262,6 +263,8 @@ Requires: akonadi
%patch16 -p1 -b .showremainingtime
# upstream patches
+%patch100 -p5 -b .plasmaCrash
+
%build
@@ -589,6 +592,9 @@ fi
%changelog
+* Wed Sep 23 2009 Lukáš Tinkl <ltinkl at redhat.com> - 4.3.1-5
+- fix spontaneous Plasma crashes due to uninitialized vars
+
* Mon Sep 14 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.3.1-4
- drop PolicyKit 0.9 support (PolicyKit-kde) on F12+/EL
- Previous message (by thread): rpms/kdebase-workspace/F-11 kdebase-workspace-4.3.2-plasmaCrash.patch, NONE, 1.1 kdebase-workspace.spec, 1.241, 1.242
- Next message (by thread): rpms/rhnsd/devel import.log, NONE, 1.1 rhnsd.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list