rev 13750 - branches/kde4.2/packages/kdebase-workspace/debian/patches

Fathi Boudra fabo at alioth.debian.org
Sun Feb 8 13:11:08 UTC 2009


Author: fabo
Date: 2009-02-08 13:11:07 +0000 (Sun, 08 Feb 2009)
New Revision: 13750

Modified:
   branches/kde4.2/packages/kdebase-workspace/debian/patches/01_r922805_kdm_qt4.5_crash_fix.diff
   branches/kde4.2/packages/kdebase-workspace/debian/patches/06_kdm_does_not_wreak_havoc.diff
Log:
Fix patch 06. build++.
Refresh patch 01. Thanks gkiagia :)


Modified: 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	2009-02-07 19:07:36 UTC (rev 13749)
+++ branches/kde4.2/packages/kdebase-workspace/debian/patches/01_r922805_kdm_qt4.5_crash_fix.diff	2009-02-08 13:11:07 UTC (rev 13750)
@@ -1,8 +1,9 @@
-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 @@
+fix crash with qt 4.5.
+argc is passed to qapp by ref and needs to outlive the ctor
+
+--- a/kdm/kfrontend/kgapp.cpp
++++ b/kdm/kfrontend/kgapp.cpp
+@@ -70,7 +70,7 @@ sigAlarm( int )
  
  }
  
@@ -11,7 +12,7 @@
  	inherited( argc, argv ),
  	regrabPtr( false ), regrabKbd( false ),
  	dragWidget( 0 )
-@@ -296,13 +296,14 @@
+@@ -296,13 +296,14 @@ main( int argc ATTR_UNUSED, char **argv 
  	}
  
  	static char *fakeArgv[] = { (char *)"kdmgreet", 0 };
@@ -27,11 +28,9 @@
  	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 @@
+--- a/kdm/kfrontend/kgapp.h
++++ b/kdm/kfrontend/kgapp.h
+@@ -35,7 +35,7 @@ class GreeterApp : public QApplication {
  	typedef QApplication inherited;
  
    public:

Modified: branches/kde4.2/packages/kdebase-workspace/debian/patches/06_kdm_does_not_wreak_havoc.diff
===================================================================
--- branches/kde4.2/packages/kdebase-workspace/debian/patches/06_kdm_does_not_wreak_havoc.diff	2009-02-07 19:07:36 UTC (rev 13749)
+++ branches/kde4.2/packages/kdebase-workspace/debian/patches/06_kdm_does_not_wreak_havoc.diff	2009-02-08 13:11:07 UTC (rev 13750)
@@ -1,15 +1,14 @@
 --- a/kdm/kfrontend/genkdmconf.c
 +++ b/kdm/kfrontend/genkdmconf.c
-@@ -2998,9 +2998,9 @@ int main( int argc, char **argv )
+@@ -2998,9 +2998,11 @@ int main( int argc, char **argv )
  				memcmp( oldkde + olen - sizeof(SHR_CONF) + 1,
  						SHR_CONF, sizeof(SHR_CONF) ))
  			{
--				fprintf( stderr,
--				         "Warning: --old-kde does not end with " SHR_CONF ". "
--				         "Might wreak havoc.\n" );
-+				//fprintf( stderr,
-+				//         "Warning: --old-kde does not end with " SHR_CONF ". "
-+				//         "Might wreak havoc.\n" );
++				/*
+ 				fprintf( stderr,
+ 				         "Warning: --old-kde does not end with " SHR_CONF ". "
+ 				         "Might wreak havoc.\n" );
++				*/
  				oldkdepfx = oldkde;
  			} else
  				ASPrintf( (char **)&oldkdepfx,




More information about the pkg-kde-commits mailing list