Wed Jul 7 17:27:35 UTC 2010

Author: rdieter

Update of /cvs/pkgs/rpms/kdebase-workspace/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv27917

Modified Files:
	.cvsignore kdebase-workspace.spec sources 
Added Files:
	kdebase-workspace-4.4.92-classicmenu-logout.patch 
	kdebase-workspace-4.4.92-systemsettings_onlyshowin_kde.patch 
	kdebase-workspace-4.4.92-xsession_errors_O_APPEND.patch 
Removed Files:
	kdebase-workspace-4.3.75-show_systemsettings.patch 
	kdebase-workspace-4.3.80-xsession_errors_O_APPEND.patch 
	kdebase-workspace-4.3.95-brightness_keys.patch 
	kdebase-workspace-4.4.0-classicmenu-logout.patch 
Log Message:
First pass at it, still need to rebase plymouth patch

* Wed Jul 07 2010 Rex Dieter <rdieter at fedoraproject.org> - 4.4.92-1
- 4.5 RC2 (4.4.92)


kdebase-workspace-4.4.92-classicmenu-logout.patch:
 core/itemhandlers.cpp         |    7 ++++++-
 simpleapplet/simpleapplet.cpp |    4 ++++
 simpleapplet/simpleapplet.h   |    3 ++-
 3 files changed, 12 insertions(+), 2 deletions(-)

--- NEW FILE kdebase-workspace-4.4.92-classicmenu-logout.patch ---
diff -up kdebase-workspace-4.4.92/plasma/desktop/applets/kickoff/core/itemhandlers.cpp.classicmenu-logout kdebase-workspace-4.4.92/plasma/desktop/applets/kickoff/core/itemhandlers.cpp
--- kdebase-workspace-4.4.92/plasma/desktop/applets/kickoff/core/itemhandlers.cpp.classicmenu-logout	2010-01-06 11:00:18.000000000 -0600
+++ kdebase-workspace-4.4.92/plasma/desktop/applets/kickoff/core/itemhandlers.cpp	2010-07-07 12:21:02.507932611 -0500
@@ -110,7 +110,8 @@ bool LeaveItemHandler::openUrl(const KUr
         QTimer::singleShot(0, this, SLOT(switchUser()));
         return true;
     } else if (m_logoutAction == "logout" || m_logoutAction == "logoutonly" ||
-               m_logoutAction == "restart" || m_logoutAction == "shutdown") {
+               m_logoutAction == "restart" || m_logoutAction == "shutdown" ||
+               m_logoutAction == "leave") {
         // decouple dbus call, otherwise we'll run into a dead-lock
         QTimer::singleShot(0, this, SLOT(logout()));
         return true;
@@ -163,6 +164,10 @@ void LeaveItemHandler::logout()
         type = KWorkSpace::ShutdownTypeReboot;
     } else if (m_logoutAction == "shutdown") {
         type = KWorkSpace::ShutdownTypeHalt;
+    } else if (m_logoutAction == "leave") {
+        // This one brings up the dialog, for use in the classic menu.
+        confirm = KWorkSpace::ShutdownConfirmYes;
+        type = KWorkSpace::ShutdownTypeDefault;
     }
 
 //FIXME: the proper fix is to implement the KWorkSpace methods for Windows
diff -up kdebase-workspace-4.4.92/plasma/desktop/applets/kickoff/simpleapplet/simpleapplet.cpp.classicmenu-logout kdebase-workspace-4.4.92/plasma/desktop/applets/kickoff/simpleapplet/simpleapplet.cpp
--- kdebase-workspace-4.4.92/plasma/desktop/applets/kickoff/simpleapplet/simpleapplet.cpp.classicmenu-logout	2010-07-07 04:44:56.000000000 -0500
+++ kdebase-workspace-4.4.92/plasma/desktop/applets/kickoff/simpleapplet/simpleapplet.cpp	2010-07-07 12:22:14.298172379 -0500
@@ -209,6 +209,7 @@ public:
             case Shutdown:                 return i18n("Shut down");
             case Logout:                   return i18n("Log out");
             case Leave:                    return i18n("Leave");
+            case LeaveDialog:              return i18n("Leave...");	
         }
         return QString();
     }
@@ -234,6 +235,7 @@ public:
             case Shutdown:                 return "system-shutdown";
             case Logout:                   return "system-log-out";
             case Leave:                    return "system-shutdown";
+            case LeaveDialog:              return "system-shutdown";
         }
         return QString();
     }
@@ -725,6 +727,8 @@ void MenuLauncherApplet::showMenu(bool p
                 menuview->addAction(KIcon(d->viewIcon(LockScreen)), d->viewText(LockScreen))->setData(KUrl("leave:/lock"));
             } else if(vtname == "Logout") {
                 menuview->addAction(KIcon(d->viewIcon(Logout)), d->viewText(Logout))->setData(KUrl("leave:/logout"));
+            } else if(vtname == "LeaveDialog") {
+                menuview->addAction(KIcon(d->viewIcon(LeaveDialog)), d->viewText(LeaveDialog))->setData(KUrl("leave:/leave"));
             } else if(vtname == "Leave") {
                 Kickoff::LeaveModel *leavemodel = new Kickoff::LeaveModel(menuview);
                 leavemodel->updateModel();
diff -up kdebase-workspace-4.4.92/plasma/desktop/applets/kickoff/simpleapplet/simpleapplet.h.classicmenu-logout kdebase-workspace-4.4.92/plasma/desktop/applets/kickoff/simpleapplet/simpleapplet.h
--- kdebase-workspace-4.4.92/plasma/desktop/applets/kickoff/simpleapplet/simpleapplet.h.classicmenu-logout	2010-06-06 15:35:40.000000000 -0500
+++ kdebase-workspace-4.4.92/plasma/desktop/applets/kickoff/simpleapplet/simpleapplet.h	2010-07-07 12:21:02.509931144 -0500
@@ -59,7 +59,8 @@ public:
         Restart, ///< Restart Action
         Shutdown, ///< Shutdown Action
         Logout, ///< Logout Action
-        Leave ///< Leave Menu
+        Leave, ///< Leave Menu
+        LeaveDialog ///< Leave Dialog Action
     };
 
     /**

kdebase-workspace-4.4.92-systemsettings_onlyshowin_kde.patch:
 systemsettings.desktop |    1 +
 1 file changed, 1 insertion(+)

--- NEW FILE kdebase-workspace-4.4.92-systemsettings_onlyshowin_kde.patch ---
diff -up kdebase-workspace-4.4.92/plasma/desktop/applets/kickoff/core/applicationmodel.cpp.show_systemsettings kdebase-workspace-4.4.92/plasma/desktop/applets/kickoff/core/applicationmodel.cpp
diff -up kdebase-workspace-4.4.92/systemsettings/app/systemsettings.desktop.show_systemsettings kdebase-workspace-4.4.92/systemsettings/app/systemsettings.desktop
--- kdebase-workspace-4.4.92/systemsettings/app/systemsettings.desktop.show_systemsettings	2010-04-28 03:01:06.000000000 -0500
+++ kdebase-workspace-4.4.92/systemsettings/app/systemsettings.desktop	2010-07-07 12:18:40.197921854 -0500
@@ -169,3 +169,4 @@ Name[zh_TW]=系統設定
 
 X-DBUS-StartupType=Unique
 Categories=Qt;KDE;Settings;
+OnlyShowIn=KDE;

kdebase-workspace-4.4.92-xsession_errors_O_APPEND.patch:
 client.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE kdebase-workspace-4.4.92-xsession_errors_O_APPEND.patch ---
diff -up kdebase-workspace-4.4.92/kdm/backend/client.c.xsession_errors_O_APPEND kdebase-workspace-4.4.92/kdm/backend/client.c
--- kdebase-workspace-4.4.92/kdm/backend/client.c.xsession_errors_O_APPEND	2010-07-06 01:54:30.000000000 -0500
+++ kdebase-workspace-4.4.92/kdm/backend/client.c	2010-07-07 12:27:24.901922619 -0500
@@ -1223,7 +1223,7 @@ createClientLog(const char *log)
         if (!(lname = expandMacros(log, macros)))
             exit(1);
         unlink(lname);
-        if ((lfd = open(lname, O_WRONLY|O_CREAT|O_EXCL, 0600)) >= 0) {
+        if ((lfd = open(lname, O_WRONLY|O_CREAT|O_EXCL|O_APPEND, 0600)) >= 0) {
             dup2(lfd, 1);
             dup2(lfd, 2);
             close(lfd);


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-workspace/devel/.cvsignore,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -p -r1.55 -r1.56
--- .cvsignore	25 Jun 2010 15:26:09 -0000	1.55
+++ .cvsignore	7 Jul 2010 17:27:34 -0000	1.56
@@ -1 +1 @@
-kdebase-workspace-4.4.90.tar.bz2
+kdebase-workspace-4.4.92.tar.bz2


Index: kdebase-workspace.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-workspace/devel/kdebase-workspace.spec,v
retrieving revision 1.413
retrieving revision 1.414
diff -u -p -r1.413 -r1.414
--- kdebase-workspace.spec	25 Jun 2010 22:51:24 -0000	1.413
+++ kdebase-workspace.spec	7 Jul 2010 17:27:35 -0000	1.414
@@ -12,8 +12,8 @@
 
 Summary: KDE Workspace
 Name:    kdebase-workspace
-Version: 4.4.90
-Release: 2%{?dist}
+Version: 4.4.92
+Release: 1%{?dist}
 
 License: GPLv2
 Group:   User Interface/Desktops
@@ -23,7 +23,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version
 
 Patch1: kdebase-workspace-4.4.80-redhat-startkde.patch
 Patch2: kdebase-workspace-4.3.98-plasma-konsole.patch
-Patch3: kdebase-workspace-4.3.75-show_systemsettings.patch
+Patch3: kdebase-workspace-4.4.92-systemsettings_onlyshowin_kde.patch
 %if 0%{?polkit_1}
 Patch4: kdebase-workspace-4.3.95-ck-shutdown.patch
 %else
@@ -44,11 +44,11 @@ Patch16: kdebase-workspace-4.4.80-batter
 # allow adding a "Leave..." button which brings up the complete shutdown dialog
 # to the classic menu (as in KDE <= 4.2.x); the default is still the upstream
 # default Leave submenu
-Patch17: kdebase-workspace-4.4.0-classicmenu-logout.patch
+Patch17: kdebase-workspace-4.4.92-classicmenu-logout.patch
 Patch18: kdebase-workspace-4.4.2-kdm_plymouth.patch
 # kubuntu kudos! bulletproof-X bits ripped out
 Patch19: kdebase-workspace-4.4.80-kdm_plymouth081.patch
-Patch20: kdebase-workspace-4.3.80-xsession_errors_O_APPEND.patch
+Patch20: kdebase-workspace-4.4.92-xsession_errors_O_APPEND.patch
 # support the widgetStyle4 hack in the Qt KDE platform plugin
 Patch21: kdebase-workspace-4.3.98-platformplugin-widgetstyle4.patch
 # fix the Games menu in the classic menu mixing up Name and Description
@@ -288,7 +288,7 @@ Requires: akonadi
 # RH/Fedora-specific startkde changes
 %patch1 -p1 -b .redhat-startkde
 %patch2 -p1 -b .plasma-konsole
-%patch3 -p1 -b .show_systemsettings
+%patch3 -p1 -b .systemsettings_onlyshowin_kde
 # ConsoleKit >= 0.2.4 shutdown/reboot support (needed for GDM 2.22)
 %patch4 -p1 -b .ck-shutdown
 %patch7 -p0 -b .krdb
@@ -689,6 +689,9 @@ fi
 
 
 %changelog
+* Wed Jul 07 2010 Rex Dieter <rdieter at fedoraproject.org> - 4.4.92-1
+- 4.5 RC2 (4.4.92)
+
 * Fri Jun 25 2010 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.4.90-2
 - port and reapply rootprivs (#434824) patch
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-workspace/devel/sources,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -p -r1.63 -r1.64
--- sources	25 Jun 2010 15:26:10 -0000	1.63
+++ sources	7 Jul 2010 17:27:35 -0000	1.64
@@ -1 +1 @@
-b9b231bae1077bc6c3a960d1caad1038  kdebase-workspace-4.4.90.tar.bz2
+35c13bd20bf26bdbd66b3b3ab974ad7a  kdebase-workspace-4.4.92.tar.bz2


--- kdebase-workspace-4.3.75-show_systemsettings.patch DELETED ---


--- kdebase-workspace-4.3.80-xsession_errors_O_APPEND.patch DELETED ---


--- kdebase-workspace-4.3.95-brightness_keys.patch DELETED ---


--- kdebase-workspace-4.4.0-classicmenu-logout.patch DELETED ---

