[kde-workspace] backports++ (kdm crasher in particular)
Rex Dieter
rdieter at fedoraproject.org
Fri May 2 11:46:24 UTC 2014
commit 9cba9f6757b8d75a34124efa2e88486d12311f4e
Author: Rex Dieter <rdieter at math.unl.edu>
Date: Fri May 2 06:46:42 2014 -0500
backports++ (kdm crasher in particular)
...-Present-Windows-effect-when-control-clic.patch | 4 +-
...fter-dismissing-the-context-menu-of-a-jus.patch | 2 +-
0004-connect-to-the-right-signal.patch | 2 +-
0009-Do-not-popup-during-initialization.patch | 28 ++++++++++++++
0010-Fix-crash-when-DesktopNames-isn-t-set.patch | 38 ++++++++++++++++++++
kde-workspace.spec | 9 ++++-
6 files changed, 78 insertions(+), 5 deletions(-)
---
diff --git a/0001-Trigger-the-Present-Windows-effect-when-control-clic.patch b/0001-Trigger-the-Present-Windows-effect-when-control-clic.patch
index 54edae2..dc76af9 100644
--- a/0001-Trigger-the-Present-Windows-effect-when-control-clic.patch
+++ b/0001-Trigger-the-Present-Windows-effect-when-control-clic.patch
@@ -1,8 +1,8 @@
From 87a754910fdb3b71a489dbbaf8f962f0feb9b46d Mon Sep 17 00:00:00 2001
From: Eike Hein <hein at kde.org>
Date: Mon, 28 Apr 2014 10:12:31 +0200
-Subject: [PATCH 1/7] Trigger the Present Windows effect when control-clicking
- on a group.
+Subject: [PATCH 01/10] Trigger the Present Windows effect when
+ control-clicking on a group.
BUG:326279
---
diff --git a/0002-Fix-crash-after-dismissing-the-context-menu-of-a-jus.patch b/0002-Fix-crash-after-dismissing-the-context-menu-of-a-jus.patch
index f08fb9f..7fde381 100644
--- a/0002-Fix-crash-after-dismissing-the-context-menu-of-a-jus.patch
+++ b/0002-Fix-crash-after-dismissing-the-context-menu-of-a-jus.patch
@@ -1,7 +1,7 @@
From 6a3e000bfa16cb4f3371dd7bc7005659194d5c5b Mon Sep 17 00:00:00 2001
From: Eike Hein <hein at kde.org>
Date: Mon, 28 Apr 2014 10:12:37 +0200
-Subject: [PATCH 2/7] Fix crash after dismissing the context menu of a
+Subject: [PATCH 02/10] Fix crash after dismissing the context menu of a
just-disappeared task.
BUG:326941
diff --git a/0004-connect-to-the-right-signal.patch b/0004-connect-to-the-right-signal.patch
index 5591c21..8215dd2 100644
--- a/0004-connect-to-the-right-signal.patch
+++ b/0004-connect-to-the-right-signal.patch
@@ -1,7 +1,7 @@
From 3065554afa5f3a74035e6735dda06ec68ce2e38c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Tinkl?= <lukas at kde.org>
Date: Tue, 29 Apr 2014 00:23:29 +0200
-Subject: [PATCH 4/7] connect to the right signal
+Subject: [PATCH 04/10] connect to the right signal
when updating the _device_ properties (ie. the remaining time),
only happens with UPower >= 0.99
diff --git a/0009-Do-not-popup-during-initialization.patch b/0009-Do-not-popup-during-initialization.patch
new file mode 100644
index 0000000..33f281a
--- /dev/null
+++ b/0009-Do-not-popup-during-initialization.patch
@@ -0,0 +1,28 @@
+From 42310a7851049d7706c66874f363ce7ef73655df Mon Sep 17 00:00:00 2001
+From: Jacopo De Simoi <wilderkde at gmail.com>
+Date: Thu, 1 May 2014 16:46:46 -0400
+Subject: [PATCH 09/10] Do not popup during initialization
+
+The notifier should not popup if devices are detected during the
+applet initialization phase (e.g. on plasma startup)
+CCBUG: 318061
+---
+ .../applets/devicenotifier/package/contents/ui/devicenotifier.qml | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/plasma/generic/applets/devicenotifier/package/contents/ui/devicenotifier.qml b/plasma/generic/applets/devicenotifier/package/contents/ui/devicenotifier.qml
+index 9b6132e..473036f 100644
+--- a/plasma/generic/applets/devicenotifier/package/contents/ui/devicenotifier.qml
++++ b/plasma/generic/applets/devicenotifier/package/contents/ui/devicenotifier.qml
+@@ -74,7 +74,7 @@ Item {
+ (devicesType == "removable" && data[last] && data[last]["Removable"] == true) ||
+ (devicesType == "nonRemovable" && data[last] && data[last]["Removable"] == false)) {
+ updateTooltip();
+- if (expand) {
++ if (expand && hpSource.data[last]["added"]) {
+ expandDevice(last)
+ }
+ last = "";
+--
+1.9.0
+
diff --git a/0010-Fix-crash-when-DesktopNames-isn-t-set.patch b/0010-Fix-crash-when-DesktopNames-isn-t-set.patch
new file mode 100644
index 0000000..d73f5cf
--- /dev/null
+++ b/0010-Fix-crash-when-DesktopNames-isn-t-set.patch
@@ -0,0 +1,38 @@
+From e1724800ecf3c6a7035dfa7bcaa50b2a8f48688f Mon Sep 17 00:00:00 2001
+From: David Faure <faure at kde.org>
+Date: Fri, 2 May 2014 10:26:38 +0200
+Subject: [PATCH 10/10] Fix crash when DesktopNames isn't set
+
+BUG: 334159
+FIXED-IN: 4.11.10
+---
+ kdm/backend/client.c | 12 +++++++-----
+ 1 file changed, 7 insertions(+), 5 deletions(-)
+
+diff --git a/kdm/backend/client.c b/kdm/backend/client.c
+index 335cc3e..a2d06c2 100644
+--- a/kdm/backend/client.c
++++ b/kdm/backend/client.c
+@@ -1810,12 +1810,14 @@ startClient(volatile int *pid)
+ !(sessargs = iniEntry(str, "Desktop Entry", "Exec", 0)))
+ sessargs = "";
+ buf = iniEntry(str, "Desktop Entry", "DesktopNames", 0);
+- for (buf2 = buf; *buf2; ++buf2) {
+- if (*buf2 == ';')
+- *buf2 = ':';
++ if (buf) {
++ for (buf2 = buf; *buf2; ++buf2) {
++ if (*buf2 == ';')
++ *buf2 = ':';
++ }
++ userEnviron = setEnv(userEnviron, "XDG_CURRENT_DESKTOP", buf);
++ free(buf);
+ }
+- userEnviron = setEnv(userEnviron, "XDG_CURRENT_DESKTOP", buf);
+- free(buf);
+ free(str);
+ free(fname);
+ goto gotit;
+--
+1.9.0
+
diff --git a/kde-workspace.spec b/kde-workspace.spec
index a1e2f61..ffee3d8 100644
--- a/kde-workspace.spec
+++ b/kde-workspace.spec
@@ -20,7 +20,7 @@
Summary: KDE Workspace
Name: kde-workspace
Version: 4.11.9
-Release: 3%{?dist}
+Release: 4%{?dist}
License: GPLv2
URL: https://projects.kde.org/projects/kde/kde-workspace
@@ -135,6 +135,8 @@ Patch62: kde-workspace-4.11.7-weather-fix-bbcukmet-crash-kde#332392.patch
Patch101: 0001-Trigger-the-Present-Windows-effect-when-control-clic.patch
Patch102: 0002-Fix-crash-after-dismissing-the-context-menu-of-a-jus.patch
Patch104: 0004-connect-to-the-right-signal.patch
+Patch109: 0009-Do-not-popup-during-initialization.patch
+Patch110: 0010-Fix-crash-when-DesktopNames-isn-t-set.patch
## plasma active patches
@@ -495,6 +497,8 @@ Requires: akonadi
%patch101 -p1 -b .0001
%patch102 -p1 -b .0002
%patch104 -p1 -b .0004
+%patch109 -p1 -b .0009
+%patch110 -p1 -b .0010
# Fedora patches
%if 0%{?fedora} && 0%{?rhel} > 6
@@ -1086,6 +1090,9 @@ fi
%changelog
+* Fri May 02 2014 Rex Dieter <rdieter at fedoraproject.org> 4.11.9-4
+- backports++ (kdm crasher in particular)
+
* Thu May 01 2014 Rex Dieter <rdieter at fedoraproject.org> 4.11.9-3
- backport some post-4.11.9 upstream commits
More information about the scm-commits
mailing list