Author: shadzik Date: Fri Jul 30 18:43:23 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- updated
---- Files affected:
packages/kde4-kdebase-workspace:
kde4-kdebase-workspace-kdmconfig.patch (1.13 -> 1.14)
---- Diffs:
================================================================
Index: packages/kde4-kdebase-workspace/kde4-kdebase-workspace-kdmconfig.patch
diff -u
packages/kde4-kdebase-workspace/kde4-kdebase-workspace-kdmconfig.patch:1.13
packages/kde4-kdebase-workspace/kde4-kdebase-workspace-kdmconfig.patch:1.14
--- packages/kde4-kdebase-workspace/kde4-kdebase-workspace-kdmconfig.patch:1.13
Thu Feb 18 00:38:39 2010
+++ packages/kde4-kdebase-workspace/kde4-kdebase-workspace-kdmconfig.patch
Fri Jul 30 20:43:18 2010
@@ -22,42 +22,18 @@
" properly with real DPI value better fonts should be used or
configuration"
" of font hinting should be checked.</p>" );
comboForceDpi->setWhatsThis(whatsthis);
-diff -Nru kdebase-workspace-4.3.73svn1040395/kcontrol/kdm/background.cpp
kdebase-workspace-4.3.73svn1040395-new/kcontrol/kdm/background.cpp
---- kdebase-workspace-4.3.73svn1040395/kcontrol/kdm/background.cpp
2009-08-05 11:56:09.000000000 +0200
-+++ kdebase-workspace-4.3.73svn1040395-new/kcontrol/kdm/background.cpp
2009-10-28 22:58:08.000000000 +0100
-@@ -44,7 +44,7 @@
- " specified in the Setup= option in kdmrc (usually Xsetup).") );
- m_simpleConf = KSharedConfig::openConfig(
- config->group( "X-*-Greeter" ).readEntry(
-- "BackgroundCfg", KDE_CONFDIR "/kdm/backgroundrc" ) );
-+ "BackgroundCfg", "/etc/X11/kdm/backgroundrc" ) );
- m_background = new BGDialog( this, m_simpleConf );
-
- connect( m_background, SIGNAL(changed( bool )), SIGNAL(changed()) );
-diff -Nru kdebase-workspace-4.3.73svn1040395/kcontrol/kdm/kdm-users.cpp
kdebase-workspace-4.3.73svn1040395-new/kcontrol/kdm/kdm-users.cpp
---- kdebase-workspace-4.3.73svn1040395/kcontrol/kdm/kdm-users.cpp
2009-08-05 11:56:09.000000000 +0200
-+++ kdebase-workspace-4.3.73svn1040395-new/kcontrol/kdm/kdm-users.cpp
2009-10-28 22:58:08.000000000 +0100
-@@ -85,7 +85,7 @@
-
- // We assume that $kde_datadir/kdm exists, but better check for pics/
and pics/users,
- // and create them if necessary.
-- m_userPixDir = config->group( "X-*-Greeter" ).readEntry( "FaceDir",
KStandardDirs::installPath( "data" ) + "kdm/faces" ) + '/';
-+ m_userPixDir = config->group( "X-*-Greeter" ).readEntry( "FaceDir",
"/etc/X11/kdm/faces" ) + '/';
- QDir testDir( m_userPixDir );
- if (!testDir.exists() && !testDir.mkdir( testDir.absolutePath() ) &&
!geteuid())
- KMessageBox::sorry( this, i18n("Unable to create folder %1",
testDir.absolutePath() ) );
-diff -Nru kdebase-workspace-4.3.73svn1040395/kcontrol/kdm/main.cpp
kdebase-workspace-4.3.73svn1040395-new/kcontrol/kdm/main.cpp
---- kdebase-workspace-4.3.73svn1040395/kcontrol/kdm/main.cpp 2009-04-05
22:00:13.000000000 +0200
-+++ kdebase-workspace-4.3.73svn1040395-new/kcontrol/kdm/main.cpp
2009-10-28 22:58:08.000000000 +0100
-@@ -186,7 +186,7 @@
- kWarning() << "user(s) '" << tgmapci.value().join( "," )
- << "' have unknown GID " << tgmapci.key() << endl;
+--- kdebase-workspace-4.5.0/kcontrol/kdm/kdm-users.cpp.orig 2010-05-27
19:23:09.000000000 +0200
++++ kdebase-workspace-4.5.0/kcontrol/kdm/kdm-users.cpp 2010-07-30
20:37:06.492035540 +0200
+@@ -103,8 +103,7 @@
+ defmaxuid = "65000";
+ #endif
+
+- m_userPixDir = config->group("X-*-Greeter").readEntry("FaceDir",
+- KStandardDirs::installPath("data") + "kdm/faces") + '/';
++ m_userPixDir = config->group( "X-*-Greeter" ).readEntry( "FaceDir",
"/etc/X11/kdm/faces" ) + '/';
-- config = new KConfig( QString::fromLatin1(KDE_CONFDIR "/kdm/kdmrc"),
KConfig::SimpleConfig );
-+ config = new KConfig( QString::fromLatin1("/etc/X11/kdm/kdmrc"),
KConfig::SimpleConfig );
-
- QVBoxLayout *top = new QVBoxLayout( this );
- top->setMargin( 0 );
+ if (!getpwnam("nobody"))
+ KMessageBox::sorry(this, i18n(
diff -Nru kdebase-workspace-4.3.73svn1040395/kdm/config.def
kdebase-workspace-4.3.73svn1040395-new/kdm/config.def
--- kdebase-workspace-4.3.73svn1040395/kdm/config.def 2009-10-26
10:14:48.000000000 +0100
+++ kdebase-workspace-4.3.73svn1040395-new/kdm/config.def 2009-10-28
22:58:08.000000000 +0100
@@ -193,29 +169,27 @@
-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)
+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)
")
-diff -Nru kdebase-workspace-4.3.73svn1040395/kdm/kfrontend/genkdmconf.c
kdebase-workspace-4.3.73svn1040395-new/kdm/kfrontend/genkdmconf.c
---- kdebase-workspace-4.3.73svn1040395/kdm/kfrontend/genkdmconf.c
2009-10-26 10:14:48.000000000 +0100
-+++ kdebase-workspace-4.3.73svn1040395-new/kdm/kfrontend/genkdmconf.c
2009-10-28 22:58:55.000000000 +0100
-@@ -3162,7 +3162,7 @@
- f = createFile( "README", 0644 );
- fprintf_( f,
- "This automatically generated configuration consists of the following
files:\n" );
-- fprintf_( f, "- " KDMCONF "/kdmrc\n" );
-+ fprintf( f, "- /etc/X11/kdm/kdmrc\n" );
- for (fp = aflist; fp; fp = fp->next)
- fprintf_( f, "- %s\n", fp->str );
- if (use_destdir && !no_in_notice)
-diff -Nru kdebase-workspace-4.3.73svn1040395/kdm/kfrontend/kdm_config.c
kdebase-workspace-4.3.73svn1040395-new/kdm/kfrontend/kdm_config.c
---- kdebase-workspace-4.3.73svn1040395/kdm/kfrontend/kdm_config.c
2009-10-26 10:14:48.000000000 +0100
-+++ kdebase-workspace-4.3.73svn1040395-new/kdm/kfrontend/kdm_config.c
2009-10-28 22:58:08.000000000 +0100
-@@ -390,7 +390,7 @@
-
- CONF_READ_ENTRIES
-
--static const char *kdmrc = KDMCONF "/kdmrc";
-+static const char *kdmrc = "/etc/X11/kdm/kdmrc";
-
- static Section *rootsec;
+--- kdebase-workspace-4.5.0/kdm/kfrontend/genkdmconf.c.orig 2010-07-06
08:54:31.000000000 +0200
++++ kdebase-workspace-4.5.0/kdm/kfrontend/genkdmconf.c 2010-07-30
20:40:48.828680855 +0200
+@@ -3254,7 +3254,7 @@
+ f = createFile("README", 0644);
+ fprintf_(f,
+ "This automatically generated configuration consists of the following
files:\n");
+- fprintf_(f, "- " KDMCONF "/kdmrc\n");
++ fprintf( f, "- /etc/X11/kdm/kdmrc\n" );
+ for (fp = aflist; fp; fp = fp->next)
+ fprintf_(f, "- %s\n", fp->str);
+ if (use_destdir && !no_in_notice)
+--- kdebase-workspace-4.5.0/kdm/kfrontend/kdmctl.c.orig 2010-07-06
08:54:31.000000000 +0200
++++ kdebase-workspace-4.5.0/kdm/kfrontend/kdmctl.c 2010-07-30
20:42:26.855824153 +0200
+@@ -150,7 +150,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;
diff -Nru kdebase-workspace-4.3.73svn1040395/kdm/kfrontend/kdmctl.c
kdebase-workspace-4.3.73svn1040395-new/kdm/kfrontend/kdmctl.c
--- kdebase-workspace-4.3.73svn1040395/kdm/kfrontend/kdmctl.c 2008-01-05
00:55:45.000000000 +0100
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kde4-kdebase-workspace/kde4-kdebase-workspace-kdmconfig.patch?r1=1.13&r2=1.14&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
