[packages/kdebase/dev-trinity] kdebase-kdmconfig.patch: more /etc/X11/kdm changes in source

[glen]

commit db8a32fb9fca27e08cc1acbff3cd23ad477ed20d
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Wed Jun 4 11:59:57 2014 +0300

    kdebase-kdmconfig.patch: more /etc/X11/kdm changes in source

 kdebase-kdmconfig.patch | 45 +++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 45 insertions(+)
---
diff --git a/kdebase-kdmconfig.patch b/kdebase-kdmconfig.patch
index d36b706..03d51fa 100644
--- a/kdebase-kdmconfig.patch
+++ b/kdebase-kdmconfig.patch
@@ -66,6 +66,51 @@
    }
  
    TQVBoxLayout *top = new TQVBoxLayout(this);
+--- kdebase-trinity-3.5.13.2/kcontrol/screensaver/scrnsave.cpp~	2014-06-03 23:19:33.000000000 +0300
++++ kdebase-trinity-3.5.13.2/kcontrol/screensaver/scrnsave.cpp	2014-06-04 11:12:35.914596433 +0300
+@@ -51,11 +51,11 @@
+ #include <fixx11h.h>
+ 
+ #define OPEN_TDMCONFIG_AND_SET_GROUP									\
+-if( stat( KDE_CONFDIR "/kdm/kdmdistrc" , &st ) == 0) {							\
+-	mTDMConfig = new KSimpleConfig( TQString::fromLatin1( KDE_CONFDIR "/kdm/kdmdistrc" ));		\
++if( stat( "/etc/X11/kdm/kdmdistrc" , &st ) == 0) {							\
++	mTDMConfig = new KSimpleConfig( TQString::fromLatin1( "/etc/X11/kdm/kdmdistrc" ));		\
+ }													\
+ else {													\
+-	mTDMConfig = new KSimpleConfig( TQString::fromLatin1( KDE_CONFDIR "/kdm/kdmrc" ));		\
++	mTDMConfig = new KSimpleConfig( TQString::fromLatin1( "/etc/X11/kdm/kdmrc" ));		\
+ }													\
+ mTDMConfig->setGroup("X-*-Greeter");
+ 
+--- kdebase-trinity-3.5.13.2/kdesktop/lock/main.cc~	2013-05-06 11:08:22.000000000 +0300
++++ kdebase-trinity-3.5.13.2/kdesktop/lock/main.cc	2014-06-04 11:13:06.705992318 +0300
+@@ -52,11 +52,11 @@
+ #endif
+ 
+ #define OPEN_TDMCONFIG_AND_SET_GROUP									\
+-if( stat( KDE_CONFDIR "/kdm/kdmdistrc" , &st ) == 0) {							\
+-	tdmconfig = new KSimpleConfig( TQString::fromLatin1( KDE_CONFDIR "/kdm/kdmdistrc" ));		\
++if( stat( "/etc/X11/kdm/kdmdistrc" , &st ) == 0) {							\
++	tdmconfig = new KSimpleConfig( TQString::fromLatin1( "/etc/X11/kdm/kdmdistrc" ));		\
+ }													\
+ else {													\
+-	tdmconfig = new KSimpleConfig( TQString::fromLatin1( KDE_CONFDIR "/kdm/kdmrc" ));		\
++	tdmconfig = new KSimpleConfig( TQString::fromLatin1( "/etc/X11/kdm/kdmrc" ));		\
+ }													\
+ tdmconfig->setGroup("X-*-Greeter");
+ 
+--- kdebase-trinity-3.5.13.2/kdm/kfrontend/kdmctl.c~	2013-03-04 19:36:45.000000000 +0200
++++ kdebase-trinity-3.5.13.2/kdm/kfrontend/kdmctl.c	2014-06-04 11:13:21.883347041 +0300
+@@ -146,7 +146,7 @@
+ {
+ 	char *dpy = getenv( "DISPLAY" );
+ 	const char *ctl = getenv( "DM_CONTROL" );
+-	const char *cfg = KDE_CONFDIR "/kdm/kdmrc";
++	const char *cfg = "/etc/X11/kdm/kdmrc";
+ 	char *ptr;
+ 	int fd;
+ 
 --- kdebase-030930/kdm/kfrontend/Makefile.am~	2003-09-30 00:47:50.000000000 +0200
 +++ kdebase-030930/kdm/kfrontend/Makefile.am	2003-09-30 10:06:29.000000000 +0200
 @@ -38,7 +38,7 @@
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/kdebase.git/commitdiff/f59a30135a5137d2c2904517cb7332a2714f9ab0