kde4-kdebase-workspace-kdmconfig.patch

   1 diff -urN kdebase-workspace-4.2.1.org/doc/kdm/index.docbook kdebase-workspace-4.2.1/doc/kdm/index.docbook
   2 --- kdebase-workspace-4.2.1.org/doc/kdm/index.docbook   2008-05-29 13:18:56.000000000 +0200
   3 +++ kdebase-workspace-4.2.1/doc/kdm/index.docbook       2009-03-02 20:47:03.479423152 +0100
   4 @@ -317,7 +317,7 @@
   5  system, and that you simply want to change its behavior in some way.</para>
   6
   7  <para>When &kdm; starts up, it reads its configuration from the folder
   8 -<filename class="directory">$<envar>KDEDIR</envar>/share/config/kdm/</filename>
   9 +<filename class="directory">/etc/X11/kdm/</filename>
  10  (this may
  11  be <filename class="directory">/etc/kde4/kdm/</filename> or something else
  12  on your system).</para>
  13 diff -urN kdebase-workspace-4.2.1.org/kcontrol/fonts/fonts.cpp kdebase-workspace-4.2.1/kcontrol/fonts/fonts.cpp
  14 --- kdebase-workspace-4.2.1.org/kcontrol/fonts/fonts.cpp        2008-12-21 21:19:15.000000000 +0100
  15 +++ kdebase-workspace-4.2.1/kcontrol/fonts/fonts.cpp    2009-03-02 20:47:03.479423152 +0100
  16 @@ -643,7 +643,7 @@
  17         "<p>The use of this option is generally discouraged. For selecting proper DPI"
  18         " value a better option is explicitly configuring it for the whole X server if"
  19         " possible (e.g. DisplaySize in xorg.conf or adding <i>-dpi value</i> to"
  20 -       " ServerLocalArgs= in $KDEDIR/share/config/kdm/kdmrc). When fonts do not render"
  21 +       " ServerLocalArgs= in /etc/X11/kdm/kdmrc). When fonts do not render"
  22         " properly with real DPI value better fonts should be used or configuration"
  23         " of font hinting should be checked.</p>" );
  24     comboForceDpi->setWhatsThis(whatsthis);
  25 diff -urN kdebase-workspace-4.2.1.org/kcontrol/kdm/background.cpp kdebase-workspace-4.2.1/kcontrol/kdm/background.cpp
  26 --- kdebase-workspace-4.2.1.org/kcontrol/kdm/background.cpp     2008-07-03 07:05:24.000000000 +0200
  27 +++ kdebase-workspace-4.2.1/kcontrol/kdm/background.cpp 2009-03-02 20:47:03.479423152 +0100
  28 @@ -45,7 +45,7 @@
  29                 " specified in the Setup= option in kdmrc (usually Xsetup).") );
  30         m_simpleConf = KSharedConfig::openConfig(
  31                 config->group( "X-*-Greeter" ).readEntry(
  32 -                       "BackgroundCfg", KDE_CONFDIR "/kdm/backgroundrc" ) );
  33 +                       "BackgroundCfg", "/etc/X11/kdm/backgroundrc" ) );
  34         m_background = new BGDialog( this, m_simpleConf );
  35
  36         connect( m_background, SIGNAL(changed( bool )), SIGNAL(changed()) );
  37 diff -urN kdebase-workspace-4.2.1.org/kcontrol/kdm/kdm-users.cpp kdebase-workspace-4.2.1/kcontrol/kdm/kdm-users.cpp
  38 --- kdebase-workspace-4.2.1.org/kcontrol/kdm/kdm-users.cpp      2008-08-28 18:12:26.000000000 +0200
  39 +++ kdebase-workspace-4.2.1/kcontrol/kdm/kdm-users.cpp  2009-03-02 20:47:03.483148370 +0100
  40 @@ -87,7 +87,7 @@
  41
  42         // We assume that $kde_datadir/kdm exists, but better check for pics/ and pics/users,
  43         // and create them if necessary.
  44 -       m_userPixDir = config->group( "X-*-Greeter" ).readEntry( "FaceDir", KStandardDirs::installPath( "data" ) + "kdm/faces" ) + '/';
  45 +       m_userPixDir = config->group( "X-*-Greeter" ).readEntry( "FaceDir", "/etc/X11/kdm/faces" ) + '/';
  46         QDir testDir( m_userPixDir );
  47         if (!testDir.exists() && !testDir.mkdir( testDir.absolutePath() ) && !geteuid())
  48                 KMessageBox::sorry( this, i18n("Unable to create folder %1", testDir.absolutePath() ) );
  49 diff -urN kdebase-workspace-4.2.1.org/kcontrol/kdm/main.cpp kdebase-workspace-4.2.1/kcontrol/kdm/main.cpp
  50 --- kdebase-workspace-4.2.1.org/kcontrol/kdm/main.cpp   2009-01-06 18:22:15.000000000 +0100
  51 +++ kdebase-workspace-4.2.1/kcontrol/kdm/main.cpp       2009-03-02 20:47:03.492731619 +0100
  52 @@ -187,7 +187,7 @@
  53                 kWarning() << "user(s) '" << tgmapci.value().join( "," )
  54                 << "' have unknown GID " << tgmapci.key() << endl;
  55
  56 -       config = new KConfig( QString::fromLatin1(KDE_CONFDIR "/kdm/kdmrc"), KConfig::SimpleConfig );
  57 +       config = new KConfig( QString::fromLatin1("/etc/X11/kdm/kdmrc"), KConfig::SimpleConfig );
  58
  59         QVBoxLayout *top = new QVBoxLayout( this );
  60         top->setMargin( 0 );
  61 diff -urN kdebase-workspace-4.2.1.org/kdm/config.def kdebase-workspace-4.2.1/kdm/config.def
  62 --- kdebase-workspace-4.2.1.org/kdm/config.def  2009-02-26 15:16:59.000000000 +0100
  63 +++ kdebase-workspace-4.2.1/kdm/config.def      2009-03-02 20:49:26.802753807 +0100
  64 @@ -29,7 +29,7 @@
  65  #define RCVERMAJOR 2
  66  #define RCVERMINOR 4
  67
  68 -#define KDMCONF KDE_CONFDIR "/kdm"
  69 +#define KDMCONF "/etc/X11/kdm"
  70  #define KDMDATA KDE_DATADIR "/kdm"
  71
  72  #ifdef _AIX
  73 @@ -1101,7 +1101,7 @@
  74  Key: Xaccess
  75  Type: string
  76  # differs from xdm
  77 -Default: *KDMCONF "/Xaccess"
  78 +Default: *"/etc/X11/kdm/Xaccess"
  79  User: config(Xaccess)
  80  Instance: #""
  81  Update: mk_xaccess
  82 @@ -1163,7 +1163,7 @@
  83
  84  Key: Willing
  85  Type: string
  86 -Default: ""
  87 +Default: KDMCONF "/Xwilling"
  88  User: core
  89  # will be overwritten
  90  Instance: #
  91 @@ -1602,7 +1602,7 @@
  92
  93  Key: Startup
  94  Type: string
  95 -Default: ""
  96 +Default: KDMCONF "/Xsetup"
  97  User: core
  98  # will be overwritten
  99  Instance: #*/""
 100 @@ -1620,7 +1620,7 @@
 101
 102  Key: Reset
 103  Type: string
 104 -Default: ""
 105 +Default: KDMCONF "Xreset"
 106  User: core
 107  # will be overwritten
 108  Instance: #*/""
 109 @@ -1638,7 +1638,7 @@
 110
 111  Key: Session
 112  Type: string
 113 -Default: XBINDIR "/xterm -ls -T"
 114 +Default: KDMCONF "/Xsession"
 115  #Merge: xdm - incompatible!
 116  User: core
 117  # will be overwritten
 118 @@ -1755,10 +1755,10 @@
 119
 120  Key: AllowRootLogin
 121  Type: bool
 122 -Default: true
 123 +Default: false
 124  User: core
 125  User: greeter(showRoot)
 126 -Instance: */false
 127 +Instance: #*/true
 128  Merge: xdm
 129  Comment:
 130   Allow root logins?
 131 @@ -1768,11 +1768,11 @@
 132
 133  Key: AllowNullPasswd
 134  Type: bool
 135 -Default: true
 136 +Default: false
 137  User: core
 138  # sensible?
 139 -Instance: */false
 140 -Instance: :*/true
 141 +Instance: #*/true
 142 +Instance: #:*/true
 143  Merge: xdm
 144  Comment:
 145   Allow to log in, when user has set an empty password?
 146 @@ -1930,10 +1930,10 @@
 147
 148  Key: SessionsDirs
 149  Type: list
 150 -Default: *KDMDATA "/sessions"
 151 +Default: *"/usr/share/xsessions"
 152  User: core
 153  User: greeter-c
 154 -Instance: */KDMCONF "/sessions," KDMDATA "/sessions"
 155 +Instance: */"/etc/X11/sessions,/usr/share/xsessions"
 156  Update: upd_sessionsdirs
 157  Comment:
 158   The directories containing session type definitions in .desktop format,
 159 @@ -2277,7 +2277,7 @@
 160
 161  Key: MinShowUID
 162  Type: int
 163 -Default: 0
 164 +Default: 1000
 165  User: greeter(lowUserId)
 166  # will be overwritten
 167  Instance: #*/
 168 @@ -2338,7 +2338,7 @@
 169
 170  Key: FaceDir
 171  Type: string
 172 -Default: *KDMDATA "/faces"
 173 +Default: *"/etc/X11/kdm/faces"
 174  User: greeter
 175  Instance: #*/"/usr/share/faces"
 176  Update: upd_facedir
 177 @@ -2421,7 +2421,7 @@
 178
 179  Key: BackgroundCfg
 180  Type: string
 181 -Default: *KDMCONF "/backgroundrc"
 182 +Default: *"/etc/X11/kdm/backgroundrc"
 183  User: greeter-c
 184  Instance: #*/""
 185  Update: handleBgCfg
 186 diff -urN kdebase-workspace-4.2.1.org/kdm/kfrontend/CMakeLists.txt kdebase-workspace-4.2.1/kdm/kfrontend/CMakeLists.txt
 187 --- kdebase-workspace-4.2.1.org/kdm/kfrontend/CMakeLists.txt    2008-07-31 10:14:09.000000000 +0200
 188 +++ kdebase-workspace-4.2.1/kdm/kfrontend/CMakeLists.txt        2009-03-02 20:47:03.496184466 +0100
 189 @@ -109,5 +109,5 @@
 190
 191  ## use 'GENKDMCONF_FLAGS=... make install' to add flags to the config generation (try genkdmconf -h)
 192  install(CODE "
 193 -exec_program(\"${CMAKE_CURRENT_BINARY_DIR}/genkdmconf\" ARGS --in \\\"\\\$DESTDIR${CONFIG_INSTALL_DIR}/kdm\\\" --no-in-notice --face-src \\\"${CMAKE_CURRENT_SOURCE_DIR}/pics\\\" \\\$GENKDMCONF_FLAGS)
 194 +exec_program(\"${CMAKE_CURRENT_BINARY_DIR}/genkdmconf\" ARGS --in \\\"\\\${DESTDIR}/etc/X11/kdm\\\" --no-in-notice --face-src \\\"${CMAKE_CURRENT_SOURCE_DIR}/pics\\\" \\\$GENKDMCONF_FLAGS)
 195  ")
 196 diff -urN kdebase-workspace-4.2.1.org/kdm/kfrontend/genkdmconf.c kdebase-workspace-4.2.1/kdm/kfrontend/genkdmconf.c
 197 --- kdebase-workspace-4.2.1.org/kdm/kfrontend/genkdmconf.c      2008-12-04 09:34:57.000000000 +0100
 198 +++ kdebase-workspace-4.2.1/kdm/kfrontend/genkdmconf.c  2009-03-02 20:47:03.496184466 +0100
 199 @@ -3116,7 +3116,7 @@
 200         f = createFile( "README", 0644 );
 201         fprintf( f,
 202  "This automatically generated configuration consists of the following files:\n" );
 203 -       fprintf( f, "- " KDMCONF "/kdmrc\n" );
 204 +       fprintf( f, "- /etc/X11/kdm/kdmrc\n" );
 205         for (fp = aflist; fp; fp = fp->next)
 206                 fprintf( f, "- %s\n", fp->str );
 207         if (use_destdir && !no_in_notice)
 208 diff -urN kdebase-workspace-4.2.1.org/kdm/kfrontend/kdm_config.c kdebase-workspace-4.2.1/kdm/kfrontend/kdm_config.c
 209 --- kdebase-workspace-4.2.1.org/kdm/kfrontend/kdm_config.c      2008-01-05 00:55:45.000000000 +0100
 210 +++ kdebase-workspace-4.2.1/kdm/kfrontend/kdm_config.c  2009-03-02 20:47:03.666143067 +0100
 211 @@ -390,7 +390,7 @@
 212
 213  CONF_READ_ENTRIES
 214
 215 -static const char *kdmrc = KDMCONF "/kdmrc";
 216 +static const char *kdmrc = "/etc/X11/kdm/kdmrc";
 217
 218  static Section *rootsec;
 219
 220 diff -urN kdebase-workspace-4.2.1.org/kdm/kfrontend/kdmctl.c kdebase-workspace-4.2.1/kdm/kfrontend/kdmctl.c
 221 --- kdebase-workspace-4.2.1.org/kdm/kfrontend/kdmctl.c  2008-01-05 00:55:45.000000000 +0100
 222 +++ kdebase-workspace-4.2.1/kdm/kfrontend/kdmctl.c      2009-03-02 20:47:03.666143067 +0100
 223 @@ -150,7 +150,7 @@
 224  {
 225         char *dpy = getenv( "DISPLAY" );
 226         const char *ctl = getenv( "DM_CONTROL" );
 227 -       const char *cfg = KDE_CONFDIR "/kdm/kdmrc";
 228 +       const char *cfg = "/etc/X11/kdm/kdmrc";
 229         char *ptr;
 230         int fd;
 231
 232 diff -urN kdebase-workspace-4.2.1.org/kdm/kfrontend/sessions/CMakeLists.txt kdebase-workspace-4.2.1/kdm/kfrontend/sessions/CMakeLists.txt
 233 --- kdebase-workspace-4.2.1.org/kdm/kfrontend/sessions/CMakeLists.txt   2008-04-30 15:58:40.000000000 +0200
 234 +++ kdebase-workspace-4.2.1/kdm/kfrontend/sessions/CMakeLists.txt       2009-03-02 20:47:03.666143067 +0100
 235 @@ -51,5 +51,5 @@
 236         xfce.desktop
 237         xfce4.desktop
 238
 239 -       DESTINATION ${DATA_INSTALL_DIR}/kdm/sessions
 240 +       DESTINATION /etc/X11/sessions
 241  )