Hello community,
here is the log from the commit of package kdebase4-workspace for openSUSE:Factory
checked in at Wed May 20 00:09:41 CEST 2009.
--------
--- KDE/kdebase4-workspace/kdebase4-wallpapers.changes 2009-05-06 18:46:34.000000000 +0200
+++ kdebase4-workspace/kdebase4-wallpapers.changes 2009-05-20 00:02:35.705774000 +0200
@@ -1,0 +2,22 @@
+Mon May 18 09:55:27 CEST 2009 - coolo@novell.com
+
+- remove hotplug-kde3 patch, it was never included in > 4.0 packages
+
+-------------------------------------------------------------------
+Fri May 15 10:38:12 CEST 2009 - coolo@suse.de
+
+- (Beineri) split plasma patch into smaller chunks
+- remove patches that are no longer necessary
+- rediff kdm patches
+
+-------------------------------------------------------------------
+Thu May 14 18:46:23 CEST 2009 - dmueller@suse.de
+
+- update to 4.2.85 (KDE 4.3 beta1)
+
+-------------------------------------------------------------------
+Thu May 14 01:04:31 CEST 2009 - dmueller@suse.de
+
+- fix dependencies of subpackages
+
+-------------------------------------------------------------------
kdebase4-workspace.changes: same change
python-kdebase4.changes: same change
calling whatdependson for head-i586
Old:
----
4_2_BRANCH.diff
hotplug-kde3.diff
kdebase-workspace-4.2.3.tar.bz2
klipperrc.diff
plasma.diff
rediff-plasma.sh
solid-bluetooth.diff
taskbarthumbnail.diff
_upstream
wm-switch-systemsettings.diff
New:
----
4_3_BRANCH.diff
kdebase-workspace-4.2.85.tar.bz2
plasma-branding-defaults.diff
plasma-dashboard-leave.diff
plasma-kickoff-newly-collapsing.diff
plasma-lock_logout_order.diff
plasma-panel-resize-hint.diff
plasma-plaindesktop.diff
plasma-wallpaper-description.diff
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kdebase4-wallpapers.spec ++++++
--- /var/tmp/diff_new_pack.C17696/_old 2009-05-20 00:02:49.000000000 +0200
+++ /var/tmp/diff_new_pack.C17696/_new 2009-05-20 00:02:49.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package kdebase4-wallpapers (Version 4.2.3)
+# spec file for package kdebase4-wallpapers (Version 4.2.85)
#
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -18,7 +18,8 @@
Name: kdebase4-wallpapers
-BuildRequires: NetworkManager-devel bluez-devel libQtWebKit-devel libkdepimlibs4-devel libqimageblitz-devel libsmbclient-devel libxklavier-devel
+BuildRequires: NetworkManager-devel bluez-devel libQtWebKit-devel libknotificationitem-devel
+BuildRequires: libkdepimlibs4-devel libqimageblitz-devel libsmbclient-devel libxklavier-devel
%if %suse_version > 1020
BuildRequires: libusb-devel
%else
@@ -28,7 +29,7 @@
Group: System/GUI/KDE
Summary: KDE 4 Wallpapers
Url: http://www.kde.org/
-Version: 4.2.3
+Version: 4.2.85
Release: 1
Source0: kdebase-workspace-%version.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -55,7 +56,6 @@
cd build/wallpapers
%makeinstall
rm -r $RPM_BUILD_ROOT/usr/share/wallpapers/Blue_Curl
- rm -r $RPM_BUILD_ROOT/usr/share/wallpapers/Air
%kde_post_install
%clean
@@ -67,6 +67,16 @@
/usr/share/wallpapers
%changelog
+* Mon May 18 2009 coolo@novell.com
+- remove hotplug-kde3 patch, it was never included in > 4.0 packages
+* Fri May 15 2009 coolo@suse.de
+- (Beineri) split plasma patch into smaller chunks
+- remove patches that are no longer necessary
+- rediff kdm patches
+* Thu May 14 2009 dmueller@suse.de
+- update to 4.2.85 (KDE 4.3 beta1)
+* Thu May 14 2009 dmueller@suse.de
+- fix dependencies of subpackages
* Thu Apr 30 2009 dmueller@suse.de
- update to 4.2.3
* see http://kde.org/announcements/changelogs/changelog4_2_2to4_2_3.php
++++++ kdebase4-workspace.spec ++++++
--- /var/tmp/diff_new_pack.C17696/_old 2009-05-20 00:02:49.000000000 +0200
+++ /var/tmp/diff_new_pack.C17696/_new 2009-05-20 00:02:49.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package kdebase4-workspace (Version 4.2.3)
+# spec file for package kdebase4-workspace (Version 4.2.85)
#
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -21,9 +21,9 @@
BuildRequires: NetworkManager-devel bluez-devel libkde4-devel libqimageblitz-devel
BuildRequires: libraw1394-devel libsmbclient-devel libusb-devel libxklavier-devel
BuildRequires: audit-devel libQtWebKit-devel libsoprano-devel pam-devel python
-BuildRequires: google-gadgets-devel libkdepimlibs4-devel
+BuildRequires: google-gadgets-devel libkdepimlibs4-devel libknotificationitem-devel
%if %suse_version > 1030
-BuildRequires: ConsoleKit-devel liblazy-devel
+BuildRequires: ConsoleKit-devel gpsd-devel liblazy-devel libpolkit-qt-devel
%ifnarch s390 s390x
BuildRequires: libsensors4-devel
%endif
@@ -37,19 +37,15 @@
Group: System/GUI/KDE
Summary: The KDE Workspace Components
Url: http://www.kde.org/
-Version: 4.2.3
+Version: 4.2.85
Release: 1
Source0: kdebase-workspace-%version.tar.bz2
-Source1: rediff-plasma.sh
Source2: titlebar_decor.png
Source3: kwin-cubecap.png
-Source90: _upstream
Source91: kdebase4-workspace-rpmlintrc
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Patch0: 4_2_BRANCH.diff
-Patch2: plasma.diff
+Patch0: 4_3_BRANCH.diff
Patch8: kwin-suse.diff
-#Patch10: kwin-two-desktops.diff
Patch18: startkde.diff
Patch60: kdm-audit-log.diff
Patch62: kdm-cope-with-new-grub.diff
@@ -61,20 +57,31 @@
Patch68: kdm-make_it_cool.diff
Patch69: kdm-all-users-nopass.diff
Patch70: kdm-generic-same-pam.diff
+#Subject: Dialog notifying about running low on disk space
+#From: Lubos Lunak
+#Feature: bnc#199054
+#Patch-upstream: no
Patch74: lowdiskspace.patch
Patch77: systemsettings-desktop.diff
Patch82: rotate-wacom-pointers.diff
-Patch83: hotplug-kde3.diff
Patch85: windeco-color.diff
-Patch87: klipperrc.diff
Patch88: kde4-migrate.diff
-Patch90: wm-switch-systemsettings.diff
Patch94: systemsettings-root-kcm.diff
-Patch95: taskbarthumbnail.diff
Patch97: suspend-lock.diff
Patch98: kdm-dont-grab-mouse.diff
+#Subject: Increase the time KDM waits for X to start up
+#From: Lubos Lunak
+#Patch-upstream: no
+#Bug: bnc#462478
Patch99: kdm-long-xserver-timeout.diff
-Patch100: solid-bluetooth.diff
+Patch103: plasma-branding-defaults.diff
+Patch104: plasma-lock_logout_order.diff
+# slightly modified copy of standard desktop containment
+Patch105: plasma-plaindesktop.diff
+Patch106: plasma-dashboard-leave.diff
+Patch107: plasma-kickoff-newly-collapsing.diff
+Patch108: plasma-panel-resize-hint.diff
+Patch109: plasma-wallpaper-description.diff
Requires: kde4-kgreeter-plugins = %version
%kde4_runtime_requires
%if %suse_version == 1110
@@ -109,38 +116,42 @@
%prep
%setup -q -n kdebase-workspace-%version
+# prepare a patched copy of the default containment
+pushd plasma/containments
+cp -a desktop plaindesktop
+mv plaindesktop/plasma-containment-desktop.desktop plaindesktop/plasma-containment-plaindesktop.desktop
+sed -i -re '/(Name|Comment)\[/d' plaindesktop/plasma-containment-plaindesktop.desktop
+popd
%patch
-%patch2
%patch8
-#%patch10
%patch18
%patch60
%patch62
%patch63
-# needs rediff- still necessary?
-#%patch64
+%patch64
%patch65
%patch66
%patch67
%patch68
%patch69
%patch70
-# needs rediff (KDE 4.2 update)
-#%patch74
+%patch74
%patch77
%patch82
-#%patch83
%patch85
-%patch87
%patch88
-# needs rediff ( KDE 4.2 update)
-#%patch90
-%patch94
-# needs rediff (KDE 4.2 update)
-#%patch95
+# needs rediff (KDE 4.3 update)
+#%patch94
%patch97
%patch98
-%patch100
+%patch99
+%patch103
+%patch104
+%patch105
+%patch106
+%patch107
+%patch108
+%patch109
cp %{SOURCE3} kwin/effects/data/cubecap.png
%build
@@ -175,10 +186,9 @@
rm -r $RPM_BUILD_ROOT/usr/share/wallpapers/Vector_Sunset
rm -r $RPM_BUILD_ROOT/usr/share/wallpapers/EOS
rm -r $RPM_BUILD_ROOT/usr/share/wallpapers/Plasmalicious
- rm -r $RPM_BUILD_ROOT/usr/share/wallpapers/HighTide
mkdir -p $RPM_BUILD_ROOT/etc
mv $RPM_BUILD_ROOT/usr/etc/ksysguarddrc $RPM_BUILD_ROOT/etc/
- mv $RPM_BUILD_ROOT/usr/etc/systemsettingsrc $RPM_BUILD_ROOT/etc/
+ #mv $RPM_BUILD_ROOT/usr/etc/systemsettingsrc $RPM_BUILD_ROOT/etc/
rm -rf $RPM_BUILD_ROOT/usr/share/doc/kde/HTML/en/kicker
%suse_update_desktop_file systemsettings X-SuSE-core
%suse_update_desktop_file ksysguard System Monitor
@@ -299,6 +309,8 @@
License: GPL v2 or later
Group: System/GUI/KDE
Summary: Google Gadgets support for Plasma
+Requires: %name = %version
+%requires_ge libqt4-x11
%description google-gadgets
This package contains Google Gadgets support for the KDE workspace.
@@ -326,6 +338,7 @@
Group: System/GUI/KDE
Summary: KDE Window Manager
Provides: windowmanager
+Requires: kde4-kdm = %version
%kde4_runtime_requires
%if %suse_version == 1110
Requires: %{name}-branding = 11.1
@@ -360,6 +373,7 @@
Group: System/GUI/KDE
Summary: The KDE Greeter Plugin Components
Provides: windowmanager
+Requires: kde4-kdm = %version
%kde4_runtime_requires
%description -n kde4-kgreeter-plugins
@@ -397,7 +411,7 @@
%doc COPYING COPYING.DOC README
/usr/include/*
%_kde_share_dir/apps/cmake
-%_libdir/cmake
+%_libdir/cmake/KDE4Workspace-%version
%_libdir/liblsofui.so
%_kde4_modules/plugins/designer/ksysguardlsofwidgets.so
%_libdir/libsolidcontrolifaces.so
@@ -417,6 +431,10 @@
%_libdir/libnepomukquery.so
%_libdir/libnepomukqueryclient.so
%_libdir/libkephal.so
+%_libdir/libplasma-geolocation-interface.so
+%if %suse_version > 1030
+%_libdir/libpolkitkdeprivate.so
+%endif
%package -n kde4-kdm
License: GPL v2 or later
@@ -481,8 +499,9 @@
%defattr(-,root,root)
%doc COPYING COPYING.DOC README
%config %_kde_config_dir/background.knsrc
-%config %_kde_config_dir/klipperrc
+#%config %_kde_config_dir/klipperrc
%config %_kde_config_dir/wallpaper.knsrc
+%dir %_kde_share_dir/apps/kcmsolidactions
%dir /usr/%_lib/kconf_update_bin
%dir /usr/%_lib/strigi
%dir /usr/share/autostart
@@ -493,7 +512,7 @@
%doc %lang(en) /usr/share/doc/kde/HTML/en/kxkb
%doc %lang(en) /usr/share/doc/kde/HTML/en/plasma
%doc %lang(en) /usr/share/doc/kde/HTML/en/systemsettings
-/etc/systemsettingsrc
+#/etc/systemsettingsrc
%exclude /usr/share/wallpapers/default_blue.jpg
%exclude /usr/share/wallpapers/default_blue.jpg.desktop
%_kde4_modules/fontthumbnail.so
@@ -526,9 +545,6 @@
%_kde4_modules/kcm_xinerama.so
%_kde4_modules/kded_khotkeys.so
%_kde4_modules/kded_networkstatus.so
-%if 0
-%_kde4_modules/kded_susefreespacenotifier.so
-%endif
%_kde4_modules/kfontviewpart.so
%_kde4_modules/kgreet_*.so
%_kde4_modules/kio_fonts.so
@@ -543,7 +559,7 @@
%_kde4_modules/libexec/kcmdatetimehelper
%_kde4_modules/libexec/kfontprint
%_kde4_modules/libexec/kio_fonts_helper
-%_kde4_modules/libexec/krunner_lock
+%_kde4_modules/libexec/kscreenlocker
%_kde4_modules/libexec/test_kcm_xinerama
%exclude %_kde4_modules/plasma_*_ggl.so
%_kde4_modules/plasma_*.so
@@ -567,15 +583,8 @@
%_kde_share_dir/apps/kcminput
%_kde_share_dir/apps/kcmkeys
%_kde_share_dir/apps/kconf_update/convertShortcuts.pl
-%_kde_share_dir/apps/kconf_update/kaccel.upd
-%_kde_share_dir/apps/kconf_update/kcmdisplayrc.upd
-%_kde_share_dir/apps/kconf_update/khotkeys_32b1_update.upd
-%_kde_share_dir/apps/kconf_update/khotkeys_printscreen.upd
-%_kde_share_dir/apps/kconf_update/konqueror_gestures_kde321_update.upd
-%_kde_share_dir/apps/kconf_update/ksmserver.upd
-%_kde_share_dir/apps/kconf_update/mouse_cursor_theme.upd
%_kde_share_dir/apps/kconf_update/move_session_config.sh
-%_kde_share_dir/apps/kconf_update/plasma-add-shortcut-to-menu.upd
+%_kde_share_dir/apps/kconf_update/*.upd
%_kde_share_dir/apps/kcontrol
%_kde_share_dir/apps/kdisplay
%_kde_share_dir/apps/kfontinst
@@ -614,9 +623,6 @@
%_kde_share_dir/services/kcm_solid.desktop
%_kde_share_dir/services/kcm_keyboard.desktop
%_kde_share_dir/services/kded/networkstatus.desktop
-%if 0
-%_kde_share_dir/services/kded/susefreespacenotifier.desktop
-%endif
%_kde_share_dir/services/keyboard.desktop
%_kde_share_dir/services/keyboard_layout.desktop
%_kde_share_dir/services/keys.desktop
@@ -630,19 +636,17 @@
%_kde_share_dir/services/plasma-dataengine-network.desktop
%_kde_share_dir/services/plasma-battery-default.desktop
%_kde_share_dir/services/plasma-containment-desktop.desktop
+%_kde_share_dir/services/plasma-containment-plaindesktop.desktop
%_kde_share_dir/services/plasma-containment-panel.desktop
%_kde_share_dir/services/plasma-containment-saverdesktop.desktop
%_kde_share_dir/services/plasma-dataengine-*.desktop
%_kde_share_dir/services/plasma-packagestructure-dashboard.desktop
%_kde_share_dir/services/plasma-pager-default.desktop
%_kde_share_dir/services/plasma-runner-*.desktop
-%_kde_share_dir/services/plasma-scriptengine-applet-dashboard.desktop
-%_kde_share_dir/services/plasma-scriptengine-applet-web.desktop
-%_kde_share_dir/services/plasma-scriptengine-applet-simple-javascript.desktop
-%_kde_share_dir/services/plasma-scriptengine-runner-javascript.desktop
+%_kde_share_dir/services/plasma-engine-*.desktop
+%_kde_share_dir/services/plasma-scriptengine-applet-*.desktop
%_kde_share_dir/services/plasma-tasks-default.desktop
%_kde_share_dir/services/plasma-wallpaper-color.desktop
-%_kde_share_dir/services/plasma-containment-plaindesktop.desktop
%_kde_share_dir/services/randr.desktop
%_kde_share_dir/services/screensaver.desktop
%_kde_share_dir/services/ScreenSavers
@@ -659,12 +663,10 @@
%_kde_share_dir/servicetypes/solidnetworkmanager.desktop
%_kde_share_dir/servicetypes/solidpowermanager.desktop
%_kde_share_dir/servicetypes/systemsettingscategory.desktop
-%_libdir/kconf_update_bin/khotkeys_update
%_libdir/kconf_update_bin/plasma-add-shortcut-to-menu
#%_libdir/kde4/kickoff_plasma_applet_launcher.so
%_libdir/libkdeinit4_kaccess.so
-%_libdir/libplasma_applet-system-monitor.so.4
-%_libdir/libplasma_applet-system-monitor.so.4.2.0
+%_libdir/libplasma_applet-system-monitor.so.4*
%_libdir/libkdeinit4_kcminit.so
%_libdir/libkdeinit4_kcminit_startup.so
%_libdir/libkdeinit4_klipper.so
@@ -673,7 +675,7 @@
%_libdir/libkdeinit4_ksmserver.so
%_libdir/libkdeinit4_ksysguard.so
%_libdir/libkdeinit4_kxkb.so
-%_libdir/libkdeinit4_plasma.so
+%_libdir/libkdeinit4_plasma-desktop.so
%_libdir/libkfontinst.so.*
%_libdir/libkfontinstui.so.*
%_libdir/libkhotkeysprivate.so.*
@@ -687,7 +689,7 @@
%_libdir/libsolidcontrolifaces.so.*
%_libdir/libsolidcontrol.so.*
%_libdir/libtaskmanager.so.*
-%_libdir/libweather_ion.so.*
+%_libdir/libkickoff.so
%_libdir/strigi/strigita_font.so
# todo - move to own package?
/usr/bin/kaccess
@@ -713,10 +715,9 @@
/usr/bin/ksysguard
/usr/bin/ksystraycmd
/usr/bin/kxkb
-/usr/bin/plasma
+/usr/bin/plasma-desktop
/usr/bin/plasmaengineexplorer
/usr/bin/plasma-overlay
-/usr/bin/plasmapkg
/usr/bin/plasmoidviewer
/usr/bin/safestartkde
/usr/bin/setscheduler
@@ -728,6 +729,7 @@
#/usr/%_lib/kde4/klipper_panelapplet.so
#/usr/%_lib/kde4/kxkb_panelapplet.so
#/usr/%_lib/kde4/kxkb_part.so
+/usr/share/man/man1/plasmaengineexplorer.1.gz
/usr/share/applications/kde4/kfontview.desktop
/usr/share/applications/kde4/klipper.desktop
/usr/share/applications/kde4/kmenuedit.desktop
@@ -738,6 +740,7 @@
/usr/share/autostart/klipper.desktop
/usr/share/autostart/krunner.desktop
/usr/share/autostart/plasma.desktop
+/usr/share/autostart/plasma-desktop.desktop
/usr/share/dbus-1/interfaces/org.freedesktop.ScreenSaver.xml
/usr/share/dbus-1/interfaces/org.kde.khotkeys.xml
/usr/share/dbus-1/interfaces/org.kde.krunner.App.xml
@@ -776,9 +779,7 @@
/usr/share/wallpapers
%verify(not mode) %attr(4755,root,shadow) %_kde4_modules/libexec/kcheckpass
%_kde_share_dir/services/plasma-wallpaper-image.desktop
-%_kde4_modules/kcm_krunner_shell.so
/usr/share/dbus-1/services/org.kde.krunner.service
-%_kde_share_dir/services/plasma-runner-shell_config.desktop
%_kde4_modules/kcm_powerdevilconfig.so
%_kde4_modules/kded_powerdevil.so
%_kde4_modules/krunner_powerdevil.so
@@ -827,15 +828,60 @@
%_kde_share_dir/services/plasma-runner-places.desktop
%_kde4_modules/kded_kephal.so
%_libdir/libkephal.so.*
+%_libdir/libweather_ion.so.*
%_kde_share_dir/config.kcfg/plasma-shell-desktop.kcfg
-%_kde_share_dir/services/kded/kded_kephal.desktop
%_kde_share_dir/services/plasma-applet-quicklaunch.desktop
%_kde_share_dir/apps/desktoptheme
-%_kde_share_dir/servicetypes/weather_ion.desktop
-%_kde4_modules/kded_kwrited.so
-/usr/share/kde4/services/kded/kwrited.desktop
+%_kde_share_dir/apps/kconf_update/plasma-to-plasmadesktop-shortcuts.upd
+%_kde_share_dir/services/kded/kephal.desktop
+#%_libdir/kde4/kded_systemtraydaemon.so
+#/usr/share/dbus-1/interfaces/org.kde.SystemTrayDaemon.xml
+#%_kde_share_dir/services/kded/systemtraydaemon.desktop
+%_libdir/kde4/kded_kwrited.so
+%_kde_share_dir/services/kded/kwrited.desktop
+/usr/bin/solid-action-desktop-gen
+%_libdir/kde4/kcm_solid_actions.so
+%_kde_share_dir/apps/kcmsolidactions/solid-action-template.desktop
+%_kde_share_dir/services/solid-actions.desktop
+/usr/bin/plasmawallpaperviewer
+%_libdir/kde4/solid_wicd.so
+%_libdir/kde4/classic_mode.so
+%_libdir/kde4/icon_mode.so
+%_libdir/kde4/kded_notificationitemwatcher.so
+%_libdir/libsystemsettingsview.so
+%_kde_share_dir/services/kded/notificationitemwatcher.desktop
+%_kde_share_dir/servicetypes/systemsettingsview.desktop
+/usr/%_lib/kconf_update_bin/plasma-to-plasma-desktop
+/usr/%_lib/kde4/plasma-geolocation-ip.so
+/usr/%_lib/libplasma-geolocation-interface.so.*
+/usr/share/kde4/services/plasma-geolocation-ip.desktop
+/usr/share/kde4/servicetypes/plasma-geolocationprovider.desktop
+%if %suse_version > 1030
+/usr/%_lib/kde4/plasma-geolocation-gps.so
+/usr/share/kde4/services/plasma-geolocation-gps.desktop
+/usr/bin/polkit-kde-authorization
+%_libdir/kde4/kcm_pkk_authorization.so
+%_libdir/kde4/libexec/polkit-kde-manager
+%_libdir/libpolkitkdeprivate.so.*
+/usr/share/dbus-1/services/kde-org.freedesktop.PolicyKit.AuthenticationAgent.service
+/usr/share/dbus-1/services/org.kde.PolicyKit.service
+%lang(en) %doc /usr/share/doc/kde/HTML/en/PolicyKit-kde
+%_kde_share_dir/services/kcm_pkk_authorization.desktop
+%endif
+%_libdir/kde4/kded_susefreespacenotifier.so
+%_kde_share_dir/services/kded/susefreespacenotifier.desktop
%changelog
+* Mon May 18 2009 coolo@novell.com
+- remove hotplug-kde3 patch, it was never included in > 4.0 packages
+* Fri May 15 2009 coolo@suse.de
+- (Beineri) split plasma patch into smaller chunks
+- remove patches that are no longer necessary
+- rediff kdm patches
+* Thu May 14 2009 dmueller@suse.de
+- update to 4.2.85 (KDE 4.3 beta1)
+* Thu May 14 2009 dmueller@suse.de
+- fix dependencies of subpackages
* Thu Apr 30 2009 dmueller@suse.de
- update to 4.2.3
* see http://kde.org/announcements/changelogs/changelog4_2_2to4_2_3.php
++++++ python-kdebase4.spec ++++++
--- /var/tmp/diff_new_pack.C17696/_old 2009-05-20 00:02:49.000000000 +0200
+++ /var/tmp/diff_new_pack.C17696/_new 2009-05-20 00:02:49.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package python-kdebase4 (Version 4.2.3)
+# spec file for package python-kdebase4 (Version 4.2.85)
#
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -18,7 +18,11 @@
Name: python-kdebase4
-BuildRequires: NetworkManager-devel bluez-devel libQtWebKit-devel libkdepimlibs4-devel libqimageblitz-devel libsmbclient-devel libxklavier-devel python-kde4
+BuildRequires: NetworkManager-devel bluez-devel libQtWebKit-devel libkdepimlibs4-devel libqimageblitz-devel
+BuildRequires: libknotificationitem-devel libsmbclient-devel libxklavier-devel python-kde4
+%if %suse_version > 1030
+BuildRequires: ConsoleKit-devel libpolkit-qt-devel
+%endif
%if %suse_version > 1020
BuildRequires: libusb-devel
%else
@@ -28,11 +32,11 @@
Group: System/GUI/KDE
Summary: Python bindings for KDE 4 desktop shell
Url: http://www.kde.org/
-Version: 4.2.3
+Version: 4.2.85
Release: 1
Source0: kdebase-workspace-%version.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Requires: python-kde4 = %{version}
+Requires: python-kde4 = %( echo `rpm -q --queryformat '%{VERSION}' python-kde4`)
%description
Python bindings for Plasma, the KDE 4 desktop shell. These bindings
@@ -68,6 +72,16 @@
%_kde_share_dir/services/plasma-*.desktop
%changelog
+* Mon May 18 2009 coolo@novell.com
+- remove hotplug-kde3 patch, it was never included in > 4.0 packages
+* Fri May 15 2009 coolo@suse.de
+- (Beineri) split plasma patch into smaller chunks
+- remove patches that are no longer necessary
+- rediff kdm patches
+* Thu May 14 2009 dmueller@suse.de
+- update to 4.2.85 (KDE 4.3 beta1)
+* Thu May 14 2009 dmueller@suse.de
+- fix dependencies of subpackages
* Thu Apr 30 2009 dmueller@suse.de
- update to 4.2.3
* see http://kde.org/announcements/changelogs/changelog4_2_2to4_2_3.php
++++++ 4_2_BRANCH.diff -> 4_3_BRANCH.diff ++++++
++++ 15575 lines (skipped)
++++ between KDE/kdebase4-workspace/4_2_BRANCH.diff
++++ and kdebase4-workspace/4_3_BRANCH.diff
++++++ kde4-migrate.diff ++++++
--- /var/tmp/diff_new_pack.C17696/_old 2009-05-20 00:02:50.000000000 +0200
+++ /var/tmp/diff_new_pack.C17696/_new 2009-05-20 00:02:50.000000000 +0200
@@ -2,7 +2,7 @@
===================================================================
--- startkde.cmake.orig
+++ startkde.cmake
-@@ -66,6 +66,11 @@ fi
+@@ -76,6 +76,11 @@ fi
kdehome=$HOME/@KDE_DEFAULT_HOME@
test -n "$KDEHOME" && kdehome=`echo "$KDEHOME"|sed "s,^~/,$HOME/,"`
++++++ kdebase-workspace-4.2.3.tar.bz2 -> kdebase-workspace-4.2.85.tar.bz2 ++++++
KDE/kdebase4-workspace/kdebase-workspace-4.2.3.tar.bz2 kdebase4-workspace/kdebase-workspace-4.2.85.tar.bz2 differ: byte 11, line 1
++++++ kdm-all-users-nopass.diff ++++++
--- /var/tmp/diff_new_pack.C17696/_old 2009-05-20 00:02:50.000000000 +0200
+++ /var/tmp/diff_new_pack.C17696/_new 2009-05-20 00:02:50.000000000 +0200
@@ -2,7 +2,7 @@
===================================================================
--- kdm/backend/client.c.orig
+++ kdm/backend/client.c
-@@ -522,6 +522,9 @@ isNoPassAllowed( struct passwd *pw )
+@@ -523,6 +523,9 @@ isNoPassAllowed( struct passwd *pw )
if (cursource != PWSRC_MANUAL)
return True;
@@ -16,7 +16,7 @@
===================================================================
--- kdm/config.def.orig
+++ kdm/config.def
-@@ -1878,6 +1878,15 @@ Description:
+@@ -1891,6 +1891,15 @@ Description:
(and any other user with UID = 0).
<emphasis>Never</emphasis> list <systemitem class="username">root</systemitem>.
++++++ kdm-audit-log.diff ++++++
--- /var/tmp/diff_new_pack.C17696/_old 2009-05-20 00:02:50.000000000 +0200
+++ /var/tmp/diff_new_pack.C17696/_new 2009-05-20 00:02:50.000000000 +0200
@@ -19,7 +19,7 @@
===================================================================
--- kdm/backend/client.c.orig
+++ kdm/backend/client.c
-@@ -87,6 +87,14 @@ extern int loginsuccess( const char *Use
+@@ -88,6 +88,14 @@ extern int loginsuccess( const char *Use
#endif
#include
@@ -34,7 +34,7 @@
/*
* Session data, mostly what struct verify_info was for
*/
-@@ -336,6 +344,56 @@ getPAMXauthData( const char *xauth_file
+@@ -337,6 +345,56 @@ getPAMXauthData( const char *xauth_file
}
# endif
@@ -91,7 +91,7 @@
static int
doPAMAuth( const char *psrv, struct pam_data *pdata )
{
-@@ -419,6 +477,8 @@ doPAMAuth( const char *psrv, struct pam_
+@@ -420,6 +478,8 @@ doPAMAuth( const char *psrv, struct pam_
gSendStr( curuser );
}
if (pretc != PAM_SUCCESS) {
@@ -100,7 +100,7 @@
switch (pretc) {
case PAM_USER_UNKNOWN:
case PAM_AUTH_ERR:
-@@ -765,6 +825,8 @@ verify( GConvFunc gconv, int rootok )
+@@ -766,6 +826,8 @@ verify( GConvFunc gconv, int rootok )
if (!p->pw_uid) {
if (!rootok && !td->allowRootLogin)
V_RET_FAIL( "Root logins are not allowed" );
@@ -109,7 +109,7 @@
wipeStr( curpass );
curpass = 0;
return True; /* don't deny root to log in */
-@@ -805,6 +867,8 @@ verify( GConvFunc gconv, int rootok )
+@@ -806,6 +868,8 @@ verify( GConvFunc gconv, int rootok )
}
if (pretc == PAM_SUCCESS)
break;
@@ -118,7 +118,7 @@
/* effectively there is only PAM_AUTHTOK_ERR */
gSendInt( V_FAIL );
}
-@@ -892,6 +956,8 @@ verify( GConvFunc gconv, int rootok )
+@@ -893,6 +957,8 @@ verify( GConvFunc gconv, int rootok )
displayStr( V_MSG_ERR,
"Your account has expired;"
" please contact your system administrator" );
@@ -127,7 +127,7 @@
gSendInt( V_FAIL );
LC_RET0;
} else if (tim > (expir - warntime) && !quietlog) {
-@@ -918,6 +984,8 @@ verify( GConvFunc gconv, int rootok )
+@@ -919,6 +985,8 @@ verify( GConvFunc gconv, int rootok )
displayStr( V_MSG_ERR,
"Your account has expired;"
" please contact your system administrator" );
@@ -136,7 +136,7 @@
gSendInt( V_FAIL );
LC_RET0;
}
-@@ -969,6 +1037,8 @@ verify( GConvFunc gconv, int rootok )
+@@ -970,6 +1038,8 @@ verify( GConvFunc gconv, int rootok )
}
displayStr( V_MSG_ERR,
"Logins are not allowed at the moment.\nTry again later" );
@@ -145,7 +145,7 @@
gSendInt( V_FAIL );
LC_RET0;
}
-@@ -978,6 +1048,8 @@ verify( GConvFunc gconv, int rootok )
+@@ -979,6 +1049,8 @@ verify( GConvFunc gconv, int rootok )
if (!auth_timeok( lc, time( NULL ) )) {
displayStr( V_MSG_ERR,
"You are not allowed to login at the moment" );
@@ -154,7 +154,7 @@
gSendInt( V_FAIL );
LC_RET0;
}
-@@ -989,6 +1061,8 @@ verify( GConvFunc gconv, int rootok )
+@@ -990,6 +1062,8 @@ verify( GConvFunc gconv, int rootok )
debug( "shell not in /etc/shells\n" );
endusershell();
V_RET_FAIL( "Your login shell is not listed in /etc/shells" );
@@ -163,7 +163,7 @@
}
if (!strcmp( s, p->pw_shell )) {
endusershell();
-@@ -1516,6 +1590,9 @@ startClient( volatile int *pid )
+@@ -1517,6 +1591,9 @@ startClient( volatile int *pid )
# define D_LOGIN_SETGROUP 0
#endif /* USE_PAM */
++++++ kdm-generic-same-pam.diff ++++++
--- /var/tmp/diff_new_pack.C17696/_old 2009-05-20 00:02:50.000000000 +0200
+++ /var/tmp/diff_new_pack.C17696/_new 2009-05-20 00:02:50.000000000 +0200
@@ -2,7 +2,7 @@
===================================================================
--- kdm/backend/client.c.orig
+++ kdm/backend/client.c
-@@ -600,7 +600,8 @@ verify( GConvFunc gconv, int rootok )
+@@ -601,7 +601,8 @@ verify( GConvFunc gconv, int rootok )
#ifdef USE_PAM
pnopass = False;
@@ -12,7 +12,7 @@
if (!gconv( GCONV_USER, 0 ))
return False;
if (isNoPassAllowed( curuser )) {
-@@ -613,11 +614,11 @@ verify( GConvFunc gconv, int rootok )
+@@ -614,11 +615,11 @@ verify( GConvFunc gconv, int rootok )
psrv = PAMService;
} else
psrv = PAMService;
++++++ kdm-long-xserver-timeout.diff ++++++
--- /var/tmp/diff_new_pack.C17696/_old 2009-05-20 00:02:50.000000000 +0200
+++ /var/tmp/diff_new_pack.C17696/_new 2009-05-20 00:02:50.000000000 +0200
@@ -5,9 +5,11 @@
See the bugreport. In short, some drivers suck.
---- kdm/config.def.sav 2008-09-29 11:23:22.000000000 +0200
-+++ kdm/config.def 2009-01-14 17:23:34.000000000 +0100
-@@ -1332,7 +1332,7 @@ Description:
+Index: kdm/config.def
+===================================================================
+--- kdm/config.def.orig
++++ kdm/config.def
+@@ -1348,7 +1348,7 @@ Description:
Key: ServerTimeout
Type: int
++++++ kdm-make_it_cool.diff ++++++
--- /var/tmp/diff_new_pack.C17696/_old 2009-05-20 00:02:50.000000000 +0200
+++ /var/tmp/diff_new_pack.C17696/_new 2009-05-20 00:02:50.000000000 +0200
@@ -2,7 +2,7 @@
===================================================================
--- kdm/kfrontend/kgreeter.cpp.orig
+++ kdm/kfrontend/kgreeter.cpp
-@@ -64,20 +64,20 @@ Foundation, Inc., 51 Franklin Street, Fi
+@@ -66,20 +66,20 @@ Foundation, Inc., 51 Franklin Street, Fi
class UserListView : public QListWidget {
public:
@@ -26,7 +26,7 @@
virtual QSize sizeHint() const
{
if (!cachedSizeHint.isValid()) {
-@@ -145,6 +145,7 @@ class UserListView : public QListWidget
+@@ -147,6 +147,7 @@ class UserListView : public QListWidget
private:
bool m_suppressClick;
@@ -34,7 +34,7 @@
};
class UserListViewItem : public QListWidgetItem {
-@@ -181,7 +182,7 @@ KGreeter::KGreeter( bool framed )
+@@ -183,7 +184,7 @@ KGreeter::KGreeter( bool framed )
"PrevUser" );
if (_userList) {
@@ -43,7 +43,7 @@
connect( userView, SIGNAL(itemClicked( QListWidgetItem * )),
SLOT(slotUserClicked( QListWidgetItem * )) );
connect( userView, SIGNAL(itemDoubleClicked( QListWidgetItem * )),
-@@ -189,8 +190,6 @@ KGreeter::KGreeter( bool framed )
+@@ -191,8 +192,6 @@ KGreeter::KGreeter( bool framed )
}
if (_userCompletion)
userList = new QStringList;
@@ -52,7 +52,7 @@
sessMenu = new QMenu( this );
connect( sessMenu, SIGNAL(triggered( QAction * )),
-@@ -331,8 +330,11 @@ UserList::UserList( char **in )
+@@ -361,8 +360,11 @@ UserList::UserList( char **in )
users.insert( *in );
}
@@ -65,7 +65,7 @@
{
struct passwd *ps;
-@@ -358,6 +360,9 @@ KGreeter::insertUsers()
+@@ -387,6 +389,9 @@ KGreeter::insertUsers()
if (_showUsers == SHOW_ALL) {
UserList noUsers( _noUsers );
QSet<QString> dupes;
@@ -75,7 +75,7 @@
for (setpwent(); (ps = getpwent()) != 0;) {
if (*ps->pw_dir && *ps->pw_shell &&
(ps->pw_uid >= (unsigned)_lowUserId ||
-@@ -369,10 +374,53 @@ KGreeter::insertUsers()
+@@ -398,10 +403,53 @@ KGreeter::insertUsers()
QString username( QFile::decodeName( ps->pw_name ) );
if (!dupes.contains( username )) {
dupes.insert( username );
@@ -130,7 +130,7 @@
} else {
UserList users( _users );
if (users.hasGroups()) {
-@@ -748,6 +796,9 @@ KStdGreeter::KStdGreeter()
+@@ -777,6 +825,9 @@ KStdGreeter::KStdGreeter()
break;
}
@@ -140,7 +140,7 @@
if (userView) {
if (clock)
inner_box->addWidget( clock, 0, Qt::AlignCenter );
-@@ -861,6 +912,9 @@ KThemedGreeter::KThemedGreeter( KdmTheme
+@@ -890,6 +941,9 @@ KThemedGreeter::KThemedGreeter( KdmTheme
adjustGeometry();
@@ -150,7 +150,7 @@
themer->setWidget( this );
connect( themer, SIGNAL(activated( const QString & )),
-@@ -944,6 +998,13 @@ KThemedGreeter::KThemedGreeter( KdmTheme
+@@ -973,6 +1027,13 @@ KThemedGreeter::KThemedGreeter( KdmTheme
completeMenu();
#endif
@@ -164,7 +164,7 @@
if ((system_button = themer->findNode( "system_button" ))) {
if (optMenu)
addAction( optMenu->menuAction() );
-@@ -974,7 +1035,10 @@ KThemedGreeter::pluginSetup()
+@@ -1003,7 +1064,10 @@ KThemedGreeter::pluginSetup()
{
inherited::pluginSetup();
++++++ kdm-suspend-hal.diff ++++++
--- /var/tmp/diff_new_pack.C17696/_old 2009-05-20 00:02:50.000000000 +0200
+++ /var/tmp/diff_new_pack.C17696/_new 2009-05-20 00:02:50.000000000 +0200
@@ -1,8 +1,8 @@
Index: kdm/config.def
===================================================================
---- kdm/config.def (Revision 773810)
-+++ kdm/config.def (Arbeitskopie)
-@@ -1795,6 +1795,19 @@
+--- kdm/config.def.orig
++++ kdm/config.def
+@@ -1795,6 +1795,19 @@ Description:
Who is allowed to shut down the system. This applies both to the
greeter and to the command sockets.
@@ -24,9 +24,9 @@
None: no forced shutdown is allowed at all
Index: kdm/backend/greet.h
===================================================================
---- kdm/backend/greet.h (Revision 773810)
-+++ kdm/backend/greet.h (Arbeitskopie)
-@@ -150,6 +150,7 @@
+--- kdm/backend/greet.h.orig
++++ kdm/backend/greet.h
+@@ -150,6 +150,7 @@ from the copyright holder.
# define SHUT_REBOOT 1 /* how */
# define SHUT_HALT 2
# define SHUT_CONSOLE -1 /* pseudo-code */
@@ -36,9 +36,9 @@
# define SHUT_FORCENOW 2
Index: kdm/backend/ctrl.c
===================================================================
---- kdm/backend/ctrl.c (Revision 773810)
-+++ kdm/backend/ctrl.c (Arbeitskopie)
-@@ -442,6 +442,10 @@
+--- kdm/backend/ctrl.c.orig
++++ kdm/backend/ctrl.c
+@@ -434,6 +434,10 @@ processCtrl( const char *string, int len
Reply( "nuke\t" );
}
}
@@ -51,9 +51,9 @@
writer( fd, cbuf, sprintf( cbuf, "reserve %d\t",
Index: kdm/kfrontend/kdmshutdown.cpp
===================================================================
---- kdm/kfrontend/kdmshutdown.cpp (Revision 773810)
-+++ kdm/kfrontend/kdmshutdown.cpp (Arbeitskopie)
-@@ -22,6 +22,7 @@
+--- kdm/kfrontend/kdmshutdown.cpp.orig
++++ kdm/kfrontend/kdmshutdown.cpp
+@@ -22,6 +22,7 @@ Foundation, Inc., 51 Franklin Street, Fi
*/
@@ -61,7 +61,7 @@
#include "kdmshutdown.h"
#include "kdm_greet.h"
#include "utils.h"
-@@ -33,6 +34,7 @@
+@@ -33,6 +34,7 @@ Foundation, Inc., 51 Franklin Street, Fi
#include
#include <KStandardGuiItem>
#include
@@ -69,7 +69,7 @@
#include <QAction>
#include <QApplication>
-@@ -54,6 +56,10 @@
+@@ -55,6 +57,10 @@ Foundation, Inc., 51 Franklin Street, Fi
int KDMShutdownBase::curPlugin = -1;
PluginList KDMShutdownBase::pluginList;
@@ -80,7 +80,7 @@
KDMShutdownBase::KDMShutdownBase( int _uid, QWidget *_parent )
: inherited( _parent )
, box( new QVBoxLayout( this ) )
-@@ -64,6 +70,7 @@
+@@ -65,6 +71,7 @@ KDMShutdownBase::KDMShutdownBase( int _u
, doesNuke( false )
, mayOk( true )
, maySched( false )
@@ -88,7 +88,7 @@
, rootlab( 0 )
, verify( 0 )
, needRoot( -1 )
-@@ -84,6 +91,7 @@
+@@ -85,6 +92,7 @@ KDMShutdownBase::complete( QWidget *prev
if (uid &&
((willShut && _allowShutdown == SHUT_ROOT) ||
@@ -96,7 +96,7 @@
(mayNuke && _allowNuke == SHUT_ROOT)))
{
rootlab = new QLabel( i18n("Root authorization required."), this );
-@@ -172,6 +180,7 @@
+@@ -171,6 +179,7 @@ KDMShutdownBase::updateNeedRoot()
{
int nNeedRoot = uid &&
(((willShut && _allowShutdown == SHUT_ROOT) ||
@@ -104,7 +104,7 @@
(_allowNuke == SHUT_ROOT && doesNuke)));
if (verify && nNeedRoot != needRoot) {
if (needRoot == 1)
-@@ -501,6 +510,63 @@
+@@ -488,6 +497,63 @@ KDMSlimShutdown::KDMSlimShutdown( QWidge
buttonlay->addWidget( btnReboot );
connect( btnReboot, SIGNAL(clicked()), SLOT(slotReboot()) );
@@ -165,11 +165,11 @@
+ }
+ }
+
- gSet( 1 );
- gSendInt( G_ListBootOpts );
- if (gRecvInt() == BO_OK) {
-@@ -548,6 +614,65 @@
- freeStrArr( targetList );
+ int dummy, cur;
+ if (getBootOptions( &targetList, &dummy, &cur )) {
+ QMenu *targets = new QMenu( this );
+@@ -523,6 +589,65 @@ KDMSlimShutdown::KDMSlimShutdown( QWidge
+ buttonlay->addSpacing( KDialog::spacingHint() );
}
+void KDMSlimShutdown::slotSuspend()
@@ -190,9 +190,9 @@
+ // dpySpec *sess = fetchSessions( lstRemote | lstTTY );
+ // it would be nice to show the sessions to suspend, but it
+ // would require string changes (coolo)
-+ dpySpec *sess = 0;
++ QList<DpySpec> sess;
+ kDebug() << "slotSuspend" << _allowSuspend;
-+ if (sess || _allowSuspend == SHUT_ROOT)
++ if (!sess.isEmpty() || _allowSuspend == SHUT_ROOT)
+ {
+ int ret = KDMConfShutdown( -1, sess, SHUT_SUSPEND, 0 ).exec();
+ if ( !ret )
@@ -234,7 +234,7 @@
void
KDMSlimShutdown::slotSched()
{
-@@ -614,16 +739,27 @@
+@@ -592,16 +717,27 @@ KDMConfShutdown::KDMConfShutdown( int _u
if (type == SHUT_CONSOLE)
willShut = false;
#endif
@@ -266,14 +266,14 @@
-#endif
- i18n("Restart Computer") )
+ .arg( title )
- .arg( os ?
- i18n("<br/>(Next boot: %1)",
- QString::fromLocal8Bit( os ) ) :
+ .arg( !os.isEmpty() ?
+ i18n("<br/>(Next boot: %1)", os ) :
+ QString() ),
Index: kdm/kfrontend/CMakeLists.txt
===================================================================
---- kdm/kfrontend/CMakeLists.txt (Revision 773810)
-+++ kdm/kfrontend/CMakeLists.txt (Arbeitskopie)
-@@ -4,10 +4,14 @@
+--- kdm/kfrontend/CMakeLists.txt.orig
++++ kdm/kfrontend/CMakeLists.txt
+@@ -4,10 +4,14 @@ add_subdirectory( themes )
add_subdirectory( pics )
add_subdirectory( sessions )
@@ -284,24 +284,24 @@
${KDEBASE_WORKSPACE_SOURCE_DIR}/kcontrol/kdm/background
${KDEBASE_WORKSPACE_SOURCE_DIR}/libs/kdm
${QIMAGEBLITZ_INCLUDES}
-+ ${LAZY_INCLUDE_DIRS}
++ ${LAZY_INCLUDE_DIRS}
)
set(kdmthemer_SRCS
-@@ -70,7 +74,7 @@
+@@ -70,7 +74,7 @@ endif (WITH_KDM_XCONSOLE)
macro_add_file_dependencies(kdm_greet.h ${confci})
kde4_add_executable(kdm_greet ${kdm_greet_SRCS})
--target_link_libraries(kdm_greet ${KDE4_KDEUI_LIBS} ${POSIX4_LIBRARIES})
-+target_link_libraries(kdm_greet ${KDE4_KDEUI_LIBS} ${POSIX4_LIBRARIES} lazy )
+-target_link_libraries(kdm_greet ${KDE4_KDEUI_LIBS} ${QT_QTXML_LIBRARY} ${X11_X11_LIB} ${POSIX4_LIBRARIES})
++target_link_libraries(kdm_greet ${KDE4_KDEUI_LIBS} ${QT_QTXML_LIBRARY} ${X11_X11_LIB} ${POSIX4_LIBRARIES} lazy)
if (X11_XTest_FOUND)
target_link_libraries(kdm_greet ${X11_XTest_LIB})
endif (X11_XTest_FOUND)
Index: kdm/kfrontend/kdmshutdown.h
===================================================================
---- kdm/kfrontend/kdmshutdown.h (Revision 773810)
-+++ kdm/kfrontend/kdmshutdown.h (Arbeitskopie)
-@@ -65,7 +65,7 @@
+--- kdm/kfrontend/kdmshutdown.h.orig
++++ kdm/kfrontend/kdmshutdown.h
+@@ -67,7 +67,7 @@ class KDMShutdownBase : public FDialog,
#else
static const bool willShut = true;
#endif
@@ -310,7 +310,7 @@
private Q_SLOTS:
void slotSched();
-@@ -116,7 +116,6 @@
+@@ -118,7 +118,6 @@ class KDMShutdown : public KDMShutdownBa
QComboBox *targets;
int oldTarget;
int sch_st, sch_to;
@@ -318,7 +318,7 @@
};
class KDMRadioButton : public QRadioButton {
-@@ -166,11 +165,15 @@
+@@ -161,11 +160,15 @@ class KDMSlimShutdown : public FDialog {
void slotReboot();
void slotReboot( QAction * );
void slotSched();
@@ -326,8 +326,8 @@
+ void slotSuspend( QAction * );
private:
- bool checkShutdown( int type, const char *os );
- char **targetList;
+ bool checkShutdown( int type, const QString &os );
+ QStringList targetList;
+ bool suspend_disk, suspend_ram, standby;
+ QAction *qa_suspend_disk, *qa_suspend_ram, *qa_standby;
++++++ kdm-sysconfig-values.diff ++++++
--- /var/tmp/diff_new_pack.C17696/_old 2009-05-20 00:02:50.000000000 +0200
+++ /var/tmp/diff_new_pack.C17696/_new 2009-05-20 00:02:50.000000000 +0200
@@ -2,7 +2,7 @@
===================================================================
--- kdm/kfrontend/CMakeLists.txt.orig
+++ kdm/kfrontend/CMakeLists.txt
-@@ -111,3 +111,5 @@ build_confci()
+@@ -115,3 +115,5 @@ build_confci()
install(CODE "
exec_program(\"${CMAKE_CURRENT_BINARY_DIR}/genkdmconf\" ARGS --in \\\"\\\$DESTDIR${CONFIG_INSTALL_DIR}/kdm\\\" --no-in-notice --face-src \\\"${CMAKE_CURRENT_SOURCE_DIR}/pics\\\" \\\$GENKDMCONF_FLAGS)
")
@@ -505,7 +505,7 @@
Comment: &
Description:
Who is allowed to shut down the system. This applies both to the
-@@ -1866,6 +1883,7 @@ Type: bool
+@@ -1879,6 +1896,7 @@ Type: bool
Default: false
User: dep
Instance: #:0/true
@@ -513,7 +513,7 @@
Comment: &
Description:
Enable automatic login. <emphasis>Use with extreme care!</emphasis>
-@@ -1899,7 +1917,7 @@ Default: ""
+@@ -1912,7 +1930,7 @@ Default: ""
PostProc: PautoLoginX
User: core(autoUser)
User: greeter
@@ -522,7 +522,7 @@
Merge: xdm:autoUser(P_autoUser)
Comment: &
Description:
-@@ -1930,10 +1948,10 @@ Description:
+@@ -1943,10 +1961,10 @@ Description:
Key: SessionsDirs
Type: list
@@ -535,7 +535,7 @@
Update: upd_sessionsdirs
Comment:
The directories containing session type definitions in .desktop format,
-@@ -2002,7 +2020,7 @@ Description:
+@@ -2015,7 +2033,7 @@ Description:
Key: UseSessReg
Type: bool
@@ -544,7 +544,7 @@
User: core
Instance: #*/!
Comment:
-@@ -2048,7 +2066,8 @@ Type: enum
+@@ -2061,7 +2079,8 @@ Type: enum
Clock/LOGO_CLOCK: a neat analog clock
Default: Clock
User: greeter
@@ -554,7 +554,7 @@
Comment:
What should be shown in the greeter's logo are:
Description:
-@@ -2264,7 +2283,7 @@ Description:
+@@ -2277,7 +2296,7 @@ Description:
Key: HiddenUsers
Type: list
@@ -563,7 +563,7 @@
User: greeter-c(noUsers)
Instance: #*/"root"
# depends on {Min,Max}ShowUID
-@@ -2408,7 +2427,7 @@ Description:
+@@ -2421,7 +2440,7 @@ Description:
Key: UseBackground
Type: bool
@@ -572,7 +572,7 @@
User: greeter
Instance: #*/!
Comment:
-@@ -2546,6 +2565,7 @@ Type: bool
+@@ -2559,6 +2578,7 @@ Type: bool
Default: false
User: greeter
Instance: :0/true
@@ -580,7 +580,7 @@
Comment:
Enable &kdm;'s built-in xconsole. Note that this can be enabled for only
one display at a time.
-@@ -2634,9 +2654,9 @@ Description:
+@@ -2647,9 +2667,9 @@ Description:
Key: Preloader
Type: string
@@ -592,7 +592,7 @@
Update: upd_preloader
Comment: &
Description:
-@@ -2646,7 +2666,7 @@ Description:
+@@ -2659,7 +2679,7 @@ Description:
Key: UseTheme
Type: bool
@@ -601,7 +601,7 @@
User: greeter
Instance: */true
Comment: &
-@@ -2655,9 +2675,10 @@ Description:
+@@ -2668,9 +2688,10 @@ Description:
Key: Theme
Type: string
++++++ kwin-suse.diff ++++++
--- /var/tmp/diff_new_pack.C17696/_old 2009-05-20 00:02:50.000000000 +0200
+++ /var/tmp/diff_new_pack.C17696/_new 2009-05-20 00:02:50.000000000 +0200
@@ -20,7 +20,7 @@
}
OxygenClient::~OxygenClient()
-@@ -305,7 +309,7 @@ void OxygenClient::paintEvent(QPaintEven
+@@ -303,7 +307,7 @@ void OxygenClient::paintEvent(QPaintEven
const int titleWidth = frame.width() -
titleEdgeLeft - layoutMetric(LM_TitleEdgeRight) -
buttonsLeftWidth() - buttonsRightWidth() -
@@ -29,7 +29,7 @@
QPalette pal2( palette );
if( !OxygenFactory::blendTitlebarColors()) {
-@@ -321,6 +325,12 @@ void OxygenClient::paintEvent(QPaintEven
+@@ -319,6 +323,12 @@ void OxygenClient::paintEvent(QPaintEven
painter.drawText(titleLeft, titleTop-1, titleWidth, titleHeight, // -1 is to go into top resizearea
OxygenFactory::titleAlignment() | Qt::AlignVCenter, caption());
@@ -42,7 +42,7 @@
painter.setRenderHint(QPainter::Antialiasing);
// Draw dividing line
-@@ -346,7 +356,7 @@ void OxygenClient::paintEvent(QPaintEven
+@@ -344,7 +354,7 @@ void OxygenClient::paintEvent(QPaintEven
}
if (align & Qt::AlignLeft) {
++++++ lowdiskspace.patch ++++++
++++ 656 lines (skipped)
++++ between KDE/kdebase4-workspace/lowdiskspace.patch
++++ and kdebase4-workspace/lowdiskspace.patch
++++++ plasma-branding-defaults.diff ++++++
Index: plasma/shells/desktop/desktopcorona.cpp
===================================================================
--- plasma/shells/desktop/desktopcorona.cpp.orig
+++ plasma/shells/desktop/desktopcorona.cpp
@@ -23,6 +23,7 @@
#include <QDir>
#include <QGraphicsLayout>
#include <QTimer>
+#include <QFile>
#include <KDebug>
#include <KDialog>
@@ -118,7 +119,9 @@ void DesktopCorona::addDesktopContainmen
Plasma::Containment* c = findFreeContainment();
if (!c) {
- c = addContainment("desktop");
+ KSharedConfigPtr defaultconfig = KSharedConfig::openConfig("plasma-desktoprc");
+ KConfigGroup group = KConfigGroup(defaultconfig, "Defaults");
+ c = addContainment(group.readEntry("containment", "desktop"));
}
c->setScreen(screen, desktop);
@@ -227,6 +230,23 @@ void DesktopCorona::loadDefaultLayout()
applet->setGlobalShortcut(KShortcut("Alt+F1"));
}
+ if (QFile::exists("/usr/share/kde4/services/plasma-applet-showdashboard.desktop"))
+ loadDefaultApplet("showdashboard", panel);
+
+ QVariantList args;
+ if (QFile::exists("/usr/share/applications/kde4/dolphin.desktop")) {
+ args << "/usr/share/applications/kde4/dolphin.desktop";
+
+ panel->addApplet("icon", args);
+ }
+
+ args.clear();
+ if (QFile::exists("/usr/share/applications/kde4/konqbrowser.desktop")) {
+ args << "/usr/share/applications/kde4/konqbrowser.desktop";
+
+ panel->addApplet("icon", args);
+ }
+
loadDefaultApplet("notifier", panel);
loadDefaultApplet("pager", panel);
loadDefaultApplet("tasks", panel);
@@ -242,7 +262,13 @@ void DesktopCorona::loadDefaultLayout()
}
engines->unloadEngine("powermanagement");
+ if (QFile::exists("/usr/share/kde4/services/plasma-applet-networkmanagement.desktop")) {
+ loadDefaultApplet("networkmanagement", panel);
+ }
+
loadDefaultApplet("digital-clock", panel);
+ loadDefaultApplet("lockout", panel);
+
emit containmentAdded(panel);
QTimer::singleShot(1000, this, SLOT(saveDefaultSetup()));
Index: plasma/applets/kickoff/simpleapplet/simpleapplet.cpp
===================================================================
--- plasma/applets/kickoff/simpleapplet/simpleapplet.cpp.orig
+++ plasma/applets/kickoff/simpleapplet/simpleapplet.cpp
@@ -37,6 +37,7 @@
#include
#include
#include
+#include <QFile>
// KDE
#include <KIcon>
@@ -284,7 +285,11 @@ MenuLauncherApplet::~MenuLauncherApplet(
void MenuLauncherApplet::init()
{
KConfigGroup cg = config();
- QString iconname = "start-here-kde";
+ QString iconname;
+ if (QFile::exists("/usr/share/icons/oxygen/scalable/places/start-here-branding.svg"))
+ iconname = "start-here-branding";
+ else
+ iconname = "start-here-kde";
QStringList viewtypes = cg.readEntry("views", QStringList());
if(viewtypes.isEmpty()) { // backward-compatibility to
#include
#include
+#include <QFile>
// KDE
#include <KIcon>
@@ -106,7 +107,10 @@ LauncherApplet::~LauncherApplet()
void LauncherApplet::init()
{
KConfigGroup cg = config();
- setPopupIcon(cg.readEntry("icon", "start-here-kde"));
+ if (QFile::exists("/usr/share/icons/oxygen/scalable/places/start-here-branding.svg"))
+ setPopupIcon(cg.readEntry("icon", "start-here-branding"));
+ else
+ setPopupIcon(cg.readEntry("icon", "start-here-kde"));
if (KService::serviceByStorageId("kde4-kmenuedit.desktop")) {
QAction* menueditor = new QAction(i18n("Menu Editor"), this);
Index: plasma/applets/kickoff/core/systemmodel.cpp
===================================================================
--- plasma/applets/kickoff/core/systemmodel.cpp.orig
+++ plasma/applets/kickoff/core/systemmodel.cpp
@@ -85,7 +85,7 @@ public:
connect(placesModel, SIGNAL(rowsRemoved(QModelIndex, int, int)),
q, SLOT(sourceRowsRemoved(QModelIndex, int, int)));
- topLevelSections << i18n("Applications")
+ topLevelSections << i18n("Administration")
<< i18n("Places")
<< i18n("Removable Storage")
<< i18n("Storage");
@@ -259,18 +259,33 @@ QVariant SystemModel::data(const QModelI
KService::Ptr service = d->appsList[index.row()];
- switch (role) {
- case Qt::DisplayRole:
- return service->name();
- case Qt::DecorationRole:
- return KIcon(service->icon());
- case SubTitleRole:
- return service->genericName();
- case UrlRole:
- return service->entryPath();
- default:
- return QVariant();
- }
+ if (service->name()=="sysinfo") {
+ switch(role) {
+ case Qt::DisplayRole:
+ return i18n("System Information");
+ case Qt::DecorationRole:
+ return KIcon("hwinfo");
+ case SubTitleRole:
+ return "sysinfo:/";
+ case UrlRole:
+ return "sysinfo:/";
+ default:
+ return QVariant();
+ }
+ } else {
+ switch(role) {
+ case Qt::DisplayRole:
+ return service->name();
+ case Qt::DecorationRole:
+ return KIcon(service->icon());
+ case SubTitleRole:
+ return service->genericName();
+ case UrlRole:
+ return service->entryPath();
+ default:
+ return QVariant();
+ }
+ }
}
if (role == UrlRole && !d->placesModel->isHidden(mapToSource(index))) {
Index: plasma/applets/kickoff/core/favoritesmodel.cpp
===================================================================
--- plasma/applets/kickoff/core/favoritesmodel.cpp.orig
+++ plasma/applets/kickoff/core/favoritesmodel.cpp
@@ -167,6 +167,11 @@ FavoritesModel::~FavoritesModel()
void FavoritesModel::add(const QString& url)
{
+ KService::Ptr service = KService::serviceByStorageId(url);
+ if (!service) {
+ return;
+ }
+
Private::globalFavoriteList << url;
Private::globalFavoriteSet << url;
Index: plasma/applets/kickoff/core/models.cpp
===================================================================
--- plasma/applets/kickoff/core/models.cpp.orig
+++ plasma/applets/kickoff/core/models.cpp
@@ -162,7 +162,19 @@ QStringList Kickoff::systemApplicationLi
{
KConfigGroup appsGroup = componentData().config()->group("SystemApplications");
QStringList apps;
- apps << "systemsettings";
+
+ if (QFile::exists("/usr/share/applications/YaST.desktop"))
+ apps << "YaST.desktop";
+
+ if (QFile::exists("/usr/share/applications/package-manager.desktop"))
+ apps << "package-manager.desktop";
+
+ if (KService::serviceByStorageId("YaST2/live-installer.desktop"))
+ apps << "YaST2/live-installer.desktop";
+
+ if (QFile::exists("/usr/share/kde4/services/sysinfo.protocol"))
+ apps << "/usr/share/kde4/services/sysinfo.protocol";
+
apps = appsGroup.readEntry("DesktopFiles", apps);
return apps;
}
Index: plasma/applets/kickoff/ui/brandingbutton.cpp
===================================================================
--- plasma/applets/kickoff/ui/brandingbutton.cpp.orig
+++ plasma/applets/kickoff/ui/brandingbutton.cpp
@@ -68,8 +68,10 @@ void BrandingButton::checkBranding()
void BrandingButton::openHomepage()
{
- //FIXME: 4.3 .. add a brandingConfig to Theme
- KUrl home("http://www.kde.org");
+ KConfig config("kickoffrc");
+ KConfigGroup group = config.group("Branding");
+ KUrl home(group.readEntry("Homepage", "http://www.kde.org/"));
+
QString themePath = KStandardDirs::locate("data", "desktoptheme/" +
Plasma::Theme::defaultTheme()->themeName() +
"/metadata.desktop");
++++++ plasma-dashboard-leave.diff ++++++
Index: plasma/shells/desktop/dashboardview.cpp
===================================================================
--- plasma/shells/desktop/dashboardview.cpp.orig
+++ plasma/shells/desktop/dashboardview.cpp
@@ -161,6 +161,12 @@ void DashboardView::appletBrowserDestroy
bool DashboardView::eventFilter(QObject *watched, QEvent *event)
{
if (watched != m_appletBrowser) {
+ if (event->type() == QEvent::MouseButtonPress) {
+ QMouseEvent *me = static_cast(event);
+ if (me->button() == Qt::LeftButton) {
+ hideView();
+ }
+ }
return false;
}
++++++ plasma-kickoff-newly-collapsing.diff ++++++
Index: plasma/applets/kickoff/core/applicationmodel.cpp
===================================================================
--- plasma/applets/kickoff/core/applicationmodel.cpp.orig
+++ plasma/applets/kickoff/core/applicationmodel.cpp
@@ -120,6 +120,8 @@ public:
}
void fillNode(const QString &relPath, AppNode *node);
+ void addAppNode(const QString &icon, const QString &appName, const QString &genericName,
+ const QString& relPath, const QString &desktopEntry, bool isDir, AppNode *parent);
static QHash iconNameMap();
ApplicationModel *q;
@@ -130,77 +132,113 @@ public:
QStringList systemApplications;
DisplayOrder displayOrder;
bool allowSeparators;
+
+ QStringList newInstalledPrograms, seenPrograms;
+ QString currentDate;
};
void ApplicationModelPrivate::fillNode(const QString &_relPath, AppNode *node)
{
+ if (_relPath=="new/") {
+ for (QStringList::ConstIterator it = newInstalledPrograms.begin(); it != newInstalledPrograms.end(); ++it) {
+ KService::Ptr p = KService::serviceByStorageId((*it));
+
+ if (p->noDisplay()) {
+ continue;
+ }
+
+ AppNode *newnode = new AppNode();
+ newnode->icon = KIcon(p->icon());
+ newnode->appName = p->name();
+ newnode->genericName = p->genericName();
+ newnode->relPath = QString();
+ newnode->desktopEntry = p->entryPath();
+ newnode->isDir = false;
+ newnode->parent = node;
+ node->children.append(newnode);
+ }
+ return;
+ }
+
KServiceGroup::Ptr root = KServiceGroup::group(_relPath);
if (!root || !root->isValid()) {
return;
}
- const KServiceGroup::List list = root->entries(true /* sorted */,
+ KServiceGroup::List list = root->entries(true /* sorted */,
true /* exclude no display entries */,
- allowSeparators /* allow separators */,
+ false /* allow separators */,
primaryNamePolicy == ApplicationModel::GenericNamePrimary /* sort by generic name */);
- // application name <-> service map for detecting duplicate entries
- QHash existingServices;
+ KSortableList slist;
+ KSortableList glist;
+ QMap specialTitle;
+ QMap categoryIcon;
+ QMap shortenedMenuPath;
// generic name <-> node mapping to determinate duplicate generic names
QHash > genericNames;
+ bool isSeparator = false;
for (KServiceGroup::List::ConstIterator it = list.constBegin(); it != list.constEnd(); ++it) {
- QString icon;
- QString appName;
- QString genericName;
- QString relPath = _relPath;
- QString desktopEntry;
- bool isDir = false;
- bool isSeparator = false;
const KSycocaEntry::Ptr p = (*it);
if (p->isType(KST_KService)) {
const KService::Ptr service = KService::Ptr::staticCast(p);
- if (service->noDisplay()) {
- continue;
+ slist.insert( service->name().toLocal8Bit(), p);
+ }
+ else if (p->isType(KST_KServiceGroup))
+ {
+ KServiceGroup::Ptr serviceGroup = KServiceGroup::Ptr::staticCast(p);
+ if ( serviceGroup->SuSEshortMenu() ){
+ KServiceGroup::List l = serviceGroup->entries(true, true /*excludeNoDisplay_*/, false );
+ if ( l.count() == 1 ) {
+
+ // the special case, we want to short the menu.
+ // TOFIX? : this works only for one level
+ KServiceGroup::List::ConstIterator _it=l.begin();
+ const KSycocaEntry::Ptr _e = (*_it);
+ if (_e->isType(KST_KService)) {
+ const KService::Ptr s = KService::Ptr::staticCast(_e);
+ QString key;
+ if ( serviceGroup->SuSEgeneralDescription() )
+ key = s->name();
+ else {
+ // we use the normal menu description
+ key = s->name();
+ if( !s->genericName().isEmpty() && serviceGroup->caption()!=s->genericName())
+ key = serviceGroup->caption() + " (" + s->name() + ")";
+ }
+ specialTitle.insert( _e->name(), key );
+ categoryIcon.insert( _e->name(), serviceGroup->icon() );
+ slist.insert( key.toLocal8Bit(), _e );
+ shortenedMenuPath.insert( _e->name(), serviceGroup->relPath() );
+ // and escape from here
+ continue;
+ }
+ }
}
+ glist.insert( serviceGroup->caption().toLocal8Bit(), p );
+ }
+ else
+ slist.insert( p->name().toLocal8Bit(), p);
+ }
+
+ list = root->SuSEsortEntries( slist, glist, true /*excludeNoDisplay_*/, false );
+
+ for( KServiceGroup::List::ConstIterator it = list.begin();
+ it != list.end(); ++it)
+ {
+ const KSycocaEntry::Ptr p = (*it);
+ if (p->isType(KST_KService))
+ {
+ const KService::Ptr service = KService::Ptr::staticCast(p);
- icon = service->icon();
- appName = service->name();
- genericName = service->genericName();
- desktopEntry = service->entryPath();
-
- // check for duplicates (eg. KDE 3 and KDE 4 versions of application
- // both present)
- if (duplicatePolicy == ApplicationModel::ShowLatestOnlyPolicy &&
- existingServices.contains(appName)) {
- if (Kickoff::isLaterVersion(existingServices[appName], service)) {
- continue;
- } else {
- // find and remove the existing entry with the same name
- for (int i = node->children.count() - 1; i >= 0; --i) {
- AppNode *app = node->children.at(i);
- if (app->appName == appName &&
- app->genericName == genericName &&
- app->iconName == icon) {
- app = node->children.takeAt(i);
- const QString s = app->genericName.toLower();
- if (genericNames.contains(s)) {
- QList list = genericNames[s];
- for (int j = list.count() - 1; j >= 0; --j) {
- if(list.at(j) == app) {
- list.takeAt(j);
- }
- }
- genericNames[s] = list;
- }
- delete app;
- }
- }
- }
+
+ if (service->noDisplay()) {
+ continue;
}
if (systemApplicationPolicy == ApplicationModel::ShowSystemOnlyPolicy &&
@@ -210,9 +248,40 @@ void ApplicationModelPrivate::fillNode(c
continue;
}
- existingServices[appName] = service;
+ QString menuPath;
+ if (shortenedMenuPath[service->name()].isEmpty())
+ menuPath=_relPath+service->menuId();
+ else
+ menuPath=shortenedMenuPath[service->name()]+service->menuId();
+
+ QString icon = categoryIcon[service->name()];
+ if (icon.isEmpty())
+ icon = service->icon();
+
+ QString name = specialTitle[service->name()];
+ if (name.isEmpty())
+ name = service->name();
+
+ QString genericName = service->genericName();
+ if (genericName.isEmpty()) {
+ genericName = name;
+ name = QString::null;
+ }
+
+ if (name==genericName)
+ name = QString::null;
+
+ addAppNode(icon, name, genericName, _relPath, service->entryPath(), false, node);
} else if (p->isType(KST_KServiceGroup)) {
- const KServiceGroup::Ptr serviceGroup = KServiceGroup::Ptr::staticCast(p);
+ KServiceGroup::Ptr serviceGroup = KServiceGroup::Ptr::staticCast(p);
+
+ if ( serviceGroup->SuSEshortMenu() ){
+ KServiceGroup::List l = serviceGroup->entries(true, true /*excludeNoDisplay_*/ );
+ if ( l.count() == 1 )
+ continue;
+ }
+ // standard sub menu
+
if (serviceGroup->noDisplay() || serviceGroup->childCount() == 0) {
continue;
@@ -221,15 +290,11 @@ void ApplicationModelPrivate::fillNode(c
kDebug(250) << "Service group" << serviceGroup->entryPath() << serviceGroup->icon()
<< serviceGroup->relPath() << serviceGroup->directoryEntryPath();
- icon = serviceGroup->icon();
- if (iconNameMap().contains(icon)) {
+ QString icon = serviceGroup->icon();
+ if (iconNameMap().contains(icon))
icon = iconNameMap().value(icon);
- }
- genericName = serviceGroup->caption();
- relPath = serviceGroup->relPath();
- appName = serviceGroup->comment();
- isDir = true;
+ addAppNode(icon, serviceGroup->comment(), serviceGroup->caption(), serviceGroup->relPath(), QString::null, true, node);
} else if (p->isType(KST_KServiceSeparator)) {
isSeparator = true;
} else {
@@ -237,26 +302,29 @@ void ApplicationModelPrivate::fillNode(c
continue;
}
+ }
+
+ if (_relPath.isEmpty() && newInstalledPrograms.count()) {
+
AppNode *newnode = new AppNode();
- newnode->iconName = icon;
- newnode->icon = KIcon(icon);
- newnode->appName = appName;
- newnode->genericName = genericName;
- newnode->relPath = relPath;
- newnode->desktopEntry = desktopEntry;
- newnode->isDir = isDir;
- newnode->isSeparator = isSeparator;
+ newnode->icon = KIcon("chronometer");
+ newnode->appName = QString();
+ newnode->genericName = i18n("Recently Installed");
+ newnode->relPath = "new/";
+ newnode->desktopEntry = QString();
+ newnode->isDir = true;
newnode->parent = node;
- node->children.append(newnode);
+ node->children.prepend(newnode);
+#if 0
if (p->isType(KST_KService)) {
const QString s = genericName.toLower();
QList list = genericNames.contains(s) ? genericNames[s] : QList();
list.append(newnode);
genericNames[s] = list;
}
+#endif
}
-
// set the subTitleMandatory field for nodes that do not provide a unique generic
// name what may help us on display to show in such cases also the subtitle to
// provide a hint to the user what the duplicate entries are about.
@@ -269,6 +337,20 @@ void ApplicationModelPrivate::fillNode(c
}
}
+void ApplicationModelPrivate::addAppNode(const QString &icon, const QString &appName, const QString &genericName,
+ const QString& relPath, const QString &desktopEntry, bool isDir, AppNode *parent )
+{
+ AppNode *newnode = new AppNode();
+ newnode->icon = KIcon(icon);
+ newnode->appName = appName;
+ newnode->genericName = genericName;
+ newnode->relPath = relPath;
+ newnode->desktopEntry = desktopEntry;
+ newnode->isDir = isDir;
+ newnode->parent = parent;
+ parent->children.append(newnode);
+}
+
ApplicationModel::ApplicationModel(QObject *parent, bool allowSeparators)
: KickoffAbstractModel(parent),
d(new ApplicationModelPrivate(this, allowSeparators))
@@ -279,6 +361,7 @@ ApplicationModel::ApplicationModel(QObje
dbus.connect(QString(), "/kickoff", "org.kde.plasma", "reloadMenu", this, SLOT(reloadMenu()));
connect(KSycoca::self(), SIGNAL(databaseChanged()), this, SLOT(checkSycocaChange()));
d->fillNode(QString(), d->root);
+ createNewProgramList();
}
ApplicationModel::~ApplicationModel()
@@ -471,6 +554,7 @@ void ApplicationModel::reloadMenu()
d->root = new AppNode();
d->fillNode(QString(), d->root);
reset();
+ createNewProgramList();
}
void ApplicationModel::checkSycocaChange()
@@ -490,6 +574,100 @@ ApplicationModel::SystemApplicationPolic
return d->systemApplicationPolicy;
}
+void ApplicationModel::createNewProgramList()
+{
+ KConfigGroup kickoffrc = Kickoff::componentData().config()->group("Applications");
+ d->seenPrograms = kickoffrc.readEntry("FirstSeen", QStringList());
+ d->newInstalledPrograms.clear();
+
+ d->currentDate = QDate::currentDate().toString(Qt::ISODate);
+
+ bool initialize = (d->seenPrograms.count() == 0);
+
+ bool seenProgramsChanged = createNewProgramList(QString::null);
+
+ if (initialize) {
+ for (QStringList::Iterator it = d->seenPrograms.begin(); it != d->seenPrograms.end(); ++it) {
+ *(++it) = "-";
+ }
+
+ d->newInstalledPrograms.clear();
+ }
+
+ if (seenProgramsChanged) {
+ kickoffrc.writeEntry("FirstSeen", d->seenPrograms);
+ kickoffrc.sync();
+ }
+}
+
+bool ApplicationModel::createNewProgramList(QString relPath)
+{
+ bool seenProgramsChanged = false;
+
+ KServiceGroup::Ptr group = KServiceGroup::group(relPath);
+ if (!group || !group->isValid()) {
+ return false;
+ }
+
+ KServiceGroup::List list = group->entries();
+ if (list.isEmpty()) {
+ return false;
+ }
+
+ KServiceGroup::List::ConstIterator it = list.begin();
+ for (; it != list.end(); ++it) {
+ KSycocaEntry::Ptr e = (*it);
+
+ if (e) {
+ if (e->isType(KST_KServiceGroup)) {
+ KServiceGroup::Ptr g(KServiceGroup::Ptr::staticCast(e));
+ if(!g->noDisplay()) {
+ seenProgramsChanged |= createNewProgramList(g->relPath());
+ }
+ } else if (e->isType(KST_KService)) {
+ KService::Ptr s(KService::Ptr::staticCast(e));
+ if (s->isApplication() && !s->noDisplay() ) {
+ QString shortStorageId = s->storageId().replace(".desktop", QString::null);
+ QStringList::Iterator it_find = d->seenPrograms.begin();
+ QStringList::Iterator it_end = d->seenPrograms.end();
+ bool found = false;
+ for (; it_find != it_end; ++it_find) {
+ if (*(it_find)==shortStorageId) {
+ found = true;
+ break;
+ }
+ ++it_find;
+ }
+ if (!found) {
+ seenProgramsChanged = true;
+ d->seenPrograms += shortStorageId;
+ d->seenPrograms += d->currentDate;
+ if (d->newInstalledPrograms.indexOf(s->storageId())==-1) {
+ d->newInstalledPrograms += s->storageId();
+ }
+ }
+ else {
+ ++it_find;
+ if (*(it_find)!="-") {
+ QDate date = QDate::fromString(*(it_find), Qt::ISODate);
+ if (date.daysTo(QDate::currentDate())<3) {
+ if (d->newInstalledPrograms.indexOf(s->storageId())==-1) {
+ d->newInstalledPrograms += s->storageId();
+ }
+ }
+ else {
+ seenProgramsChanged=true;
+ (*it_find)="-";
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ return seenProgramsChanged;
+}
+
/**
* FIXME This is a temporary workaround to map the icon names found
* in the desktop directory files (from /usr/share/desktop-directories)
Index: plasma/applets/kickoff/core/applicationmodel.h
===================================================================
--- plasma/applets/kickoff/core/applicationmodel.h.orig
+++ plasma/applets/kickoff/core/applicationmodel.h
@@ -118,10 +118,15 @@ public slots:
void reloadMenu();
void checkSycocaChange();
+protected slots:
+ void createNewProgramList();
+
private:
friend class ApplicationModelPrivate;
ApplicationModelPrivate *const d;
+ bool createNewProgramList(QString relPath);
+
Q_DISABLE_COPY(ApplicationModel)
};
++++++ plasma-lock_logout_order.diff ++++++
Index: plasma/applets/lock_logout/Messages.sh
===================================================================
--- plasma/applets/lock_logout/Messages.sh.orig
+++ plasma/applets/lock_logout/Messages.sh
@@ -1,4 +1,6 @@
#! /usr/bin/env bash
+$XGETTEXT *.cpp -o $podir/plasma_applet_lock_logout.pot
+#! /usr/bin/env bash
$EXTRACTRC *.ui >> rc.cpp
$XGETTEXT *.cpp -o $podir/plasma_applet_lockout.pot
rm -f rc.cpp
Index: plasma/applets/lock_logout/lockout.cpp
===================================================================
--- plasma/applets/lock_logout/lockout.cpp.orig
+++ plasma/applets/lock_logout/lockout.cpp
@@ -22,12 +22,14 @@
// Plasma
#include
#include
+#include
// Qt
#include // QWIDGETSIZE_MAX
#include
#include
#include <QGraphicsLinearLayout>
+#include <QAction>
// KDE
#include <KIcon>
@@ -79,6 +81,10 @@ void LockOut::init()
Plasma::ToolTipContent logoutToolTip(i18n("Leave..."),i18n("Logout, turn off or restart the computer"),m_iconLogout->icon());
Plasma::ToolTipManager::self()->setContent(m_iconLogout, logoutToolTip);
+ QAction *switcher = new QAction(i18n("Alternate Button Order"), this);
+ m_actions.append(switcher);
+ connect(switcher, SIGNAL(triggered(bool)), this, SLOT(switchOrder()));
+
showButtons();
}
@@ -86,6 +92,17 @@ LockOut::~LockOut()
{
}
+void LockOut::switchOrder()
+{
+ KConfigGroup cg = config();
+ cg.writeEntry("AlternateButtonOrder", !cg.readEntry("AlternateButtonOrder", false));
+ emit configNeedsSaving();
+
+ QGraphicsLayoutItem* item = m_layout->itemAt(0);
+ m_layout->removeAt(0);
+ m_layout->addItem(item);
+}
+
void LockOut::checkLayout()
{
Qt::Orientation direction;
@@ -151,6 +168,10 @@ void LockOut::constraintsEvent(Plasma::C
}
}
+QList LockOut::contextualActions()
+{
+ return m_actions;
+}
void LockOut::clickLock()
{
kDebug()<<"LockOut:: lock clicked ";
@@ -226,7 +247,21 @@ void LockOut::showButtons()
m_layout->removeItem(m_iconLock);
m_layout->removeItem(m_iconLogout);
- if (m_showLockButton) {
+ if (m_showLockButton && m_showLogoutButton) {
+ m_iconLock->setVisible(true);
+ m_iconLogout->setVisible(true);
+ KConfigGroup cg = config();
+ if (cg.readEntry("AlternateButtonOrder", false)) {
+ m_layout->addItem(m_iconLock);
+ m_layout->addItem(m_iconLogout);
+ }
+ else {
+ m_layout->addItem(m_iconLogout);
+ m_layout->addItem(m_iconLock);
+ }
+ }
+ else {
+ if (m_showLockButton) {
m_iconLock->setVisible(true);
m_layout->addItem(m_iconLock);
} else {
@@ -239,7 +274,8 @@ void LockOut::showButtons()
} else {
m_iconLogout->setVisible(false);
}
-
+ }
+
setConfigurationRequired(!m_showLockButton && !m_showLogoutButton);
checkLayout();
#endif // !Q_OS_WIN
Index: plasma/applets/lock_logout/lockout.h
===================================================================
--- plasma/applets/lock_logout/lockout.h.orig
+++ plasma/applets/lock_logout/lockout.h
@@ -42,10 +42,12 @@ class LockOut : public Plasma::Applet
~LockOut();
void init();
virtual void constraintsEvent(Plasma::Constraints constraints);
+ virtual QList contextualActions();
public slots:
void clickLogout();
void clickLock();
+ void switchOrder();
protected Q_SLOTS:
void configAccepted();
@@ -62,6 +64,7 @@ class LockOut : public Plasma::Applet
Plasma::IconWidget *m_iconLock;
Plasma::IconWidget *m_iconLogout;
QGraphicsLinearLayout *m_layout;
+ QList m_actions;
void checkLayout();
void showButtons();
};
++++++ plasma-panel-resize-hint.diff ++++++
Index: plasma/shells/desktop/panelcontroller.cpp
===================================================================
--- plasma/shells/desktop/panelcontroller.cpp.orig
+++ plasma/shells/desktop/panelcontroller.cpp
@@ -949,6 +949,7 @@ void PanelController::mouseMoveFilter(QM
newX - screenGeom.left() <= screenGeom.width()/3) {
move(newX, pos().y());
d->resizeFrameHeight(geometry().left() - screenGeom.left());
+ d->sizeTool->setText(i18n("Width: %1", screenGeom.left() + (mapToGlobal(event->pos()).x() - d->startDragPos.x())));
}
break;
}
@@ -958,6 +959,7 @@ void PanelController::mouseMoveFilter(QM
newX + width() - screenGeom.left() >= 2*(screenGeom.width()/3)) {
move(newX, pos().y());
d->resizeFrameHeight(screenGeom.right() - geometry().right());
+ d->sizeTool->setText(i18n("Width: %1", screenGeom.right() - (mapToGlobal(event->pos()).x() - d->startDragPos.x()) - width() + 1));
}
break;
}
@@ -967,6 +969,7 @@ void PanelController::mouseMoveFilter(QM
newY - screenGeom.top()<= screenGeom.height()/3) {
move(pos().x(), newY);
d->resizeFrameHeight(geometry().top() - screenGeom.top());
+ d->sizeTool->setText(i18n("Height: %1", screenGeom.top() + (mapToGlobal(event->pos()).y() - d->startDragPos.y())));
}
break;
}
@@ -977,6 +980,7 @@ void PanelController::mouseMoveFilter(QM
newY + height() - screenGeom.top() >= 2*(screenGeom.height()/3)) {
move(pos().x(), newY);
d->resizeFrameHeight(screenGeom.bottom() - geometry().bottom());
+ d->sizeTool->setText(i18n("Height: %1", screenGeom.bottom() - (mapToGlobal(event->pos()).y() - d->startDragPos.y()) - height() + 1));
}
break;
}
++++++ plasma-plaindesktop.diff ++++++
--- plasma/containments/plaindesktop/CMakeLists.txt 2009-01-11 11:37:56.000000000 +0100
+++ plasma/containments/plaindesktop/CMakeLists.txt 2009-05-15 14:07:28.000000000 +0200
@@ -9,13 +9,12 @@
set(screensaver_xml ${KDEBASE_WORKSPACE_SOURCE_DIR}/krunner/dbus/org.freedesktop.ScreenSaver.xml)
QT4_ADD_DBUS_INTERFACE(desktop_SRCS ${screensaver_xml} screensaver_interface)
-kde4_add_plugin(plasma_containment_desktop ${desktop_SRCS})
+kde4_add_plugin(plasma_containment_plaindesktop ${desktop_SRCS})
if(WIN32)
-target_link_libraries(plasma_containment_desktop ${KDE4_PLASMA_LIBS} ${KDE4_KIO_LIBS} ${KDE4_KFILE_LIBS})
+target_link_libraries(plasma_containment_plaindesktop ${KDE4_PLASMA_LIBS} ${KDE4_KIO_LIBS} ${KDE4_KFILE_LIBS})
else(WIN32)
-target_link_libraries(plasma_containment_desktop ${KDE4_PLASMA_LIBS} kworkspace ${KDE4_KIO_LIBS} ${KDE4_KFILE_LIBS} )
+target_link_libraries(plasma_containment_plaindesktop ${KDE4_PLASMA_LIBS} kworkspace ${KDE4_KIO_LIBS} ${KDE4_KFILE_LIBS} )
endif(WIN32)
-install(TARGETS plasma_containment_desktop DESTINATION ${PLUGIN_INSTALL_DIR})
-install(FILES plasma-containment-desktop.desktop DESTINATION ${SERVICES_INSTALL_DIR})
-install(FILES plasma_desktop_containment.kwinrules DESTINATION ${DATA_INSTALL_DIR}/kwin/default_rules)
+install(TARGETS plasma_containment_plaindesktop DESTINATION ${PLUGIN_INSTALL_DIR})
+install(FILES plasma-containment-plaindesktop.desktop DESTINATION ${SERVICES_INSTALL_DIR})
--- plasma/containments/plaindesktop/desktop.cpp 2009-05-14 22:29:52.000000000 +0200
+++ plasma/containments/plaindesktop/desktop.cpp 2009-05-15 14:07:28.000000000 +0200
@@ -59,7 +59,7 @@
using namespace Plasma;
DefaultDesktop::DefaultDesktop(QObject *parent, const QVariantList &args)
- : Containment(parent, args),
+ : Containment(parent, args, false),
m_addPanelsMenu(0),
m_lockDesktopAction(0),
m_appletBrowserAction(0),
--- plasma/containments/plaindesktop/plasma-containment-plaindesktop.desktop 2009-05-15 14:15:33.000000000 +0200
+++ plasma/containments/plaindesktop/plasma-containment-plaindesktop.desktop 2009-05-15 14:07:28.000000000 +0200
@@ -1,16 +1,16 @@
[Desktop Entry]
-Name=Desktop
-Comment=Default desktop containment
+Name=Plain Desktop
+Comment=Desktop without toolbox
Icon=user-desktop
Type=Service
X-KDE-ServiceTypes=Plasma/Applet,Plasma/Containment
X-Plasma-ContainmentCategories=desktop
NoDisplay=true
-X-KDE-Library=plasma_containment_desktop
+X-KDE-Library=plasma_containment_plaindesktop
X-KDE-PluginInfo-Author=The Plasma Team
X-KDE-PluginInfo-Email=panel-devel@kde.org
-X-KDE-PluginInfo-Name=desktop
+X-KDE-PluginInfo-Name=plaindesktop
X-KDE-PluginInfo-Version=1.0
X-KDE-PluginInfo-Website=http://plasma.kde.org/
X-KDE-PluginInfo-Category=Containments
Index: plasma/containments/CMakeLists.txt
===================================================================
--- plasma/containments/CMakeLists.txt (revision 968327)
+++ plasma/containments/CMakeLists.txt (working copy)
@@ -2,3 +2,4 @@
add_subdirectory(panel)
add_subdirectory(mid-panel)
add_subdirectory(screensaver)
+add_subdirectory(plaindesktop)
++++++ plasma-wallpaper-description.diff ++++++
Index: plasma/wallpapers/image/backgroundlistmodel.cpp
===================================================================
--- plasma/wallpapers/image/backgroundlistmodel.cpp.orig
+++ plasma/wallpapers/image/backgroundlistmodel.cpp
@@ -20,6 +20,8 @@
#include
#include <KProgressDialog>
#include <KStandardDirs>
+#include <KDesktopFile>
+#include <KConfigGroup>
#include
#include
@@ -326,7 +328,6 @@ void BackgroundFinder::start()
} else if(QFile::exists(wp.filePath() + "/metadata.desktop")) {
Plasma::PackageStructure::Ptr structure = Plasma::Wallpaper::packageStructure(m_structureParent);
Plasma::Package pkg(wp.filePath(), structure);
-
if (pkg.isValid() && (!m_container || !m_container->contains(pkg.path()))) {
if (setLabel) {
progress->setLabelText(i18n("Finding images for the wallpaper slideshow.") + "\n\n" +
++++++ startkde.diff ++++++
--- /var/tmp/diff_new_pack.C17696/_old 2009-05-20 00:02:51.000000000 +0200
+++ /var/tmp/diff_new_pack.C17696/_new 2009-05-20 00:02:51.000000000 +0200
@@ -2,7 +2,7 @@
===================================================================
--- startkde.cmake.orig
+++ startkde.cmake
-@@ -70,6 +70,9 @@ test -n "$KDEHOME" && kdehome=`echo "$KD
+@@ -80,6 +80,9 @@ test -n "$KDEHOME" && kdehome=`echo "$KD
mkdir -m 700 -p $kdehome
mkdir -m 700 -p $kdehome/share
mkdir -m 700 -p $kdehome/share/config
@@ -12,7 +12,7 @@
cat >$kdehome/share/config/startupconfigkeys <
#include
#include
-@@ -644,9 +645,16 @@ void KSMShutdownDlg::slotSuspend(QAction
+@@ -651,9 +652,16 @@ void KSMShutdownDlg::slotSuspend(QAction
{
m_bootOption.clear();
Solid::Control::PowerManager::SuspendMethod spdMethod = action->data().valueSolid::Control::PowerManager::SuspendMethod();
++++++ systemsettings-desktop.diff ++++++
--- /var/tmp/diff_new_pack.C17696/_old 2009-05-20 00:02:51.000000000 +0200
+++ /var/tmp/diff_new_pack.C17696/_new 2009-05-20 00:02:51.000000000 +0200
@@ -1,7 +1,7 @@
-Index: systemsettings/systemsettings.desktop
+Index: systemsettings/app/systemsettings.desktop
===================================================================
---- systemsettings/systemsettings.desktop.orig
-+++ systemsettings/systemsettings.desktop
+--- systemsettings/app/systemsettings.desktop.orig
++++ systemsettings/app/systemsettings.desktop
@@ -5,7 +5,7 @@ Type=Application
X-DocPath=systemsettings/index.html
X-KDE-StartupNotify=true
@@ -11,7 +11,7 @@
GenericName[ar]=إعدادات النظام
GenericName[be@latin]=Systemnyja nałady
GenericName[bg]=Системни настройки
-@@ -77,7 +77,7 @@ GenericName[x-test]=xxSystem Settingsxx
+@@ -78,7 +78,7 @@ GenericName[x-test]=xxSystem Settingsxx
GenericName[zh_CN]=系统设置
GenericName[zh_TW]=系統設定
@@ -20,9 +20,9 @@
Name[ar]=إعدادات النظام
Name[be]=Сістэмныя настаўленні
Name[be@latin]=Systemnyja nałady
-@@ -154,4 +154,4 @@ Name[zh_CN]=系统设置
+@@ -156,4 +156,4 @@ Name[zh_CN]=系统设置
Name[zh_TW]=系統設定
X-DBUS-StartupType=Unique
--Categories=Qt;KDE;System;
-+Categories=Qt;KDE;X-SuSE-core;Qt;Core;
+-Categories=Qt;KDE;Settings;
++Categories=Qt;KDE;Settings;X-SuSE-core;Qt;Core;
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org