rpms/kdebase-workspace/F-10 kdebase-workspace-4.2.0-kde#181199.patch, NONE, 1.1 kdebase-workspace-4.2.0-kdm-qt45.patch, NONE, 1.1 kdebase-workspace.spec, 1.155, 1.156

[Kevin Kofler]

Author: kkofler

Update of /cvs/pkgs/rpms/kdebase-workspace/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31382/F-10

Modified Files:
	kdebase-workspace.spec 
Added Files:
	kdebase-workspace-4.2.0-kde#181199.patch 
	kdebase-workspace-4.2.0-kdm-qt45.patch 
Log Message:
Sync from devel:

* Mon Feb 162009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.2.0-10
- fix shutdown dialog not centered, sometimes entirely off screen (kde#181199)

* Wed Feb 11 2009 Than Ngo <than at redhat.com> - 4.2.0-9
- fix kdm crash with Qt-4.5

kdebase-workspace-4.2.0-kde#181199.patch:

--- NEW FILE kdebase-workspace-4.2.0-kde#181199.patch ---
Index: ksmserver/shutdowndlg.cpp
===================================================================
--- ksmserver/shutdowndlg.cpp	(Revision 915365)
+++ ksmserver/shutdowndlg.cpp	(Revision 915366)
@@ -604,6 +604,8 @@
         m_svg->paint(&p, QRect(0, 0, width(), height()), "background");
         setMask(mask);
     }
+
+    KDialog::centerOnScreen(this);
 }
 
 void KSMShutdownDlg::slotLogout()

kdebase-workspace-4.2.0-kdm-qt45.patch:

--- NEW FILE kdebase-workspace-4.2.0-kdm-qt45.patch ---
diff -up kdebase-workspace-4.2.0/kdm/kfrontend/kgapp.h.orig kdebase-workspace-4.2.0/kdm/kfrontend/kgapp.h
--- kdebase-workspace-4.2.0/kdm/kfrontend/kgapp.h.orig	2009-02-11 15:57:52.000000000 +0100
+++ kdebase-workspace-4.2.0/kdm/kfrontend/kgapp.h	2009-02-11 15:58:20.000000000 +0100
@@ -35,7 +35,7 @@ class GreeterApp : public QApplication {
 	typedef QApplication inherited;
 
   public:
-	GreeterApp(int argc, char **argv);
+	GreeterApp(int &argc, char **argv);
 	virtual bool x11EventFilter( XEvent * );
 
   protected:
diff -up kdebase-workspace-4.2.0/kdm/kfrontend/kgapp.cpp.orig kdebase-workspace-4.2.0/kdm/kfrontend/kgapp.cpp
--- kdebase-workspace-4.2.0/kdm/kfrontend/kgapp.cpp.orig	2009-02-11 16:16:28.000000000 +0100
+++ kdebase-workspace-4.2.0/kdm/kfrontend/kgapp.cpp	2009-02-11 16:22:15.000000000 +0100
@@ -70,7 +70,7 @@ sigAlarm( int )
 
 }
 
-GreeterApp::GreeterApp( int argc, char **argv ) :
+GreeterApp::GreeterApp( int &argc, char **argv ) :
 	inherited( argc, argv ),
 	regrabPtr( false ), regrabKbd( false ),
 	dragWidget( 0 )
@@ -296,13 +296,14 @@ main( int argc ATTR_UNUSED, char **argv 
 	}
 
 	static char *fakeArgv[] = { (char *)"kdmgreet", 0 };
+	static int fakeArgc = as(fakeArgv) - 1;
 
 	KCrash::setFlags( KCrash::KeepFDs | KCrash::SaferDialog | KCrash::AlwaysDirectly );
 	KCrash::setApplicationName( QLatin1String( fakeArgv[0] ) );
 	KCrash::setCrashHandler( KCrash::defaultCrashHandler );
 	XSetIOErrorHandler( xIOErr );
 	KComponentData inst( fakeArgv[0] );
-	GreeterApp app( as(fakeArgv) - 1, fakeArgv );
+	GreeterApp app( fakeArgc, fakeArgv );
 	foreach (const QString &dir, KGlobal::dirs()->resourceDirs( "qtplugins" ))
 		app.addLibraryPath( dir );
 	initQAppConfig();


Index: kdebase-workspace.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-workspace/F-10/kdebase-workspace.spec,v
retrieving revision 1.155
retrieving revision 1.156
diff -u -r1.155 -r1.156
--- kdebase-workspace.spec	9 Feb 2009 19:41:00 -0000	1.155
+++ kdebase-workspace.spec	16 Feb 2009 04:38:24 -0000	1.156
@@ -8,7 +8,7 @@
 Name: kdebase-workspace
 Version: 4.2.0
 
-Release: 8%{?dist}
+Release: 10%{?dist}
 Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdebase-workspace-%{version}.tar.bz2
 License: GPLv2
 Group: User Interface/Desktops
@@ -38,7 +38,12 @@
 # 0.3 requires BlueZ 4 and the patch above
 Patch102: kdebase-workspace-4.2.0-bluetooth-revert.patch
 # http://bugs.kde.org/180576
-Patch103:  kdebase-workspace-4.2.0-kde#180576.patch
+Patch103: kdebase-workspace-4.2.0-kde#180576.patch
+Patch104: kdebase-workspace-4.2.0-kdm-qt45.patch
+# http://bugs.kde.org/show_bug.cgi?id=181199
+# http://websvn.kde.org/?view=rev&revision=915366
+# fix shutdown dialog not centered, sometimes entirely off screen (from 4.2.1)
+Patch105: kdebase-workspace-4.2.0-kde#181199.patch
 
 # FIXME: "inconsistent naming System Monitor vs KSysGuard" http://bugs.kde.org/162151
 
@@ -205,7 +210,8 @@
 %patch101 -p0 -b .solid-bluetoothTrunkTo42
 %endif
 %patch103 -p1 -b .kde#180576
-
+%patch104 -p1 -b .kdm-qt45
+%patch105 -p0 -b .kde#181199
 
 %build
 
@@ -331,6 +337,12 @@
 
 
 %changelog
+* Mon Feb 162009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.2.0-10
+- fix shutdown dialog not centered, sometimes entirely off screen (kde#181199)
+
+* Wed Feb 11 2009 Than Ngo <than at redhat.com> - 4.2.0-9
+- fix kdm crash with Qt-4.5
+
 * Mon Feb 09 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.0-8
 - kickoff logout shuts down system (#484737, kdebug#180576)