[prev in list] [next in list] [prev in thread] [next in thread] 

List:       mandrake-cooker
Subject:    [Cooker] Re: [svn-commit] r58855 - in packages/cooker/kdebase/current: SOURCES
From:       Helio Chissini de Castro <helio () mandriva ! com>
Date:       2006-08-30 16:53:44
Message-ID: 200608301353.44866.helio () mandriva ! com
[Download RAW message or body]

Can you explain why you reverted this hardcoded patches ?
kdmrc modifications are already present on mandriva-kdm-config.
Logout withou confirmation on root state is problem on broken root config, as 
i said

Is not mean to be all patches or reversion been discussed befor been done ?
Or this just serve for me ?


Em Wednesday 30 August 2006 13:46, lmontel@mandriva.com escreveu:
> Author: lmontel
> Date: Wed Aug 30 18:46:40 2006
> New Revision: 58855
>
> Added:
>   
> packages/cooker/kdebase/current/SOURCES/kdebase-3.4.2-fix-kdm-server-args.p
>atch
> packages/cooker/kdebase/current/SOURCES/kdebase-3.5.3-logout-without-confir
>mation.patch Modified:
>    packages/cooker/kdebase/current/SPECS/kdebase.spec
>
> Log:
> New package (3.5.4-15mdv 2006-08-30)
> Readd some removed patchs
>
>
> Added:
> packages/cooker/kdebase/current/SOURCES/kdebase-3.4.2-fix-kdm-server-args.p
>atch
> ===========================================================================
>=== --- (empty file)
> +++
> packages/cooker/kdebase/current/SOURCES/kdebase-3.4.2-fix-kdm-server-args.p
>atch	Wed Aug 30 18:46:40 2006 @@ -0,0 +1,14 @@
> +--- kdebase-3.4.2/kdm/config.def--	2005-09-08 15:28:23.000000000 +0200
> ++++ kdebase-3.4.2/kdm/config.def	2005-09-08 15:28:49.000000000 +0200
> +@@ -1348,9 +1348,9 @@ Description:
> +
> + Key: ServerArgsLocal
> + Type: string
> +-Default: ""
> ++Default: "-nolisten tcp"
> + User: core
> +-Instance: :*/"-nolisten tcp"
> ++Instance: */"-deferglyphs 16 -nolisten tcp"
> + Comment: &
> + Description:
> +  Additional arguments for the &X-Server;s for local sessions.
>
> Added:
> packages/cooker/kdebase/current/SOURCES/kdebase-3.5.3-logout-without-confir
>mation.patch
> ===========================================================================
>=== --- (empty file)
> +++
> packages/cooker/kdebase/current/SOURCES/kdebase-3.5.3-logout-without-confir
>mation.patch	Wed Aug 30 18:46:40 2006 @@ -0,0 +1,34 @@
> +--- kdebase-3.5.3/kdesktop/desktop.cc.orig	2006-06-22 21:14:19.000000000
> -0300 ++++ kdebase-3.5.3/kdesktop/desktop.cc	2006-07-12 15:10:12.000000000
> -0300 +@@ -861,6 +861,11 @@
> +             KApplication::ShutdownTypeNone );
> + }
> +
> ++void KDesktop::logoutWithoutConfirmation()
> ++{
> ++ slotLogoutNoCnf();
> ++}
> ++
> + void KDesktop::logout( KApplication::ShutdownConfirm confirm,
> +                        KApplication::ShutdownType sdtype )
> + {
> +--- kdebase-3.5.3/kdesktop/desktop.h.orig	2006-04-27 15:06:09.000000000
> -0300 ++++ kdebase-3.5.3/kdesktop/desktop.h	2006-07-12 15:11:14.000000000
> -0300 +@@ -84,6 +84,7 @@
> +   virtual void logout();
> +   virtual void clearCommandHistory();
> +   virtual void runAutoStart();
> ++  virtual void logoutWithoutConfirmation();
> +
> +   virtual void switchDesktops( int delta );
> +
> +--- kdebase-3.5.3/kdesktop/KDesktopIface.h.orig	2006-04-27
> 15:06:09.000000000 -0300 ++++
> kdebase-3.5.3/kdesktop/KDesktopIface.h	2006-07-12 15:10:12.000000000 -0300
> +@@ -75,6 +75,7 @@
> +      * Bye bye
> +      */
> +     virtual void logout() = 0;
> ++	virtual void logoutWithoutConfirmation() = 0;
> +     /**
> +      * Returns whether KDesktop uses a virtual root.
> +      */
>
> Modified: packages/cooker/kdebase/current/SPECS/kdebase.spec
> ===========================================================================
>=== --- packages/cooker/kdebase/current/SPECS/kdebase.spec	(original)
> +++ packages/cooker/kdebase/current/SPECS/kdebase.spec	Wed Aug 30 18:46:40
> 2006 @@ -37,7 +37,7 @@
>  Name: kdebase
>  Summary:	K Desktop Environment - Core files
>  Version: 3.5.4
> -Release: %mkrel 14
> +Release: %mkrel 15
>  Epoch: 1
>  Group: Graphical desktop/KDE
>  License:	GPL
> @@ -271,6 +271,11 @@
>  Patch144: kdebase-post-3.5.4-kpager-draganddrop.patch
>  Patch145: kdebase-3.3.2-fix-kdm-theme-mdk.patch
>  Patch146: kdebase-post-3.5.4-kcontrol-key-modifiers-crash.patch
> +
> +Patch147:	kdebase-3.4.2-fix-kdm-server-args.patch
> +
> +Patch148:	kdebase-3.5.3-logout-without-confirmation.patch
> +
>  BuildConflicts: lm_utils
>  BuildConflicts: lm_utils-devel
>  BuildConflicts: liblm_sensors1
> @@ -1679,6 +1684,10 @@
>  %patch145 -p1 -b .fix_kdm_theme
>  %patch146 -p1 -b .post354
>
> +%patch147 -p1 -b .fix_kdm_server_args
> +
> +%patch148 -p1 -b .fix_logout_without_confirmation
> +
>  %build
>  # This is here just because patch 93. Too
>  # bad that we can get rid of this lib problem without

-- 
Helio Chissini de Castro
Research and development
Mandriva Brasil Labs
[prev in list] [next in list] [prev in thread] [next in thread]