[kdebase-workspace] revert patch adding broken launchers (#747982)
nucleo
nucleo at fedoraproject.org
Fri Oct 21 18:26:45 UTC 2011
commit 9849ffbc1db3159160dcc5fc77918e4871dd3839
Author: nucleo <nucleo at fedoraproject.org>
Date: Fri Oct 21 21:26:40 2011 +0300
revert patch adding broken launchers (#747982)
kdebase-workspace-4.7.2-bz#747982-launchers.patch | 14 ++++++++++++++
kdebase-workspace.spec | 12 +++++++++++-
2 files changed, 25 insertions(+), 1 deletions(-)
---
diff --git a/kdebase-workspace-4.7.2-bz#747982-launchers.patch b/kdebase-workspace-4.7.2-bz#747982-launchers.patch
new file mode 100644
index 0000000..7be71fb
--- /dev/null
+++ b/kdebase-workspace-4.7.2-bz#747982-launchers.patch
@@ -0,0 +1,14 @@
+--- kde-workspace-4.7.2/plasma/desktop/shell/data/layouts/org.kde.plasma-desktop.defaultPanel/contents/layout.js 2011-05-20 23:32:08.000000000 +0300
++++ kde-workspace-4.7.2/plasma/desktop/shell/data/layouts/org.kde.plasma-desktop.defaultPanel/contents/layout.js 2011-10-21 21:08:57.028169349 +0300
+@@ -8,10 +8,7 @@
+ panel.addWidget("launcher")
+ panel.addWidget("org.kde.showActivityManager")
+ panel.addWidget("pager")
+-tasks = panel.addWidget("tasks")
++panel.addWidget("tasks")
+ panel.addWidget("systemtray")
+ panel.addWidget("digital-clock")
+
+-tasks.currentConfigGroup = new Array("Launchers")
+-tasks.writeConfig("browser", "preferred://browser, , , ")
+-tasks.writeConfig("filemanager", "preferred://filemanager, , , ")
diff --git a/kdebase-workspace.spec b/kdebase-workspace.spec
index e47ce2c..e3f5170 100644
--- a/kdebase-workspace.spec
+++ b/kdebase-workspace.spec
@@ -9,7 +9,7 @@
Summary: KDE Workspace
Name: kdebase-workspace
Version: 4.7.2
-Release: 7%{?dist}
+Release: 8%{?dist}
License: GPLv2
Group: User Interface/Desktops
@@ -66,6 +66,12 @@ Patch23: kdebase-workspace-4.5.2-startkde_zenity.patch
# multilib QT_PLUGIN_PATH, http://bugzilla.redhat.com/704840
Patch24: kdebase-workspace-4.6.90-multilib_qt_plugin_path.patch
+# revert patch adding broken browser launcher
+# https://projects.kde.org/projects/kde/kde-workspace/repository/revisions/2bbbbdd8fe5a38ae27bab44c9515b2ba78f75277
+# https://bugzilla.redhat.com/show_bug.cgi?id=747982
+# https://bugs.kde.org/show_bug.cgi?id=284628
+Patch25: kdebase-workspace-4.7.2-bz#747982-launchers.patch
+
## upstreamable patches:
# "keyboard stops working", https://bugs.kde.org/show_bug.cgi?id=171685#c135
Patch50: kdebase-workspace-4.6.80-kde#171685.patch
@@ -351,6 +357,7 @@ pushd %{name}-%{version}
%patch21 -p1 -b .platformplugin-widgetstyle4
%patch23 -p1 -b .startkde_zenity
%patch24 -p1 -b .multilib_qt_plugin_path
+%patch25 -p1 -b .bz#747982-launchers
# upstreamable patches
%patch50 -p1 -b .kde#171685
@@ -844,6 +851,9 @@ fi
%changelog
+* Fri Oct 21 2011 Alexey Kurov <nucleo at fedoraproject.org> - 4.7.2-8
+- revert patch adding broken launchers (#747982)
+
* Mon Oct 17 2011 Rex Dieter <rdieter at fedoraproject.org> 4.7.2-7
- Generate texture coordinates for limited NPOT support (kde#269576)
More information about the scm-commits
mailing list