summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexey Shvetsov <alexxy@gentoo.org>2009-06-14 13:07:08 +0000
committerAlexey Shvetsov <alexxy@gentoo.org>2009-06-14 13:07:08 +0000
commite111eedb18603a760995507617963ebc806184eb (patch)
tree26e09bfb2801b771a1a992c99a144de7f9a815e3 /kde-base/kdm/files
parent[kde-base/kdewebdev] Clean unneeded patches (diff)
downloadgentoo-2-e111eedb18603a760995507617963ebc806184eb.tar.gz
gentoo-2-e111eedb18603a760995507617963ebc806184eb.tar.bz2
gentoo-2-e111eedb18603a760995507617963ebc806184eb.zip
[kde-base/kdm] Clean unneeded patches
(Portage version: 2.2_rc33/cvs/Linux x86_64)
Diffstat (limited to 'kde-base/kdm/files')
-rw-r--r--kde-base/kdm/files/kdm-3.5.8-login.diff40
-rw-r--r--kde-base/kdm/files/kdm-4.2.0-qt4.5.patch27
-rw-r--r--kde-base/kdm/files/kdm-4.2.0-qt4.5_h.patch11
3 files changed, 0 insertions, 78 deletions
diff --git a/kde-base/kdm/files/kdm-3.5.8-login.diff b/kde-base/kdm/files/kdm-3.5.8-login.diff
deleted file mode 100644
index 790987adfdb4..000000000000
--- a/kde-base/kdm/files/kdm-3.5.8-login.diff
+++ /dev/null
@@ -1,40 +0,0 @@
---- kdm/backend/inifile.c
-+++ kdm/backend/inifile.c
-@@ -37,6 +37,7 @@
- #include "dm_error.h"
-
- #include <sys/types.h>
-+#include <sys/stat.h>
- #include <unistd.h>
- #include <stdlib.h>
- #include <string.h>
-@@ -47,17 +48,27 @@
- {
- char *data;
- int fd, len;
-+ struct stat st;
-
- if ((fd = open( fname, O_RDONLY | O_NONBLOCK )) < 0) {
- Debug( "cannot open ini-file %\"s: %m", fname );
- return 0;
- }
-- len = lseek( fd, 0, SEEK_END );
-+ if (fstat( fd, &st ) || !S_ISREG( st.st_mode )) {
-+ LogWarn( "Ini-file %\"s is no regular file\n", fname );
-+ close( fd );
-+ return 0;
-+ }
-+ if (st.st_size >= 0x10000) {
-+ LogWarn( "Ini-file %\"s is too big\n", fname );
-+ close( fd );
-+ return 0;
-+ }
-+ len = st.st_size;
- if (!(data = Malloc( len + 2 ))) {
- close( fd );
- return 0;
- }
-- lseek( fd, 0, SEEK_SET );
- if (read( fd, data, len ) != len) {
- Debug( "cannot read ini-file %\"s: %m", fname );
- free( data );
diff --git a/kde-base/kdm/files/kdm-4.2.0-qt4.5.patch b/kde-base/kdm/files/kdm-4.2.0-qt4.5.patch
deleted file mode 100644
index f452135bfb0b..000000000000
--- a/kde-base/kdm/files/kdm-4.2.0-qt4.5.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- kdm/kfrontend/kgapp.cpp 2009/01/06 17:13:38 906699
-+++ kdm/kfrontend/kgapp.cpp 2009/02/07 15:59:44 922805
-@@ -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();
diff --git a/kde-base/kdm/files/kdm-4.2.0-qt4.5_h.patch b/kde-base/kdm/files/kdm-4.2.0-qt4.5_h.patch
deleted file mode 100644
index c8f4576eef93..000000000000
--- a/kde-base/kdm/files/kdm-4.2.0-qt4.5_h.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- kdm/kfrontend/kgapp.h 2009/01/06 17:13:38 906699
-+++ kdm/kfrontend/kgapp.h 2009/02/07 15:59:44 922805
-@@ -35,7 +35,7 @@
- typedef QApplication inherited;
-
- public:
-- GreeterApp(int argc, char **argv);
-+ GreeterApp(int &argc, char **argv);
- virtual bool x11EventFilter( XEvent * );
-
- protected: