Author: arekm Date: Sat Mar 5 12:36:02 2005 GMT
Module: SOURCES Tag: DEVEL
---- Log message:
- up to 3.4.0
---- Files affected:
SOURCES:
kdebase-bgdefaults.patch (1.1 -> 1.1.2.1) , kdebase-startkde.patch (1.6 ->
1.6.2.1) , kdebase-kdm_utmpx.patch (1.1.4.1 -> 1.1.4.2)
---- Diffs:
================================================================
Index: SOURCES/kdebase-bgdefaults.patch
diff -u SOURCES/kdebase-bgdefaults.patch:1.1
SOURCES/kdebase-bgdefaults.patch:1.1.2.1
--- SOURCES/kdebase-bgdefaults.patch:1.1 Sun Oct 26 12:44:15 2003
+++ SOURCES/kdebase-bgdefaults.patch Sat Mar 5 13:35:56 2005
@@ -1,13 +1,14 @@
--- kdebase-031020/kcontrol/background/bgdefaults.h.orig 2003-03-26
15:38:26.000000000 +0100
+++ kdebase-031020/kcontrol/background/bgdefaults.h 2003-10-21
13:35:49.000000000 +0200
-@@ -26,8 +26,8 @@
+@@ -24,8 +24,8 @@
// Per desktop defaults
// Before you change this get in touch with me ([EMAIL PROTECTED])
// Thanks!!
--#define _defColorA QColor("#1E72A0")
+-#define _defColorA QColor("#003082")
-#define _defColorB QColor("#C0C0C0")
+#define _defColorA QColor("#39374B")
+#define _defColorB QColor("#42528F")
- #define _defBackgroundMode KBackgroundSettings::VerticalGradient
+ #define _defBackgroundMode KBackgroundSettings::Flat
#define _defWallpaperMode KBackgroundSettings::NoWallpaper
#define _defMultiMode KBackgroundSettings::NoMulti
+
================================================================
Index: SOURCES/kdebase-startkde.patch
diff -u SOURCES/kdebase-startkde.patch:1.6
SOURCES/kdebase-startkde.patch:1.6.2.1
--- SOURCES/kdebase-startkde.patch:1.6 Tue Dec 16 23:39:44 2003
+++ SOURCES/kdebase-startkde.patch Sat Mar 5 13:35:56 2005
@@ -1,35 +1,19 @@
--- kdebase-031021/startkde.orig 2003-10-14 22:48:48.000000000 +0200
+++ kdebase-031021/startkde 2003-10-21 13:58:14.000000000 +0200
-@@ -142,18 +142,20 @@
+@@ -181,6 +181,7 @@
# run KPersonalizer before the session, if this is the first login
if kreadconfig --file kpersonalizerrc --group General --key FirstLogin
--default true --type bool; then
-- # start only dcopserver, don't start whole kdeinit (takes too long)
-- echo 'startkde: Running kpersonalizer...' 1>&2
-- dcopserver
-- kwin --lock &
-- kpersonalizer --before-session
-- # handle kpersonalizer restarts (language change)
-- while test $? -eq 1; do
-- kpersonalizer --r --before-session
-- done
-- dcopserver_shutdown
-- # shutdown will also make kwin quit, give it time to do so
-- sleep 1
-+ if test `/usr/bin/which kpersonalizer 2>/dev/null`; then
-+ # start only dcopserver, don't start whole kdeinit (takes too long)
-+ echo 'startkde: Running kpersonalizer...' 1>&2
-+ dcopserver
-+ kwin --lock &
-+ kpersonalizer --before-session
-+ # handle kpersonalizer restarts (language change)
-+ while test $? -eq 1; do
-+ kpersonalizer --r --before-session
-+ done
-+ dcopserver_shutdown
-+ # shutdown will also make kwin quit, give it time to do so
-+ sleep 1
-+ fi
++ if test `/usr/bin/which kpersonalizer 2>/dev/null`; then
+ # start only dcopserver, don't start whole kdeinit (takes too long)
+ echo 'startkde: Running kpersonalizer...' 1>&2
+ dcopserver
+@@ -192,6 +193,7 @@
+ done
+ dcopquit kwin
+ dcopserver_shutdown --wait
++ fi
fi
# the splashscreen and progress indicator
+
================================================================
Index: SOURCES/kdebase-kdm_utmpx.patch
diff -u SOURCES/kdebase-kdm_utmpx.patch:1.1.4.1
SOURCES/kdebase-kdm_utmpx.patch:1.1.4.2
--- SOURCES/kdebase-kdm_utmpx.patch:1.1.4.1 Fri Feb 11 17:25:50 2005
+++ SOURCES/kdebase-kdm_utmpx.patch Sat Mar 5 13:35:56 2005
@@ -1,19 +1,20 @@
--- kdebase-050210/kdm/backend/dm.h.orig 2005-02-08 21:51:08.000000000
+0100
+++ kdebase-050210/kdm/backend/dm.h 2005-02-11 12:00:00.277539336 +0100
-@@ -196,15 +196,7 @@
- # define WTMP_FILE "/usr/adm/wtmp"
- # endif
+@@ -137,15 +137,7 @@
+ # define WTMP_FILE "/usr/adm/wtmp"
# endif
--# ifndef UTMP_FILE
--# ifdef _PATH_UTMPX
--# define UTMP_FILE _PATH_UTMPX
--# elif defined(_PATH_UTMP)
--# define UTMP_FILE _PATH_UTMP
--# else
--# define UTMP_FILE "/etc/utmp"
--# endif
+ #endif
+-#ifndef UTMP_FILE
+-# ifdef _PATH_UTMPX
+-# define UTMP_FILE _PATH_UTMPX
+-# elif defined(_PATH_UTMP)
+-# define UTMP_FILE _PATH_UTMP
+-# else
+-# define UTMP_FILE "/etc/utmp"
-# endif
+-#endif
+# define UTMP_FILE "/var/run/utmpx"
- #endif /* NEED_UTMP */
- typedef struct GPipe {
+ #ifdef HAVE_NETCONFIG_H
+ # define STREAMSCONN
+
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SOURCES/kdebase-bgdefaults.patch?r1=1.1&r2=1.1.2.1&f=u
http://cvs.pld-linux.org/SOURCES/kdebase-startkde.patch?r1=1.6&r2=1.6.2.1&f=u
http://cvs.pld-linux.org/SOURCES/kdebase-kdm_utmpx.patch?r1=1.1.4.1&r2=1.1.4.2&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
