rpms/kdebase-workspace/F-10 kdebase-workspace-4.3.2-plasmaCrash.patch, NONE, 1.1 kdebase-workspace.spec, 1.191, 1.192
Lukas Tinkl
ltinkl at fedoraproject.org
Wed Sep 23 12:47:07 UTC 2009
Author: ltinkl
Update of /cvs/extras/rpms/kdebase-workspace/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29849/F-10
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/F-10/kdebase-workspace.spec,v
retrieving revision 1.191
retrieving revision 1.192
diff -u -p -r1.191 -r1.192
--- kdebase-workspace.spec 1 Sep 2009 13:05:18 -0000 1.191
+++ kdebase-workspace.spec 23 Sep 2009 12:47:06 -0000 1.192
@@ -1,3 +1,6 @@
+%if 0%{?fedora} && 0%{?fedora} < 12
+%define with_polkit_09 1
+%endif
%{!?python_sitearch:%global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
@@ -5,7 +8,7 @@ Summary: K Desktop Environment - Workspa
Name: kdebase-workspace
Version: 4.3.1
-Release: 1%{?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
@@ -31,25 +34,24 @@ Patch16: kdebase-workspace-4.3.0-battery
# upstream patches:
# 4.3 branch
+Patch100: kdebase-workspace-4.3.2-plasmaCrash.patch
# trunk
# moving to non-multilib hack
Obsoletes: kdebase-workspace < 4.3.0-2
+%if 0%{?with_polkit_09}
Requires: PolicyKit-authentication-agent
-
-# FIXME: Should we restore this now that kdebase no longer depends on kdebase-workspace?
-%if 0%{?fedora} == 9
-# upgrade path: kdebase(3) -> kdebase-workspace
-Obsoletes: kdebase < 6:4
-# so kdebase doesn't get lost on kde3->kde4 upgrade (#444928)
-Requires: kdebase4
+%else
+Obsoletes: PolicyKit-kde < %{version}-%{release}
+# if/when we actually create this one:
+#Obsoletes: PolicyKit-kde-libs < %{version}-%{release}
+Obsoletes: polkit-qt < 0.10
%endif
# kdmtheme's functionality is now provided by kdebase-workspace itself
Obsoletes: kdmtheme < 1.3
-
%if 0%{?fedora} > 10
# -> powerdevil upgrade path
Obsoletes: kpowersave < 0.7.3-10
@@ -71,10 +73,14 @@ BuildRequires: libcaptury-devel
BuildRequires: libutempter-devel
BuildRequires: libxklavier-devel
BuildRequires: libXres-devel
+%ifnarch s390 s390x
BuildRequires: lm_sensors-devel
+%endif
BuildRequires: NetworkManager-devel
BuildRequires: pam-devel
+%if 0%{?with_polkit_09}
BuildRequires: polkit-qt-devel
+%endif
BuildRequires: qimageblitz-devel
BuildRequires: soprano-devel
BuildRequires: python-devel
@@ -91,7 +97,7 @@ Requires: kdebase-runtime >= %{version}
Requires: oxygen-icon-theme >= 4.3.0
# pkg-splits, upgrade path
-%if 0%{?fedora} < 12
+%if 0%{?fedora} < 12 || 0%{?rhel} < 6
Requires: kdm = %{version}-%{release}
%endif
Requires: ksysguardd = %{version}-%{release}
@@ -103,20 +109,21 @@ Requires: xorg-x11-apps
Requires: xorg-x11-utils
Requires: xorg-x11-server-utils
+%define default_face_icon default1.png
+
%if 0%{?fedora} == 10
%define default_face_icon default_solar.png
Requires: solar-kde-theme
-%else
+%endif
+
%if 0%{?fedora} == 11
%define default_face_icon default_leonidas.png
Requires: leonidas-kde-theme
-%else
-%define default_face_icon default1.png
-%endif
%endif
-%if 0%{?fedora} > 11
+%if 0%{?fedora} > 11 || 0%{?rhel} > 5
Requires: system-backgrounds-kde
+Requires: system-ksplash-theme
%endif
Requires: kio_sysinfo
@@ -160,9 +167,7 @@ Requires: %{name} = %{version}-%{release
Summary: KDE wallpapers
Group: User Interface/Desktops
Requires: kde-filesystem
-%if 0%{?fedora} > 9
BuildArch: noarch
-%endif
%description wallpapers
%{summary}.
@@ -186,9 +191,7 @@ Group: System Environment/Daemons
%package -n oxygen-cursor-themes
Summary: Oxygen cursor themes
Group: User Interface/Desktops
-%if 0%{?fedora} > 9
BuildArch: noarch
-%endif
%description -n oxygen-cursor-themes
%{summary}.
@@ -198,9 +201,21 @@ Group: System Environment/Libraries
# This can be used by apps which want to use the PolicyKit
# frontend implementation of the desktop they are running under
Provides: PolicyKit-authentication-agent
+# when -libs was born
+#Obsoletes: PolicyKit-kde < 4.3.1-4
+#Requires: PolicyKit-kde-libs%{?_isa} = %{version}-%{release}
%description -n PolicyKit-kde
This package provides a PolicyKit Authentication Frontend for KDE
+# maybe for 4.3.1-4 ? -- Rex
+%package -n PolicyKit-kde-libs
+Summary: Runtime libraries for PolicyKit-kde
+Group: System Environment/Libraries
+Requires: kdelibs4%{?_isa} >= %{version}
+Requires: PolicyKit-kde = %{version}-%{release}
+%description -n PolicyKit-kde-libs
+%{summary}.
+
%package googlegadgets
Summary: Google Desktop Gadgets
Group: User Interface/Desktops
@@ -211,6 +226,7 @@ Requires: %{name} = %{version}-%{release
%package python-applet
Summary: Plasma widget in Python
Group: User Interface/Desktops
+Provides: plasma-scriptengine-python = %{version}-%{release}
Requires: %{name} = %{version}-%{release}
Requires: PyKDE4 >= %{version}
%description python-applet
@@ -247,6 +263,8 @@ Requires: akonadi
%patch16 -p1 -b .showremainingtime
# upstream patches
+%patch100 -p5 -b .plasmaCrash
+
%build
@@ -272,8 +290,7 @@ make install/fast DESTDIR=%{buildroot} -
mkdir -p %{buildroot}%{_datadir}/xsessions/
ln -s %{_kde4_appsdir}/kdm/sessions/kde.desktop %{buildroot}%{_datadir}/xsessions/kde.desktop
-# FIXME/TODO: provide kdm config in kde-settings(-kdm)
-# nuke, use external kde-config-kdm
+# nuke, use external kde-settings-kdm
rm -rf %{buildroot}%{_kde4_configdir}/kdm
# own %{_kde4_appsdir}/kdm/faces and set default user image
@@ -400,7 +417,6 @@ fi
%{_kde4_datadir}/kde4/services/*
%exclude %{_kde4_datadir}/kde4/services/kdm.desktop
-%exclude %{_kde4_sharedir}/kde4/services/kcm_pkk_authorization.desktop
%{_kde4_datadir}/kde4/servicetypes/*
%{_kde4_datadir}/sounds/pop.wav
%{_kde4_datadir}/autostart/klipper.desktop
@@ -410,8 +426,6 @@ fi
%{_kde4_datadir}/applications/kde4/*
%{_datadir}/dbus-1/interfaces/*.xml
%{_datadir}/dbus-1/services/*.service
-%exclude %{_kde4_datadir}/dbus-1/services/org.kde.PolicyKit.service
-%exclude %{_kde4_datadir}/dbus-1/services/kde-org.freedesktop.PolicyKit.AuthenticationAgent.service
%{_kde4_datadir}/config.kcfg/*
%{_datadir}/xsessions/*.desktop
%{_kde4_docdir}/HTML/en/kcontrol/
@@ -429,7 +443,6 @@ fi
%{_kde4_libdir}/kde4/ion_*.so
%{_kde4_libdir}/kde4/kcm_*.so
%exclude %{_kde4_libdir}/kde4/kcm_kdm.so
-%exclude %{_kde4_libdir}/kde4/kcm_pkk_authorization.so
%{_kde4_libdir}/kde4/kded_*.so
%{_kde4_libdir}/kde4/kfontviewpart.so
%{_kde4_libdir}/kde4/kio_fonts.so
@@ -474,11 +487,20 @@ fi
%exclude %{_kde4_datadir}/kde4/services/plasma-engine-akonadi.desktop
%exclude %{_kde4_libdir}/kde4/plasma_engine_calendar.so
%exclude %{_kde4_datadir}/kde4/services/plasma-dataengine-calendar.desktop
+%if 0%{?with_polkit_09}
+# PolicyKit-kde
+%exclude %{_kde4_sharedir}/kde4/services/kcm_pkk_authorization.desktop
+%exclude %{_kde4_datadir}/dbus-1/services/org.kde.PolicyKit.service
+%exclude %{_kde4_datadir}/dbus-1/services/kde-org.freedesktop.PolicyKit.AuthenticationAgent.service
+%exclude %{_kde4_libdir}/kde4/kcm_pkk_authorization.so
+%endif
%files libs
%defattr(-,root,root,-)
%{_kde4_libdir}/lib*.so.*
+%if 0%{?with_polkit_09}
%exclude %{_kde4_libdir}/libpolkitkdeprivate.so.4*
+%endif
%{_kde4_libdir}/libplasma_applet-system-monitor.so
%{_kde4_libdir}/kde4/plugins/designer/ksysguardwidgets.so
%{_kde4_libdir}/kde4/plugins/designer/ksysguardlsofwidgets.so
@@ -540,10 +562,10 @@ fi
%{_kde4_datadir}/kde4/services/plasma-applet-ggl*
%{_kde4_datadir}/kde4/services/*googlegadgets.desktop
+%if 0%{?with_polkit_09}
%files -n PolicyKit-kde
%defattr(-,root,root,-)
%{_kde4_bindir}/polkit-kde-authorization
-%{_kde4_libdir}/libpolkitkdeprivate.so.4*
%{_kde4_libdir}/kde4/kcm_pkk_authorization.so
%{_kde4_libexecdir}/polkit-kde-manager
%{_kde4_datadir}/dbus-1/services/org.kde.PolicyKit.service
@@ -553,6 +575,7 @@ fi
#files -n PolicyKit-kde-libs
#defattr(-,root,root,-)
%{_kde4_libdir}/libpolkitkdeprivate.so.4*
+%endif
%files python-applet
%defattr(-,root,root,-)
@@ -569,6 +592,19 @@ 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
+
+* Sat Sep 12 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.1-3
+- -python-applet: Provides: plasma-scriptengine-python
+- Requires: system-ksplash-theme (f12+,rhel6+)
+
+* Fri Sep 11 2009 Than Ngo <than at redhat.com> - 4.3.1-2
+- drop BR: lm_sensors-devel on s390(x)
+
* Fri Aug 28 2009 Than Ngo <than at redhat.com> - 4.3.1-1
- 4.3.1
- drop Requires: kde-plasma-folderview, rely on comps instead
More information about the fedora-extras-commits
mailing list