rev 13748 - in branches/kde4.2/packages/kdebase-workspace/debian: . patches

[George Kiagiadakis]

Author: gkiagia-guest
Date: 2009-02-07 17:57:32 +0000 (Sat, 07 Feb 2009)
New Revision: 13748

Added:
   branches/kde4.2/packages/kdebase-workspace/debian/patches/01_r922805_kdm_qt4.5_crash_fix.diff
Modified:
   branches/kde4.2/packages/kdebase-workspace/debian/changelog
   branches/kde4.2/packages/kdebase-workspace/debian/patches/series
Log:
Backport the fix for kdm crashing with Qt 4.5 (r922803 on trunk, r922805 on 4.2 branch).


Modified: branches/kde4.2/packages/kdebase-workspace/debian/changelog
===================================================================
--- branches/kde4.2/packages/kdebase-workspace/debian/changelog	2009-02-07 17:54:16 UTC (rev 13747)
+++ branches/kde4.2/packages/kdebase-workspace/debian/changelog	2009-02-07 17:57:32 UTC (rev 13748)
@@ -22,8 +22,13 @@
 
   * Add replaces: systemsettings (<< 4:4.1.80) (Closes: #507380).
 
- -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 07 Feb 2009 18:37:06 +0100
+  +++ Changes by George Kiagiadakis:
 
+  * Add patch 01_r922805_kdm_qt4.5_crash_fix.diff from upstream, which fixes
+    a kdm crash with Qt 4.5-rc1.
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 07 Feb 2009 18:46:22 +0200
+
 kdebase-workspace (4:4.2.0-1) experimental; urgency=low
 
   * New upstream release.

Added: branches/kde4.2/packages/kdebase-workspace/debian/patches/01_r922805_kdm_qt4.5_crash_fix.diff
===================================================================
--- branches/kde4.2/packages/kdebase-workspace/debian/patches/01_r922805_kdm_qt4.5_crash_fix.diff	                        (rev 0)
+++ branches/kde4.2/packages/kdebase-workspace/debian/patches/01_r922805_kdm_qt4.5_crash_fix.diff	2009-02-07 17:57:32 UTC (rev 13748)
@@ -0,0 +1,42 @@
+Index: kdebase-workspace/kdm/kfrontend/kgapp.cpp
+===================================================================
+--- kdebase-workspace.orig/kdm/kfrontend/kgapp.cpp	2009-02-07 18:43:54.000000000 +0200
++++ kdebase-workspace/kdm/kfrontend/kgapp.cpp	2009-02-07 18:44:31.000000000 +0200
+@@ -70,7 +70,7 @@
+ 
+ }
+ 
+-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 @@
+ 	}
+ 
+ 	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/kdm/kfrontend/kgapp.h
+===================================================================
+--- kdebase-workspace.orig/kdm/kfrontend/kgapp.h	2009-02-07 18:43:54.000000000 +0200
++++ kdebase-workspace/kdm/kfrontend/kgapp.h	2009-02-07 18:44:18.000000000 +0200
+@@ -35,7 +35,7 @@
+ 	typedef QApplication inherited;
+ 
+   public:
+-	GreeterApp(int argc, char **argv);
++	GreeterApp(int &argc, char **argv);
+ 	virtual bool x11EventFilter( XEvent * );
+ 
+   protected:

Modified: branches/kde4.2/packages/kdebase-workspace/debian/patches/series
===================================================================
--- branches/kde4.2/packages/kdebase-workspace/debian/patches/series	2009-02-07 17:54:16 UTC (rev 13747)
+++ branches/kde4.2/packages/kdebase-workspace/debian/patches/series	2009-02-07 17:57:32 UTC (rev 13748)
@@ -1,3 +1,4 @@
+01_r922805_kdm_qt4.5_crash_fix.diff
 06_kdm_does_not_wreak_havoc.diff
 07_kdmrc_defaults.diff
 08_genkdmconf.diff