Mailinglist Archive: opensuse-commit (783 mails)
| < Previous | Next > |
commit kdebase3 for openSUSE:Factory
- From: root@xxxxxxxxxxxxxxx (h_root)
- Date: Tue, 07 Apr 2009 14:08:01 +0200
- Message-id: <20090407120801.CFAA8678159@xxxxxxxxxxxxxxx>
Hello community,
here is the log from the commit of package kdebase3 for openSUSE:Factory
checked in at Tue Apr 7 14:08:01 CEST 2009.
--------
--- KDE/kdebase3/kdebase3.changes 2008-12-15 15:54:27.000000000 +0100
+++ /mounts/work_src_done/STABLE/kdebase3/kdebase3.changes 2009-04-04
17:33:39.000000000 +0200
@@ -1,0 +2,5 @@
+Sat Apr 4 17:33:29 CEST 2009 - coolo@xxxxxxx
+
+- refresh all patches to fix build
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kdebase3.spec ++++++
--- /var/tmp/diff_new_pack.f14453/_old 2009-04-07 14:07:26.000000000 +0200
+++ /var/tmp/diff_new_pack.f14453/_new 2009-04-07 14:07:26.000000000 +0200
@@ -1,7 +1,7 @@
#
# spec file for package kdebase3 (Version 3.5.10)
#
-# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -73,7 +73,7 @@
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Url: http://www.kde.org/
Version: 3.5.10
-Release: 20
+Release: 21
%define kde_version 3.5.10
Requires: kdebase3-runtime == %{version}
Source0: kdebase-%{kde_version}.tar.bz2
@@ -458,7 +458,7 @@
Summary: Set and list fileshares
Group: System/Management
Version: 2.0
-Release: 563
+Release: 564
%description -n fileshareset
This package contains the the fileshareset utility to allow users to
@@ -1648,6 +1648,8 @@
/opt/kde3/share/icons/*/*/*/personal.*
%changelog
+* Sat Apr 04 2009 coolo@xxxxxxx
+- refresh all patches to fix build
* Thu Dec 11 2008 dmueller@xxxxxxx
- fix kdebase3 being pulled in for kde4 installs (bnc#458323)
* Wed Dec 10 2008 olh@xxxxxxx
@@ -1666,9 +1668,9 @@
- Update 3_5_BRANCH.diff (bnc#430476)
* Sun Sep 21 2008 wstephenson@xxxxxxx
- Fix maximum port allowed in knetattach wizard (bnc#335794)
-* Tue Sep 09 2008 dmueller@xxxxxxx
+* Wed Sep 10 2008 dmueller@xxxxxxx
- remove resmgr references from kcheckpass (bnc#422616)
-* Tue Sep 02 2008 dmueller@xxxxxxx
+* Wed Sep 03 2008 dmueller@xxxxxxx
- build against libsensors4
* Tue Aug 26 2008 llunak@xxxxxxx
- fix wallpapers when the number of screens changes (bnc#329221)
@@ -1687,7 +1689,7 @@
as well (bnc#385149)
* Thu Jul 24 2008 dmueller@xxxxxxx
- disable ksysguard openslp patch as it causes hangs
-* Sun Jul 13 2008 dmueller@xxxxxxx
+* Mon Jul 14 2008 dmueller@xxxxxxx
- fix suspend/hibernate buttons for 11.0 and newer (bnc#290917)
* Wed Jun 11 2008 dmueller@xxxxxxx
- remove kdebase3-nsplugins64 package and add nspluginwrapper
@@ -1755,7 +1757,7 @@
- fix sensors support in ksysguardd
* Mon Feb 18 2008 dmueller@xxxxxxx
- add missing split provides
-* Wed Feb 13 2008 dmueller@xxxxxxx
+* Thu Feb 14 2008 dmueller@xxxxxxx
- update to 3.5.9
* bugfixes, translation update
* Sat Feb 09 2008 stbinner@xxxxxxx
@@ -2076,7 +2078,7 @@
- fix more shell insertion issues with khelpcenter
* Tue Nov 14 2006 ltinkl@xxxxxxx
- fixed #218764 - shell insertion vulnerability in khelpcenter
-* Mon Nov 13 2006 dmueller@xxxxxxx
+* Tue Nov 14 2006 dmueller@xxxxxxx
- update optional kwin diff to add custom start script support
(#219020)
* Mon Nov 13 2006 dmueller@xxxxxxx
@@ -2221,7 +2223,7 @@
- use sudo for kdesu
* Tue Sep 19 2006 coolo@xxxxxxx
- disable low disk space warning for < 10.1
-* Mon Sep 18 2006 dmueller@xxxxxxx
+* Tue Sep 19 2006 dmueller@xxxxxxx
- update kickoff patch to include numerous bugfixes
* Mon Sep 18 2006 ltinkl@xxxxxxx
- fixing low disk space warning dialog (the don't-show-again case)
@@ -2563,7 +2565,7 @@
* Wed Dec 14 2005 lmuelle@xxxxxxx
- Package fileshareset and filesharelist as a separate package named fileshare
for post 10.0 products and use %%_bindir as install location.
-* Sun Dec 04 2005 lmuelle@xxxxxxx
+* Mon Dec 05 2005 lmuelle@xxxxxxx
- Revert libsmbclient renameing.
* Fri Dec 02 2005 coolo@xxxxxxx
- update to 3.5 branch and adapt the patches accordingly
@@ -3092,7 +3094,7 @@
- apply default-fonts.diff again
* Sun Mar 21 2004 adrian@xxxxxxx
- fix kcontrol yast integration
-* Wed Mar 17 2004 adrian@xxxxxxx
+* Thu Mar 18 2004 adrian@xxxxxxx
- move krandrtray menu entry
- move some .desktop files to correct sub package
* Wed Mar 17 2004 coolo@xxxxxxx
@@ -3206,7 +3208,7 @@
- use 3.1.94, second try tar ball
* Mon Dec 01 2003 adrian@xxxxxxx
- update to 3.1.94 ( KDE 3.2 beta 2 )
-* Thu Nov 13 2003 adrian@xxxxxxx
+* Fri Nov 14 2003 adrian@xxxxxxx
- update to new snapshot from 2003102409
- fix kwin startup
- add SLP support for ksysguard
@@ -3285,7 +3287,7 @@
- do even apply coolos patch
- further kcontrol yast patch. we need only one line in the
desktop file now and can keep a usual Exec line
-* Mon Sep 08 2003 adrian@xxxxxxx
+* Tue Sep 09 2003 adrian@xxxxxxx
- update to version 3.1.4
- some missing bits, to be able to load YaST embedded into kcontrol
again
@@ -3462,7 +3464,7 @@
* Tue Mar 04 2003 adrian@xxxxxxx
- add missing Provides/Obsoletes kdialog
- use a better icon for Home directory items
-* Sat Mar 01 2003 adrian@xxxxxxx
+* Sun Mar 02 2003 adrian@xxxxxxx
- update to version 3.1.1
* kwin fixes: don't show toplevel menus for non-active windows.
* konq fixes: don't repost data on reload, if url changes
@@ -3655,7 +3657,7 @@
- do not create a sub menu for Terminal and Konq in kicker/quickbrowser
- disable tracing of kdesud via prctl() instead of set gid bit (hint from okir)
- hot fix for kdm xconsole
-* Tue Aug 20 2002 adrian@xxxxxxx
+* Wed Aug 21 2002 adrian@xxxxxxx
- apply kdm xconsole patch from ossi with some changes
- let konqueror->Go->Applications go to {/etc/,}opt/kde3/share/applnk
- set explicit kcheckpass permissions in %%files section
@@ -3758,7 +3760,7 @@
- fix memory leak in kfind (partitial, but the bigger one ;)
* Mon Jun 10 2002 coolo@xxxxxxx
- adding fix for cddb computation
-* Sun Jun 09 2002 adrian@xxxxxxx
+* Mon Jun 10 2002 adrian@xxxxxxx
- fix build on lib64 (audiocd slave)
* Wed May 29 2002 adrian@xxxxxxx
- use update_admin
@@ -3802,7 +3804,7 @@
- fix ~/.kde2->~/.kde copy routine
* Fri Mar 15 2002 ro@xxxxxxx
- changed neededforbuild <ssh> to <openssh>
-* Sun Mar 10 2002 adrian@xxxxxxx
+* Mon Mar 11 2002 adrian@xxxxxxx
- fix %%pre install script
* Sun Mar 10 2002 adrian@xxxxxxx
- update to 3.0rc2
@@ -3889,7 +3891,7 @@
- add fix for wrong ownership of $HOME/.wmrc
* Thu Sep 20 2001 adrian@xxxxxxx
- change icon for kwintv template
-* Tue Sep 18 2001 mfabian@xxxxxxx
+* Wed Sep 19 2001 mfabian@xxxxxxx
- fix for bug #10464:
make Japanese input possible even when UNIX-style application
shortcuts are selected (Japanese input becomes impossible
@@ -3945,7 +3947,7 @@
- kdm pam support fix
* Tue Aug 28 2001 adrian@xxxxxxx
- fix startkde scripts for new theme
-* Sun Aug 26 2001 ro@xxxxxxx
+* Mon Aug 27 2001 ro@xxxxxxx
- fix typo in specfile (build-root dir was missing in one place)
* Sat Aug 25 2001 adrian@xxxxxxx
- update to current KDE_2_2_BRANCH
@@ -4024,7 +4026,7 @@
* Tue May 01 2001 adrian@xxxxxxx
- kcmshell reposition for YaST2 modules
- use iso-8895-15 to support the EUR
-* Tue Apr 24 2001 adrian@xxxxxxx
+* Wed Apr 25 2001 adrian@xxxxxxx
- drop sensors support (do it really destroy thinkpads ?, not my ;-)
- add konsole patch from mls for latin9
* Mon Apr 23 2001 adrian@xxxxxxx
@@ -4048,7 +4050,7 @@
apply NOnostdlib patch (resolve hopefully ppc link problems)
* Fri Mar 30 2001 ro@xxxxxxx
- neededforbuild fix
-* Wed Mar 28 2001 mfabian@xxxxxxx
+* Thu Mar 29 2001 mfabian@xxxxxxx
- I didn't apply the patch for my last changelog entry correctly.
fixed.
* Tue Mar 27 2001 mfabian@xxxxxxx
@@ -4135,7 +4137,7 @@
a little work on the logo
fix rc.config template
fix $LANG problem in welcome page startup
-* Thu Jan 11 2001 adrian@xxxxxxx
+* Fri Jan 12 2001 adrian@xxxxxxx
- changed logo
changed inactive text color in window header
* Thu Jan 11 2001 adrian@xxxxxxx
@@ -4182,7 +4184,7 @@
- make symbol labels nicer
do not show double icons
added rc.config entrys for kdm
-* Sun Dec 10 2000 adrian@xxxxxxx
+* Mon Dec 11 2000 adrian@xxxxxxx
- extend startkde for dvd and cdrecorder
added logo background mode
changed kicker configuration
@@ -4192,7 +4194,7 @@
- fixing startkde and working on the SuSE theme
* Wed Dec 06 2000 adrian@xxxxxxx
- fixed kde link
-* Wed Nov 29 2000 adrian@xxxxxxx
+* Thu Nov 30 2000 adrian@xxxxxxx
- update to 2.0.1
* Tue Nov 21 2000 ro@xxxxxxx
- switch to openmotif
++++++ 3_5_BRANCH.diff ++++++
++++ 1456 lines (skipped)
++++ between KDE/kdebase3/3_5_BRANCH.diff
++++ and /mounts/work_src_done/STABLE/kdebase3/3_5_BRANCH.diff
++++++ access.diff ++++++
--- /var/tmp/diff_new_pack.f14453/_old 2009-04-07 14:07:27.000000000 +0200
+++ /var/tmp/diff_new_pack.f14453/_new 2009-04-07 14:07:27.000000000 +0200
@@ -1,6 +1,8 @@
---- kcontrol/access/kaccess.cpp
+Index: kcontrol/access/kaccess.cpp
+===================================================================
+--- kcontrol/access/kaccess.cpp.orig
+++ kcontrol/access/kaccess.cpp
-@@ -216,7 +216,7 @@
+@@ -216,7 +216,7 @@ void KAccessApp::readSettings()
xkb->ctrls->debounce_delay = config->readNumEntry("BounceKeysDelay", 500);
// gestures for enabling the other features
@@ -9,7 +11,7 @@
if (_gestures)
xkb->ctrls->enabled_ctrls |= XkbAccessXKeysMask;
else
-@@ -241,7 +241,7 @@
+@@ -241,7 +241,7 @@ void KAccessApp::readSettings()
else
xkb->ctrls->ax_options &= ~(XkbAX_FeatureFBMask | XkbAX_SlowWarnFBMask);
@@ -18,7 +20,9 @@
_kNotifyModifiers = config->readBoolEntry("kNotifyModifiers", false);
_kNotifyAccessX = config->readBoolEntry("kNotifyAccessX", false);
---- kcontrol/access/kcmaccess.cpp
+Index: kcontrol/access/kcmaccess.cpp
+===================================================================
+--- kcontrol/access/kcmaccess.cpp.orig
+++ kcontrol/access/kcmaccess.cpp
@@ -7,6 +7,7 @@
@@ -28,7 +32,7 @@
#include <math.h>
#include <dcopref.h>
-@@ -639,12 +640,14 @@
+@@ -686,12 +687,14 @@ void KAccessConfig::load( bool useDefaul
bounceKeysDelay->setValue(config->readNumEntry("BounceKeysDelay", 500));
bounceKeysRejectBeep->setChecked(config->readBoolEntry("BounceKeysRejectBeep",
true));
++++++ applet-lock-logout.diff ++++++
--- /var/tmp/diff_new_pack.f14453/_old 2009-04-07 14:07:27.000000000 +0200
+++ /var/tmp/diff_new_pack.f14453/_new 2009-04-07 14:07:27.000000000 +0200
@@ -1,8 +1,8 @@
Index: kicker/applets/lockout/lockout.cpp
===================================================================
---- kicker/applets/lockout/lockout.cpp (Revision 849786)
-+++ kicker/applets/lockout/lockout.cpp (Arbeitskopie)
-@@ -31,6 +31,7 @@
+--- kicker/applets/lockout/lockout.cpp.orig
++++ kicker/applets/lockout/lockout.cpp
+@@ -31,6 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE
#include <qtoolbutton.h>
#include <qstyle.h>
#include <qtooltip.h>
@@ -10,7 +10,7 @@
#include <dcopclient.h>
-@@ -54,7 +55,7 @@
+@@ -54,7 +55,7 @@ extern "C"
}
Lockout::Lockout( const QString& configFile, QWidget *parent, const char
*name)
@@ -19,14 +19,14 @@
{
KConfig *conf = config();
conf->setGroup("lockout");
-@@ -71,9 +72,17 @@
+@@ -71,8 +72,16 @@ Lockout::Lockout( const QString& configF
layout->setMargin( 0 );
layout->setSpacing( 0 );
- lockButton = new SimpleButton( this, "lock");
- logoutButton = new SimpleButton( this, "logout");
+ bAlternateButtonOrder = !conf->readBoolEntry( "OriginalLayout",true );
-
++
+ if (bAlternateButtonOrder) {
+ lockButton = new SimpleButton( this, "lock");
+ logoutButton = new SimpleButton( this, "logout");
@@ -35,11 +35,10 @@
+ logoutButton = new SimpleButton( this, "logout");
+ lockButton = new SimpleButton( this, "lock");
+ }
-+
+
QToolTip::add( lockButton, i18n("Lock the session") );
QToolTip::add( logoutButton, i18n("Log out") );
-
-@@ -204,12 +213,15 @@
+@@ -204,12 +213,15 @@ bool Lockout::eventFilter( QObject *o, Q
this, SLOT( lock() ) );
popup->insertSeparator();
@@ -55,7 +54,7 @@
//popup->setItemChecked( 100, bTransparent );
//popup->connectItem(100, this, SLOT( slotTransparent() ) );
//if (conf->entryIsImmutable( "Transparent" ))
-@@ -226,6 +238,7 @@
+@@ -226,6 +238,7 @@ bool Lockout::eventFilter( QObject *o, Q
popup->insertItem( SmallIcon( "exit" ), i18n("&Log Out..."),
this, SLOT( logout() ) );
popup->insertSeparator();
@@ -63,7 +62,7 @@
//popup->insertItem( i18n( "&Transparent" ), 100 );
popup->insertItem( SmallIcon( "configure" ),
i18n( "&Configure Session Manager..." ),
-@@ -235,6 +248,9 @@
+@@ -235,6 +248,9 @@ bool Lockout::eventFilter( QObject *o, Q
//popup->connectItem(100, this, SLOT( slotTransparent() ) );
//if (conf->entryIsImmutable( "Transparent" ))
// popup->setItemEnabled( 100, false );
@@ -73,7 +72,7 @@
popup->exec( me->globalPos() );
delete popup;
-@@ -263,6 +279,27 @@
+@@ -263,6 +279,27 @@ void Lockout::slotTransparent()
conf->sync();
}
@@ -103,9 +102,9 @@
// Run the logout settings.
Index: kicker/applets/lockout/lockout.h
===================================================================
---- kicker/applets/lockout/lockout.h (Revision 849786)
-+++ kicker/applets/lockout/lockout.h (Arbeitskopie)
-@@ -36,6 +36,7 @@
+--- kicker/applets/lockout/lockout.h.orig
++++ kicker/applets/lockout/lockout.h
+@@ -36,6 +36,7 @@ private slots:
void slotLockPrefs();
void slotLogoutPrefs();
@@ -113,7 +112,7 @@
void slotTransparent();
void slotIconChanged();
-@@ -47,6 +48,7 @@
+@@ -47,6 +48,7 @@ private:
QBoxLayout *layout;
bool bTransparent;
++++++ arts-start-on-demand.diff ++++++
--- /var/tmp/diff_new_pack.f14453/_old 2009-04-07 14:07:27.000000000 +0200
+++ /var/tmp/diff_new_pack.f14453/_new 2009-04-07 14:07:27.000000000 +0200
@@ -1,4 +1,6 @@
---- kcontrol/arts/Makefile.am
+Index: kcontrol/arts/Makefile.am
+===================================================================
+--- kcontrol/arts/Makefile.am.orig
+++ kcontrol/arts/Makefile.am
@@ -1,3 +1,9 @@
+bin_PROGRAMS = arts-start
@@ -10,8 +12,10 @@
kde_module_LTLIBRARIES = kcm_arts.la
kcm_arts_la_SOURCES = arts.cpp generaltab.ui hardwaretab.ui krichtextlabel.cpp
---- ./kcontrol/arts/arts-start.cpp.sav
-+++ ./kcontrol/arts/arts-start.cpp
+Index: kcontrol/arts/arts-start.cpp
+===================================================================
+--- /dev/null
++++ kcontrol/arts/arts-start.cpp
@@ -0,0 +1,79 @@
+/*
+
++++++ artwork.diff ++++++
--- /var/tmp/diff_new_pack.f14453/_old 2009-04-07 14:07:27.000000000 +0200
+++ /var/tmp/diff_new_pack.f14453/_new 2009-04-07 14:07:27.000000000 +0200
@@ -1,6 +1,8 @@
---- kioslave/fish/fish.protocol
+Index: kioslave/fish/fish.protocol
+===================================================================
+--- kioslave/fish/fish.protocol.orig
+++ kioslave/fish/fish.protocol
-@@ -10,7 +10,7 @@
+@@ -10,7 +10,7 @@ makedir=true
deleting=true
linking=true
moving=true
@@ -8,10 +10,12 @@
+Icon=folder_html
Description=A kioslave for the FISH protocol
Description[af]='n Kioslave vir die FISH protokol
- Description[bn]=ফিশ (FISH) প্রোটোকল-এর জন্য একটি kioslave
---- kioslave/floppy/floppy.protocol
+ Description[be]=Kioslave для пратакола FISH
+Index: kioslave/floppy/floppy.protocol
+===================================================================
+--- kioslave/floppy/floppy.protocol.orig
+++ kioslave/floppy/floppy.protocol
-@@ -9,6 +9,6 @@
+@@ -9,6 +9,6 @@ writing=true
makedir=true
deleting=true
moving=true
@@ -19,9 +23,11 @@
+Icon=3floppy_unmount
DocPath=kioslave/floppy.html
Class=:local
---- kioslave/nfs/nfs.protocol
+Index: kioslave/nfs/nfs.protocol
+===================================================================
+--- kioslave/nfs/nfs.protocol.orig
+++ kioslave/nfs/nfs.protocol
-@@ -11,4 +11,4 @@
+@@ -11,4 +11,4 @@ deleting=true
linking=true
moving=true
DocPath=kioslave/nfs.html
++++++ autorun.patch ++++++
--- /var/tmp/diff_new_pack.f14453/_old 2009-04-07 14:07:27.000000000 +0200
+++ /var/tmp/diff_new_pack.f14453/_new 2009-04-07 14:07:27.000000000 +0200
@@ -1,8 +1,8 @@
Index: kioslave/media/medianotifier/medianotifier.cpp
-================================================================================
---- kioslave/media/medianotifier/medianotifier.cpp
+===================================================================
+--- kioslave/media/medianotifier/medianotifier.cpp.orig
+++ kioslave/media/medianotifier/medianotifier.cpp
-@@ -133,7 +133,7 @@
+@@ -133,7 +133,7 @@ bool MediaNotifier::autostart( const KFi
// be checked for the following Autostart files in order of precedence:
// .autorun, autorun, autorun.sh
QStringList autorun_list;
@@ -11,7 +11,7 @@
QStringList::iterator it = autorun_list.begin();
QStringList::iterator end = autorun_list.end();
-@@ -191,7 +191,12 @@
+@@ -191,7 +191,12 @@ bool MediaNotifier::execAutorun( const K
// with the current working directory ( CWD ) set to the root
// directory of the medium.
KProcess proc;
++++++ background_default.diff ++++++
--- /var/tmp/diff_new_pack.f14453/_old 2009-04-07 14:07:27.000000000 +0200
+++ /var/tmp/diff_new_pack.f14453/_new 2009-04-07 14:07:27.000000000 +0200
@@ -1,8 +1,8 @@
Index: kcontrol/background/bgwallpaper.cpp
-================================================================================
---- kcontrol/background/bgwallpaper.cpp
+===================================================================
+--- kcontrol/background/bgwallpaper.cpp.orig
+++ kcontrol/background/bgwallpaper.cpp
-@@ -149,7 +149,7 @@
+@@ -149,7 +149,7 @@ void BGMultiWallpaperDialog::slotAdd()
mimeTypes += "image/svg+xml";
#endif
++++++ clock-applet-style.diff ++++++
--- /var/tmp/diff_new_pack.f14453/_old 2009-04-07 14:07:27.000000000 +0200
+++ /var/tmp/diff_new_pack.f14453/_new 2009-04-07 14:07:27.000000000 +0200
@@ -1,4 +1,6 @@
---- kicker/applets/clock/clockapplet.kcfg
+Index: kicker/applets/clock/clockapplet.kcfg
+===================================================================
+--- kicker/applets/clock/clockapplet.kcfg.orig
+++ kicker/applets/clock/clockapplet.kcfg
@@ -14,7 +14,7 @@
<choice name="Analog"/>
@@ -9,7 +11,7 @@
</entry>
</group>
<group name="Date">
-@@ -56,7 +56,7 @@
+@@ -56,7 +56,7 @@ defFont.setPointSize(8);
<label>Font for the clock.</label>
<code>
defFont=KGlobalSettings::generalFont();
++++++ clock-suse-integrate.diff ++++++
--- /var/tmp/diff_new_pack.f14453/_old 2009-04-07 14:07:27.000000000 +0200
+++ /var/tmp/diff_new_pack.f14453/_new 2009-04-07 14:07:27.000000000 +0200
@@ -1,5 +1,7 @@
---- kcontrol/clock/tzone.cpp.sav 2006-01-04 14:58:37.000000000 +0100
-+++ kcontrol/clock/tzone.cpp 2006-10-20 13:48:50.000000000 +0200
+Index: kcontrol/clock/tzone.cpp
+===================================================================
+--- kcontrol/clock/tzone.cpp.orig
++++ kcontrol/clock/tzone.cpp
@@ -27,12 +27,16 @@
#include <qlabel.h>
@@ -137,8 +139,10 @@
+ strout << line << '\n';
+ }
+}
---- kcontrol/clock/tzone.h.sav 2005-09-29 21:33:59.000000000 +0200
-+++ kcontrol/clock/tzone.h 2006-10-20 13:33:20.000000000 +0200
+Index: kcontrol/clock/tzone.h
+===================================================================
+--- kcontrol/clock/tzone.h.orig
++++ kcontrol/clock/tzone.h
@@ -47,6 +47,8 @@ protected slots:
private:
@@ -148,8 +152,10 @@
KTimezones m_zoneDb;
QLabel *m_local;
KTimezoneWidget *tzonelist;
---- kcontrol/clock/dtime.h.sav 2005-09-29 21:33:59.000000000 +0200
-+++ kcontrol/clock/dtime.h 2006-10-20 15:10:07.000000000 +0200
+Index: kcontrol/clock/dtime.h
+===================================================================
+--- kcontrol/clock/dtime.h.orig
++++ kcontrol/clock/dtime.h
@@ -65,6 +65,9 @@ signals:
void timeout();
void set_time();
@@ -172,8 +178,10 @@
KDatePicker *cal;
QComboBox *month;
---- kcontrol/clock/dtime.cpp.sav 2005-09-29 21:33:59.000000000 +0200
-+++ kcontrol/clock/dtime.cpp 2006-10-20 15:18:43.000000000 +0200
+Index: kcontrol/clock/dtime.cpp
+===================================================================
+--- kcontrol/clock/dtime.cpp.orig
++++ kcontrol/clock/dtime.cpp
@@ -38,6 +38,7 @@
#include <kmessagebox.h>
#include <kdialog.h>
++++++ default_fonts.diff ++++++
--- /var/tmp/diff_new_pack.f14453/_old 2009-04-07 14:07:27.000000000 +0200
+++ /var/tmp/diff_new_pack.f14453/_new 2009-04-07 14:07:27.000000000 +0200
@@ -1,11 +1,13 @@
---- kcontrol/fonts/fonts.cpp
+Index: kcontrol/fonts/fonts.cpp
+===================================================================
+--- kcontrol/fonts/fonts.cpp.orig
+++ kcontrol/fonts/fonts.cpp
@@ -1,3 +1,4 @@
+
// KDE Display fonts setup tab
//
// Copyright (c) Mark Donohoe 1997
-@@ -500,11 +501,11 @@
+@@ -524,11 +525,11 @@ KFonts::KFonts(QWidget *parent, const ch
// Keep in sync with kdelibs/kdecore/kglobalsettings.cpp
++++++ default-kdeprintfax.diff ++++++
--- /var/tmp/diff_new_pack.f14453/_old 2009-04-07 14:07:28.000000000 +0200
+++ /var/tmp/diff_new_pack.f14453/_new 2009-04-07 14:07:28.000000000 +0200
@@ -1,6 +1,8 @@
---- kdeprint/kdeprintfax/confsystem.cpp
+Index: kdeprint/kdeprintfax/confsystem.cpp
+===================================================================
+--- kdeprint/kdeprintfax/confsystem.cpp.orig
+++ kdeprint/kdeprintfax/confsystem.cpp
-@@ -103,7 +103,7 @@
+@@ -103,7 +103,7 @@ void ConfSystem::load()
m_commands << conf->readPathEntry("HylaFax",
defaultCommand(hylafax_default_cmd));
m_commands << conf->readPathEntry("Mgetty",
defaultCommand(mgetty_default_cmd));
m_commands << conf->readPathEntry( "Other", QString::null );
++++++ dont-always-start-kaccess.diff ++++++
--- /var/tmp/diff_new_pack.f14453/_old 2009-04-07 14:07:28.000000000 +0200
+++ /var/tmp/diff_new_pack.f14453/_new 2009-04-07 14:07:28.000000000 +0200
@@ -1,6 +1,8 @@
---- kcontrol/access/kcmaccess.cpp
+Index: kcontrol/access/kcmaccess.cpp
+===================================================================
+--- kcontrol/access/kcmaccess.cpp.orig
+++ kcontrol/access/kcmaccess.cpp
-@@ -103,10 +103,57 @@
+@@ -103,10 +103,57 @@ void ExtendedIntNumInput::slotSliderValu
static bool needToRunKAccessDaemon( KConfig *config )
{
++++++ fix_default_theme_reset.diff ++++++
--- /var/tmp/diff_new_pack.f14453/_old 2009-04-07 14:07:28.000000000 +0200
+++ /var/tmp/diff_new_pack.f14453/_new 2009-04-07 14:07:28.000000000 +0200
@@ -1,6 +1,8 @@
---- kcontrol/kthememanager/ktheme.cpp
+Index: kcontrol/kthememanager/ktheme.cpp
+===================================================================
+--- kcontrol/kthememanager/ktheme.cpp.orig
+++ kcontrol/kthememanager/ktheme.cpp
-@@ -188,11 +188,11 @@
+@@ -188,11 +188,11 @@ QString KTheme::createYourself( bool pac
globalConf->setGroup( "Icons" );
QDomElement iconElem = m_dom.createElement( "icons" );
iconElem.setAttribute( "name", globalConf->readEntry(
"Theme",KIconTheme::current() ) );
@@ -17,7 +19,7 @@
m_root.appendChild( iconElem );
// 4. Sounds
-@@ -704,7 +704,7 @@
+@@ -726,7 +726,7 @@ QString KTheme::getProperty( QDomElement
}
void KTheme::createIconElems( const QString & group, const QString & object,
@@ -26,7 +28,7 @@
{
cfg->setGroup( group );
QStringList elemNames;
-@@ -723,7 +723,9 @@
+@@ -745,7 +745,9 @@ void KTheme::createIconElems( const QStr
QDomElement tmpCol = m_dom.createElement( *it );
tmpCol.setAttribute( "object", object );
@@ -37,9 +39,11 @@
tmpCol.setAttribute( "value", cfg->readNumEntry( *it, 1 ) );
else if ( (*it).contains( "DisabledEffect" ) )
tmpCol.setAttribute( "name", cfg->readEntry( *it, "togray" )
);
---- kcontrol/kthememanager/ktheme.h
+Index: kcontrol/kthememanager/ktheme.h
+===================================================================
+--- kcontrol/kthememanager/ktheme.h.orig
+++ kcontrol/kthememanager/ktheme.h
-@@ -155,11 +155,12 @@
+@@ -155,11 +155,12 @@ private:
* Creates a list of "icon" elements based on:
* @param group The group in the KConfig object @p cfg
* @param object Specifier (similiar, but not identical to @p group)
++++++ fix-desktop-icons.diff ++++++
--- /var/tmp/diff_new_pack.f14453/_old 2009-04-07 14:07:28.000000000 +0200
+++ /var/tmp/diff_new_pack.f14453/_new 2009-04-07 14:07:28.000000000 +0200
@@ -1,7 +1,7 @@
Index: kcontrol/componentchooser/componentchooser.desktop
===================================================================
---- kcontrol/componentchooser/componentchooser.desktop (Revision 849791)
-+++ kcontrol/componentchooser/componentchooser.desktop (Arbeitskopie)
+--- kcontrol/componentchooser/componentchooser.desktop.orig
++++ kcontrol/componentchooser/componentchooser.desktop
@@ -1,6 +1,6 @@
[Desktop Entry]
Exec=kcmshell componentchooser
@@ -12,8 +12,8 @@
Index: kcontrol/taskbar/kcmtaskbar.desktop
===================================================================
---- kcontrol/taskbar/kcmtaskbar.desktop (Revision 849791)
-+++ kcontrol/taskbar/kcmtaskbar.desktop (Arbeitskopie)
+--- kcontrol/taskbar/kcmtaskbar.desktop.orig
++++ kcontrol/taskbar/kcmtaskbar.desktop
@@ -1,5 +1,5 @@
[Desktop Entry]
-Icon=kmenu
@@ -23,8 +23,8 @@
Exec=kcmshell kcmtaskbar
Index: kcontrol/nics/nic.desktop
===================================================================
---- kcontrol/nics/nic.desktop (Revision 849791)
-+++ kcontrol/nics/nic.desktop (Arbeitskopie)
+--- kcontrol/nics/nic.desktop.orig
++++ kcontrol/nics/nic.desktop
@@ -2,7 +2,7 @@
Exec=kcmshell nic
Type=Application
@@ -36,8 +36,8 @@
X-KDE-Library=nic
Index: kcontrol/input/mouse.desktop
===================================================================
---- kcontrol/input/mouse.desktop (Revision 849791)
-+++ kcontrol/input/mouse.desktop (Arbeitskopie)
+--- kcontrol/input/mouse.desktop.orig
++++ kcontrol/input/mouse.desktop
@@ -1,6 +1,6 @@
[Desktop Entry]
Exec=kcmshell mouse
@@ -48,8 +48,8 @@
Index: kcontrol/smserver/kcmsmserver.desktop
===================================================================
---- kcontrol/smserver/kcmsmserver.desktop (Revision 849791)
-+++ kcontrol/smserver/kcmsmserver.desktop (Arbeitskopie)
+--- kcontrol/smserver/kcmsmserver.desktop.orig
++++ kcontrol/smserver/kcmsmserver.desktop
@@ -1,5 +1,5 @@
[Desktop Entry]
-Icon=exit
@@ -59,8 +59,8 @@
Exec=kcmshell kcmsmserver
Index: kcontrol/kded/kcmkded.desktop
===================================================================
---- kcontrol/kded/kcmkded.desktop (Revision 849791)
-+++ kcontrol/kded/kcmkded.desktop (Arbeitskopie)
+--- kcontrol/kded/kcmkded.desktop.orig
++++ kcontrol/kded/kcmkded.desktop
@@ -1,6 +1,6 @@
[Desktop Entry]
Exec=kcmshell kcmkded
@@ -71,8 +71,8 @@
Index: kcontrol/konq/desktop.desktop
===================================================================
---- kcontrol/konq/desktop.desktop (Revision 849791)
-+++ kcontrol/konq/desktop.desktop (Arbeitskopie)
+--- kcontrol/konq/desktop.desktop.orig
++++ kcontrol/konq/desktop.desktop
@@ -1,7 +1,7 @@
[Desktop Entry]
Type=Application
@@ -84,8 +84,8 @@
Index: kcontrol/konq/desktopbehavior.desktop
===================================================================
---- kcontrol/konq/desktopbehavior.desktop (Revision 849791)
-+++ kcontrol/konq/desktopbehavior.desktop (Arbeitskopie)
+--- kcontrol/konq/desktopbehavior.desktop.orig
++++ kcontrol/konq/desktopbehavior.desktop
@@ -1,7 +1,7 @@
[Desktop Entry]
Type=Application
@@ -97,8 +97,8 @@
Index: kcontrol/privacy/privacy.desktop
===================================================================
---- kcontrol/privacy/privacy.desktop (Revision 849791)
-+++ kcontrol/privacy/privacy.desktop (Arbeitskopie)
+--- kcontrol/privacy/privacy.desktop.orig
++++ kcontrol/privacy/privacy.desktop
@@ -1,5 +1,5 @@
[Desktop Entry]
-Icon=trashcan_empty
@@ -108,8 +108,8 @@
Comment[ar]=الخصوصية - وحدة kcontrol لتنظيف الآثار غير المرغوب بها التي
يتركها المستخدم على النظام
Index: kcontrol/crypto/crypto.desktop
===================================================================
---- kcontrol/crypto/crypto.desktop (Revision 849791)
-+++ kcontrol/crypto/crypto.desktop (Arbeitskopie)
+--- kcontrol/crypto/crypto.desktop.orig
++++ kcontrol/crypto/crypto.desktop
@@ -1,5 +1,5 @@
[Desktop Entry]
-Icon=encrypted
@@ -119,9 +119,9 @@
DocPath=kcontrol/crypto/index.html
Index: kcontrol/kio/netpref.desktop
===================================================================
---- kcontrol/kio/netpref.desktop (Revision 849791)
-+++ kcontrol/kio/netpref.desktop (Arbeitskopie)
-@@ -76,7 +76,7 @@
+--- kcontrol/kio/netpref.desktop.orig
++++ kcontrol/kio/netpref.desktop
+@@ -76,7 +76,7 @@ Comment[zh_CN]=配置通用网络首选�
Comment[zh_TW]=設定一般網路喜好設定，例如逾時值
Comment[zu]=Hlanganisela okuncanyelwa uwonkewonke koxhumano olusazekile,
njengamanani esikhathi sokuphuma
Exec=kcmshell netpref
@@ -132,8 +132,8 @@
Keywords[bg]=просрочка, време, времето, пауза, прекъсване, връзка, timeout,
iopref, netpref, network preferences, ftp
Index: kcontrol/konqhtml/khtml_filter.desktop
===================================================================
---- kcontrol/konqhtml/khtml_filter.desktop (Revision 849791)
-+++ kcontrol/konqhtml/khtml_filter.desktop (Arbeitskopie)
+--- kcontrol/konqhtml/khtml_filter.desktop.orig
++++ kcontrol/konqhtml/khtml_filter.desktop
@@ -1,7 +1,7 @@
[Desktop Entry]
Type=Application
@@ -145,9 +145,9 @@
X-KDE-Library=konqhtml
Index: kcontrol/joystick/joystick.desktop
===================================================================
---- kcontrol/joystick/joystick.desktop (Revision 849791)
-+++ kcontrol/joystick/joystick.desktop (Arbeitskopie)
-@@ -173,5 +173,5 @@
+--- kcontrol/joystick/joystick.desktop.orig
++++ kcontrol/joystick/joystick.desktop
+@@ -173,5 +173,5 @@ Type=Application
X-KDE-FactoryName=kcm_joystick
X-KDE-Library=joystick
X-KDE-Test-Module=true
@@ -156,8 +156,8 @@
Categories=Qt;KDE;X-KDE-settings-hardware;
Index: kcontrol/colors/colors.desktop
===================================================================
---- kcontrol/colors/colors.desktop (Revision 849791)
-+++ kcontrol/colors/colors.desktop (Arbeitskopie)
+--- kcontrol/colors/colors.desktop.orig
++++ kcontrol/colors/colors.desktop
@@ -1,6 +1,6 @@
[Desktop Entry]
Exec=kcmshell colors
@@ -168,8 +168,8 @@
Index: kcontrol/performance/kcmperformance.desktop
===================================================================
---- kcontrol/performance/kcmperformance.desktop (Revision 849791)
-+++ kcontrol/performance/kcmperformance.desktop (Arbeitskopie)
+--- kcontrol/performance/kcmperformance.desktop.orig
++++ kcontrol/performance/kcmperformance.desktop
@@ -1,5 +1,5 @@
[Desktop Entry]
-Icon=launch
@@ -179,8 +179,8 @@
Index: kcontrol/launch/kcmlaunch.desktop
===================================================================
---- kcontrol/launch/kcmlaunch.desktop (Revision 849791)
-+++ kcontrol/launch/kcmlaunch.desktop (Arbeitskopie)
+--- kcontrol/launch/kcmlaunch.desktop.orig
++++ kcontrol/launch/kcmlaunch.desktop
@@ -1,5 +1,5 @@
[Desktop Entry]
-Icon=launch
@@ -190,9 +190,9 @@
Exec=kcmshell kcmlaunch
Index: kcontrol/dnssd/kcm_kdnssd.desktop
===================================================================
---- kcontrol/dnssd/kcm_kdnssd.desktop (Revision 849791)
-+++ kcontrol/dnssd/kcm_kdnssd.desktop (Arbeitskopie)
-@@ -70,7 +70,7 @@
+--- kcontrol/dnssd/kcm_kdnssd.desktop.orig
++++ kcontrol/dnssd/kcm_kdnssd.desktop
+@@ -70,7 +70,7 @@ Comment[zh_TW]=設定服務偵測
Exec=kcmshell kcm_kdnssd
GenericName=
GenericName[ko]=일반
@@ -203,8 +203,8 @@
Name[af]=Dienste ontdekker
Index: kcontrol/spellchecking/spellchecking.desktop
===================================================================
---- kcontrol/spellchecking/spellchecking.desktop (Revision 849791)
-+++ kcontrol/spellchecking/spellchecking.desktop (Arbeitskopie)
+--- kcontrol/spellchecking/spellchecking.desktop.orig
++++ kcontrol/spellchecking/spellchecking.desktop
@@ -1,6 +1,6 @@
[Desktop Entry]
Exec=kcmshell spellchecking
@@ -215,8 +215,8 @@
Index: konqueror/sidebar/trees/history_module/kcmhistory.desktop
===================================================================
---- konqueror/sidebar/trees/history_module/kcmhistory.desktop (Revision
849791)
-+++ konqueror/sidebar/trees/history_module/kcmhistory.desktop (Arbeitskopie)
+--- konqueror/sidebar/trees/history_module/kcmhistory.desktop.orig
++++ konqueror/sidebar/trees/history_module/kcmhistory.desktop
@@ -1,5 +1,5 @@
[Desktop Entry]
-Icon=history
@@ -224,7 +224,9 @@
Type=Application
Exec=kcmshell kcmhistory
---- kioslave/cgi/kcmcgi/kcmcgi.desktop
+Index: kioslave/cgi/kcmcgi/kcmcgi.desktop
+===================================================================
+--- kioslave/cgi/kcmcgi/kcmcgi.desktop.orig
+++ kioslave/cgi/kcmcgi/kcmcgi.desktop
@@ -1,5 +1,5 @@
[Desktop Entry]
@@ -233,12 +235,16 @@
Type=Application
Exec=kcmshell kcmcgi
DocPath=
---- kioslave/media/kcmodule/media.desktop
+Index: kioslave/media/kcmodule/media.desktop
+===================================================================
+--- kioslave/media/kcmodule/media.desktop.orig
+++ kioslave/media/kcmodule/media.desktop
-@@ -2,5 +2,5 @@
- Encoding=UTF-8
+@@ -1,7 +1,7 @@
+ [Desktop Entry]
Type=Application
#DocPath=
-Icon=system
+Icon=kcmmedia
Exec=kcmshell media
+
+
++++++ fix-kcontrol-yast.diff ++++++
--- /var/tmp/diff_new_pack.f14453/_old 2009-04-07 14:07:28.000000000 +0200
+++ /var/tmp/diff_new_pack.f14453/_new 2009-04-07 14:07:28.000000000 +0200
@@ -1,4 +1,6 @@
---- kcontrol/kcontrol/modules.cpp
+Index: kcontrol/kcontrol/modules.cpp
+===================================================================
+--- kcontrol/kcontrol/modules.cpp.orig
+++ kcontrol/kcontrol/modules.cpp
@@ -19,6 +19,7 @@
@@ -8,7 +10,7 @@
#include <qlabel.h>
-@@ -59,6 +60,10 @@
+@@ -59,6 +60,10 @@ ConfigModule::~ConfigModule()
ProxyWidget *ConfigModule::module()
{
@@ -19,7 +21,7 @@
if (_module)
return _module;
-@@ -161,6 +166,7 @@
+@@ -168,6 +173,7 @@ void ConfigModule::runAsRoot()
// prepare the process to run the kcmshell
QString cmd = service()->exec().stripWhiteSpace();
bool kdeshell = false;
@@ -27,7 +29,7 @@
if (cmd.left(5) == "kdesu")
{
cmd = cmd.remove(0,5).stripWhiteSpace();
-@@ -178,6 +184,15 @@
+@@ -185,6 +191,15 @@ void ConfigModule::runAsRoot()
kdeshell = true;
}
@@ -43,7 +45,7 @@
// run the process
QString kdesu = KStandardDirs::findExe("kdesu");
if (!kdesu.isEmpty())
-@@ -189,12 +204,12 @@
+@@ -196,12 +211,12 @@ void ConfigModule::runAsRoot()
// in that case the modules is started through kdesud and kdesu
// returns before the module is running and that doesn't work.
// We also don't have a way to close the module in that case.
++++++ fix-kio-smb-auth.diff ++++++
--- /var/tmp/diff_new_pack.f14453/_old 2009-04-07 14:07:28.000000000 +0200
+++ /var/tmp/diff_new_pack.f14453/_new 2009-04-07 14:07:28.000000000 +0200
@@ -1,9 +1,9 @@
? kioslave/smb/kio_smb_la_all_cpp.cpp
Index: kioslave/smb/kio_smb_auth.cpp
-================================================================================
---- kioslave/smb/kio_smb_auth.cpp
+===================================================================
+--- kioslave/smb/kio_smb_auth.cpp.orig
+++ kioslave/smb/kio_smb_auth.cpp
-@@ -144,6 +144,7 @@
+@@ -144,6 +144,7 @@ bool SMBSlave::checkPassword(SMBUrl &url
if ( openPassDlg(info) ) {
kdDebug(KIO_SMB) << "openPassDlg returned " << info.username << endl;
url.setUser(info.username);
++++++ fix-lockup-from-gnome-apps.diff ++++++
--- /var/tmp/diff_new_pack.f14453/_old 2009-04-07 14:07:28.000000000 +0200
+++ /var/tmp/diff_new_pack.f14453/_new 2009-04-07 14:07:28.000000000 +0200
@@ -1,6 +1,8 @@
---- khelpcenter/navigator.cpp
+Index: khelpcenter/navigator.cpp
+===================================================================
+--- khelpcenter/navigator.cpp.orig
+++ khelpcenter/navigator.cpp
-@@ -333,9 +333,14 @@
+@@ -333,9 +333,14 @@ void Navigator::selectItem( const KURL &
// First, populate the NavigatorAppItems if we don't want the home page
if ( url != homeURL() ) {
for ( QListViewItem *item = mContentsTree->firstChild(); item;
++++++ hide-only-showin-entries.diff ++++++
--- /var/tmp/diff_new_pack.f14453/_old 2009-04-07 14:07:28.000000000 +0200
+++ /var/tmp/diff_new_pack.f14453/_new 2009-04-07 14:07:28.000000000 +0200
@@ -1,8 +1,8 @@
Index: konqueror/konq_mainwindow.cc
-================================================================================
---- konqueror/konq_mainwindow.cc
+===================================================================
+--- konqueror/konq_mainwindow.cc.orig
+++ konqueror/konq_mainwindow.cc
-@@ -4923,6 +4923,9 @@
+@@ -4926,6 +4926,9 @@ void KonqMainWindow::updateOpenWithActio
KTrader::OfferList::ConstIterator end = services.end();
for (; it != end; ++it )
{
++++++ improve-panelservicemenu-geticonset.diff ++++++
--- /var/tmp/diff_new_pack.f14453/_old 2009-04-07 14:07:28.000000000 +0200
+++ /var/tmp/diff_new_pack.f14453/_new 2009-04-07 14:07:28.000000000 +0200
@@ -1,6 +1,8 @@
---- kicker/libkicker/global.cpp
+Index: kicker/libkicker/global.cpp
+===================================================================
+--- kicker/libkicker/global.cpp.orig
+++ kicker/libkicker/global.cpp
-@@ -424,6 +424,12 @@
+@@ -425,6 +425,12 @@ QIconSet menuIconSet(const QString& icon
KIcon::ActiveState,
0,
true);
@@ -13,7 +15,7 @@
// make sure they are not larger than 20x20
if (normal.width() > 20 || normal.height() > 20)
-@@ -436,8 +442,14 @@
+@@ -437,8 +443,14 @@ QIconSet menuIconSet(const QString& icon
active.convertFromImage(active.convertToImage().smoothScale(20,20));
}
++++++ ioslaveinfo-icon.diff ++++++
--- /var/tmp/diff_new_pack.f14453/_old 2009-04-07 14:07:28.000000000 +0200
+++ /var/tmp/diff_new_pack.f14453/_new 2009-04-07 14:07:28.000000000 +0200
@@ -1,11 +1,13 @@
---- kcontrol/ioslaveinfo/ioslaveinfo.desktop 2006/12/05 14:07:55 1.1
-+++ kcontrol/ioslaveinfo/ioslaveinfo.desktop 2006/12/05 14:08:12
-@@ -73,7 +73,7 @@
+Index: kcontrol/ioslaveinfo/ioslaveinfo.desktop
+===================================================================
+--- kcontrol/ioslaveinfo/ioslaveinfo.desktop.orig
++++ kcontrol/ioslaveinfo/ioslaveinfo.desktop
+@@ -79,7 +79,7 @@ Comment[zh_TW]=可用協定的資訊
Comment[zu]=Ulwazi mayelana nemithetho elandelwayo ekhona
DocPath=kinfocenter/protocols/index.html
Exec=kcmshell ioslaveinfo
-Icon=history
+Icon=enhanced_browsing
Keywords=Protocol,IO slaves,Slaves,Network,Information,Timeout
- Keywords[ar]=بروتوكول,IO Slaves,Slaves,الشبكة,معلومات الوقت المحدد
+ Keywords[ar]=الميفاق,IO Slaves,Slaves,الشبكة,معلومات نفاذ الوقت
Keywords[az]=Protokol, IO Kölələri, Kölələr, Şəbəkə,Mə'lumat, Vaxt Dolması
++++++ kcminit-ignore-arts.diff ++++++
--- /var/tmp/diff_new_pack.f14453/_old 2009-04-07 14:07:29.000000000 +0200
+++ /var/tmp/diff_new_pack.f14453/_new 2009-04-07 14:07:29.000000000 +0200
@@ -1,6 +1,8 @@
---- kcminit/main.cpp
+Index: kcminit/main.cpp
+===================================================================
+--- kcminit/main.cpp.orig
+++ kcminit/main.cpp
-@@ -98,6 +98,9 @@
+@@ -98,6 +98,9 @@ void KCMInit::runModules( int phase )
if (library.isEmpty())
library = service->library();
++++++ kcmkdm-default-grub.diff ++++++
--- /var/tmp/diff_new_pack.f14453/_old 2009-04-07 14:07:29.000000000 +0200
+++ /var/tmp/diff_new_pack.f14453/_new 2009-04-07 14:07:29.000000000 +0200
@@ -1,7 +1,13 @@
---- kcontrol/kdm/kdm-shut.cpp (Revision 623677)
-+++ kcontrol/kdm/kdm-shut.cpp (Arbeitskopie)
-@@ -90,3 +90,3 @@
+Index: kcontrol/kdm/kdm-shut.cpp
+===================================================================
+--- kcontrol/kdm/kdm-shut.cpp.orig
++++ kcontrol/kdm/kdm-shut.cpp
+@@ -90,7 +90,7 @@ KDMSessionsWidget::KDMSessionsWidget(QWi
+ QGroupBox *group4 = new QGroupBox( i18n("Miscellaneous"), this );
+
bm_combo = new KBackedComboBox( group4 );
- bm_combo->insertItem("None", i18n("boot manager", "None"));
+ bm_combo->insertItem("None", i18n("boot manager", "Grub"));
bm_combo->insertItem("Grub", i18n("Grub"));
+ #if defined(__linux__) && ( defined(__i386__) || defined(__amd64__) )
+ bm_combo->insertItem("Lilo", i18n("Lilo"));
++++++ kcmsamba_log.diff ++++++
--- /var/tmp/diff_new_pack.f14453/_old 2009-04-07 14:07:29.000000000 +0200
+++ /var/tmp/diff_new_pack.f14453/_new 2009-04-07 14:07:29.000000000 +0200
@@ -1,8 +1,8 @@
-Index: kcmsambalog.cpp
-================================================================================
---- kcontrol/samba/kcmsambalog.cpp
+Index: kcontrol/samba/kcmsambalog.cpp
+===================================================================
+--- kcontrol/samba/kcmsambalog.cpp.orig
+++ kcontrol/samba/kcmsambalog.cpp
-@@ -39,7 +39,7 @@
+@@ -39,7 +39,7 @@ LogView::LogView(QWidget *parent,KConfig
,configFile(config)
,filesCount(0)
,connectionsCount(0)
@@ -11,7 +11,7 @@
,label(&logFileName,i18n("Samba log file: "),this)
,viewHistory(this)
,showConnOpen(i18n("Show opened connections"),this)
-@@ -88,7 +88,7 @@
+@@ -88,7 +88,7 @@ LogView::LogView(QWidget *parent,KConfig
" on this page. The log file (shown above) will be read to obtain the"
" events logged by samba.") );
@@ -20,7 +20,7 @@
viewHistory.setAllColumnsShowFocus(TRUE);
viewHistory.setFocusPolicy(QWidget::ClickFocus);
-@@ -130,7 +130,7 @@
+@@ -130,7 +130,7 @@ void LogView::loadSettings()
{
if (configFile==0) return;
configFile->setGroup(LOGGROUPNAME);
++++++ kcmshell_use_kde-sound.diff ++++++
--- /var/tmp/diff_new_pack.f14453/_old 2009-04-07 14:07:29.000000000 +0200
+++ /var/tmp/diff_new_pack.f14453/_new 2009-04-07 14:07:29.000000000 +0200
@@ -1,6 +1,6 @@
Index: kcontrol/info/sound.desktop
-================================================================================
---- kcontrol/info/sound.desktop
+===================================================================
+--- kcontrol/info/sound.desktop.orig
+++ kcontrol/info/sound.desktop
@@ -1,5 +1,5 @@
[Desktop Entry]
++++++ kcontrol.diff ++++++
--- /var/tmp/diff_new_pack.f14453/_old 2009-04-07 14:07:29.000000000 +0200
+++ /var/tmp/diff_new_pack.f14453/_new 2009-04-07 14:07:29.000000000 +0200
@@ -1,4 +1,6 @@
---- kcontrol/kcontrol/KControl.desktop
+Index: kcontrol/kcontrol/KControl.desktop
+===================================================================
+--- kcontrol/kcontrol/KControl.desktop.orig
+++ kcontrol/kcontrol/KControl.desktop
@@ -1,4 +1,6 @@
[Desktop Entry]
++++++ kcontrol-energy.diff ++++++
--- /var/tmp/diff_new_pack.f14453/_old 2009-04-07 14:07:29.000000000 +0200
+++ /var/tmp/diff_new_pack.f14453/_new 2009-04-07 14:07:29.000000000 +0200
@@ -1,8 +1,8 @@
Index: kcontrol/energy/energy.h
===================================================================
---- kcontrol/energy/energy.h (revision 552073)
-+++ kcontrol/energy/energy.h (working copy)
-@@ -43,6 +43,7 @@ private slots:
+--- kcontrol/energy/energy.h.orig
++++ kcontrol/energy/energy.h
+@@ -44,6 +44,7 @@ private slots:
void slotChangeStandby(int);
void slotChangeSuspend(int);
void slotChangeOff(int);
@@ -10,7 +10,7 @@
void openURL(const QString &);
private:
-@@ -53,7 +54,7 @@ private:
+@@ -54,7 +55,7 @@ private:
static void applySettings(bool, int, int, int);
friend void init_energy();
@@ -21,8 +21,8 @@
Index: kcontrol/energy/energy.cpp
===================================================================
---- kcontrol/energy/energy.cpp (revision 552073)
-+++ kcontrol/energy/energy.cpp (working copy)
+--- kcontrol/energy/energy.cpp.orig
++++ kcontrol/energy/energy.cpp
@@ -26,6 +26,7 @@
#include <qlabel.h>
#include <qlayout.h>
@@ -39,7 +39,7 @@
#include <X11/X.h>
#include <X11/Xlib.h>
-@@ -140,6 +142,7 @@ KEnergy::KEnergy(QWidget *parent, const
+@@ -140,6 +142,7 @@ KEnergy::KEnergy(QWidget *parent, const
m_Suspend = DFLT_SUSPEND;
m_Off = DFLT_OFF;
m_bDPMS = false;
@@ -47,7 +47,7 @@
m_bMaintainSanity = true;
setQuickHelp( i18n("<h1>Display Power Control</h1> If your display
supports"
-@@ -154,6 +157,13 @@ KEnergy::KEnergy(QWidget *parent, const
+@@ -154,6 +157,13 @@ KEnergy::KEnergy(QWidget *parent, const
#ifdef HAVE_DPMS
int dummy;
m_bDPMS = DPMSQueryExtension(qt_xdisplay(), &dummy, &dummy);
@@ -61,7 +61,7 @@
#endif
QVBoxLayout *top = new QVBoxLayout(this, 0, KDialog::spacingHint());
-@@ -162,14 +172,26 @@ KEnergy::KEnergy(QWidget *parent, const
+@@ -162,14 +172,26 @@ KEnergy::KEnergy(QWidget *parent, const
QLabel *lbl;
if (m_bDPMS) {
@@ -120,7 +120,7 @@
top->addStretch();
if (m_bDPMS)
-@@ -275,7 +309,8 @@ void KEnergy::defaults()
+@@ -270,7 +304,8 @@ void KEnergy::defaults()
void KEnergy::readSettings()
{
@@ -130,7 +130,7 @@
m_Standby = m_pConfig->readNumEntry("displayStandby", DFLT_STANDBY);
m_Suspend = m_pConfig->readNumEntry("displaySuspend", DFLT_SUSPEND);
m_Off = m_pConfig->readNumEntry("displayPowerOff", DFLT_OFF);
-@@ -302,20 +337,27 @@ void KEnergy::writeSettings()
+@@ -297,20 +332,27 @@ void KEnergy::writeSettings()
m_bChanged = false;
}
++++++ kde3-session.diff ++++++
--- /var/tmp/diff_new_pack.f14453/_old 2009-04-07 14:07:29.000000000 +0200
+++ /var/tmp/diff_new_pack.f14453/_new 2009-04-07 14:07:29.000000000 +0200
@@ -1,6 +1,8 @@
---- kdm/kfrontend/sessions/kde.desktop.in 2008/04/12 06:15:16 1.1
-+++ kdm/kfrontend/sessions/kde.desktop.in 2008/04/12 06:15:26
-@@ -3,7 +3,7 @@
+Index: kdm/kfrontend/sessions/kde.desktop.in
+===================================================================
+--- kdm/kfrontend/sessions/kde.desktop.in.orig
++++ kdm/kfrontend/sessions/kde.desktop.in
+@@ -3,7 +3,7 @@ Encoding=UTF-8
Type=XSession
Exec=@KDE_BINDIR@/startkde
TryExec=@KDE_BINDIR@/startkde
++++++ kde3-session-restore.diff ++++++
--- /var/tmp/diff_new_pack.f14453/_old 2009-04-07 14:07:29.000000000 +0200
+++ /var/tmp/diff_new_pack.f14453/_new 2009-04-07 14:07:29.000000000 +0200
@@ -1,7 +1,7 @@
Index: kde3
===================================================================
---- kde3 (revision 793519)
-+++ kde3 (working copy)
+--- kde3.orig
++++ kde3
@@ -6,4 +6,7 @@
# and make sure this script is in $PATH (e.g. make a symlink if necessary).
#
++++++ kdebase_khc_rellinks.diff ++++++
--- /var/tmp/diff_new_pack.f14453/_old 2009-04-07 14:07:35.000000000 +0200
+++ /var/tmp/diff_new_pack.f14453/_new 2009-04-07 14:07:35.000000000 +0200
@@ -1,6 +1,6 @@
-Index: khelpcenter/mainwindow.cpp
-================================================================================
---- khelpcenter/khelpcenterui.rc
+Index: khelpcenter/khelpcenterui.rc
+===================================================================
+--- khelpcenter/khelpcenterui.rc.orig
+++ khelpcenter/khelpcenterui.rc
@@ -1,5 +1,5 @@
<!DOCTYPE kpartgui SYSTEM "kpartgui.dtd">
@@ -42,7 +42,9 @@
+ <Action name="rellinks_last" />
</ToolBar>
</kpartgui>
---- khelpcenter/mainwindow.cpp
+Index: khelpcenter/mainwindow.cpp
+===================================================================
+--- khelpcenter/mainwindow.cpp.orig
+++ khelpcenter/mainwindow.cpp
@@ -41,6 +41,7 @@
#include <kstatusbar.h>
@@ -52,7 +54,7 @@
#include <qsplitter.h>
#include <qtextedit.h>
-@@ -106,6 +107,8 @@
+@@ -106,6 +107,8 @@ MainWindow::MainWindow()
connect( mDoc, SIGNAL( selectionChanged() ),
SLOT( enableCopyTextAction() ) );
@@ -61,7 +63,7 @@
statusBar()->insertItem(i18n("Preparing Index"), 0, 1);
statusBar()->setItemAlignment(0, AlignLeft | AlignVCenter);
-@@ -250,6 +253,8 @@
+@@ -250,6 +253,8 @@ void MainWindow::setupActions()
new KAction( i18n( "Configure Fonts..." ), KShortcut(), this, SLOT(
slotConfigureFonts() ), actionCollection(), "configure_fonts" );
new KAction( i18n( "Increase Font Sizes" ), "viewmag+", KShortcut(),
this, SLOT( slotIncFontSizes() ), actionCollection(), "incFontSizes" );
new KAction( i18n( "Decrease Font Sizes" ), "viewmag-", KShortcut(),
this, SLOT( slotDecFontSizes() ), actionCollection(), "decFontSizes" );
@@ -70,7 +72,7 @@
}
void MainWindow::slotCopySelectedText()
-@@ -462,6 +467,418 @@
+@@ -462,6 +467,418 @@ void MainWindow::slotConfigureFonts()
mDoc->slotReload();
}
@@ -489,7 +491,9 @@
#include "mainwindow.moc"
// vim:ts=2:sw=2:et
---- khelpcenter/mainwindow.h
+Index: khelpcenter/mainwindow.h
+===================================================================
+--- khelpcenter/mainwindow.h.orig
+++ khelpcenter/mainwindow.h
@@ -13,6 +13,15 @@
#include "navigator.h"
@@ -507,7 +511,7 @@
class KHTMLPart;
class QSplitter;
-@@ -68,11 +77,43 @@
+@@ -68,11 +77,43 @@ class MainWindow : public KMainWindow, p
void writeConfig();
protected slots:
@@ -551,7 +555,7 @@
private slots:
void slotGlossSelected(const GlossaryEntry &entry);
-@@ -90,7 +131,29 @@
+@@ -90,7 +131,29 @@ class MainWindow : public KMainWindow, p
void slotConfigureFonts();
void slotCopySelectedText();
@@ -582,7 +586,7 @@
void updateZoomActions();
QSplitter *mSplitter;
-@@ -100,6 +163,17 @@
+@@ -100,6 +163,17 @@ private:
KAction *mLastSearchAction;
KAction *mCopyText;
LogDialog *mLogDialog;
++++++ kdebase_networkstatus_branch.diff ++++++
--- /var/tmp/diff_new_pack.f14453/_old 2009-04-07 14:07:35.000000000 +0200
+++ /var/tmp/diff_new_pack.f14453/_new 2009-04-07 14:07:35.000000000 +0200
@@ -1,7 +1,7 @@
Index: konqueror/konq_frame.cc
===================================================================
---- konqueror/konq_frame.cc (.../KDE/3.5/kdebase) (revision 667321)
-+++ konqueror/konq_frame.cc (.../work/~wstephens/kdebase) (revision
667321)
+--- konqueror/konq_frame.cc.orig
++++ konqueror/konq_frame.cc
@@ -34,6 +34,7 @@
#include <kprogress.h>
#include <klocale.h>
@@ -10,7 +10,7 @@
#include "konq_events.h"
#include "konq_frame.h"
-@@ -97,6 +98,10 @@
+@@ -97,6 +98,10 @@ KonqFrameStatusBar::KonqFrameStatusBar(
m_progressBar->hide();
addWidget( m_progressBar, 0, true /*permanent->right align*/ );
@@ -23,9 +23,9 @@
}
Index: konqueror/Makefile.am
===================================================================
---- konqueror/Makefile.am (.../KDE/3.5/kdebase) (revision 667321)
-+++ konqueror/Makefile.am (.../work/~wstephens/kdebase) (revision
667321)
-@@ -48,7 +48,7 @@
+--- konqueror/Makefile.am.orig
++++ konqueror/Makefile.am
+@@ -48,7 +48,7 @@ noinst_HEADERS = KonqMainWindowIface.h K
konq_misc.h konq_openurlrequest.h konq_profiledlg.h konq_run.h \
konq_view.h konq_viewmgr.h konq_extensionmanager.h version.h
++++++ kdeeject.diff ++++++
--- /var/tmp/diff_new_pack.f14453/_old 2009-04-07 14:07:35.000000000 +0200
+++ /var/tmp/diff_new_pack.f14453/_new 2009-04-07 14:07:35.000000000 +0200
@@ -1,6 +1,6 @@
Index: kdeeject/kdeeject
-================================================================================
---- kdeeject/kdeeject
+===================================================================
+--- kdeeject/kdeeject.orig
+++ kdeeject/kdeeject
@@ -4,12 +4,38 @@
#
@@ -47,7 +47,7 @@
# Checking for stuff in the PATH is ugly with sh.
# I guess this is the reason for making this a kde app...
OS=`uname -s`
-@@ -34,7 +60,5 @@
+@@ -34,7 +60,5 @@ if test $# -ge 1 -a "$1" != "--help"; th
elif test $quiet -eq 0; then
kdialog --title "KDE Eject" --error "Eject $1 failed!"
fi
++++++ kdesktop_icons.diff ++++++
--- /var/tmp/diff_new_pack.f14453/_old 2009-04-07 14:07:36.000000000 +0200
+++ /var/tmp/diff_new_pack.f14453/_new 2009-04-07 14:07:36.000000000 +0200
@@ -1,6 +1,8 @@
---- kdesktop/KDesktopIface.h
+Index: kdesktop/KDesktopIface.h
+===================================================================
+--- kdesktop/KDesktopIface.h.orig
+++ kdesktop/KDesktopIface.h
-@@ -107,6 +107,35 @@
+@@ -107,6 +107,35 @@ k_dcop:
* space for desktop icons
*/
virtual void desktopIconsAreaChanged(const QRect &area, int screen) = 0;
@@ -36,7 +38,9 @@
};
#endif
---- kdesktop/desktop.cc
+Index: kdesktop/desktop.cc
+===================================================================
+--- kdesktop/desktop.cc.orig
+++ kdesktop/desktop.cc
@@ -32,6 +32,9 @@
#include <unistd.h>
@@ -48,7 +52,7 @@
#include <qdir.h>
#include <qevent.h>
-@@ -58,6 +60,7 @@
+@@ -58,6 +61,7 @@
#include <kglobalsettings.h>
#include <kpopupmenu.h>
#include <kapplication.h>
@@ -56,7 +60,7 @@
// Create the equivalent of KAccelBase::connectItem
// and then remove this include and fix reconnects in initRoot() -- ellis
//#include <kaccelbase.h>
-@@ -981,4 +984,47 @@
+@@ -983,4 +987,47 @@ bool KDesktop::event(QEvent * e)
return QWidget::event(e);
}
@@ -104,9 +108,11 @@
+}
+
#include "desktop.moc"
---- kdesktop/desktop.h
+Index: kdesktop/desktop.h
+===================================================================
+--- kdesktop/desktop.h.orig
+++ kdesktop/desktop.h
-@@ -164,6 +164,11 @@
+@@ -164,6 +164,11 @@ protected:
virtual void setIconsEnabled( bool enable );
virtual bool event ( QEvent * e );
@@ -118,9 +124,11 @@
private slots:
void desktopResized();
---- kdesktop/kdiconview.cc
+Index: kdesktop/kdiconview.cc
+===================================================================
+--- kdesktop/kdiconview.cc.orig
+++ kdesktop/kdiconview.cc
-@@ -954,6 +954,18 @@
+@@ -962,6 +962,18 @@ void KDIconView::slotNewItems( const KFi
kdDebug(1214) << "KDIconView::slotNewItems count=" << entries.count() <<
endl;
KFileItemListIterator it(entries);
KFileIVI* fileIVI = 0L;
@@ -139,7 +147,7 @@
for (; it.current(); ++it)
{
KURL url = it.current()->url();
-@@ -1018,15 +1030,6 @@
+@@ -1026,15 +1038,6 @@ void KDIconView::slotNewItems( const KFi
kdDebug(1214)<<"Using saved position"<<endl;
}
}
@@ -155,7 +163,7 @@
}
}
-@@ -1630,6 +1633,98 @@
+@@ -1638,6 +1641,98 @@ void KDIconView::moveToFreePosition(QIco
}
@@ -254,7 +262,7 @@
void KDIconView::saveIconPositions()
{
kdDebug(1214) << "KDIconView::saveIconPositions" << endl;
-@@ -1657,4 +1752,11 @@
+@@ -1665,4 +1760,11 @@ void KDIconView::saveIconPositions()
m_dotDirectory->sync();
}
@@ -266,10 +274,12 @@
+
+
#include "kdiconview.moc"
---- kdesktop/kdiconview.h
+Index: kdesktop/kdiconview.h
+===================================================================
+--- kdesktop/kdiconview.h.orig
+++ kdesktop/kdiconview.h
-@@ -74,6 +74,8 @@
- void refreshIcons();
+@@ -73,6 +73,8 @@ public:
+
QStringList selectedURLs();
+ void update( const QString &url );
@@ -277,7 +287,7 @@
/**
* Save the icon positions
*/
-@@ -104,6 +106,10 @@
+@@ -103,6 +105,10 @@ public:
void startDirLister();
@@ -286,9 +296,9 @@
+ QPoint findPlaceForIcon( int column, int row );
+
protected slots:
+
// slots connected to the icon view
- void slotReturnPressed( QIconViewItem *item );
-@@ -112,8 +118,9 @@
+@@ -112,8 +118,9 @@ protected slots:
void slotMouseButtonClickedKDesktop(int _button, QIconViewItem* _item,
const QPoint& _global);
void slotContextMenuRequested(QIconViewItem* _item, const QPoint&
_global);
void slotEnableAction( const char * name, bool enabled );
++++++ kdesud-security.diff ++++++
--- /var/tmp/diff_new_pack.f14453/_old 2009-04-07 14:07:36.000000000 +0200
+++ /var/tmp/diff_new_pack.f14453/_new 2009-04-07 14:07:36.000000000 +0200
@@ -1,4 +1,6 @@
---- kdesu/kdesud/kdesud.cpp
+Index: kdesu/kdesud/kdesud.cpp
+===================================================================
+--- kdesu/kdesud/kdesud.cpp.orig
+++ kdesu/kdesud/kdesud.cpp
@@ -45,6 +45,7 @@
#include <pwd.h>
@@ -8,7 +10,7 @@
#include <sys/time.h>
#include <sys/stat.h>
#include <sys/types.h>
-@@ -248,6 +249,8 @@
+@@ -248,6 +249,8 @@ int create_socket()
int main(int argc, char *argv[])
{
++++++ kdm-admin-mode.diff ++++++
--- /var/tmp/diff_new_pack.f14453/_old 2009-04-07 14:07:36.000000000 +0200
+++ /var/tmp/diff_new_pack.f14453/_new 2009-04-07 14:07:36.000000000 +0200
@@ -1,6 +1,8 @@
---- kdm/config.def
+Index: kdm/config.def
+===================================================================
+--- kdm/config.def.orig
+++ kdm/config.def
-@@ -1988,6 +1988,17 @@
+@@ -2002,6 +2002,17 @@ Description:
Specify the widget style for the greeter. Empty means to use the
built-in default which currently is <literal>Plastik</literal>.
@@ -18,9 +20,11 @@
Key: ColorScheme
Type: string
Default: ""
---- kdm/kfrontend/Makefile.am
+Index: kdm/kfrontend/Makefile.am
+===================================================================
+--- kdm/kfrontend/Makefile.am.orig
+++ kdm/kfrontend/Makefile.am
-@@ -21,6 +21,7 @@
+@@ -21,6 +21,7 @@ kdm_greet_SOURCES = \
kchooser.cpp \
kgverify.cpp \
kdmshutdown.cpp \
@@ -28,7 +32,9 @@
kgreeter.cpp \
kgapp.cpp
kdm_greet_LDFLAGS = $(all_libraries) $(KDE_RPATH)
---- kdm/kfrontend/kdmadmindialog.cpp
+Index: kdm/kfrontend/kdmadmindialog.cpp
+===================================================================
+--- /dev/null
+++ kdm/kfrontend/kdmadmindialog.cpp
@@ -0,0 +1,176 @@
+ /*
@@ -207,7 +213,9 @@
+
+
+#include "kdmadmindialog.moc"
---- kdm/kfrontend/kdmadmindialog.h
+Index: kdm/kfrontend/kdmadmindialog.h
+===================================================================
+--- /dev/null
+++ kdm/kfrontend/kdmadmindialog.h
@@ -0,0 +1,70 @@
+ /*
@@ -280,9 +288,11 @@
+};
+
+#endif
---- kdm/kfrontend/kgreeter.cpp
+Index: kdm/kfrontend/kgreeter.cpp
+===================================================================
+--- kdm/kfrontend/kgreeter.cpp.orig
+++ kdm/kfrontend/kgreeter.cpp
-@@ -27,6 +27,7 @@
+@@ -27,6 +27,7 @@ Foundation, Inc., 51 Franklin Street, Fi
#include "kdmconfig.h"
#include "kdmclock.h"
#include "kdm_greet.h"
@@ -290,7 +300,7 @@
#include "themer/kdmthemer.h"
#include "themer/kdmitem.h"
#include "themer/kdmlabel.h"
-@@ -475,7 +476,7 @@
+@@ -509,7 +510,7 @@ KGreeter::insertSessions()
for (char **dit = _sessionsDirs; *dit; ++dit) {
QStringList ents = QDir( *dit ).entryList();
for (QStringList::ConstIterator it = ents.begin(); it !=
ents.end(); ++it)
@@ -299,7 +309,7 @@
KSimpleConfig dsk( QString( *dit ).append( '/'
).append( *it ) );
dsk.setGroup( "Desktop Entry" );
putSession( (*it).left( (*it).length() - 8 ),
-@@ -614,6 +615,17 @@
+@@ -648,6 +649,17 @@ KGreeter::slotLoadPrevWM()
return;
}
} else {
@@ -317,7 +327,7 @@
for (uint i = 0; i < sessionTypes.count() &&
!sessionTypes[i].hid; i++)
if (sessionTypes[i].type == sess) {
free( sess );
-@@ -962,6 +974,12 @@
+@@ -998,6 +1010,12 @@ KThemedGreeter::KThemedGreeter()
}
}
@@ -330,7 +340,7 @@
if (plugMenu) {
inserten( i18n("&Authentication Method"), 0, plugMenu );
needSep = true;
-@@ -1062,6 +1080,8 @@
+@@ -1103,6 +1121,8 @@ KThemedGreeter::slotThemeActivated( cons
slotSessMenu();
else if (id == "system_button")
slotActionMenu();
@@ -339,7 +349,7 @@
}
void
-@@ -1088,4 +1108,15 @@
+@@ -1129,4 +1149,15 @@ KThemedGreeter::keyPressEvent( QKeyEvent
accept();
}
@@ -355,9 +365,11 @@
+}
+
#include "kgreeter.moc"
---- kdm/kfrontend/kgreeter.h
+Index: kdm/kfrontend/kgreeter.h
+===================================================================
+--- kdm/kfrontend/kgreeter.h.orig
+++ kdm/kfrontend/kgreeter.h
-@@ -145,6 +145,7 @@
+@@ -146,6 +146,7 @@ class KThemedGreeter : public KGreeter {
void slotThemeActivated( const QString &id );
void slotSessMenu();
void slotActionMenu();
@@ -365,7 +377,7 @@
protected:
virtual void updateStatus( bool fail, bool caps, int timedleft );
-@@ -157,7 +158,7 @@
+@@ -158,7 +159,7 @@ class KThemedGreeter : public KGreeter {
KdmThemer *themer;
KdmItem *caps_warning, *xauth_warning, *pam_error, *timed_label,
*console_rect, *userlist_rect,
@@ -374,7 +386,9 @@
public: // from KGVerifyHandler
virtual void verifyFailed();
---- kdm/kfrontend/sessions/Makefile.am
+Index: kdm/kfrontend/sessions/Makefile.am
+===================================================================
+--- kdm/kfrontend/sessions/Makefile.am.orig
+++ kdm/kfrontend/sessions/Makefile.am
@@ -1,6 +1,6 @@
sessionsdir = $(kde_datadir)/kdm/sessions
@@ -384,7 +398,9 @@
9wm.desktop \
aewm++.desktop \
aewm.desktop \
---- kdm/kfrontend/sessions/admin.desktop
+Index: kdm/kfrontend/sessions/admin.desktop
+===================================================================
+--- /dev/null
+++ kdm/kfrontend/sessions/admin.desktop
@@ -0,0 +1,7 @@
+[Desktop Entry]
@@ -394,9 +410,11 @@
+TryExec=YaSTadminSession
+Name=admin
+Comment=Yast Admin Session
---- kdm/kfrontend/themer/kdmlabel.cpp
+Index: kdm/kfrontend/themer/kdmlabel.cpp
+===================================================================
+--- kdm/kfrontend/themer/kdmlabel.cpp.orig
+++ kdm/kfrontend/themer/kdmlabel.cpp
-@@ -214,6 +214,7 @@
+@@ -214,6 +214,7 @@ static const struct {
{ "language", I18N_NOOP("&Language") },
{ "session", I18N_NOOP("Session &Type") },
{ "system", I18N_NOOP("&System") }, // i18n("Actions");
++++++ kdm-aliasing.diff ++++++
--- /var/tmp/diff_new_pack.f14453/_old 2009-04-07 14:07:36.000000000 +0200
+++ /var/tmp/diff_new_pack.f14453/_new 2009-04-07 14:07:36.000000000 +0200
@@ -1,4 +1,6 @@
---- kdm/backend/Makefile.am
+Index: kdm/backend/Makefile.am
+===================================================================
+--- kdm/backend/Makefile.am.orig
+++ kdm/backend/Makefile.am
@@ -1,5 +1,6 @@
# forcibly remove thread-related defines & flags
@@ -6,4 +8,4 @@
+CFLAGS = $(XDM_CFLAGS) -fno-strict-aliasing
CPPFLAGS = $(USER_INCLUDES) $(X_INCLUDES) $(KRB4_INCS) $(KRB5_INCS) -I..
-I../..
LDFLAGS = $(USER_LDFLAGS) $(X_LDFLAGS) $(X_RPATH) $(KRB4_RPATH) $(KRB5_RPATH)
- LDADD = $(LIB_X11) -lXau $(LIBXDMCP) $(PASSWDLIBS) \
+ LDADD = $(LIB_X11) -lXau $(LIBXDMCP) $(PASSWDLIBS) $(LIBSHADOW) $(LIBGEN) \
++++++ kdm-align-userlist-labels.diff ++++++
--- /var/tmp/diff_new_pack.f14453/_old 2009-04-07 14:07:36.000000000 +0200
+++ /var/tmp/diff_new_pack.f14453/_new 2009-04-07 14:07:36.000000000 +0200
@@ -1,6 +1,8 @@
---- kdm/kfrontend/kgreeter.cpp 2007/08/14 09:35:13 1.65
-+++ kdm/kfrontend/kgreeter.cpp 2007/08/14 12:27:44
-@@ -57,6 +57,7 @@
+Index: kdm/kfrontend/kgreeter.cpp
+===================================================================
+--- kdm/kfrontend/kgreeter.cpp.orig
++++ kdm/kfrontend/kgreeter.cpp
+@@ -59,6 +59,7 @@ Foundation, Inc., 51 Franklin Street, Fi
#include <qtooltip.h>
#include <qaccel.h>
#include <qeventloop.h>
@@ -8,7 +10,7 @@
#include <pwd.h>
#include <grp.h>
-@@ -279,6 +280,33 @@
+@@ -313,6 +314,33 @@ KGreeter::insertUser( const QImage &defa
if ( p.isNull() )
p = default_pix;
++++++ kdm-all-users-nopass.diff ++++++
--- /var/tmp/diff_new_pack.f14453/_old 2009-04-07 14:07:36.000000000 +0200
+++ /var/tmp/diff_new_pack.f14453/_new 2009-04-07 14:07:36.000000000 +0200
@@ -1,8 +1,8 @@
-Index: kdm/config.def
-================================================================================
---- kdm/backend/client.c
+Index: kdm/backend/client.c
+===================================================================
+--- kdm/backend/client.c.orig
+++ kdm/backend/client.c
-@@ -372,6 +372,9 @@
+@@ -386,6 +386,9 @@ AccNoPass( const char *un, struct passwd
if (cursource != PWSRC_MANUAL)
return 1;
@@ -12,9 +12,11 @@
for (hg = 0, fp = td->noPassUsers; *fp; fp++)
if (**fp == '@')
hg = 1;
---- kdm/config.def
+Index: kdm/config.def
+===================================================================
+--- kdm/config.def.orig
+++ kdm/config.def
-@@ -1852,6 +1852,15 @@
+@@ -1852,6 +1852,15 @@ Description:
(and any other user with UID = 0).
<emphasis>Never</emphasis> list <systemitem
class="username">root</systemitem>.
++++++ kdm-audit-log.diff ++++++
--- /var/tmp/diff_new_pack.f14453/_old 2009-04-07 14:07:36.000000000 +0200
+++ /var/tmp/diff_new_pack.f14453/_new 2009-04-07 14:07:36.000000000 +0200
@@ -1,10 +1,10 @@
Index: kdm/backend/client.c
===================================================================
---- kdm/backend/client.c (Revision 662873)
-+++ kdm/backend/client.c (Arbeitskopie)
-@@ -82,6 +82,14 @@
- # include <time.h>
- #endif /* USE_PAM || _AIX */
+--- kdm/backend/client.c.orig
++++ kdm/backend/client.c
+@@ -87,6 +87,14 @@ extern int loginsuccess( const char *Use
+ #include "consolekit.h"
+ #endif
+#define AU_FAILED 0
+#define AU_SUCCESS 1
@@ -17,7 +17,7 @@
/*
* Session data, mostly what struct verify_info was for
*/
-@@ -286,6 +294,56 @@
+@@ -291,6 +299,56 @@ fail_delay( int retval ATTR_UNUSED, unsi
{}
# endif
@@ -74,7 +74,7 @@
static int
doPAMAuth( const char *psrv, struct pam_data *pdata )
{
-@@ -344,6 +402,8 @@
+@@ -349,6 +407,8 @@ doPAMAuth( const char *psrv, struct pam_
GSendStr( curuser );
}
if (pretc != PAM_SUCCESS) {
@@ -83,7 +83,7 @@
switch (pretc) {
case PAM_USER_UNKNOWN:
case PAM_AUTH_ERR:
-@@ -678,6 +738,8 @@
+@@ -702,6 +762,8 @@ Verify( GConvFunc gconv, int rootok )
if (!p->pw_uid) {
if (!rootok && !td->allowRootLogin)
V_RET_FAIL( "Root logins are not allowed" );
@@ -92,7 +92,7 @@
return 1; /* don't deny root to log in */
}
-@@ -714,6 +776,8 @@
+@@ -738,6 +800,8 @@ Verify( GConvFunc gconv, int rootok )
}
if (pretc == PAM_SUCCESS)
break;
@@ -101,7 +101,7 @@
/* effectively there is only PAM_AUTHTOK_ERR */
GSendInt( V_FAIL );
}
-@@ -803,6 +867,8 @@
+@@ -827,6 +891,8 @@ Verify( GConvFunc gconv, int rootok )
GSendInt( V_MSG_ERR );
GSendStr( "Your account has expired;"
" please contact your system
administrator" );
@@ -110,7 +110,7 @@
GSendInt( V_FAIL );
LC_RET0;
} else if (tim > (expir - warntime) && !quietlog) {
-@@ -837,6 +903,8 @@
+@@ -861,6 +927,8 @@ Verify( GConvFunc gconv, int rootok )
GSendInt( V_MSG_ERR );
GSendStr( "Your account has expired;"
" please contact your system
administrator" );
@@ -119,7 +119,7 @@
GSendInt( V_FAIL );
LC_RET0;
}
-@@ -896,6 +964,8 @@
+@@ -920,6 +988,8 @@ Verify( GConvFunc gconv, int rootok )
close( fd );
}
GSendStr( "Logins are not allowed at the moment.\nTry again
later" );
@@ -128,7 +128,7 @@
GSendInt( V_FAIL );
LC_RET0;
}
-@@ -906,6 +976,8 @@
+@@ -930,6 +1000,8 @@ Verify( GConvFunc gconv, int rootok )
PrepErrorGreet();
GSendInt( V_MSG_ERR );
GSendStr( "You are not allowed to login at the moment" );
@@ -137,7 +137,7 @@
GSendInt( V_FAIL );
LC_RET0;
}
-@@ -917,6 +989,8 @@
+@@ -941,6 +1013,8 @@ Verify( GConvFunc gconv, int rootok )
Debug( "shell not in /etc/shells\n" );
endusershell();
V_RET_FAIL( "Your login shell is not listed in
/etc/shells" );
@@ -146,7 +146,7 @@
}
if (!strcmp( s, p->pw_shell )) {
endusershell();
-@@ -1326,6 +1400,9 @@
+@@ -1365,6 +1439,9 @@ StartClient()
# define D_LOGIN_SETGROUP 0
#endif /* USE_PAM */
@@ -158,10 +158,10 @@
endpwent();
Index: kdm/configure.in.in
===================================================================
---- kdm/configure.in.in (Revision 662873)
-+++ kdm/configure.in.in (Arbeitskopie)
-@@ -241,3 +241,27 @@
- fi
+--- kdm/configure.in.in.orig
++++ kdm/configure.in.in
+@@ -288,3 +288,27 @@ fi
+ AC_SUBST(DBUS_LIBS)
dnl AC_OUTPUT(kdm/kfrontend/sessions/kde.desktop)
+
++++++ kdm-color-scheme.diff ++++++
--- /var/tmp/diff_new_pack.f14453/_old 2009-04-07 14:07:36.000000000 +0200
+++ /var/tmp/diff_new_pack.f14453/_new 2009-04-07 14:07:36.000000000 +0200
@@ -1,6 +1,8 @@
---- kdm/kfrontend/kgapp.cpp 2007/07/27 10:29:40 1.55
-+++ kdm/kfrontend/kgapp.cpp 2007/07/27 11:54:57
-@@ -42,6 +42,7 @@
+Index: kdm/kfrontend/kgapp.cpp
+===================================================================
+--- kdm/kfrontend/kgapp.cpp.orig
++++ kdm/kfrontend/kgapp.cpp
+@@ -42,6 +42,7 @@ Foundation, Inc., 51 Franklin Street, Fi
#include <qtimer.h>
#include <qcursor.h>
#include <qpalette.h>
@@ -8,7 +10,7 @@
#include <stdlib.h> // free(), exit()
#include <unistd.h> // alarm()
-@@ -144,7 +145,14 @@
+@@ -144,7 +145,14 @@ kg_main( const char *argv0 )
if (!_GUIStyle.isEmpty())
app.setStyle( _GUIStyle );
++++++ kdm-consolekit.diff ++++++
--- /var/tmp/diff_new_pack.f14453/_old 2009-04-07 14:07:36.000000000 +0200
+++ /var/tmp/diff_new_pack.f14453/_new 2009-04-07 14:07:36.000000000 +0200
@@ -1,8 +1,10 @@
---- kdm/backend/client.c
-+++ kdm/backend/client.c
-@@ -82,6 +82,10 @@
- # include <time.h>
- #endif /* USE_PAM || _AIX */
+Index: kdm/backend/client.c
+===================================================================
+--- kdm/backend/client.c.orig
++++ kdm/backend/client.c
+@@ -83,6 +83,10 @@ extern int loginsuccess( const char *Use
+ #endif
+ #include <signal.h>
+#ifdef WITH_CONSOLE_KIT
+#include "consolekit.h"
@@ -11,7 +13,7 @@
/*
* Session data, mostly what struct verify_info was for
*/
-@@ -1097,8 +1101,13 @@
+@@ -1124,8 +1128,13 @@ static int removeSession;
static int removeCreds;
#endif
@@ -25,7 +27,7 @@
{
const char *home, *sessargs, *desksess;
char **env, *xma;
-@@ -1194,6 +1203,11 @@
+@@ -1223,6 +1232,11 @@ StartClient()
if (krbtkfile[0] != '\0')
env = setEnv( env, "KRBTKFILE", krbtkfile );
#endif
@@ -37,8 +39,10 @@
userEnviron = inheritEnv( env, envvars );
env = systemEnv( p->pw_name );
systemEnviron = setEnv( env, "HOME", p->pw_dir );
---- kdm/backend/consolekit.c 1970-01-01 01:00:00.000000000 +0100
-+++ kdm/backend/consolekit.c 2007-04-18 00:34:42.000000000 +0200
+Index: kdm/backend/consolekit.c
+===================================================================
+--- /dev/null
++++ kdm/backend/consolekit.c
@@ -0,0 +1,552 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
+ *
@@ -592,8 +596,10 @@
+ dbus_connection_close (private_connection);
+ private_connection = NULL;
+}
---- kdm/backend/consolekit.h 1970-01-01 01:00:00.000000000 +0100
-+++ kdm/backend/consolekit.h 2007-04-18 00:34:51.000000000 +0200
+Index: kdm/backend/consolekit.h
+===================================================================
+--- /dev/null
++++ kdm/backend/consolekit.h
@@ -0,0 +1,36 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
+ *
@@ -631,9 +637,11 @@
+ const char *x11_display);
+
+#endif /* __CONSOLE_KIT_H */
---- kdm/backend/dm.h 2005-09-10 10:26:12.000000000 +0200
-+++ kdm/backend/dm.h 2007-04-17 23:07:13.000000000 +0200
-@@ -37,6 +37,8 @@
+Index: kdm/backend/dm.h
+===================================================================
+--- kdm/backend/dm.h.orig
++++ kdm/backend/dm.h
+@@ -37,6 +37,8 @@ from the copyright holder.
#ifndef _DM_H_
#define _DM_H_ 1
@@ -642,7 +650,7 @@
#include "greet.h"
#include <config.ci>
-@@ -476,7 +478,11 @@
+@@ -476,7 +478,11 @@ char **GRecvArgv( void );
#define GCONV_BINARY 5
typedef char *(*GConvFunc)( int what, const char *prompt );
int Verify( GConvFunc gconv, int rootok );
@@ -654,9 +662,11 @@
void SessionExit( int status ) ATTR_NORETURN;
int ReadDmrc( void );
extern char **userEnviron, **systemEnviron;
---- kdm/backend/Imakefile 2005-09-10 10:26:12.000000000 +0200
-+++ kdm/backend/Imakefile 2007-04-17 20:09:50.000000000 +0200
-@@ -155,13 +155,13 @@
+Index: kdm/backend/Imakefile
+===================================================================
+--- kdm/backend/Imakefile.orig
++++ kdm/backend/Imakefile
+@@ -155,13 +155,13 @@ PROCTITLE_DEFINES = -DHAS_SETPROCTITLE
netaddr.c reset.c resource.c protodpy.c policy.c \
session.c socket.c streams.c util.c xdmcp.c \
process.c mitauth.c \
@@ -672,9 +682,19 @@
$(XDMAUTHOBJS) $(RPCOBJS) $(KRB5OBJS)
SRCS1 = $(COMMSRCS) client.c
---- kdm/backend/Makefile.am 2005-09-10 10:26:13.000000000 +0200
-+++ kdm/backend/Makefile.am 2007-04-17 22:01:27.000000000 +0200
-@@ -13,6 +13,7 @@
+Index: kdm/backend/Makefile.am
+===================================================================
+--- kdm/backend/Makefile.am.orig
++++ kdm/backend/Makefile.am
+@@ -1,6 +1,6 @@
+ # forcibly remove thread-related defines & flags
+ AUTOMAKE_OPTIONS = foreign
+-AM_CPPFLAGS = $(USER_INCLUDES) $(X_INCLUDES) $(KRB4_INCS) $(KRB5_INCS) -I..
-I../..
++AM_CPPFLAGS = -DWITH_CONSOLE_KIT=1 $(USER_INCLUDES) $(X_INCLUDES)
$(KRB4_INCS) $(KRB5_INCS) $(DBUS_INCS) -I.. -I../..
+
+ bin_PROGRAMS = kdm
+ kdm_SOURCES = \
+@@ -9,6 +9,7 @@ kdm_SOURCES = \
bootman.c \
choose.c \
client.c \
@@ -682,9 +702,20 @@
ctrl.c \
daemon.c \
dm.c \
---- kdm/backend/session.c 2006-01-19 18:03:14.000000000 +0100
-+++ kdm/backend/session.c 2007-04-28 15:57:00.000000000 +0200
-@@ -45,6 +45,10 @@
+@@ -37,7 +38,7 @@ kdm_SOURCES = \
+ kdm_LDFLAGS = $(USER_LDFLAGS) $(X_LDFLAGS) $(X_RPATH) $(KRB4_RPATH)
$(KRB5_RPATH)
+ kdm_LDADD = $(LIB_X11) -lXau $(LIBXDMCP) $(PASSWDLIBS) \
+ $(LIB_LIBS) $(KRB4_LIBS) $(KRB5_LIBS) $(LIBSOCKET) $(LIBRESOLV) \
+- $(LIBUCB) $(LIBUTIL) $(LIBPOSIX4)
++ $(DBUS_LIBS) $(LIBUCB) $(LIBUTIL) $(LIBPOSIX4)
+
+ EXTRA_DIST = printf.c
+
+Index: kdm/backend/session.c
+===================================================================
+--- kdm/backend/session.c.orig
++++ kdm/backend/session.c
+@@ -45,6 +45,10 @@ from the copyright holder.
#include <ctype.h>
#include <signal.h>
@@ -695,7 +726,7 @@
struct display *td;
const char *td_setup = "auto";
-@@ -525,6 +529,9 @@
+@@ -530,6 +534,9 @@ ManageSession( struct display *d )
int ex, cmd;
volatile int clientPid = 0;
volatile Time_t tdiff = 0;
@@ -705,7 +736,7 @@
td = d;
Debug( "ManageSession %s\n", d->name );
-@@ -620,7 +627,12 @@
+@@ -626,7 +633,12 @@ ManageSession( struct display *d )
if (td_setup)
SetupDisplay( td_setup );
@@ -718,7 +749,7 @@
LogError( "Client start failed\n" );
SessionExit( EX_NORMAL ); /* XXX maybe EX_REMANAGE_DPY? --
enable in dm.c! */
}
-@@ -642,6 +654,14 @@
+@@ -648,6 +660,14 @@ ManageSession( struct display *d )
catchTerm( SIGTERM );
}
}
@@ -733,9 +764,11 @@
/*
* Sometimes the Xsession somehow manages to exit before
* a server crash is noticed - so we sleep a bit and wait
---- kdm/configure.in.in
-+++ kdm/configure.in.in
-@@ -240,4 +240,51 @@
+Index: kdm/configure.in.in
+===================================================================
+--- kdm/configure.in.in.orig
++++ kdm/configure.in.in
+@@ -240,4 +240,51 @@ if test "x$with_kdm_xconsole" = xyes; th
AC_DEFINE(WITH_KDM_XCONSOLE, 1, [Build kdm with built-in xconsole])
fi
@@ -787,22 +820,3 @@
+ AC_SUBST(DBUS_LIBS)
+
dnl AC_OUTPUT(kdm/kfrontend/sessions/kde.desktop)
---- kdm/backend/Makefile.am
-+++ kdm/backend/Makefile.am
-@@ -1,6 +1,6 @@
- # forcibly remove thread-related defines & flags
- AUTOMAKE_OPTIONS = foreign
--AM_CPPFLAGS = $(USER_INCLUDES) $(X_INCLUDES) $(KRB4_INCS) $(KRB5_INCS) -I..
-I../..
-+AM_CPPFLAGS = -DWITH_CONSOLE_KIT=1 $(USER_INCLUDES) $(X_INCLUDES)
$(KRB4_INCS) $(KRB5_INCS) $(DBUS_INCS) -I.. -I../..
-
- bin_PROGRAMS = kdm
- kdm_SOURCES = \
-@@ -38,7 +38,7 @@ kdm_SOURCES = \
- kdm_LDFLAGS = $(USER_LDFLAGS) $(X_LDFLAGS) $(X_RPATH) $(KRB4_RPATH)
$(KRB5_RPATH)
- kdm_LDADD = $(LIB_X11) -lXau $(LIBXDMCP) $(PASSWDLIBS) \
- $(LIB_LIBS) $(KRB4_LIBS) $(KRB5_LIBS) $(LIBSOCKET) $(LIBRESOLV) \
-- $(LIBUCB) $(LIBUTIL) $(LIBPOSIX4)
-+ $(DBUS_LIBS) $(LIBUCB) $(LIBUTIL) $(LIBPOSIX4)
-
- EXTRA_DIST = printf.c
-
++++++ kdm-cope-with-new-grub.diff ++++++
--- /var/tmp/diff_new_pack.f14453/_old 2009-04-07 14:07:37.000000000 +0200
+++ /var/tmp/diff_new_pack.f14453/_new 2009-04-07 14:07:37.000000000 +0200
@@ -1,8 +1,8 @@
Index: kdm/backend/bootman.c
-================================================================================
---- kdm/backend/bootman.c
+===================================================================
+--- kdm/backend/bootman.c.orig
+++ kdm/backend/bootman.c
-@@ -130,19 +130,14 @@
+@@ -132,19 +132,14 @@ setGrub( const char *opt, SdRec *sdr )
static void
commitGrub( void )
{
++++++ kdm-make_it_cool.diff ++++++
++++ 950 lines (skipped)
++++ between KDE/kdebase3/kdm-make_it_cool.diff
++++ and /mounts/work_src_done/STABLE/kdebase3/kdm-make_it_cool.diff
++++++ kdm-mark_autologin.diff ++++++
--- /var/tmp/diff_new_pack.f14453/_old 2009-04-07 14:07:37.000000000 +0200
+++ /var/tmp/diff_new_pack.f14453/_new 2009-04-07 14:07:37.000000000 +0200
@@ -1,6 +1,8 @@
---- kdm/backend/client.c
+Index: kdm/backend/client.c
+===================================================================
+--- kdm/backend/client.c.orig
+++ kdm/backend/client.c
-@@ -1135,6 +1135,8 @@
+@@ -1214,6 +1214,8 @@ StartClient()
env = setEnv( env, "PATH", curuid ? td->userPath : td->systemPath );
env = setEnv( env, "SHELL", p->pw_shell );
env = setEnv( env, "HOME", p->pw_dir );
++++++ kdm-relaxed-auth.diff ++++++
--- /var/tmp/diff_new_pack.f14453/_old 2009-04-07 14:07:37.000000000 +0200
+++ /var/tmp/diff_new_pack.f14453/_new 2009-04-07 14:07:37.000000000 +0200
@@ -1,8 +1,8 @@
Index: kdm/backend/auth.c
-================================================================================
---- kdm/backend/auth.c
+===================================================================
+--- kdm/backend/auth.c.orig
+++ kdm/backend/auth.c
-@@ -518,6 +518,7 @@
+@@ -518,6 +518,7 @@ DefineLocal( FILE *file, Xauth *auth, in
uname( &name );
writeAddr( FamilyLocal, strlen( name.nodename ), name.nodename,
file, auth, ok );
@@ -10,7 +10,7 @@
#endif
#if !defined(NEED_UTSNAME) || defined(__hpux)
-@@ -1211,6 +1212,9 @@
+@@ -1211,6 +1212,9 @@ SetUserAuthorization( struct display *d
userEnviron = setEnv( userEnviron, "XAUTHORITY",
envname );
systemEnviron = setEnv( systemEnviron, "XAUTHORITY",
envname );
}
++++++ kdm-suspend-hal.diff ++++++
--- /var/tmp/diff_new_pack.f14453/_old 2009-04-07 14:07:37.000000000 +0200
+++ /var/tmp/diff_new_pack.f14453/_new 2009-04-07 14:07:37.000000000 +0200
@@ -1,6 +1,8 @@
---- kdm/backend/ctrl.c
+Index: kdm/backend/ctrl.c
+===================================================================
+--- kdm/backend/ctrl.c.orig
+++ kdm/backend/ctrl.c
-@@ -483,6 +483,10 @@
+@@ -483,6 +483,10 @@ processCtrl( const char *string, int len
Reply( "nuke\t" );
}
}
@@ -11,9 +13,11 @@
if ((d->displayType & d_location) == dLocal &&
AnyReserveDisplays())
Writer( fd, cbuf, sprintf( cbuf,
"reserve %d\t",
---- kdm/backend/greet.h
+Index: kdm/backend/greet.h
+===================================================================
+--- kdm/backend/greet.h.orig
+++ kdm/backend/greet.h
-@@ -125,6 +125,7 @@
+@@ -125,6 +125,7 @@ from the copyright holder.
# define SHUT_REBOOT 1 /* how */
# define SHUT_HALT 2
# define SHUT_CONSOLE -1 /* pseudo-code */
@@ -21,9 +25,11 @@
# define SHUT_SCHEDULE 0 /* when; config only */
# define SHUT_TRYNOW 1
# define SHUT_FORCENOW 2
---- kdm/config.def
+Index: kdm/config.def
+===================================================================
+--- kdm/config.def.orig
+++ kdm/config.def
-@@ -1798,6 +1798,19 @@
+@@ -1799,6 +1799,19 @@ Description:
Who is allowed to shut down the system. This applies both to the
greeter and to the command <acronym>FiFo</acronym>.
@@ -43,9 +49,11 @@
Key: AllowSdForceNow
Type: enum
None: no forced shutdown is allowed at all
---- kdm/kfrontend/kdmshutdown.cpp
+Index: kdm/kfrontend/kdmshutdown.cpp
+===================================================================
+--- kdm/kfrontend/kdmshutdown.cpp.orig
+++ kdm/kfrontend/kdmshutdown.cpp
-@@ -22,6 +22,7 @@
+@@ -22,6 +22,7 @@ Foundation, Inc., 51 Franklin Street, Fi
*/
@@ -53,7 +61,7 @@
#include "kdmshutdown.h"
#include "kdm_greet.h"
-@@ -34,6 +35,7 @@
+@@ -34,6 +35,7 @@ Foundation, Inc., 51 Franklin Street, Fi
#include <kdialog.h>
#include <kstandarddirs.h>
#include <kuser.h>
@@ -61,7 +69,7 @@
#include <qcombobox.h>
#include <qvbuttongroup.h>
-@@ -57,6 +59,10 @@
+@@ -57,6 +59,10 @@ Foundation, Inc., 51 Franklin Street, Fi
int KDMShutdownBase::curPlugin = -1;
PluginList KDMShutdownBase::pluginList;
@@ -72,7 +80,7 @@
KDMShutdownBase::KDMShutdownBase( int _uid, QWidget *_parent )
: inherited( _parent )
, box( new QVBoxLayout( this, KDmh, KDsh ) )
-@@ -71,6 +77,7 @@
+@@ -71,6 +77,7 @@ KDMShutdownBase::KDMShutdownBase( int _u
, verify( 0 )
, needRoot( -1 )
, uid( _uid )
@@ -80,7 +88,7 @@
{
}
-@@ -87,6 +94,7 @@
+@@ -87,6 +94,7 @@ KDMShutdownBase::complete( QWidget *prev
if (uid &&
((willShut && _allowShutdown == SHUT_ROOT) ||
@@ -88,7 +96,7 @@
(mayNuke && _allowNuke == SHUT_ROOT)))
{
rootlab = new QLabel( i18n("Root authorization required."),
this );
-@@ -169,6 +177,7 @@
+@@ -169,6 +177,7 @@ KDMShutdownBase::updateNeedRoot()
{
int nNeedRoot = uid &&
(((willShut && _allowShutdown == SHUT_ROOT) ||
@@ -96,7 +104,7 @@
(_allowNuke == SHUT_ROOT && doesNuke)));
if (verify && nNeedRoot != needRoot) {
if (needRoot == 1)
-@@ -425,7 +434,7 @@
+@@ -425,7 +434,7 @@ KDMRadioButton::mouseDoubleClickEvent( Q
KDMDelayedPushButton::KDMDelayedPushButton( const KGuiItem &item,
@@ -105,7 +113,7 @@
const char *name )
: inherited( item, parent, name )
, pop( 0 )
-@@ -490,6 +499,57 @@
+@@ -490,6 +499,57 @@ KDMSlimShutdown::KDMSlimShutdown( QWidge
buttonlay->addWidget( btnReboot );
connect( btnReboot, SIGNAL(clicked()), SLOT(slotReboot()) );
@@ -163,7 +171,7 @@
GSet( 1 );
GSendInt( G_ListBootOpts );
if (GRecvInt() == BO_OK) {
-@@ -536,6 +596,65 @@
+@@ -536,6 +596,65 @@ KDMSlimShutdown::~KDMSlimShutdown()
freeStrArr( targetList );
}
@@ -229,7 +237,7 @@
void
KDMSlimShutdown::slotSched()
{
-@@ -601,16 +720,27 @@
+@@ -601,16 +720,27 @@ KDMConfShutdown::KDMConfShutdown( int _u
if (type == SHUT_CONSOLE)
willShut = false;
#endif
@@ -264,9 +272,11 @@
.arg( os ?
i18n("<br>(Next boot: %1)")
.arg( QString::fromLocal8Bit( os ) ) :
---- kdm/kfrontend/kdmshutdown.h
+Index: kdm/kfrontend/kdmshutdown.h
+===================================================================
+--- kdm/kfrontend/kdmshutdown.h.orig
+++ kdm/kfrontend/kdmshutdown.h
-@@ -67,7 +67,7 @@
+@@ -67,7 +67,7 @@ class KDMShutdownBase : public FDialog,
#else
static const bool willShut = true;
#endif
@@ -275,7 +285,7 @@
private slots:
void slotSched();
-@@ -118,7 +118,6 @@
+@@ -118,7 +118,6 @@ class KDMShutdown : public KDMShutdownBa
QComboBox *targets;
int oldTarget;
int sch_st, sch_to;
@@ -283,7 +293,7 @@
};
class KDMRadioButton : public QRadioButton {
-@@ -168,10 +167,13 @@
+@@ -168,10 +167,13 @@ class KDMSlimShutdown : public FDialog {
void slotReboot();
void slotReboot( int );
void slotSched();
@@ -297,9 +307,11 @@
};
---- kdm/kfrontend/Makefile.am
+Index: kdm/kfrontend/Makefile.am
+===================================================================
+--- kdm/kfrontend/Makefile.am.orig
+++ kdm/kfrontend/Makefile.am
-@@ -4,7 +4,7 @@
+@@ -4,7 +4,7 @@ GENKDMCONF_FLAGS =
SUBDIRS = themer themes pics sessions
AM_CPPFLAGS = -I$(srcdir)/../backend -I.. -I$(top_srcdir)/kcontrol/background
\
@@ -308,7 +320,7 @@
bin_PROGRAMS = kdm_config kdm_greet krootimage genkdmconf kdmctl
-@@ -25,7 +25,7 @@
+@@ -25,7 +25,7 @@ kdm_greet_SOURCES = \
kgreeter.cpp \
kgapp.cpp
kdm_greet_LDFLAGS = $(all_libraries) $(KDE_RPATH)
++++++ kdm-sysconfig-values.diff ++++++
--- /var/tmp/diff_new_pack.f14453/_old 2009-04-07 14:07:37.000000000 +0200
+++ /var/tmp/diff_new_pack.f14453/_new 2009-04-07 14:07:37.000000000 +0200
@@ -1,6 +1,8 @@
+Index: kdm/config.def
+===================================================================
--- kdm/config.def.orig
+++ kdm/config.def
-@@ -792,6 +792,21 @@
+@@ -792,6 +792,21 @@ Description:
<emphasis>Do not</emphasis> change it, you may interfere with future
upgrades and this could result in &kdm; failing to run.
@@ -22,7 +24,7 @@
Key: PAMService
If: defined(USE_PAM)
Type: string
-@@ -874,10 +889,10 @@
+@@ -874,10 +889,10 @@ Description:
Key: PidFile
Type: string
@@ -36,7 +38,7 @@
Comment:
Where &kdm; should store its PID (do not store if empty).
Description:
-@@ -901,10 +916,10 @@
+@@ -901,10 +916,10 @@ Description:
Key: AuthDir
Type: path
# differs from XDM
@@ -50,7 +52,7 @@
Comment:
Where to store authorization files.
Description:
-@@ -930,7 +945,7 @@
+@@ -930,7 +945,7 @@ Description:
Key: ExportList
Type: list
@@ -59,7 +61,7 @@
User: core
Instance: #"LD_LIBRARY_PATH,ANOTHER_IMPORTANT_VAR"
Merge: xdm(P_List)
-@@ -1063,9 +1078,10 @@
+@@ -1063,9 +1078,10 @@ Description:
Key: Enable
Type: bool
@@ -71,7 +73,7 @@
Comment: &
Description:
Whether &kdm; should listen to incoming &XDMCP; requests.
-@@ -1102,11 +1118,10 @@
+@@ -1102,11 +1118,10 @@ Description:
Key: Xaccess
Type: string
# differs from xdm
@@ -86,7 +88,7 @@
Comment:
&XDMCP; access control file in the usual XDM-Xaccess format.
Description:
-@@ -1164,13 +1179,11 @@
+@@ -1164,13 +1179,11 @@ Description:
Key: Willing
Type: string
@@ -102,7 +104,7 @@
Comment:
The program which is invoked to dynamically generate replies to &XDMCP;
DirectQuery or BroadcastQuery requests.
-@@ -1244,7 +1257,7 @@
+@@ -1244,7 +1257,7 @@ Type: enum
None/BO_NONE: no boot manager
Grub/BO_GRUB: Grub boot manager
Lilo/BO_LILO: Lilo boot manager (Linux on i386 & x86-64 only)
@@ -111,7 +113,7 @@
User: core
User: greeter
Instance: #Grub
-@@ -1347,6 +1360,7 @@
+@@ -1347,6 +1360,7 @@ Default: DEF_SERVER_CMD
DDefault: -
User: core
Instance: :*/DEF_SERVER_CMD
@@ -119,7 +121,7 @@
Comment:
The command line to start the &X-Server;, without display number and VT spec.
This string is subject to word splitting.
-@@ -1355,7 +1369,7 @@
+@@ -1355,7 +1369,7 @@ Description:
This string is subject to word splitting.
</para><para>
The default is something reasonable for the system on which &kdm; was built,
@@ -128,7 +130,7 @@
Key: ServerArgsLocal
Type: string
-@@ -1549,11 +1563,10 @@
+@@ -1549,11 +1563,10 @@ Description:
Key: Resources
# XXX strictly speaking this is supposed to be a string list, i think.
Type: string
@@ -142,7 +144,7 @@
Comment:
Specify a file with X-resources for the greeter, chooser and background.
The KDE frontend does not use this file, so you do not need it unless you
-@@ -1581,12 +1594,11 @@
+@@ -1581,12 +1594,11 @@ Description:
Key: Setup
Type: string
@@ -157,7 +159,7 @@
Comment:
A program to run before the greeter is shown. Can be used to start an
xconsole or an alternative background generator. Subject to word splitting.
-@@ -1602,12 +1614,11 @@
+@@ -1602,12 +1614,11 @@ Description:
Key: Startup
Type: string
@@ -172,7 +174,7 @@
Comment:
A program to run before a user session starts. Subject to word splitting.
Description:
-@@ -1620,12 +1631,11 @@
+@@ -1620,12 +1631,11 @@ Description:
Key: Reset
Type: string
@@ -187,7 +189,7 @@
Comment:
A program to run after a user session exits. Subject to word splitting.
Description:
-@@ -1638,12 +1648,12 @@
+@@ -1638,12 +1648,12 @@ Description:
Key: Session
Type: string
@@ -202,7 +204,7 @@
Comment:
The program which is run as the user which logs in. It is supposed to
interpret the session argument (see SessionsDirs) and start an appropriate
-@@ -1746,10 +1756,11 @@
+@@ -1746,10 +1756,11 @@ Description:
Key: AllowRootLogin
Type: bool
@@ -216,7 +218,7 @@
Merge: xdm
Comment:
Allow root logins?
-@@ -1764,6 +1775,7 @@
+@@ -1764,6 +1775,7 @@ User: core
# sensible?
Instance: */false
Instance: :*/true
@@ -224,7 +226,7 @@
Merge: xdm
Comment:
Allow to log in, when user has set an empty password?
-@@ -1775,7 +1775,7 @@
+@@ -1775,12 +1787,13 @@ Type: enum
None/SHUT_NONE: no <guilabel>Shutdown...</guilabel> menu entry is shown at
all
Root/SHUT_ROOT: the <systemitem class="username">root</systemitem> password
must be entered to shut down
All/SHUT_ALL: everybody can shut down the machine
@@ -233,10 +235,6 @@
User: core
User: greeter
Instance: */Root
-@@ -1779,8 +1791,9 @@
- User: core
- User: greeter
- Instance: */Root
-Instance: :*/All
-Merge: kdm:-Greeter/
+Instance: #:*/All
@@ -245,7 +243,7 @@
Comment: &
Description:
Who is allowed to shut down the system. This applies both to the
-@@ -1866,6 +1879,7 @@
+@@ -1866,6 +1879,7 @@ Type: bool
Default: false
User: dep
Instance: #:0/true
@@ -253,7 +251,7 @@
Comment: &
Description:
Enable automatic login. <emphasis>Use with extreme care!</emphasis>
-@@ -1899,7 +1913,7 @@
+@@ -1899,7 +1913,7 @@ Default: ""
PostProc: PautoLoginX
User: core(autoUser)
User: greeter
@@ -262,7 +260,7 @@
Merge: xdm:autoUser(P_autoUser)
Comment: &
Description:
-@@ -1930,10 +1944,10 @@
+@@ -1930,10 +1944,10 @@ Description:
Key: SessionsDirs
Type: list
@@ -275,7 +273,7 @@
Comment:
The directories containing session type definitions in .desktop format.
Description:
-@@ -2008,7 +2022,8 @@
+@@ -2008,7 +2022,8 @@ Type: enum
Clock/LOGO_CLOCK: a neat analog clock
Default: Clock
User: greeter
@@ -285,7 +283,7 @@
Comment:
What should be shown in the greeter's logo are:
Description:
-@@ -2223,7 +2238,7 @@
+@@ -2223,7 +2238,7 @@ Description:
Key: HiddenUsers
Type: list
@@ -294,7 +292,7 @@
User: greeter-c(noUsers)
Instance: #*/"root"
# depends on {Min,Max}ShowUID
-@@ -2363,13 +2378,14 @@
+@@ -2363,13 +2378,14 @@ Type: enum
Default: OneStar
User: greeter
Instance: #*/NoEcho
@@ -310,7 +308,7 @@
User: greeter
Instance: #*/!
Comment:
-@@ -2507,6 +2523,7 @@
+@@ -2507,6 +2523,7 @@ Type: bool
Default: false
User: greeter
Instance: :0/true
@@ -318,7 +316,7 @@
Comment:
Enable &kdm;'s built-in xconsole. Note that this can be enabled for only
one display at a time.
-@@ -2595,9 +2612,10 @@
+@@ -2595,9 +2612,10 @@ Description:
Key: Preloader
Type: string
@@ -331,7 +329,7 @@
Comment: &
Description:
A program to run while the greeter is visible. It is supposed to preload
-@@ -2606,7 +2624,7 @@
+@@ -2606,7 +2624,7 @@ Description:
Key: UseTheme
Type: bool
@@ -340,7 +338,7 @@
User: greeter
Instance: #*/true
Comment: &
-@@ -2615,9 +2633,10 @@
+@@ -2615,9 +2633,10 @@ Description:
Key: Theme
Type: string
@@ -353,6 +351,8 @@
Comment: &
Description:
The theme to use for the greeter. Can point to either a directory or an XML
+Index: kdm/kfrontend/read_sysconfig.sh
+===================================================================
--- /dev/null
+++ kdm/kfrontend/read_sysconfig.sh
@@ -0,0 +1,147 @@
@@ -503,9 +503,11 @@
+
+) > ${kdmdir}/kdmrc.sysconfig
+
+Index: kdm/kfrontend/kdm_config.c
+===================================================================
--- kdm/kfrontend/kdm_config.c.orig
+++ kdm/kfrontend/kdm_config.c
-@@ -386,7 +386,7 @@
+@@ -386,7 +386,7 @@ static const char *kdmrc = KDMCONF "/kdm
static Section *rootsec;
static void
@@ -514,7 +516,7 @@
{
const char *nstr, *dstr, *cstr, *dhost, *dnum, *dclass;
char *s, *e, *st, *en, *ek, *sl, *pt;
-@@ -396,14 +396,9 @@
+@@ -396,14 +396,9 @@ ReadConf()
int nlen, dlen, clen, dhostl, dnuml, dclassl;
int i, line, sectmoan, restl;
File file;
@@ -531,7 +533,7 @@
return;
for (s = file.buf, line = 0, cursec = 0, sectmoan = 1; s < file.eof;
s++) {
-@@ -429,7 +424,7 @@
+@@ -429,7 +424,7 @@ ReadConf()
e--;
if (*e != ']') {
cursec = 0;
@@ -540,16 +542,18 @@
continue;
}
nstr = sl + 1;
-@@ -439,7 +434,7 @@
+@@ -438,8 +433,8 @@ ReadConf()
+ if (nlen == cursec->nlen &&
!memcmp( nstr, cursec->name, nlen ))
{
- LogInfo( "Multiple occurrences of
section [%.*s] in %s. "
+- LogInfo( "Multiple occurrences of
section [%.*s] in %s. "
- "Consider merging them.\n",
nlen, nstr, kdmrc );
++ Debug( "Multiple occurrences of section
[%.*s] in %s. "
+ "Consider merging them.\n",
nlen, nstr, rcfile );
goto secfnd;
}
if (nstr[0] == 'X' && nstr[1] == '-') {
-@@ -495,7 +490,7 @@
+@@ -495,7 +490,7 @@ ReadConf()
illsec:
cursec = 0;
LogError( "Unrecognized section name [%.*s] at %s:%d\n",
@@ -558,7 +562,7 @@
continue;
newsec:
if (!(cursec = Malloc( sizeof(*cursec) )))
-@@ -523,7 +518,7 @@
+@@ -523,7 +518,7 @@ ReadConf()
if (!cursec) {
if (sectmoan) {
sectmoan = 0;
@@ -567,7 +571,7 @@
}
goto sktoeol;
}
-@@ -531,13 +526,13 @@
+@@ -531,13 +526,13 @@ ReadConf()
for (; (s < file.eof) && (*s != '\n'); s++)
if (*s == '=')
goto haveeq;
@@ -583,7 +587,7 @@
goto sktoeol;
}
if (!isspace( *ek ))
-@@ -551,7 +546,7 @@
+@@ -551,7 +546,7 @@ ReadConf()
if (*s == '\\') {
s++;
if (s >= file.eof || *s == '\n') {
@@ -592,7 +596,7 @@
break;
}
switch (*s) {
-@@ -580,29 +575,42 @@
+@@ -580,29 +575,42 @@ ReadConf()
goto keyok;
}
LogError( "Unrecognized key '%.*s' in section [%.*s] at
%s:%d\n",
@@ -640,9 +644,11 @@
static Entry *
FindGEnt( int id )
{
+Index: kdm/kfrontend/genkdmconf.c
+===================================================================
--- kdm/kfrontend/genkdmconf.c.orig
+++ kdm/kfrontend/genkdmconf.c
-@@ -66,6 +66,7 @@
+@@ -66,6 +66,7 @@ Foundation, Inc., 51 Franklin Street, Fi
#define stringify(x) __stringify(x)
#define RCVERSTR stringify(RCVERMAJOR) "." stringify(RCVERMINOR)
@@ -650,7 +656,7 @@
static int old_scripts, no_old_scripts, old_confs, no_old,
no_backup, no_in_notice, use_destdir, mixed_scripts;
-@@ -73,7 +74,7 @@
+@@ -73,7 +74,7 @@ static const char *newdir = KDMCONF, *fa
*oldxdm, *oldkde;
static int oldver;
@@ -659,7 +665,7 @@
typedef struct StrList {
struct StrList *next;
-@@ -462,6 +463,7 @@
+@@ -462,6 +463,7 @@ wrconf( FILE *f )
const char *cmt;
putfqval( "General", "ConfigVersion", RCVERSTR );
@@ -667,7 +673,7 @@
for (cs = config; cs; cs = cs->next) {
fprintf( f, "%s[%s]\n",
cs->comment ? cs->comment : "\n", cs->name );
-@@ -1363,6 +1365,26 @@
+@@ -1363,6 +1365,26 @@ upd_consolettys( Entry *ce, Section *cs
}
#endif
@@ -694,7 +700,7 @@
#ifdef XDMCP
static void
cp_keyfile( Entry *ce, Section *cs ATTR_UNUSED )
-@@ -2228,7 +2250,7 @@
+@@ -2228,7 +2250,7 @@ static int
mergeKdmRcNewer( const char *path )
{
char *p;
@@ -703,7 +709,7 @@
RSection *rootsect, *cs;
REntry *ce;
int i, j;
-@@ -2291,8 +2313,12 @@
+@@ -2291,8 +2313,12 @@ mergeKdmRcNewer( const char *path )
}
#ifdef XDMCP
@@ -717,9 +723,11 @@
if (!*(cp = getfqval( "General", "ConfigVersion", "" ))) { /* < 3.1 */
mod_usebg = 1;
if (is22conf( path )) {
+Index: kdm/kfrontend/Makefile.am
+===================================================================
--- kdm/kfrontend/Makefile.am.orig
+++ kdm/kfrontend/Makefile.am
-@@ -64,3 +64,7 @@
+@@ -64,3 +64,7 @@ kdm_greet_COMPILE_FIRST = ../config.ci
kdm_config_COMPILE_FIRST = ../config.ci
genkdmconf_COMPILE_FIRST = ../config.ci
@@ -727,14 +735,3 @@
+appsdir = $(kde_datadir)/kdm
+apps_SCRIPTS = read_sysconfig.sh
+
---- kdm/kfrontend/kdm_config.c.orig
-+++ kdm/kfrontend/kdm_config.c
-@@ -433,7 +433,7 @@
- if (nlen == cursec->nlen &&
- !memcmp( nstr, cursec->name, nlen ))
- {
-- LogInfo( "Multiple occurrences of
section [%.*s] in %s. "
-+ Debug( "Multiple occurrences of section
[%.*s] in %s. "
- "Consider merging them.\n",
nlen, nstr, rcfile );
- goto secfnd;
- }
++++++ kdm-use-rpmoptflags.diff ++++++
--- /var/tmp/diff_new_pack.f14453/_old 2009-04-07 14:07:37.000000000 +0200
+++ /var/tmp/diff_new_pack.f14453/_new 2009-04-07 14:07:37.000000000 +0200
@@ -1,5 +1,7 @@
---- kdm/backend/Makefile.am.orig 2007-01-17 13:55:28.000000000 +0100
-+++ kdm/backend/Makefile.am 2007-01-17 13:59:19.000000000 +0100
+Index: kdm/backend/Makefile.am
+===================================================================
+--- kdm/backend/Makefile.am.orig
++++ kdm/backend/Makefile.am
@@ -1,11 +1,6 @@
# forcibly remove thread-related defines & flags
AUTOMAKE_OPTIONS = foreign
++++++ kdm-wordbreak.diff ++++++
--- /var/tmp/diff_new_pack.f14453/_old 2009-04-07 14:07:37.000000000 +0200
+++ /var/tmp/diff_new_pack.f14453/_new 2009-04-07 14:07:37.000000000 +0200
@@ -1,8 +1,8 @@
Index: kdm/kfrontend/kfdialog.cpp
-================================================================================
---- kdm/kfrontend/kfdialog.cpp
+===================================================================
+--- kdm/kfrontend/kfdialog.cpp.orig
+++ kdm/kfrontend/kfdialog.cpp
-@@ -28,6 +28,7 @@
+@@ -28,6 +28,7 @@ Foundation, Inc., 51 Franklin Street, Fi
#include <klocale.h>
#include <kpushbutton.h>
#include <kstdguiitem.h>
@@ -10,7 +10,7 @@
#include <qlabel.h>
#include <qlayout.h>
-@@ -137,6 +138,9 @@
+@@ -137,6 +138,9 @@ KFMsgBox::KFMsgBox( QWidget *parent, QMe
QLabel *label1 = new QLabel( this );
label1->setPixmap( QMessageBox::standardIcon( type ) );
QLabel *label2 = new QLabel( text, this );
++++++ khelpcenter-beagle.diff ++++++
--- /var/tmp/diff_new_pack.f14453/_old 2009-04-07 14:07:37.000000000 +0200
+++ /var/tmp/diff_new_pack.f14453/_new 2009-04-07 14:07:37.000000000 +0200
@@ -1,6 +1,6 @@
-Index: khc_beagle_search.pl
+Index: khelpcenter/searchhandlers/khc_beagle_search.pl
===================================================================
---- khelpcenter/searchhandlers/khc_beagle_search.pl
+--- /dev/null
+++ khelpcenter/searchhandlers/khc_beagle_search.pl
@@ -0,0 +1,88 @@
+#!/usr/bin/perl -w
@@ -91,15 +91,9 @@
+@hits = ("There are no search results") if ($#hits < 0);
+
+formatHTML(\@words, \@hits);
-
-Property changes on: khc_beagle_search.pl
-___________________________________________________________________
-Name: svn:executable
- + *
-
-Index: khc_beagle_index.pl
+Index: khelpcenter/searchhandlers/khc_beagle_index.pl
===================================================================
---- khelpcenter/searchhandlers/khc_beagle_index.pl
+--- /dev/null
+++ khelpcenter/searchhandlers/khc_beagle_index.pl
@@ -0,0 +1,49 @@
+#!/usr/bin/perl
@@ -151,15 +145,10 @@
+if (addRoot) {
+ createExistsFile($idir, $ident);
+}
-
-Property changes on: khc_beagle_index.pl
-___________________________________________________________________
-Name: svn:executable
- + *
-Index: docbook.desktop
+Index: khelpcenter/searchhandlers/docbook.desktop
===================================================================
---- khelpcenter/searchhandlers/docbook.desktop
(.../KDE/3.5/kdebase/khelpcenter/searchhandlers) (revision 605405)
-+++ khelpcenter/searchhandlers/docbook.desktop
(.../work/suse_kickoff/khelpcenter/searchhandlers) (revision 605405)
+--- khelpcenter/searchhandlers/docbook.desktop.orig
++++ khelpcenter/searchhandlers/docbook.desktop
@@ -2,5 +2,5 @@
DocumentTypes=text/docbook
@@ -168,11 +157,11 @@
-IndexCommand=khc_docbookdig.pl --indexdir=%d --docpath=%p --identifier=%i
+SearchCommand=khc_beagle_search.pl --method=%o --maxnum=%m %w
+IndexCommand=khc_beagle_index.pl %d %i
-Index: Makefile.am
+Index: khelpcenter/searchhandlers/Makefile.am
===================================================================
---- khelpcenter/searchhandlers/Makefile.am
(.../KDE/3.5/kdebase/khelpcenter/searchhandlers) (revision 605405)
-+++ khelpcenter/searchhandlers/Makefile.am
(.../work/suse_kickoff/khelpcenter/searchhandlers) (revision 605405)
-@@ -3,7 +3,7 @@
+--- khelpcenter/searchhandlers/Makefile.am.orig
++++ khelpcenter/searchhandlers/Makefile.am
+@@ -3,7 +3,7 @@ searchhandlers_DATA = htdig.desktop man.
searchhandlersdir = $(kde_datadir)/khelpcenter/searchhandlers
kde_bin_SCRIPTS = khc_htdig.pl khc_htsearch.pl khc_mansearch.pl \
++++++ khelpcenter-delayed-indexcheck.cpp ++++++
--- /var/tmp/diff_new_pack.f14453/_old 2009-04-07 14:07:37.000000000 +0200
+++ /var/tmp/diff_new_pack.f14453/_new 2009-04-07 14:07:37.000000000 +0200
@@ -1,6 +1,8 @@
---- khelpcenter/navigator.cpp 2007/08/22 12:24:13 1.121
-+++ khelpcenter/navigator.cpp 2007/08/22 13:28:51
-@@ -121,8 +121,6 @@
+Index: khelpcenter/navigator.cpp
+===================================================================
+--- khelpcenter/navigator.cpp.orig
++++ khelpcenter/navigator.cpp
+@@ -121,8 +121,6 @@ Navigator::Navigator( View *view, QWidge
mTabWidget = new QTabWidget( this );
topLayout->addWidget( mTabWidget );
@@ -9,7 +11,7 @@
setupContentsTab();
setupGlossaryTab();
-@@ -136,6 +134,9 @@
+@@ -136,6 +134,9 @@ Navigator::Navigator( View *view, QWidge
mSearchWidget->updateScopeList();
mSearchWidget->readConfig( KGlobal::config() );
}
++++++ khelpcenter-gnome-support.patch ++++++
--- /var/tmp/diff_new_pack.f14453/_old 2009-04-07 14:07:37.000000000 +0200
+++ /var/tmp/diff_new_pack.f14453/_new 2009-04-07 14:07:37.000000000 +0200
@@ -1,6 +1,6 @@
-Index: khelpcenter/table-of-contents.xslt
-================================================================================
---- khelpcenter/docentry.cpp
+Index: khelpcenter/docentry.cpp
+===================================================================
+--- khelpcenter/docentry.cpp.orig
+++ khelpcenter/docentry.cpp
@@ -1,5 +1,6 @@
#include <qregexp.h>
@@ -9,7 +9,7 @@
#include <kdebug.h>
#include <kdesktopfile.h>
-@@ -206,6 +207,37 @@
+@@ -206,6 +207,37 @@ bool DocEntry::readFromFile( const QStri
{
KDesktopFile file( fileName );
@@ -47,7 +47,9 @@
mName = file.readName();
mSearch = file.readEntry( "X-DOC-Search" );
mIcon = file.readIcon();
---- khelpcenter/navigator.cpp
+Index: khelpcenter/navigator.cpp
+===================================================================
+--- khelpcenter/navigator.cpp.orig
+++ khelpcenter/navigator.cpp
@@ -22,6 +22,7 @@
#include <sys/types.h>
@@ -57,7 +59,7 @@
#include <qdir.h>
#include <qfile.h>
-@@ -275,6 +276,38 @@
+@@ -275,6 +276,38 @@ void Navigator::createItemFromDesktopFil
const QString &file )
{
KDesktopFile desktopFile( file );
@@ -96,7 +98,7 @@
QString docPath = desktopFile.readDocPath();
if ( !docPath.isNull() ) {
// First parameter is ignored if second is an absolute path
-@@ -317,6 +350,9 @@
+@@ -317,6 +350,9 @@ void Navigator::selectItem( const KURL &
{
alternativeURL.setQuery("anchor="+url.ref());
alternativeURL.setRef(QString::null);
@@ -106,7 +108,7 @@
}
// If the navigator already has the given URL selected, do nothing.
-@@ -401,15 +437,43 @@
+@@ -401,15 +437,43 @@ void Navigator::slotItemSelected( QListV
TOC *tocTree = item->createTOC();
kdDebug( 1400 ) << "slotItemSelected(): Trying to build TOC for "
<< item->entry()->name() << endl;
@@ -155,7 +157,9 @@
kdDebug( 1400 ) << "slotItemSelected(): doc = " << doc << endl;
tocTree->build( doc );
---- khelpcenter/navigatorappitem.cpp
+Index: khelpcenter/navigatorappitem.cpp
+===================================================================
+--- khelpcenter/navigatorappitem.cpp.orig
+++ khelpcenter/navigatorappitem.cpp
@@ -21,6 +21,8 @@
@@ -166,7 +170,7 @@
#include <kdebug.h>
#include <kservicegroup.h>
-@@ -134,11 +136,42 @@
+@@ -134,11 +136,42 @@ void NavigatorAppItem::populate( bool re
QString NavigatorAppItem::documentationURL( KService *s )
{
@@ -210,7 +214,9 @@
return docPath;
return QString( "help:/" ) + docPath;
---- khelpcenter/table-of-contents.xslt
+Index: khelpcenter/table-of-contents.xslt
+===================================================================
+--- khelpcenter/table-of-contents.xslt.orig
+++ khelpcenter/table-of-contents.xslt
@@ -8,6 +8,12 @@
</table-of-contents>
@@ -241,9 +247,11 @@
+</xsl:template>
+
</xsl:stylesheet>
---- khelpcenter/view.cpp
+Index: khelpcenter/view.cpp
+===================================================================
+--- khelpcenter/view.cpp.orig
+++ khelpcenter/view.cpp
-@@ -146,21 +146,51 @@
+@@ -150,21 +150,51 @@ QString View::langLookup( const QString
// assemble the local search paths
const QStringList localDoc = KGlobal::dirs()->resourceDirs("html");
@@ -300,7 +308,7 @@
QFileInfo info(*it);
if (info.exists() && info.isFile() && info.isReadable())
return *it;
-@@ -168,7 +198,7 @@
+@@ -172,7 +202,7 @@ QString View::langLookup( const QString
// Fall back to the index.docbook for this language if we couldn't
find its
// specific docbook file. If we are not looking up docbook (images,
// css etc) then look in other languages first.
@@ -309,7 +317,7 @@
{
QString file = (*it).left((*it).findRev('/')) + "/index.docbook";
info.setFile(file);
-@@ -176,9 +206,15 @@
+@@ -180,9 +210,15 @@ QString View::langLookup( const QString
{
return *it;
}
++++++ khelpcenter-localindices.patch ++++++
--- /var/tmp/diff_new_pack.f14453/_old 2009-04-07 14:07:37.000000000 +0200
+++ /var/tmp/diff_new_pack.f14453/_new 2009-04-07 14:07:37.000000000 +0200
@@ -1,6 +1,8 @@
---- khelpcenter/kcmhelpcenter.cpp
+Index: khelpcenter/kcmhelpcenter.cpp
+===================================================================
+--- khelpcenter/kcmhelpcenter.cpp.orig
+++ khelpcenter/kcmhelpcenter.cpp
-@@ -321,6 +321,7 @@
+@@ -321,6 +321,7 @@ bool KCMHelpCenter::save()
void KCMHelpCenter::load()
{
@@ -8,7 +10,7 @@
mIndexDirLabel->setText( Prefs::indexDirectory() );
mListView->clear();
-@@ -675,6 +676,12 @@
+@@ -675,6 +676,12 @@ void KCMHelpCenter::checkSelection()
enableButtonOK( count != 0 );
}
@@ -21,9 +23,11 @@
#include "kcmhelpcenter.moc"
// vim:ts=2:sw=2:et
---- khelpcenter/kcmhelpcenter.h
+Index: khelpcenter/kcmhelpcenter.h
+===================================================================
+--- khelpcenter/kcmhelpcenter.h.orig
+++ khelpcenter/kcmhelpcenter.h
-@@ -146,6 +146,11 @@
+@@ -146,6 +146,11 @@ class KCMHelpCenter : public KDialogBase
void advanceProgress();
++++++ khelpcenter-use-suseconfig-indexer.diff ++++++
--- /var/tmp/diff_new_pack.f14453/_old 2009-04-07 14:07:37.000000000 +0200
+++ /var/tmp/diff_new_pack.f14453/_new 2009-04-07 14:07:37.000000000 +0200
@@ -1,8 +1,8 @@
Index: khelpcenter/navigator.cpp
-================================================================================
---- khelpcenter/navigator.cpp
+===================================================================
+--- khelpcenter/navigator.cpp.orig
+++ khelpcenter/navigator.cpp
-@@ -654,10 +654,16 @@
+@@ -654,10 +654,16 @@ void Navigator::hideSearch()
bool Navigator::checkSearchIndex()
{
++++++ khelpcenter-use-susehelp.diff ++++++
--- /var/tmp/diff_new_pack.f14453/_old 2009-04-07 14:07:37.000000000 +0200
+++ /var/tmp/diff_new_pack.f14453/_new 2009-04-07 14:07:37.000000000 +0200
@@ -1,6 +1,8 @@
---- kdebase-3.5.4/khelpcenter/khelpcenter.desktop
-+++ kdebase-3.5.4/khelpcenter/khelpcenter.desktop
-@@ -116,7 +116,7 @@
+Index: kdebase-3.5.10/khelpcenter/khelpcenter.desktop
+===================================================================
+--- kdebase-3.5.10.orig/khelpcenter/khelpcenter.desktop
++++ kdebase-3.5.10/khelpcenter/khelpcenter.desktop
+@@ -127,7 +127,7 @@ Icon=khelpcenter
DocPath=khelpcenter/index.html
Type=Service
Terminal=false
++++++ khotkeys-multimedia-action2.diff ++++++
--- /var/tmp/diff_new_pack.f14453/_old 2009-04-07 14:07:37.000000000 +0200
+++ /var/tmp/diff_new_pack.f14453/_new 2009-04-07 14:07:37.000000000 +0200
@@ -1,5 +1,7 @@
---- khotkeys/shared/actions.cpp.sav 2006-12-06 16:54:40.000000000 +0100
-+++ khotkeys/shared/actions.cpp 2006-12-18 18:11:47.000000000 +0100
+Index: khotkeys/shared/actions.cpp
+===================================================================
+--- khotkeys/shared/actions.cpp.orig
++++ khotkeys/shared/actions.cpp
@@ -29,6 +29,7 @@
#include <kaccel.h>
#include <kservice.h>
@@ -8,7 +10,7 @@
#include "windows.h"
#include "action_data.h"
-@@ -116,14 +117,16 @@ void Command_url_action::execute()
+@@ -116,7 +117,6 @@ void Command_url_action::execute()
{
if( command_url().isEmpty())
return;
@@ -16,7 +18,7 @@
QString cmd = command_url();
static bool sm_ready = false;
if( !sm_ready )
- {
+@@ -124,6 +124,9 @@ void Command_url_action::execute()
kapp->propagateSessionManager();
sm_ready = true;
}
@@ -26,7 +28,7 @@
// int space_pos = command_url().find( ' ' );
// if( command_url()[ 0 ] != '\'' && command_url()[ 0 ] != '"' &&
space_pos > -1
// && command_url()[ space_pos - 1 ] != '\\' )
-@@ -170,6 +173,38 @@ void Command_url_action::execute()
+@@ -176,6 +179,38 @@ void Command_url_action::execute()
timeout.start( 1000, true ); // 1sec timeout
}
@@ -65,8 +67,10 @@
QString Command_url_action::description() const
{
return i18n( "Command/URL : " ) + command_url();
---- khotkeys/shared/actions.h.sav 2006-12-06 16:54:40.000000000 +0100
-+++ khotkeys/shared/actions.h 2006-12-14 15:53:16.000000000 +0100
+Index: khotkeys/shared/actions.h
+===================================================================
+--- khotkeys/shared/actions.h.orig
++++ khotkeys/shared/actions.h
@@ -75,6 +75,7 @@ class KDE_EXPORT Command_url_action
protected:
QTimer timeout;
++++++ khotkeys-multimedia-action.diff ++++++
--- /var/tmp/diff_new_pack.f14453/_old 2009-04-07 14:07:37.000000000 +0200
+++ /var/tmp/diff_new_pack.f14453/_new 2009-04-07 14:07:37.000000000 +0200
@@ -1,4 +1,6 @@
---- khotkeys/data/multimedia_keys.khotkeys.sav
+Index: khotkeys/data/multimedia_keys.khotkeys
+===================================================================
+--- /dev/null
+++ khotkeys/data/multimedia_keys.khotkeys
@@ -0,0 +1,311 @@
+[Data]
@@ -312,7 +314,9 @@
+Version=2
+ImportId=multimedia_keys
+
---- khotkeys/data/Makefile.am.sav
+Index: khotkeys/data/Makefile.am
+===================================================================
+--- khotkeys/data/Makefile.am.orig
+++ khotkeys/data/Makefile.am
@@ -1,7 +1,9 @@
-khotkeys_data_DATA = kde32b1.khotkeys konqueror_gestures_kde321.khotkeys
printscreen.khotkeys
@@ -326,7 +330,9 @@
khotkeys_updatedir = $(kde_datadir)/kconf_update
EXTRA_DIST = $(khotkeys_data_DATA) $(khotkeys_update_DATA)
---- khotkeys/data/khotkeys_multimedia_keys.upd.sav
+Index: khotkeys/data/khotkeys_multimedia_keys.upd
+===================================================================
+--- /dev/null
+++ khotkeys/data/khotkeys_multimedia_keys.upd
@@ -0,0 +1,8 @@
+Id=multimedia_keys
++++++ kicker-defaults.diff ++++++
--- /var/tmp/diff_new_pack.f14453/_old 2009-04-07 14:07:37.000000000 +0200
+++ /var/tmp/diff_new_pack.f14453/_new 2009-04-07 14:07:37.000000000 +0200
@@ -1,8 +1,8 @@
-Index: kicker/libkicker/kickerSettings.kcfg
-================================================================================
---- kcontrol/kcontrol/KControl.desktop
+Index: kcontrol/kcontrol/KControl.desktop
+===================================================================
+--- kcontrol/kcontrol/KControl.desktop.orig
+++ kcontrol/kcontrol/KControl.desktop
-@@ -8,7 +8,9 @@
+@@ -7,7 +7,9 @@ Type=Application
DocPath=kcontrol/index.html
X-KDE-StartupNotify=true
@@ -13,14 +13,16 @@
Name[af]=Beheer Sentrum
Name[ar]=مركز التحكم
Name[az]=İdarə Mərkəzi
-@@ -86,3 +88,4 @@
+@@ -93,3 +95,4 @@ Name[zu]=Indawo Yokulawula
X-DCOP-ServiceType=Unique
Categories=Qt;KDE;Core;
+Keywords=control,center
---- kicker/libkicker/kickerSettings.kcfg
+Index: kicker/libkicker/kickerSettings.kcfg
+===================================================================
+--- kicker/libkicker/kickerSettings.kcfg.orig
+++ kicker/libkicker/kickerSettings.kcfg
-@@ -175,7 +175,7 @@
+@@ -159,7 +159,7 @@
<entry name="MenuExtensions" key="Extensions" type="StringList" >
<label>Optional Menus</label>
@@ -29,18 +31,22 @@
</entry>
<entry name="RecentAppsStat" type="StringList" >
---- kicker/menuext/system/systemmenu.desktop
+Index: kicker/menuext/system/systemmenu.desktop
+===================================================================
+--- kicker/menuext/system/systemmenu.desktop.orig
+++ kicker/menuext/system/systemmenu.desktop
@@ -1,5 +1,5 @@
[Desktop Entry]
-Name=System Menu
+Name=My System
Name[af]=Stelsel Kieslys
- Name[bg]=Системно меню
- Name[bn]=সিস্টেম মেনু
---- kcontrol/kicker/hidingtab_impl.cpp 2006/11/09 19:01:43 1.1
-+++ kcontrol/kicker/hidingtab_impl.cpp 2006/11/09 19:02:30
-@@ -200,7 +200,7 @@
+ Name[ar]=قائمة النظام
+ Name[be]=Сістэмнае меню
+Index: kcontrol/kicker/hidingtab_impl.cpp
+===================================================================
+--- kcontrol/kicker/hidingtab_impl.cpp.orig
++++ kcontrol/kicker/hidingtab_impl.cpp
+@@ -200,7 +200,7 @@ void HidingTab::defaults()
m_delaySpinBox->setValue( 3 );
m_autoHideSwitch->setChecked( false );
m_lHB->setChecked( false );
++++++ kio-media-errorhandling.diff ++++++
--- /var/tmp/diff_new_pack.f14453/_old 2009-04-07 14:07:38.000000000 +0200
+++ /var/tmp/diff_new_pack.f14453/_new 2009-04-07 14:07:38.000000000 +0200
@@ -1,6 +1,8 @@
---- kioslave/media/mediaimpl.cpp
+Index: kioslave/media/mediaimpl.cpp
+===================================================================
+--- kioslave/media/mediaimpl.cpp.orig
+++ kioslave/media/mediaimpl.cpp
-@@ -267,6 +267,13 @@ bool MediaImpl::ensureMediumMounted(Medi
+@@ -274,6 +274,13 @@ bool MediaImpl::ensureMediumMounted(Medi
return m_lastErrorCode==0;
}
++++++ klipperrc.diff ++++++
--- /var/tmp/diff_new_pack.f14453/_old 2009-04-07 14:07:38.000000000 +0200
+++ /var/tmp/diff_new_pack.f14453/_new 2009-04-07 14:07:38.000000000 +0200
@@ -1,6 +1,8 @@
---- klipper/klipperrc.desktop
+Index: klipper/klipperrc.desktop
+===================================================================
+--- klipper/klipperrc.desktop.orig
+++ klipper/klipperrc.desktop
-@@ -212,7 +212,7 @@
+@@ -232,7 +232,7 @@ Number of commands=5
Regexp=^https?://.
[Action_1/Command_0]
@@ -8,8 +10,8 @@
+Commandline=kfmclient openURL %s
Description=Open with &Konqueror
Description[af]=Maak oop met Konqueror
- Description[ar]=فتح ب&كونكيورر
-@@ -1508,7 +1508,7 @@
+ Description[ar]=إفتح بــ &Konqueror
+@@ -1644,7 +1644,7 @@ Number of commands=5
Regexp=^ftp://.
[Action_6/Command_0]
@@ -17,4 +19,4 @@
+Commandline=kfmclient openURL %s
Description=Open with &Konqueror
Description[af]=Maak oop met Konqueror
- Description[ar]=فتح ب&كونكيورر
+ Description[ar]=إفتح بــ &Konqueror
++++++ kmenu-search-fs20050503-fixed.diff ++++++
--- /var/tmp/diff_new_pack.f14453/_old 2009-04-07 14:07:38.000000000 +0200
+++ /var/tmp/diff_new_pack.f14453/_new 2009-04-07 14:07:38.000000000 +0200
@@ -1,6 +1,8 @@
---- kicker/kicker/ui/k_mnu.cpp
+Index: kicker/kicker/ui/k_mnu.cpp
+===================================================================
+--- kicker/kicker/ui/k_mnu.cpp.orig
+++ kicker/kicker/ui/k_mnu.cpp
-@@ -26,9 +26,13 @@
+@@ -26,9 +26,13 @@ CONNECTION WITH THE SOFTWARE OR THE USE
#include <unistd.h>
#include <dmctl.h>
@@ -14,7 +16,7 @@
#include <dcopclient.h>
#include <kapplication.h>
-@@ -40,9 +44,11 @@
+@@ -40,9 +44,11 @@ CONNECTION WITH THE SOFTWARE OR THE USE
#include <kglobal.h>
#include <kglobalsettings.h>
#include <kiconloader.h>
@@ -26,7 +28,7 @@
#include <kwin.h>
#include "client_mnu.h"
-@@ -58,9 +64,12 @@
+@@ -58,9 +64,12 @@ CONNECTION WITH THE SOFTWARE OR THE USE
#include "quickbrowser_mnu.h"
#include "recentapps.h"
@@ -39,7 +41,7 @@
PanelKMenu::PanelKMenu()
: PanelServiceMenu(QString::null, QString::null, 0, "KMenu")
, bookmarkMenu(0)
-@@ -165,6 +174,26 @@
+@@ -165,6 +174,26 @@ void PanelKMenu::paletteChanged()
}
}
@@ -66,7 +68,7 @@
void PanelKMenu::initialize()
{
// kdDebug(1210) << "PanelKMenu::initialize()" << endl;
-@@ -191,13 +220,29 @@
+@@ -191,13 +220,29 @@ void PanelKMenu::initialize()
// add services
PanelServiceMenu::initialize();
@@ -98,7 +100,7 @@
}
// create recent menu section
-@@ -740,3 +785,43 @@
+@@ -737,3 +782,43 @@ void PanelKMenu::clearRecentMenuItems()
}
@@ -142,9 +144,11 @@
+ KPanelMenu::keyPressEvent(e);
+ }
+}
---- kicker/kicker/ui/k_mnu.h
+Index: kicker/kicker/ui/k_mnu.h
+===================================================================
+--- kicker/kicker/ui/k_mnu.h.orig
+++ kicker/kicker/ui/k_mnu.h
-@@ -73,6 +73,8 @@
+@@ -73,6 +73,8 @@ protected slots:
void slotSaveSession();
void slotRunCommand();
void slotEditUserContact();
@@ -153,7 +157,7 @@
void paletteChanged();
virtual void configChanged();
void updateRecent();
-@@ -89,6 +91,8 @@
+@@ -89,6 +91,8 @@ protected:
void doNewSession(bool lock);
void createRecentMenuItems();
virtual void clearSubmenus();
@@ -162,7 +166,7 @@
private:
QPopupMenu *sessionsMenu;
-@@ -101,6 +105,8 @@
+@@ -101,6 +105,8 @@ private:
KActionCollection *actionCollection;
KBookmarkOwner *bookmarkOwner;
PopupMenuList dynamicSubMenus;
@@ -171,9 +175,11 @@
};
#endif
---- kicker/kicker/ui/service_mnu.cpp
+Index: kicker/kicker/ui/service_mnu.cpp
+===================================================================
+--- kicker/kicker/ui/service_mnu.cpp.orig
+++ kicker/kicker/ui/service_mnu.cpp
-@@ -26,6 +26,7 @@
+@@ -26,6 +26,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE
#include <qbitmap.h>
#include <qpixmap.h>
#include <qimage.h>
@@ -181,7 +187,7 @@
#include <dcopclient.h>
#include <kapplication.h>
-@@ -100,6 +101,8 @@
+@@ -100,6 +101,8 @@ void PanelServiceMenu::initialize()
clear();
clearSubmenus();
@@ -190,7 +196,7 @@
doInitialize();
}
-@@ -296,6 +299,10 @@
+@@ -296,6 +299,10 @@ void PanelServiceMenu::fillMenu(KService
int newId = insertItem(iconset, groupCaption, m, id++);
entryMap_.insert(newId, static_cast<KSycocaEntry*>(g));
@@ -201,7 +207,7 @@
// We have to delete the sub menu our selves! (See Qt docs.)
subMenus.append(m);
}
-@@ -308,6 +315,7 @@
+@@ -308,6 +315,7 @@ void PanelServiceMenu::fillMenu(KService
}
KService::Ptr s(static_cast<KService *>(e));
@@ -209,7 +215,7 @@
insertMenuItem(s, id++, -1, &suppressGenericNames, QString::null,
specialTitle[s->name()], categoryIcon[s->name()] );
}
else if (e->isType(KST_KServiceSeparator))
-@@ -898,6 +906,8 @@
+@@ -900,6 +908,8 @@ void PanelServiceMenu::slotClear()
delete *it;
}
subMenus.clear();
@@ -218,7 +224,7 @@
}
void PanelServiceMenu::selectFirstItem()
-@@ -922,3 +932,72 @@
+@@ -924,3 +934,72 @@ void PanelServiceMenu::updateRecentlyUse
RecentlyLaunchedApps::the().m_bNeedToUpdate = true;
}
@@ -291,9 +297,11 @@
+{
+ return hasSearchResults_;
+}
---- kicker/kicker/ui/service_mnu.h
+Index: kicker/kicker/ui/service_mnu.h
+===================================================================
+--- kicker/kicker/ui/service_mnu.h.orig
+++ kicker/kicker/ui/service_mnu.h
-@@ -26,6 +26,7 @@
+@@ -26,6 +26,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE
#include <qmap.h>
#include <qvaluevector.h>
@@ -301,7 +309,7 @@
#include <ksycocaentry.h>
#include <kservice.h>
-@@ -41,8 +42,11 @@
+@@ -41,8 +42,11 @@ CONNECTION WITH THE SOFTWARE OR THE USE
* @author Rik Hemsley <rik@xxxxxxx>
*/
@@ -313,7 +321,7 @@
class KDE_EXPORT PanelServiceMenu : public KPanelMenu
{
-@@ -63,6 +67,8 @@
+@@ -63,6 +67,8 @@ public:
virtual void showMenu();
bool highlightMenuItem( const QString &menuId );
void selectFirstItem();
@@ -322,7 +330,7 @@
private:
void fillMenu( KServiceGroup::Ptr &_root, KServiceGroup::List &_list,
-@@ -115,6 +121,9 @@
+@@ -115,6 +121,9 @@ protected:
bool addmenumode_;
QPoint startPos_;
PopupMenuList subMenus;
++++++ kmenu-search-slowdown-fix.diff ++++++
--- /var/tmp/diff_new_pack.f14453/_old 2009-04-07 14:07:38.000000000 +0200
+++ /var/tmp/diff_new_pack.f14453/_new 2009-04-07 14:07:38.000000000 +0200
@@ -1,6 +1,8 @@
---- kicker/kicker/ui/k_mnu.cpp
+Index: kicker/kicker/ui/k_mnu.cpp
+===================================================================
+--- kicker/kicker/ui/k_mnu.cpp.orig
+++ kicker/kicker/ui/k_mnu.cpp
-@@ -774,6 +774,7 @@
+@@ -771,6 +771,7 @@ void PanelKMenu::updateRecent()
insertSeparator(RecentlyLaunchedApps::the().m_nNumMenuItems);
}
}
@@ -8,9 +10,11 @@
}
void PanelKMenu::clearRecentMenuItems()
---- kicker/kicker/ui/service_mnu.cpp
+Index: kicker/kicker/ui/service_mnu.cpp
+===================================================================
+--- kicker/kicker/ui/service_mnu.cpp.orig
+++ kicker/kicker/ui/service_mnu.cpp
-@@ -63,13 +63,20 @@
+@@ -63,13 +63,20 @@ PanelServiceMenu::PanelServiceMenu(const
insertInlineHeader_( insertInlineHeader ),
clearOnClose_(false),
addmenumode_(addmenumode),
@@ -32,7 +36,7 @@
}
PanelServiceMenu::~PanelServiceMenu()
-@@ -103,6 +110,7 @@
+@@ -103,6 +110,7 @@ void PanelServiceMenu::initialize()
clearSubmenus();
searchSubMenuIDs.clear();
searchMenuItems.clear();
@@ -40,7 +44,7 @@
doInitialize();
}
-@@ -289,15 +297,13 @@
+@@ -289,15 +297,13 @@ void PanelServiceMenu::fillMenu(KService
newSubMenu(g->name(), g->relPath(), this, g->name().utf8(),
inlineHeaderName);
m->setCaption(groupCaption);
@@ -57,7 +61,7 @@
entryMap_.insert(newId, static_cast<KSycocaEntry*>(g));
// This submenu will be searched when applying a search string
searchSubMenuIDs[m] = newId;
-@@ -392,6 +398,12 @@
+@@ -392,6 +398,12 @@ void PanelServiceMenu::doInitialize()
void PanelServiceMenu::configChanged()
{
@@ -70,7 +74,7 @@
deinitialize();
}
-@@ -456,9 +468,9 @@
+@@ -456,9 +468,9 @@ void PanelServiceMenu::insertMenuItem(KS
int newId;
if ( label.isEmpty() )
@@ -82,7 +86,7 @@
entryMap_.insert(newId, static_cast<KSycocaEntry*>(s));
}
-@@ -1001,3 +1013,23 @@
+@@ -1003,3 +1015,23 @@ bool PanelServiceMenu::hasSearchResults(
{
return hasSearchResults_;
}
@@ -106,9 +110,11 @@
+ iconsLoaded_ = true;
+ }
+}
---- kicker/kicker/ui/service_mnu.h
+Index: kicker/kicker/ui/service_mnu.h
+===================================================================
+--- kicker/kicker/ui/service_mnu.h.orig
+++ kicker/kicker/ui/service_mnu.h
-@@ -124,9 +124,12 @@
+@@ -124,9 +124,12 @@ protected:
PanelServiceMenuMap searchSubMenuIDs;
bool hasSearchResults_;
std::set<int> searchMenuItems;
++++++ kompmgr_use_defaults.diff ++++++
--- /var/tmp/diff_new_pack.f14453/_old 2009-04-07 14:07:38.000000000 +0200
+++ /var/tmp/diff_new_pack.f14453/_new 2009-04-07 14:07:38.000000000 +0200
@@ -1,5 +1,7 @@
---- kwin/kcmkwin/kwinoptions/windows.cpp.sav 2006-09-01 13:22:04.000000000
+0200
-+++ kwin/kcmkwin/kwinoptions/windows.cpp 2006-11-09 19:10:48.000000000
+0100
+Index: kwin/kcmkwin/kwinoptions/windows.cpp
+===================================================================
+--- kwin/kcmkwin/kwinoptions/windows.cpp.orig
++++ kwin/kcmkwin/kwinoptions/windows.cpp
@@ -46,6 +46,7 @@
#include <kprocess.h>
#include <qtabwidget.h>
@@ -8,7 +10,7 @@
#include <X11/X.h>
#include <X11/Xlib.h>
#include <X11/Xutil.h>
-@@ -1473,6 +1474,8 @@ void KTranslucencyConfig::load( void )
+@@ -1524,6 +1525,8 @@ void KTranslucencyConfig::load( void )
movingWindowOpacity->setEnabled(movingWindowTransparency->isChecked());
dockWindowOpacity->setEnabled(dockWindowTransparency->isChecked());
@@ -17,9 +19,11 @@
KConfig conf_(QDir::homeDirPath() + "/.xcompmgrrc");
conf_.setGroup("xcompmgr");
---- kwin/kompmgr/kompmgr.c.sav 2006-11-08 12:03:40.000000000 +0100
-+++ kwin/kompmgr/kompmgr.c 2006-11-09 17:55:37.000000000 +0100
-@@ -2420,6 +2420,8 @@ loadConfig(char *filename){
+Index: kwin/kompmgr/kompmgr.c
+===================================================================
+--- kwin/kompmgr/kompmgr.c.orig
++++ kwin/kompmgr/kompmgr.c
+@@ -2431,6 +2431,8 @@ loadConfig(char *filename){
strcat(filename, home);
strcat(filename, configfile);
++++++ konq-combo-editor.diff ++++++
--- /var/tmp/diff_new_pack.f14453/_old 2009-04-07 14:07:38.000000000 +0200
+++ /var/tmp/diff_new_pack.f14453/_new 2009-04-07 14:07:38.000000000 +0200
@@ -1,6 +1,8 @@
---- konqueror/konq_combo.h 2007/07/13 09:31:21 1.1
-+++ konqueror/konq_combo.h 2007/07/13 09:31:26
-@@ -87,6 +87,7 @@
+Index: konqueror/konq_combo.h
+===================================================================
+--- konqueror/konq_combo.h.orig
++++ konqueror/konq_combo.h
+@@ -87,6 +87,7 @@ signals:
private slots:
void slotCleared();
@@ -8,9 +10,11 @@
void slotSetIcon( int index );
void slotActivated( const QString& text );
---- konqueror/konq_combo.cc 2007/07/13 09:31:19 1.1
-+++ konqueror/konq_combo.cc 2007/07/13 09:31:26
-@@ -128,6 +128,9 @@
+Index: konqueror/konq_combo.cc
+===================================================================
+--- konqueror/konq_combo.cc.orig
++++ konqueror/konq_combo.cc
+@@ -128,6 +128,9 @@ KonqCombo::KonqCombo( QWidget *parent, c
connect( this, SIGNAL(activated( const QString& )),
SLOT(slotActivated( const QString& )) );
@@ -20,7 +24,7 @@
if ( !kapp->dcopClient()->isAttached() )
kapp->dcopClient()->attach();
}
-@@ -503,6 +506,15 @@
+@@ -506,6 +509,15 @@ void KonqCombo::slotCleared()
kapp->dcopClient()->send( "konqueror*", "KonquerorIface",
"comboCleared(QCString)", data);
}
++++++ konsole_keytab.diff ++++++
--- /var/tmp/diff_new_pack.f14453/_old 2009-04-07 14:07:38.000000000 +0200
+++ /var/tmp/diff_new_pack.f14453/_new 2009-04-07 14:07:38.000000000 +0200
@@ -1,8 +1,8 @@
Index: konsole/other/x11r5.keytab
-================================================================================
---- konsole/other/x11r5.keytab
+===================================================================
+--- konsole/other/x11r5.keytab.orig
+++ konsole/other/x11r5.keytab
-@@ -32,10 +32,10 @@
+@@ -32,10 +32,10 @@ key Left -Shift : "\EOD"
key Enter : "\r"
++++++ konsole-schema-update.diff ++++++
--- /var/tmp/diff_new_pack.f14453/_old 2009-04-07 14:07:38.000000000 +0200
+++ /var/tmp/diff_new_pack.f14453/_new 2009-04-07 14:07:38.000000000 +0200
@@ -1,6 +1,8 @@
---- konsole/other/BlackOnWhite.schema
+Index: konsole/other/BlackOnWhite.schema
+===================================================================
+--- konsole/other/BlackOnWhite.schema.orig
+++ konsole/other/BlackOnWhite.schema
-@@ -18,11 +18,11 @@
+@@ -18,11 +18,11 @@ color 1 255 255 255 1 0 # regular b
color 2 0 0 0 0 0 # regular color 0 Black
color 3 178 24 24 0 0 # regular color 1 Red
@@ -15,7 +17,7 @@
color 9 178 178 178 0 0 # regular color 7 White
# intensive colors
-@@ -34,9 +34,9 @@
+@@ -34,9 +34,9 @@ color 11 255 255 255 1 0 # intensive b
color 12 104 104 104 0 0 # intensive color 0
color 13 255 84 84 0 0 # intensive color 1
++++++ kpamgreeter.diff ++++++
--- /var/tmp/diff_new_pack.f14453/_old 2009-04-07 14:07:38.000000000 +0200
+++ /var/tmp/diff_new_pack.f14453/_new 2009-04-07 14:07:38.000000000 +0200
@@ -1,6 +1,8 @@
---- kdm/backend/client.c
+Index: kdm/backend/client.c
+===================================================================
+--- kdm/backend/client.c.orig
+++ kdm/backend/client.c
-@@ -479,6 +479,9 @@
+@@ -547,6 +547,9 @@ Verify( GConvFunc gconv, int rootok )
} else
psrv = PAMService;
pdata.usecur = TRUE;
@@ -10,7 +12,7 @@
} else {
sprintf( psrvb, "%.31s-%.31s", PAMService, curtype );
psrv = psrvb;
-@@ -548,7 +551,7 @@
+@@ -616,7 +619,7 @@ Verify( GConvFunc gconv, int rootok )
free( msg );
V_RET_FAIL( 0 );
}
@@ -19,9 +21,11 @@
if (!gconv( GCONV_USER, 0 ))
return 0;
for (curret = 0;;) {
---- kdm/kfrontend/themer/kdmlabel.h
+Index: kdm/kfrontend/themer/kdmlabel.h
+===================================================================
+--- kdm/kfrontend/themer/kdmlabel.h.orig
+++ kdm/kfrontend/themer/kdmlabel.h
-@@ -50,6 +50,7 @@
+@@ -50,6 +50,7 @@ protected:
// handle switching between normal / active / prelight configurations
virtual void statusChanged();
@@ -29,7 +33,9 @@
struct LabelStruct {
QString text;
bool isTimer;
---- kdmlib/kgreet_pam.cpp
+Index: kdmlib/kgreet_pam.cpp
+===================================================================
+--- /dev/null
+++ kdmlib/kgreet_pam.cpp
@@ -0,0 +1,668 @@
+/*
@@ -700,7 +706,9 @@
+};
+
+#include "kgreet_pam.moc"
---- kdmlib/kgreet_pam.h
+Index: kdmlib/kgreet_pam.h
+===================================================================
+--- /dev/null
+++ kdmlib/kgreet_pam.h
@@ -0,0 +1,93 @@
+/*
@@ -796,7 +804,9 @@
+};
+
+#endif /* KGREET_CLASSIC_H */
---- kdmlib/Makefile.am
+Index: kdmlib/Makefile.am
+===================================================================
+--- kdmlib/Makefile.am.orig
+++ kdmlib/Makefile.am
@@ -1,11 +1,15 @@
AM_CPPFLAGS = -I$(top_srcdir)/kdm/kfrontend $(all_includes)
@@ -815,9 +825,11 @@
kgreet_winbind_la_SOURCES = kgreet_winbind.cpp
kgreet_winbind_la_LDFLAGS = -module -no-undefined $(KDE_PLUGIN)
$(all_libraries)
kgreet_winbind_la_LIBADD = $(LIB_KDEUI)
---- kcheckpass/checkpass_pam.c
+Index: kcheckpass/checkpass_pam.c
+===================================================================
+--- kcheckpass/checkpass_pam.c.orig
+++ kcheckpass/checkpass_pam.c
-@@ -140,13 +140,16 @@
+@@ -140,13 +140,16 @@ AuthReturn Authenticate(const char *call
openlog("kcheckpass", LOG_PID, LOG_AUTH);
PAM_data.conv = conv;
++++++ kscreensaver-random-NG.diff ++++++
--- /var/tmp/diff_new_pack.f14453/_old 2009-04-07 14:07:39.000000000 +0200
+++ /var/tmp/diff_new_pack.f14453/_new 2009-04-07 14:07:39.000000000 +0200
@@ -1,4 +1,6 @@
---- kscreensaver/random.cpp
+Index: kscreensaver/random.cpp
+===================================================================
+--- kscreensaver/random.cpp.orig
+++ kscreensaver/random.cpp
@@ -1,4 +1,4 @@
-//-----------------------------------------------------------------------------
@@ -23,7 +25,7 @@
{
puts(i18n("Usage: %1 [-setup] [args]\n"
"Starts a random screen saver.\n"
-@@ -60,6 +61,43 @@
+@@ -60,6 +61,43 @@ static const KCmdLineOptions options[] =
//----------------------------------------------------------------------------
@@ -67,7 +69,7 @@
int main(int argc, char *argv[])
{
KLocale::setMainCatalogue("kscreensaver");
-@@ -103,55 +141,63 @@
+@@ -103,55 +141,63 @@ int main(int argc, char *argv[])
KConfig type("krandom.kssrc");
type.setGroup("Settings");
@@ -156,7 +158,7 @@
KRandomSequence rnd;
int indx = rnd.getLong(saverFileList.count());
-@@ -229,7 +275,7 @@
+@@ -229,7 +275,7 @@ KRandomSetup::KRandomSetup( QWidget *par
KConfig config("krandom.kssrc");
config.setGroup("Settings");
@@ -165,7 +167,9 @@
manipulateScreen->setChecked(config.readBoolEntry("ManipulateScreen",
true));
}
---- kscreensaver/Makefile.am
+Index: kscreensaver/Makefile.am
+===================================================================
+--- kscreensaver/Makefile.am.orig
+++ kscreensaver/Makefile.am
@@ -3,13 +3,13 @@
++++++ ksmserver-defaulttohalt.diff ++++++
--- /var/tmp/diff_new_pack.f14453/_old 2009-04-07 14:07:39.000000000 +0200
+++ /var/tmp/diff_new_pack.f14453/_new 2009-04-07 14:07:39.000000000 +0200
@@ -1,8 +1,8 @@
-Index: ksmserver/shutdown.cpp
-================================================================================
---- ksmserver/shutdowndlg.cpp
+Index: ksmserver/shutdowndlg.cpp
+===================================================================
+--- ksmserver/shutdowndlg.cpp.orig
+++ ksmserver/shutdowndlg.cpp
-@@ -202,7 +202,7 @@
+@@ -222,7 +222,7 @@ KSMShutdownDlg::KSMShutdownDlg( QWidget*
btnHalt->setFont( btnFont );
buttonlay->addWidget( btnHalt );
connect(btnHalt, SIGNAL(clicked()), SLOT(slotHalt()));
++++++ ksmserver-suspend.diff ++++++
--- /var/tmp/diff_new_pack.f14453/_old 2009-04-07 14:07:39.000000000 +0200
+++ /var/tmp/diff_new_pack.f14453/_new 2009-04-07 14:07:39.000000000 +0200
@@ -1,4 +1,6 @@
---- ksmserver/Makefile.am
+Index: ksmserver/Makefile.am
+===================================================================
+--- ksmserver/Makefile.am.orig
+++ ksmserver/Makefile.am
@@ -17,7 +17,7 @@
@@ -9,7 +11,7 @@
bin_PROGRAMS =
lib_LTLIBRARIES =
-@@ -31,7 +31,7 @@
+@@ -31,7 +31,7 @@ ksmserver_la_SOURCES = main.cpp server.c
KSMServerInterface.skel server.skel
ksmserver_la_LDFLAGS = $(all_libraries) -avoid-version -module
@@ -18,7 +20,7 @@
picsdir = $(kde_datadir)/ksmserver/pics
pics_DATA = shutdownkonq.png
-@@ -44,7 +44,7 @@
+@@ -44,7 +44,7 @@ updatedir = $(kde_datadir)/kconf_update
EXTRA_PROGRAMS = testsh
testsh_SOURCES = test.cpp
testsh_LDFLAGS = $(all_libraries) $(KDE_RPATH)
@@ -27,9 +29,11 @@
messages:
$(XGETTEXT) *.cpp -o $(podir)/ksmserver.pot
---- ksmserver/shutdowndlg.cpp
+Index: ksmserver/shutdowndlg.cpp
+===================================================================
+--- ksmserver/shutdowndlg.cpp.orig
+++ ksmserver/shutdowndlg.cpp
-@@ -38,17 +38,23 @@
+@@ -38,17 +38,23 @@ Copyright (C) 2000 Matthias Ettrich <ett
#include <kpixmapeffect.h>
#include <kdialog.h>
#include <kseparator.h>
@@ -53,7 +57,7 @@
static const int max_faded = 2300;
static const int slice = 20;
-@@ -195,8 +201,8 @@
+@@ -215,8 +221,8 @@ KSMShutdownDlg::KSMShutdownDlg( QWidget*
connect(btnLogout, SIGNAL(clicked()), SLOT(slotLogout()));
if (maysd) {
@@ -64,9 +68,9 @@
KPushButton* btnHalt = new KPushButton( KGuiItem( i18n("&Turn Off
Computer"), "exit"), frame );
QToolTip::add( btnHalt, i18n( "<qt><h3>Turn Off Computer</h3><p>Log
out of the current session and turn off the computer</p></qt>" ) );
btnHalt->setFont( btnFont );
-@@ -229,13 +235,58 @@
+@@ -251,13 +257,58 @@ KSMShutdownDlg::KSMShutdownDlg( QWidget*
else
- targets->insertItem( *it, index );
+ targets->insertItem( label, index );
}
-
+
@@ -125,7 +129,7 @@
buttonlay->addStretch( 1 );
// Separator
-@@ -248,6 +299,80 @@
+@@ -270,6 +321,80 @@ KSMShutdownDlg::KSMShutdownDlg( QWidget*
}
@@ -206,9 +210,11 @@
void KSMShutdownDlg::slotLogout()
{
---- ksmserver/shutdowndlg.h
+Index: ksmserver/shutdowndlg.h
+===================================================================
+--- ksmserver/shutdowndlg.h.orig
+++ ksmserver/shutdowndlg.h
-@@ -59,6 +59,8 @@
+@@ -60,6 +60,8 @@ public slots:
void slotHalt();
void slotReboot();
void slotReboot(int);
@@ -217,7 +223,7 @@
protected:
~KSMShutdownDlg() {};
-@@ -69,6 +71,7 @@
+@@ -70,6 +72,7 @@ private:
QString m_bootOption;
QPopupMenu *targets;
QStringList rebootOptions;
++++++ ksmserver-timed.diff ++++++
--- /var/tmp/diff_new_pack.f14453/_old 2009-04-07 14:07:39.000000000 +0200
+++ /var/tmp/diff_new_pack.f14453/_new 2009-04-07 14:07:39.000000000 +0200
@@ -1,6 +1,8 @@
---- ksmserver/KSMServerInterface.h
+Index: ksmserver/KSMServerInterface.h
+===================================================================
+--- ksmserver/KSMServerInterface.h.orig
+++ ksmserver/KSMServerInterface.h
-@@ -22,6 +22,8 @@
+@@ -22,6 +22,8 @@ k_dcop:
virtual void suspendStartup( QCString ) = 0;
virtual void resumeStartup( QCString ) = 0;
@@ -9,9 +11,11 @@
};
#endif
---- ksmserver/Makefile.am
+Index: ksmserver/Makefile.am
+===================================================================
+--- ksmserver/Makefile.am.orig
+++ ksmserver/Makefile.am
-@@ -28,7 +28,7 @@
+@@ -28,7 +28,7 @@ ksmserver_la_METASOURCES = AUTO
# Order is important for --enable-final!
ksmserver_la_SOURCES = main.cpp server.cpp shutdowndlg.cpp \
legacy.cpp startup.cpp shutdown.cpp client.cpp \
@@ -20,7 +24,7 @@
ksmserver_la_LDFLAGS = $(all_libraries) -avoid-version -module
ksmserver_la_LIBADD = ../kdmlib/libdmctl.la $(LIB_KDEUI) -llazy $(DBUS_LIBS)
-@@ -42,7 +42,7 @@
+@@ -42,7 +42,7 @@ updatedir = $(kde_datadir)/kconf_update
EXTRA_PROGRAMS = testsh
@@ -29,9 +33,11 @@
testsh_LDFLAGS = $(all_libraries) $(KDE_RPATH)
testsh_LDADD = $(LIB_KDEUI) shutdowndlg.lo ../kdmlib/libdmctl.la -llazy
$(DBUS_LIBS)
---- ksmserver/server.h
+Index: ksmserver/server.h
+===================================================================
+--- ksmserver/server.h.orig
+++ ksmserver/server.h
-@@ -85,6 +85,7 @@
+@@ -85,6 +85,7 @@ public:
// public API
void restoreSession( QString sessionName );
void startDefaultSession();
@@ -39,7 +45,7 @@
void shutdown( KApplication::ShutdownConfirm confirm,
KApplication::ShutdownType sdtype,
KApplication::ShutdownMode sdmode );
-@@ -92,6 +93,11 @@
+@@ -92,6 +93,11 @@ public:
virtual void suspendStartup( QCString app );
virtual void resumeStartup( QCString app );
@@ -51,7 +57,7 @@
public slots:
void cleanUp();
-@@ -138,6 +144,11 @@
+@@ -142,6 +148,11 @@ private:
bool defaultSession() const; // empty session
void setupXIOErrorHandler();
@@ -63,7 +69,7 @@
void performLegacySessionSave();
void storeLegacySession( KConfig* config );
void restoreLegacySession( KConfig* config );
-@@ -153,6 +164,7 @@
+@@ -157,6 +168,7 @@ private:
// public dcop interface
void logout( int, int, int );
@@ -71,9 +77,11 @@
QStringList sessionList();
QString currentSession();
void saveCurrentSession();
---- ksmserver/shutdown.cpp
+Index: ksmserver/shutdown.cpp
+===================================================================
+--- ksmserver/shutdown.cpp.orig
+++ ksmserver/shutdown.cpp
-@@ -93,14 +93,16 @@
+@@ -93,14 +93,16 @@ void KSMServer::logout( int confirm, int
(KApplication::ShutdownMode)sdmode );
}
@@ -94,7 +102,7 @@
if( state != Idle ) // performing startup
{
// perform shutdown as soon as startup is finished, in order to avoid
saving partial session
-@@ -111,25 +113,44 @@
+@@ -111,25 +113,44 @@ void KSMServer::shutdown( KApplication::
pendingShutdown_sdtype = sdtype;
pendingShutdown_sdmode = sdmode;
}
@@ -145,7 +153,7 @@
sdtype = KApplication::ShutdownTypeNone;
} else if (sdtype == KApplication::ShutdownTypeDefault)
sdtype = (KApplication::ShutdownType)
-@@ -138,7 +159,6 @@
+@@ -138,7 +159,6 @@ void KSMServer::shutdown( KApplication::
sdmode = KApplication::ShutdownModeInteractive;
dialogActive = true;
@@ -153,7 +161,7 @@
if ( !logoutConfirmed ) {
KSMShutdownFeedback::start(); // make the screen gray
logoutConfirmed =
-@@ -204,6 +224,42 @@
+@@ -204,6 +224,42 @@ void KSMServer::shutdown( KApplication::
dialogActive = false;
}
@@ -196,9 +204,11 @@
void KSMServer::pendingShutdownTimeout()
{
shutdown( pendingShutdown_confirm, pendingShutdown_sdtype,
pendingShutdown_sdmode );
---- ksmserver/shutdowndlg.cpp
+Index: ksmserver/shutdowndlg.cpp
+===================================================================
+--- ksmserver/shutdowndlg.cpp.orig
+++ ksmserver/shutdowndlg.cpp
-@@ -25,6 +25,7 @@
+@@ -25,6 +25,7 @@ Copyright (C) 2000 Matthias Ettrich <ett
#include <qimage.h>
#include <klocale.h>
@@ -206,7 +216,7 @@
#include <kapplication.h>
#include <kdebug.h>
#include <kpushbutton.h>
-@@ -488,3 +489,67 @@
+@@ -488,3 +489,67 @@ void KSMDelayedPushButton::slotTimeout()
popt->stop();
setDown(false);
}
@@ -274,9 +284,11 @@
+ kapp->disableStyles();
+ return result;
+}
---- ksmserver/shutdowndlg.h
+Index: ksmserver/shutdowndlg.h
+===================================================================
+--- ksmserver/shutdowndlg.h.orig
+++ ksmserver/shutdowndlg.h
-@@ -17,6 +17,7 @@
+@@ -17,6 +17,7 @@ class QVButtonGroup;
class QPopupMenu;
class QTimer;
@@ -284,7 +296,7 @@
#include <kapplication.h>
// The (singleton) widget that makes the desktop gray.
-@@ -94,4 +95,22 @@
+@@ -94,4 +95,22 @@ private:
QTimer *popt;
};
@@ -307,9 +319,11 @@
+};
+
#endif
---- ksmserver/test.cpp
+Index: ksmserver/test.cpp
+===================================================================
+--- ksmserver/test.cpp.orig
+++ ksmserver/test.cpp
-@@ -14,11 +14,16 @@
+@@ -14,11 +14,16 @@ main(int argc, char *argv[])
a.iconLoader()->addAppDir("ksmserver");
KSMShutdownFeedback::start();
@@ -327,7 +341,9 @@
/* (void)KSMShutdownDlg::confirmShutdown( false,
sdtype,
bopt ); */
---- ksmserver/timed.ui
+Index: ksmserver/timed.ui
+===================================================================
+--- /dev/null
+++ ksmserver/timed.ui
@@ -0,0 +1,352 @@
+<!DOCTYPE UI><UI version="3.3" stdsetdef="1">
++++++ ksmserver-tooltips.diff ++++++
--- /var/tmp/diff_new_pack.f14453/_old 2009-04-07 14:07:39.000000000 +0200
+++ /var/tmp/diff_new_pack.f14453/_new 2009-04-07 14:07:39.000000000 +0200
@@ -1,6 +1,8 @@
---- ksmserver/shutdowndlg.cpp
+Index: ksmserver/shutdowndlg.cpp
+===================================================================
+--- ksmserver/shutdowndlg.cpp.orig
+++ ksmserver/shutdowndlg.cpp
-@@ -126,6 +126,7 @@
+@@ -126,6 +126,7 @@ KSMShutdownDlg::KSMShutdownDlg( QWidget*
// End session
KPushButton* btnLogout = new KPushButton( KGuiItem( i18n("&End Current
Session"), "undo"), frame );
@@ -8,7 +10,7 @@
QFont btnFont = btnLogout->font();
buttonlay->addWidget( btnLogout );
connect(btnLogout, SIGNAL(clicked()), SLOT(slotLogout()));
-@@ -134,6 +135,7 @@
+@@ -134,6 +135,7 @@ KSMShutdownDlg::KSMShutdownDlg( QWidget*
// Shutdown
KPushButton* btnHalt = new KPushButton( KGuiItem( i18n("&Turn Off
Computer"), "exit"), frame );
@@ -16,7 +18,7 @@
btnHalt->setFont( btnFont );
buttonlay->addWidget( btnHalt );
connect(btnHalt, SIGNAL(clicked()), SLOT(slotHalt()));
-@@ -142,6 +144,7 @@
+@@ -142,6 +144,7 @@ KSMShutdownDlg::KSMShutdownDlg( QWidget*
// Reboot
KSMDelayedPushButton* btnReboot = new KSMDelayedPushButton( KGuiItem(
i18n("&Restart Computer"), "reload"), frame );
@@ -24,7 +26,7 @@
btnReboot->setFont( btnFont );
buttonlay->addWidget( btnReboot );
-@@ -166,7 +169,8 @@
+@@ -168,7 +171,8 @@ KSMShutdownDlg::KSMShutdownDlg( QWidget*
btnReboot->setPopup(targets);
connect( targets, SIGNAL(activated(int)), SLOT(slotReboot(int)) );
++++++ ksplashml.patch ++++++
--- /var/tmp/diff_new_pack.f14453/_old 2009-04-07 14:07:39.000000000 +0200
+++ /var/tmp/diff_new_pack.f14453/_new 2009-04-07 14:07:39.000000000 +0200
@@ -1,6 +1,8 @@
---- ksplashml/kcmksplash/installer.cpp
+Index: ksplashml/kcmksplash/installer.cpp
+===================================================================
+--- ksplashml/kcmksplash/installer.cpp.orig
+++ ksplashml/kcmksplash/installer.cpp
-@@ -474,6 +474,14 @@
+@@ -474,6 +474,14 @@ void SplashInstaller::slotTest()
KMessageBox::error(this,i18n("Unable to start ksplashsimple."));
return;
}
++++++ kwinbindings.diff ++++++
--- /var/tmp/diff_new_pack.f14453/_old 2009-04-07 14:07:39.000000000 +0200
+++ /var/tmp/diff_new_pack.f14453/_new 2009-04-07 14:07:39.000000000 +0200
@@ -1,6 +1,8 @@
---- kwin/kwinbindings.cpp.sav 2005-09-19 20:44:41.000000000 +0200
-+++ kwin/kwinbindings.cpp 2007-05-18 15:11:24.000000000 +0200
-@@ -110,22 +110,22 @@
+Index: kwin/kwinbindings.cpp
+===================================================================
+--- kwin/kwinbindings.cpp.orig
++++ kwin/kwinbindings.cpp
+@@ -119,22 +119,22 @@
DEF( I18N_NOOP("Switch to Desktop 2"), CTRL+Qt::Key_F2,
WIN+Qt::Key_F2, slotSwitchToDesktop(int) );
DEF( I18N_NOOP("Switch to Desktop 3"), CTRL+Qt::Key_F3,
WIN+Qt::Key_F3, slotSwitchToDesktop(int) );
DEF( I18N_NOOP("Switch to Desktop 4"), CTRL+Qt::Key_F4,
WIN+Qt::Key_F4, slotSwitchToDesktop(int) );
++++++ kxkb-include-latin-layout.diff ++++++
--- /var/tmp/diff_new_pack.f14453/_old 2009-04-07 14:07:39.000000000 +0200
+++ /var/tmp/diff_new_pack.f14453/_new 2009-04-07 14:07:39.000000000 +0200
@@ -1,6 +1,8 @@
---- kxkb/kcmlayout.cpp 2007/08/15 10:38:56 1.1
-+++ kxkb/kcmlayout.cpp 2007/08/15 11:02:56
-@@ -352,6 +352,9 @@
+Index: kxkb/kcmlayout.cpp
+===================================================================
+--- kxkb/kcmlayout.cpp.orig
++++ kxkb/kcmlayout.cpp
+@@ -352,6 +352,9 @@ void LayoutConfig::add()
// Create a copy of the sel widget, as one might add the same layout more
// than one time, with different variants.
QListViewItem* toadd = copyLVI(sel, widget->listLayoutsDst);
++++++ less_verbal_kdesu.patch ++++++
--- /var/tmp/diff_new_pack.f14453/_old 2009-04-07 14:07:39.000000000 +0200
+++ /var/tmp/diff_new_pack.f14453/_new 2009-04-07 14:07:39.000000000 +0200
@@ -1,6 +1,8 @@
---- kdesu/kdesu/sudlg.cpp
+Index: kdesu/kdesu/sudlg.cpp
+===================================================================
+--- kdesu/kdesu/sudlg.cpp.orig
+++ kdesu/kdesu/sudlg.cpp
-@@ -29,18 +29,10 @@
+@@ -29,18 +29,10 @@ KDEsuDialog::KDEsuDialog(QCString user,
setCaption(i18n("Run as %1").arg(user));
QString prompt;
++++++ libkonq-kdemm.diff ++++++
--- /var/tmp/diff_new_pack.f14453/_old 2009-04-07 14:07:39.000000000 +0200
+++ /var/tmp/diff_new_pack.f14453/_new 2009-04-07 14:07:39.000000000 +0200
@@ -1,6 +1,8 @@
---- libkonq/Makefile.am
+Index: libkonq/Makefile.am
+===================================================================
+--- libkonq/Makefile.am.orig
+++ libkonq/Makefile.am
-@@ -53,14 +53,10 @@
+@@ -53,14 +53,10 @@ include_HEADERS = konq_popupmenu.h knewm
konq_faviconmgr.h konq_xmlguiclient.h konqbookmarkmanager.h konq_filetip.h
@@ -17,7 +19,9 @@
noinst_HEADERS = konq_sound.h
---- libkonq/konq_sound.cc
+Index: libkonq/konq_sound.cc
+===================================================================
+--- libkonq/konq_sound.cc.orig
+++ libkonq/konq_sound.cc
@@ -16,10 +16,9 @@
Boston, MA 02110-1301, USA.
@@ -32,7 +36,7 @@
#include "konq_sound.h"
-@@ -39,71 +38,38 @@
+@@ -39,71 +38,38 @@ public:
private:
QStringList m_mimeTypes;
@@ -62,9 +66,7 @@
- {
- Arts::TraderQuery query;
- vector<Arts::TraderOffer> *offers = query.query();
-+ if( m_mimeTypes.isEmpty() )
-+ m_mimeTypes =
KDE::Multimedia::Factory::self()->playableMimeTypes();
-
+-
- for (vector<Arts::TraderOffer>::iterator it = offers->begin();
- it != offers->end(); ++it)
- {
@@ -77,6 +79,9 @@
- }
- delete offers;
- }
++ if( m_mimeTypes.isEmpty() )
++ m_mimeTypes =
KDE::Multimedia::Factory::self()->playableMimeTypes();
++
return m_mimeTypes;
}
++++++ locale-dont-show-flag.diff ++++++
--- /var/tmp/diff_new_pack.f14453/_old 2009-04-07 14:07:39.000000000 +0200
+++ /var/tmp/diff_new_pack.f14453/_new 2009-04-07 14:07:39.000000000 +0200
@@ -1,6 +1,8 @@
---- kcontrol/locale/kcmlocale.cpp
+Index: kcontrol/locale/kcmlocale.cpp
+===================================================================
+--- kcontrol/locale/kcmlocale.cpp.orig
+++ kcontrol/locale/kcmlocale.cpp
-@@ -292,9 +292,13 @@
+@@ -292,9 +292,13 @@ void KLocaleConfig::loadCountryList()
QString map( locate( "locale",
QString::fromLatin1( "l10n/%1.png" )
.arg(tag) ) );
@@ -14,7 +16,7 @@
m_comboCountry->insertSubmenu( icon, name, tag, sub, -2 );
}
-@@ -318,10 +322,14 @@
+@@ -318,10 +322,14 @@ void KLocaleConfig::loadCountryList()
tag = tag.mid(index + 1);
int menu_index = submenu.isEmpty() ? -1 : -2;
++++++ lock-xvkbd.diff ++++++
--- /var/tmp/diff_new_pack.f14453/_old 2009-04-07 14:07:40.000000000 +0200
+++ /var/tmp/diff_new_pack.f14453/_new 2009-04-07 14:07:40.000000000 +0200
@@ -31,7 +31,7 @@
{
setupSignals();
-@@ -874,10 +880,14 @@ bool LockProcess::checkPass()
+@@ -909,10 +915,14 @@ bool LockProcess::checkPass()
{
if (mAutoLogout)
killTimer(mAutoLogoutTimerId);
@@ -46,7 +46,7 @@
XWindowAttributes rootAttr;
XGetWindowAttributes(qt_xdisplay(), RootWindow(qt_xdisplay(),
-@@ -957,9 +967,13 @@ bool LockProcess::x11Event(XEvent *event
+@@ -992,9 +1002,13 @@ bool LockProcess::x11Event(XEvent *event
{
switch (event->type)
{
@@ -61,7 +61,7 @@
if (mBusy || !mDialogs.isEmpty())
break;
mBusy = true;
-@@ -996,11 +1010,30 @@ bool LockProcess::x11Event(XEvent *event
+@@ -1031,11 +1045,30 @@ bool LockProcess::x11Event(XEvent *event
case ConfigureNotify: // from SubstructureNotifyMask on the root
window
if(event->xconfigure.event == qt_xrootwin())
stayOnTop();
@@ -92,7 +92,7 @@
}
// We have grab with the grab window being the root window.
-@@ -1025,17 +1058,24 @@ bool LockProcess::x11Event(XEvent *event
+@@ -1060,17 +1093,24 @@ bool LockProcess::x11Event(XEvent *event
void LockProcess::stayOnTop()
{
@@ -120,7 +120,7 @@
for( QValueList< QWidget* >::ConstIterator it = mDialogs.begin();
it != mDialogs.end();
++it )
-@@ -1130,4 +1170,200 @@ void LockProcess::msgBox( QMessageBox::I
+@@ -1169,4 +1209,200 @@ void LockProcess::msgBox( QMessageBox::I
execDialog( &box );
}
++++++ lowdiskspace.patch ++++++
--- /var/tmp/diff_new_pack.f14453/_old 2009-04-07 14:07:40.000000000 +0200
+++ /var/tmp/diff_new_pack.f14453/_new 2009-04-07 14:07:40.000000000 +0200
@@ -3,9 +3,11 @@
Feature: bnc#199054
Patch-upstream: no
---- kioslave/media/medianotifier/Makefile.am.sav 2005-07-26
14:13:37.000000000 +0200
-+++ kioslave/media/medianotifier/Makefile.am 2008-04-11 17:34:00.000000000
+0200
-@@ -5,7 +5,8 @@ kded_medianotifier_la_LDFLAGS = -module
+Index: kioslave/media/medianotifier/Makefile.am
+===================================================================
+--- kioslave/media/medianotifier/Makefile.am.orig
++++ kioslave/media/medianotifier/Makefile.am
+@@ -5,7 +5,8 @@ kded_medianotifier_la_LDFLAGS = -module
kded_medianotifier_la_LIBADD = ../libmediacommon/libmediacommon.la
$(LIB_KDECORE) \
$(LIB_KDEUI) $(LIB_KIO)
kded_medianotifier_la_SOURCES = medianotifier.cpp medianotifier.skel \
@@ -15,8 +17,10 @@
noinst_HEADERS = medianotifier.h notificationdialog.h
---- kioslave/media/medianotifier/medianotifier.h.sav 2008-04-11
16:47:21.000000000 +0200
-+++ kioslave/media/medianotifier/medianotifier.h 2008-04-11
16:48:12.000000000 +0200
+Index: kioslave/media/medianotifier/medianotifier.h
+===================================================================
+--- kioslave/media/medianotifier/medianotifier.h.orig
++++ kioslave/media/medianotifier/medianotifier.h
@@ -27,6 +27,8 @@
#include <qstring.h>
#include <qmap.h>
@@ -35,8 +39,10 @@
+
#endif
---- kioslave/media/medianotifier/medianotifier.cpp.sav 2008-04-11
16:47:21.000000000 +0200
-+++ kioslave/media/medianotifier/medianotifier.cpp 2008-04-11
16:49:22.000000000 +0200
+Index: kioslave/media/medianotifier/medianotifier.cpp
+===================================================================
+--- kioslave/media/medianotifier/medianotifier.cpp.orig
++++ kioslave/media/medianotifier/medianotifier.cpp
@@ -36,6 +36,7 @@
#include "notifiersettings.h"
#include "notifieraction.h"
@@ -62,8 +68,10 @@
}
void MediaNotifier::onMediumChange( const QString &name, bool
allowNotification )
---- kioslave/media/medianotifier/freespacenotifier.cpp.sav 2008-04-11
16:50:50.000000000 +0200
-+++ kioslave/media/medianotifier/freespacenotifier.cpp 2008-04-11
20:08:59.000000000 +0200
+Index: kioslave/media/medianotifier/freespacenotifier.cpp
+===================================================================
+--- /dev/null
++++ kioslave/media/medianotifier/freespacenotifier.cpp
@@ -0,0 +1,159 @@
+/* This file is part of the KDE Project
+ Copyright (c) 2006 Lukas Tinkl <ltinkl@xxxxxxx>
@@ -224,8 +232,10 @@
+}
+
+#include "freespacenotifier.moc"
---- kioslave/media/medianotifier/freespacenotifier.h.sav 2008-04-11
16:50:57.000000000 +0200
-+++ kioslave/media/medianotifier/freespacenotifier.h 2008-04-11
19:25:27.000000000 +0200
+Index: kioslave/media/medianotifier/freespacenotifier.h
+===================================================================
+--- /dev/null
++++ kioslave/media/medianotifier/freespacenotifier.h
@@ -0,0 +1,51 @@
+/* This file is part of the KDE Project
+ Copyright (c) 2006 Lukas Tinkl <ltinkl@xxxxxxx>
@@ -278,8 +288,10 @@
+};
+
+#endif
---- kioslave/media/medianotifier/freespacewidget.ui.sav 2008-04-11
17:30:00.000000000 +0200
-+++ kioslave/media/medianotifier/freespacewidget.ui 2008-04-11
18:03:03.000000000 +0200
+Index: kioslave/media/medianotifier/freespacewidget.ui
+===================================================================
+--- /dev/null
++++ kioslave/media/medianotifier/freespacewidget.ui
@@ -0,0 +1,118 @@
+<!DOCTYPE UI><UI version="3.3" stdsetdef="1">
+<class>FreeSpaceWidget</class>
++++++ mach_blass.diff ++++++
--- /var/tmp/diff_new_pack.f14453/_old 2009-04-07 14:07:40.000000000 +0200
+++ /var/tmp/diff_new_pack.f14453/_new 2009-04-07 14:07:40.000000000 +0200
@@ -1,5 +1,7 @@
---- ksmserver/shutdowndlg.cpp.sav 2006-11-28 18:18:41.000000000 +0100
-+++ ksmserver/shutdowndlg.cpp 2006-11-28 18:25:15.000000000 +0100
+Index: ksmserver/shutdowndlg.cpp
+===================================================================
+--- ksmserver/shutdowndlg.cpp.orig
++++ ksmserver/shutdowndlg.cpp
@@ -35,6 +35,7 @@ Copyright (C) 2000 Matthias Ettrich <ett
#include <kuser.h>
#include <kpixmap.h>
@@ -35,11 +37,11 @@
+ QTimer::singleShot( 10, this, SLOT( slotPaintEffectOld() ) );
+ m_root.resize( width(), height() );
+ }
-+
-+}
-void KSMShutdownFeedback::slotPaintEffect()
++}
++
+// the upstream KDE effect
+void KSMShutdownFeedback::slotPaintEffectOld()
{
@@ -123,8 +125,10 @@
}
//////
---- ksmserver/shutdowndlg.h.sav 2006-11-28 18:18:41.000000000 +0100
-+++ ksmserver/shutdowndlg.h 2006-11-28 18:23:14.000000000 +0100
+Index: ksmserver/shutdowndlg.h
+===================================================================
+--- ksmserver/shutdowndlg.h.orig
++++ ksmserver/shutdowndlg.h
@@ -9,7 +9,9 @@ Copyright (C) 2000 Matthias Ettrich <ett
#include <qpixmap.h>
++++++ make-wallpapers-hideable.diff ++++++
--- /var/tmp/diff_new_pack.f14453/_old 2009-04-07 14:07:40.000000000 +0200
+++ /var/tmp/diff_new_pack.f14453/_new 2009-04-07 14:07:40.000000000 +0200
@@ -1,8 +1,8 @@
Index: kcontrol/background/bgdialog.cpp
-================================================================================
---- kcontrol/background/bgdialog.cpp
+===================================================================
+--- kcontrol/background/bgdialog.cpp.orig
+++ kcontrol/background/bgdialog.cpp
-@@ -479,14 +479,23 @@
+@@ -477,14 +477,23 @@ void BGDialog::loadWallpaperFilesList()
//search for .desktop files before searching for images without .desktop
files
QStringList lst = m_pDirs->findAllResources("wallpaper", "*desktop",
false, true);
QStringList files;
@@ -26,7 +26,7 @@
if (imageCaption.isEmpty())
{
imageCaption = fileName;
-@@ -504,9 +513,8 @@
+@@ -500,9 +509,8 @@ void BGDialog::loadWallpaperFilesList()
rs = imageCaption + " (" + QString::number(n) + ')';
lrs = rs.lower();
}
@@ -37,7 +37,7 @@
#ifdef HAVE_LIBART
canLoadScaleable = true;
#endif
-@@ -520,7 +528,7 @@
+@@ -516,7 +524,7 @@ void BGDialog::loadWallpaperFilesList()
lst = m_pDirs->findAllResources("wallpaper", "*", false, true);
for (QStringList::ConstIterator it = lst.begin(); it != lst.end(); ++it)
{
++++++ media-cryptosupport.diff ++++++
--- /var/tmp/diff_new_pack.f14453/_old 2009-04-07 14:07:40.000000000 +0200
+++ /var/tmp/diff_new_pack.f14453/_new 2009-04-07 14:07:40.000000000 +0200
@@ -1,6 +1,8 @@
---- kioslave/media/mediamanager/halbackend.cpp.orig 2007-09-19
10:55:32.000000000 +0200
-+++ kioslave/media/mediamanager/halbackend.cpp 2007-09-19 10:58:20.000000000
+0200
-@@ -210,10 +211,26 @@
+Index: kioslave/media/mediamanager/halbackend.cpp
+===================================================================
+--- kioslave/media/mediamanager/halbackend.cpp.orig
++++ kioslave/media/mediamanager/halbackend.cpp
+@@ -214,10 +214,26 @@ void HALBackend::AddDevice(const char *u
{
/* We only list volume that have a filesystem or volume that have an
audio track*/
if ( libhal_device_get_property_QString(m_halContext, udi,
"volume.fsusage") != "filesystem" &&
@@ -27,4 +29,3 @@
/* Query drive udi */
QString driveUdi = libhal_device_get_property_QString(m_halContext,
udi, "block.storage_device");
if ( driveUdi.isNull() ) // no storage - no fun
-
++++++ media-iPod.diff ++++++
--- /var/tmp/diff_new_pack.f14453/_old 2009-04-07 14:07:40.000000000 +0200
+++ /var/tmp/diff_new_pack.f14453/_new 2009-04-07 14:07:40.000000000 +0200
@@ -1,8 +1,8 @@
Index: kioslave/media/mediamanager/halbackend.cpp
-================================================================================
---- kioslave/media/mediamanager/halbackend.cpp
+===================================================================
+--- kioslave/media/mediamanager/halbackend.cpp.orig
+++ kioslave/media/mediamanager/halbackend.cpp
-@@ -31,6 +31,7 @@
+@@ -33,6 +33,7 @@
#include <kmountpoint.h>
#include <kmessagebox.h>
#include <kio/job.h>
@@ -10,7 +10,7 @@
#define MOUNT_SUFFIX (libhal_volume_is_mounted(halVolume) ?
QString("_mounted") : QString("_unmounted"))
#define MOUNT_ICON_SUFFIX (libhal_volume_is_mounted(halVolume) ?
QString("_mount") : QString("_unmount"))
-@@ -515,6 +516,13 @@
+@@ -532,6 +533,13 @@ void HALBackend::setVolumeProperties(Med
case LIBHAL_DRIVE_TYPE_PORTABLE_AUDIO_PLAYER:
{
medium->setIconName("ipod" + MOUNT_ICON_SUFFIX);
++++++ mediamanager-mount-point-utf8.diff ++++++
--- /var/tmp/diff_new_pack.f14453/_old 2009-04-07 14:07:40.000000000 +0200
+++ /var/tmp/diff_new_pack.f14453/_new 2009-04-07 14:07:40.000000000 +0200
@@ -1,6 +1,8 @@
---- kioslave/media/mediamanager/halbackend.cpp 2007/08/15 09:56:48 1.181
-+++ kioslave/media/mediamanager/halbackend.cpp 2007/08/15 11:50:48
-@@ -456,7 +456,7 @@
+Index: kioslave/media/mediamanager/halbackend.cpp
+===================================================================
+--- kioslave/media/mediamanager/halbackend.cpp.orig
++++ kioslave/media/mediamanager/halbackend.cpp
+@@ -471,7 +471,7 @@ void HALBackend::setVolumeProperties(Med
medium->mountableState(
libhal_volume_get_device_file(halVolume), /* Device node
*/
++++++ media_suse.diff ++++++
--- /var/tmp/diff_new_pack.f14453/_old 2009-04-07 14:07:40.000000000 +0200
+++ /var/tmp/diff_new_pack.f14453/_new 2009-04-07 14:07:40.000000000 +0200
@@ -1,8 +1,8 @@
Index: kioslave/media/mediamanager/halbackend.cpp
===================================================================
---- kioslave/media/mediamanager/halbackend.cpp (Revision 607627)
-+++ kioslave/media/mediamanager/halbackend.cpp (Arbeitskopie)
-@@ -256,14 +256,15 @@
+--- kioslave/media/mediamanager/halbackend.cpp.orig
++++ kioslave/media/mediamanager/halbackend.cpp
+@@ -248,14 +248,15 @@ void HALBackend::AddDevice(const char *u
return;
}
}
@@ -20,7 +20,7 @@
return;
}
-@@ -295,6 +296,12 @@
+@@ -292,6 +293,12 @@ void HALBackend::AddDevice(const char *u
m_mediaList.addMedium(medium, allowNotification);
return;
}
@@ -33,7 +33,7 @@
}
void HALBackend::RemoveDevice(const char *udi)
-@@ -794,8 +801,12 @@
+@@ -816,8 +823,12 @@ QStringList HALBackend::mountoptions(con
removable = libhal_device_get_property_bool(m_halContext,
drive_udi.latin1(), "storage.removable", NULL)
|| libhal_device_get_property_bool(m_halContext,
drive_udi.latin1(), "storage.hotpluggable", NULL);
++++++ media-teardown_crypto.diff ++++++
--- /var/tmp/diff_new_pack.f14453/_old 2009-04-07 14:07:40.000000000 +0200
+++ /var/tmp/diff_new_pack.f14453/_new 2009-04-07 14:07:40.000000000 +0200
@@ -1,6 +1,8 @@
---- kioslave/media/mediamanager/halbackend.cpp.orig 2007-09-19
10:55:32.000000000 +0200
-+++ kioslave/media/mediamanager/halbackend.cpp 2007-09-19 11:02:59.000000000
+0200
-@@ -1325,4 +1348,54 @@
+Index: kioslave/media/mediamanager/halbackend.cpp
+===================================================================
+--- kioslave/media/mediamanager/halbackend.cpp.orig
++++ kioslave/media/mediamanager/halbackend.cpp
+@@ -1379,4 +1379,54 @@ QString HALBackend::unmount(const QStrin
return QString();
}
@@ -55,21 +57,23 @@
+
+
#include "halbackend.moc"
---- kioslave/media/mediamanager/halbackend.h.orig 2007-05-14
09:55:40.000000000 +0200
-+++ kioslave/media/mediamanager/halbackend.h 2007-09-19 11:06:05.000000000
+0200
-@@ -85,8 +85,9 @@
+Index: kioslave/media/mediamanager/halbackend.h
+===================================================================
+--- kioslave/media/mediamanager/halbackend.h.orig
++++ kioslave/media/mediamanager/halbackend.h
+@@ -85,6 +85,7 @@ public:
QString mount(const QString &id);
QString mount(const Medium *medium);
QString unmount(const QString &id);
+ bool teardown(const QString &_udi);
-
+
static bool isHotplug( const QString & id );
- private:
- /**
---- kioslave/media/mediamanager/mediamanager.cpp.orig 2007-09-19
11:18:36.000000000 +0200
-+++ kioslave/media/mediamanager/mediamanager.cpp 2007-09-19
11:19:15.000000000 +0200
-@@ -232,6 +232,19 @@
+Index: kioslave/media/mediamanager/mediamanager.cpp
+===================================================================
+--- kioslave/media/mediamanager/mediamanager.cpp.orig
++++ kioslave/media/mediamanager/mediamanager.cpp
+@@ -232,6 +232,19 @@ QString MediaManager::unmount(const QStr
#endif
}
@@ -89,9 +93,11 @@
QString MediaManager::nameForLabel(const QString &label)
{
const QPtrList<Medium> media = m_mediaList.list();
---- kioslave/media/mediamanager/mediamanager.h.orig 2007-09-19
11:20:54.000000000 +0200
-+++ kioslave/media/mediamanager/mediamanager.h 2007-09-19 11:22:14.000000000
+0200
-@@ -47,6 +47,7 @@
+Index: kioslave/media/mediamanager/mediamanager.h
+===================================================================
+--- kioslave/media/mediamanager/mediamanager.h.orig
++++ kioslave/media/mediamanager/mediamanager.h
+@@ -47,6 +47,7 @@ k_dcop:
QString mount(const QString &uid);
QString unmount(const QString &uid);
@@ -99,9 +105,11 @@
QString nameForLabel(const QString &label);
ASYNC setUserLabel(const QString &name, const QString &label);
---- kioslave/media/mounthelper/kio_media_mounthelper.h.orig 2007-09-19
11:26:32.000000000 +0200
-+++ kioslave/media/mounthelper/kio_media_mounthelper.h 2007-09-19
11:27:05.000000000 +0200
-@@ -40,6 +40,8 @@
+Index: kioslave/media/mounthelper/kio_media_mounthelper.h
+===================================================================
+--- kioslave/media/mounthelper/kio_media_mounthelper.h.orig
++++ kioslave/media/mounthelper/kio_media_mounthelper.h
+@@ -40,6 +40,8 @@ private:
QString m_errorStr;
QString m_device;
bool m_isCdrom;
@@ -110,8 +118,10 @@
private slots:
void ejectFinished(KProcess* proc);
---- kioslave/media/mounthelper/kio_media_mounthelper.cpp.orig 2007-09-19
12:32:45.000000000 +0200
-+++ kioslave/media/mounthelper/kio_media_mounthelper.cpp 2007-09-19
12:42:12.000000000 +0200
+Index: kioslave/media/mounthelper/kio_media_mounthelper.cpp
+===================================================================
+--- kioslave/media/mounthelper/kio_media_mounthelper.cpp.orig
++++ kioslave/media/mounthelper/kio_media_mounthelper.cpp
@@ -27,6 +27,7 @@
#include <dcopclient.h>
#include <dcopref.h>
@@ -120,7 +130,7 @@
#include <stdlib.h>
#include <kdebug.h>
#include <kglobal.h>
-@@ -117,14 +118,17 @@
+@@ -117,14 +118,17 @@ MountHelper::MountHelper() : KApplicatio
DCOPRef mediamanager("kded", "mediamanager");
DCOPReply reply = mediamanager.call( "unmount",
medium.id());
if (reply.isValid())
@@ -145,7 +155,7 @@
}
else
{
-@@ -139,6 +147,19 @@
+@@ -139,6 +143,19 @@ MountHelper::MountHelper() : KApplicatio
}
}
++++++ minicli-combo-editor.diff ++++++
--- /var/tmp/diff_new_pack.f14453/_old 2009-04-07 14:07:40.000000000 +0200
+++ /var/tmp/diff_new_pack.f14453/_new 2009-04-07 14:07:40.000000000 +0200
@@ -1,6 +1,8 @@
---- kdesktop/minicli.h 2007/07/13 12:09:45 1.1
-+++ kdesktop/minicli.h 2007/07/13 12:19:25
-@@ -52,12 +52,14 @@
+Index: kdesktop/minicli.h
+===================================================================
+--- kdesktop/minicli.h.orig
++++ kdesktop/minicli.h
+@@ -52,12 +52,14 @@ public:
void setCommand(const QString& command);
void reset();
@@ -16,9 +18,11 @@
protected slots:
virtual void accept();
virtual void reject();
---- kdesktop/minicli.cpp 2007/07/13 11:51:07 1.153
-+++ kdesktop/minicli.cpp 2007/07/13 12:22:43
-@@ -133,6 +133,9 @@
+Index: kdesktop/minicli.cpp
+===================================================================
+--- kdesktop/minicli.cpp.orig
++++ kdesktop/minicli.cpp
+@@ -133,6 +133,9 @@ Minicli::Minicli( QWidget *parent, const
connect( m_dlg->cbCommand, SIGNAL( returnPressed() ),
m_dlg->pbRun, SLOT( animateClick() ) );
++++++ nsplugin-Preference.diff ++++++
--- /var/tmp/diff_new_pack.f14453/_old 2009-04-07 14:07:40.000000000 +0200
+++ /var/tmp/diff_new_pack.f14453/_new 2009-04-07 14:07:40.000000000 +0200
@@ -1,8 +1,8 @@
Index: nsplugins/pluginscan.cpp
-================================================================================
---- nsplugins/pluginscan.cpp
+===================================================================
+--- nsplugins/pluginscan.cpp.orig
+++ nsplugins/pluginscan.cpp
-@@ -506,7 +506,7 @@
+@@ -463,7 +463,7 @@ void writeServicesFile( QStringList mime
ts << "Icon=netscape" << endl;
ts << "Comment=" << i18n("Netscape plugin viewer") << endl;
ts << "X-KDE-Library=libnsplugin" << endl;
++++++ optional-compmgr.diff ++++++
--- /var/tmp/diff_new_pack.f14453/_old 2009-04-07 14:07:40.000000000 +0200
+++ /var/tmp/diff_new_pack.f14453/_new 2009-04-07 14:07:40.000000000 +0200
@@ -1,6 +1,8 @@
---- kwin/workspace.cpp
+Index: kwin/workspace.cpp
+===================================================================
+--- kwin/workspace.cpp.orig
+++ kwin/workspace.cpp
-@@ -58,6 +58,17 @@
+@@ -59,6 +59,17 @@ KSelectionOwner* kompmgr_selection;
bool allowKompmgrRestart = TRUE;
@@ -18,7 +20,7 @@
// Rikkus: This class is too complex. It needs splitting further.
// It's a nightmare to understand, especially with so few comments :(
-@@ -197,6 +208,9 @@
+@@ -199,6 +210,9 @@ Workspace::Workspace( bool restore )
connect( kapp->desktop(), SIGNAL( resized( int )), SLOT(
desktopResized()));
#endif
++++++ quick_browser_menu.diff ++++++
--- /var/tmp/diff_new_pack.f14453/_old 2009-04-07 14:07:40.000000000 +0200
+++ /var/tmp/diff_new_pack.f14453/_new 2009-04-07 14:07:40.000000000 +0200
@@ -1,6 +1,8 @@
---- kicker/kicker/ui/browser_mnu.cpp
+Index: kicker/kicker/ui/browser_mnu.cpp
+===================================================================
+--- kicker/kicker/ui/browser_mnu.cpp.orig
+++ kicker/kicker/ui/browser_mnu.cpp
-@@ -31,6 +31,7 @@
+@@ -31,6 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE
#include <kfileitem.h>
#include <kglobal.h>
#include <kglobalsettings.h>
@@ -8,7 +10,7 @@
#include <kiconloader.h>
#include <kio/global.h>
#include <klocale.h>
-@@ -148,12 +149,14 @@
+@@ -148,12 +149,14 @@ void PanelBrowserMenu::initialize()
// only the first part menu got them
if(_startid == 0 && !_filesOnly) {
insertTitle(path());
++++++ restore-description-parens.diff ++++++
--- /var/tmp/diff_new_pack.f14453/_old 2009-04-07 14:07:40.000000000 +0200
+++ /var/tmp/diff_new_pack.f14453/_new 2009-04-07 14:07:40.000000000 +0200
@@ -1,6 +1,8 @@
---- ./kicker/kicker/ui/service_mnu.cpp 2006/11/09 13:49:50 1.85
-+++ ./kicker/kicker/ui/service_mnu.cpp 2006/11/09 13:58:16
-@@ -426,7 +426,7 @@
+Index: kicker/kicker/ui/service_mnu.cpp
+===================================================================
+--- kicker/kicker/ui/service_mnu.cpp.orig
++++ kicker/kicker/ui/service_mnu.cpp
+@@ -426,7 +426,7 @@ void PanelServiceMenu::insertMenuItem(KS
{
if (comment.find(serviceName, 0, true) == -1)
{
++++++ runupdater.patch ++++++
--- /var/tmp/diff_new_pack.f14453/_old 2009-04-07 14:07:40.000000000 +0200
+++ /var/tmp/diff_new_pack.f14453/_new 2009-04-07 14:07:40.000000000 +0200
@@ -1,5 +1,7 @@
---- runupdater/runupdater.desktop.sav 2006-11-16 14:48:43.000000000 +0100
-+++ runupdater/runupdater.desktop 2006-11-20 21:17:04.000000000 +0100
+Index: runupdater/runupdater.desktop
+===================================================================
+--- /dev/null
++++ runupdater/runupdater.desktop
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Type=Application
@@ -10,8 +12,10 @@
+
+X-KDE-StartupNotify=false
+OnlyShowIn=KDE;
---- runupdater/runupdater.cpp.sav 2006-11-16 14:48:44.000000000 +0100
-+++ runupdater/runupdater.cpp 2006-11-20 21:50:09.000000000 +0100
+Index: runupdater/runupdater.cpp
+===================================================================
+--- /dev/null
++++ runupdater/runupdater.cpp
@@ -0,0 +1,96 @@
+/*
+ Run either opensuseupdater or zen-updater but not both.
@@ -109,8 +113,10 @@
+ return 0;
+ }
+ }
---- runupdater/Makefile.am.sav 2006-11-16 14:48:58.000000000 +0100
-+++ runupdater/Makefile.am 2006-11-20 21:17:04.000000000 +0100
+Index: runupdater/Makefile.am
+===================================================================
+--- /dev/null
++++ runupdater/Makefile.am
@@ -0,0 +1,13 @@
+INCLUDES = $(all_includes)
+
++++++ select-wm-gui.diff ++++++
--- /var/tmp/diff_new_pack.f14453/_old 2009-04-07 14:07:40.000000000 +0200
+++ /var/tmp/diff_new_pack.f14453/_new 2009-04-07 14:07:40.000000000 +0200
@@ -3,9 +3,11 @@
Feature: bnc#332079
Patch-upstream: no
---- ksmserver/startup.cpp.sav 2008-05-14 20:12:38.000000000 +0200
-+++ ksmserver/startup.cpp 2008-05-14 22:44:51.000000000 +0200
-@@ -103,38 +103,39 @@ void KSMServer::restoreSession( QString
+Index: ksmserver/startup.cpp
+===================================================================
+--- ksmserver/startup.cpp.orig
++++ ksmserver/startup.cpp
+@@ -103,38 +103,39 @@ void KSMServer::restoreSession( QString
config->setGroup( sessionGroup );
int count = config->readNumEntry( "count" );
appsToStart = count;
@@ -124,8 +126,10 @@
void KSMServer::autoStart0()
{
if( state != LaunchingWM )
---- ksmserver/server.h.sav 2008-05-14 20:12:38.000000000 +0200
-+++ ksmserver/server.h 2008-05-14 20:13:03.000000000 +0200
+Index: ksmserver/server.h
+===================================================================
+--- ksmserver/server.h.orig
++++ ksmserver/server.h
@@ -30,6 +30,8 @@ Copyright (C) 2000 Matthias Ettrich <ett
#define SESSION_PREVIOUS_LOGOUT "saved at previous logout"
#define SESSION_BY_USER "saved by user"
@@ -135,16 +139,16 @@
typedef QValueList<QCString> QCStringList;
class KSMListener;
class KSMConnection;
-@@ -92,6 +94,8 @@ public:
- virtual void suspendStartup( QCString app );
- virtual void resumeStartup( QCString app );
+@@ -98,6 +100,8 @@ public:
+ KApplication::ShutdownType sdtype,
+ KApplication::ShutdownMode sdmode );
+ void launchWM( const QValueList< QStringList >& wmStartCommands );
+
public slots:
void cleanUp();
-@@ -114,6 +118,7 @@ private slots:
+@@ -120,6 +124,7 @@ private slots:
void autoStart2();
void tryRestoreNext();
void startupSuspendTimeout();
@@ -152,7 +156,7 @@
private:
void handlePendingInteractions();
-@@ -132,13 +137,14 @@ private:
+@@ -138,13 +143,14 @@ private:
void startProtection();
void endProtection();
@@ -168,7 +172,7 @@
bool defaultSession() const; // empty session
void setupXIOErrorHandler();
-@@ -211,6 +217,8 @@ private:
+@@ -223,6 +229,8 @@ private:
int lastAppStarted;
QString lastIdStarted;
@@ -177,8 +181,10 @@
QStringList excludeApps;
WindowMap legacyWindows;
---- ksmserver/Makefile.am.sav 2008-05-14 20:12:38.000000000 +0200
-+++ ksmserver/Makefile.am 2008-05-14 20:13:03.000000000 +0200
+Index: ksmserver/Makefile.am
+===================================================================
+--- ksmserver/Makefile.am.orig
++++ ksmserver/Makefile.am
@@ -15,7 +15,7 @@
# AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
@@ -186,10 +192,12 @@
-SUBDIRS = .
+SUBDIRS = . windowmanagers
- INCLUDES= -I$(top_srcdir)/kdmlib $(all_includes)
+ INCLUDES= -I$(top_srcdir)/kdmlib $(all_includes) $(DBUS_INCS)
---- ksmserver/main.cpp.sav 2008-05-14 20:12:38.000000000 +0200
-+++ ksmserver/main.cpp 2008-05-14 20:13:03.000000000 +0200
+Index: ksmserver/main.cpp
+===================================================================
+--- ksmserver/main.cpp.orig
++++ ksmserver/main.cpp
@@ -203,8 +203,6 @@ extern "C" KDE_EXPORT int kdemain( int a
}
@@ -199,9 +207,11 @@
bool only_local = args->isSet("local");
#ifndef HAVE__ICETRANSNOLISTEN
---- ksmserver/server.cpp.sav 2008-05-14 20:12:38.000000000 +0200
-+++ ksmserver/server.cpp 2008-05-14 22:45:19.000000000 +0200
-@@ -77,6 +77,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE
+Index: ksmserver/server.cpp
+===================================================================
+--- ksmserver/server.cpp.orig
++++ ksmserver/server.cpp
+@@ -77,6 +77,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE
#include <kprocess.h>
#include <dcopclient.h>
#include <dcopref.h>
@@ -357,36 +367,46 @@
+ wm = smname.isEmpty() ? cfgwm : smname;
+ wmCommands = cfgWmCommands;
+}
---- ksmserver/windowmanagers/openbox.desktop.sav 2008-05-14
20:13:03.000000000 +0200
-+++ ksmserver/windowmanagers/openbox.desktop 2008-05-14 20:13:03.000000000
+0200
+Index: ksmserver/windowmanagers/openbox.desktop
+===================================================================
+--- /dev/null
++++ ksmserver/windowmanagers/openbox.desktop
@@ -0,0 +1,5 @@
+[Desktop Entry]
+Name=Openbox
+Exec=openbox
+TryExec=openbox
+
---- ksmserver/windowmanagers/Makefile.am.sav 2008-05-14 20:13:03.000000000
+0200
-+++ ksmserver/windowmanagers/Makefile.am 2008-05-14 20:13:03.000000000
+0200
+Index: ksmserver/windowmanagers/Makefile.am
+===================================================================
+--- /dev/null
++++ ksmserver/windowmanagers/Makefile.am
@@ -0,0 +1,2 @@
+windowmanager_DATA = compiz-custom.desktop compiz.desktop kwin4.desktop
metacity.desktop openbox.desktop
+windowmanagerdir = $(kde_datadir)/ksmserver/windowmanagers
---- ksmserver/windowmanagers/compiz.desktop.sav 2008-05-14
20:13:03.000000000 +0200
-+++ ksmserver/windowmanagers/compiz.desktop 2008-05-14 20:13:03.000000000
+0200
+Index: ksmserver/windowmanagers/compiz.desktop
+===================================================================
+--- /dev/null
++++ ksmserver/windowmanagers/compiz.desktop
@@ -0,0 +1,4 @@
+[Desktop Entry]
+Name=Compiz
+Exec=compiz ccp
+TryExec=compiz
---- ksmserver/windowmanagers/compiz-custom.desktop.sav 2008-05-14
20:13:03.000000000 +0200
-+++ ksmserver/windowmanagers/compiz-custom.desktop 2008-05-14
20:13:03.000000000 +0200
+Index: ksmserver/windowmanagers/compiz-custom.desktop
+===================================================================
+--- /dev/null
++++ ksmserver/windowmanagers/compiz-custom.desktop
@@ -0,0 +1,5 @@
+[Desktop Entry]
+Name=Compiz custom (create wrapper script 'compiz-kde-launcher' to launch it)
+Exec=compiz-kde-launcher
+TryExec=compiz
+X-KDE-WindowManagerId=compiz
---- ksmserver/windowmanagers/kwin4.desktop.sav 2008-05-14 20:13:03.000000000
+0200
-+++ ksmserver/windowmanagers/kwin4.desktop 2008-05-14 20:13:03.000000000
+0200
+Index: ksmserver/windowmanagers/kwin4.desktop
+===================================================================
+--- /dev/null
++++ ksmserver/windowmanagers/kwin4.desktop
@@ -0,0 +1,6 @@
+[Desktop Entry]
+Name=KWin (KDE4)
@@ -394,15 +414,19 @@
+TryExec=/usr/bin/kwin
+X-KDE-WindowManagerId=kwin
+
---- ksmserver/windowmanagers/metacity.desktop.sav 2008-05-14
20:13:03.000000000 +0200
-+++ ksmserver/windowmanagers/metacity.desktop 2008-05-14 20:13:03.000000000
+0200
+Index: ksmserver/windowmanagers/metacity.desktop
+===================================================================
+--- /dev/null
++++ ksmserver/windowmanagers/metacity.desktop
@@ -0,0 +1,4 @@
+[Desktop Entry]
+Name=Metacity (GNOME)
+Exec=metacity
+TryExec=metacity
---- kcontrol/smserver/smserverconfigdlg.ui.sav 2008-05-14 20:12:17.000000000
+0200
-+++ kcontrol/smserver/smserverconfigdlg.ui 2008-05-14 20:13:03.000000000
+0200
+Index: kcontrol/smserver/smserverconfigdlg.ui
+===================================================================
+--- kcontrol/smserver/smserverconfigdlg.ui.orig
++++ kcontrol/smserver/smserverconfigdlg.ui
@@ -1,4 +1,4 @@
-<!DOCTYPE UI><UI version="3.2" stdsetdef="1">
+<!DOCTYPE UI><UI version="3.3" stdsetdef="1">
@@ -458,8 +482,10 @@
</connections>
<includes>
<include location="global" impldecl="in
implementation">kdialog.h</include>
---- kcontrol/smserver/kcmsmserver.cpp.sav 2008-05-14 20:12:17.000000000
+0200
-+++ kcontrol/smserver/kcmsmserver.cpp 2008-05-14 20:13:03.000000000 +0200
+Index: kcontrol/smserver/kcmsmserver.cpp
+===================================================================
+--- kcontrol/smserver/kcmsmserver.cpp.orig
++++ kcontrol/smserver/kcmsmserver.cpp
@@ -22,6 +22,8 @@
#include <qcheckbox.h>
#include <qlayout.h>
@@ -482,7 +508,7 @@
#include "kcmsmserver.h"
#include "smserverconfigimpl.h"
-@@ -52,6 +60,7 @@ SMServerConfig::SMServerConfig( QWidget
+@@ -52,6 +60,7 @@ SMServerConfig::SMServerConfig( QWidget
dialog->show();
topLayout->add(dialog);
@@ -592,8 +618,10 @@
+
#include "kcmsmserver.moc"
---- kcontrol/smserver/kcmsmserver.h.sav 2008-05-14 20:12:17.000000000
+0200
-+++ kcontrol/smserver/kcmsmserver.h 2008-05-14 20:13:03.000000000 +0200
+Index: kcontrol/smserver/kcmsmserver.h
+===================================================================
+--- kcontrol/smserver/kcmsmserver.h.orig
++++ kcontrol/smserver/kcmsmserver.h
@@ -40,6 +40,10 @@ public:
private:
++++++ short-menus.diff ++++++
--- /var/tmp/diff_new_pack.f14453/_old 2009-04-07 14:07:40.000000000 +0200
+++ /var/tmp/diff_new_pack.f14453/_new 2009-04-07 14:07:40.000000000 +0200
@@ -1,6 +1,8 @@
---- kdesktop/Makefile.am
+Index: kdesktop/Makefile.am
+===================================================================
+--- kdesktop/Makefile.am.orig
+++ kdesktop/Makefile.am
-@@ -6,6 +6,8 @@
+@@ -6,6 +6,8 @@ kdesktop_la_LIBADD = libkdesktopsettin
SUBDIRS = . lock pics patterns programs init kwebdesktop
@@ -9,9 +11,11 @@
####### Files
bin_PROGRAMS = kcheckrunning
---- kicker/kicker/ui/service_mnu.cpp
+Index: kicker/kicker/ui/service_mnu.cpp
+===================================================================
+--- kicker/kicker/ui/service_mnu.cpp.orig
+++ kicker/kicker/ui/service_mnu.cpp
-@@ -111,6 +111,11 @@
+@@ -111,6 +111,11 @@ void PanelServiceMenu::fillMenu(KService
QStringList suppressGenericNames = _root->suppressGenericNames();
KServiceGroup::List::ConstIterator it = _list.begin();
@@ -23,7 +27,7 @@
bool separatorNeeded = false;
for (; it != _list.end(); ++it)
{
-@@ -118,19 +123,108 @@
+@@ -118,19 +123,108 @@ void PanelServiceMenu::fillMenu(KService
if (e->isType(KST_KServiceGroup))
{
@@ -89,9 +93,9 @@
+
+ _list = _root->SuSEsortEntries( slist, glist, excludeNoDisplay_, true );
+ it = _list.begin();
-+
-+ for (; it != _list.end(); ++it) {
++ for (; it != _list.end(); ++it) {
++
+ KSycocaEntry * e = *it;
+
+ if (e->isType(KST_KServiceGroup)) {
@@ -137,7 +141,7 @@
QString inlineHeaderName = g->showInlineHeader() ? groupCaption :
"";
// Item names may contain ampersands. To avoid them being
converted
// to accelerators, replace them with two ampersands.
-@@ -214,7 +308,7 @@
+@@ -214,7 +308,7 @@ void PanelServiceMenu::fillMenu(KService
}
KService::Ptr s(static_cast<KService *>(e));
@@ -146,7 +150,7 @@
}
else if (e->isType(KST_KServiceSeparator))
{
-@@ -296,7 +390,8 @@
+@@ -296,7 +390,8 @@ void PanelServiceMenu::configChanged()
void PanelServiceMenu::insertMenuItem(KService::Ptr & s, int nId,
int nIndex/*= -1*/,
const QStringList *suppressGenericNames
/* = 0 */,
@@ -156,7 +160,7 @@
{
QString serviceName = (aliasname.isEmpty() ? s->name() :
aliasname).simplifyWhiteSpace();
QString comment = s->genericName().simplifyWhiteSpace();
-@@ -347,7 +442,15 @@
+@@ -347,7 +442,15 @@ void PanelServiceMenu::insertMenuItem(KS
// to accelerators, replace them with two ampersands.
serviceName.replace("&", "&&");
@@ -173,9 +177,11 @@
entryMap_.insert(newId, static_cast<KSycocaEntry*>(s));
}
---- kicker/kicker/ui/service_mnu.h
+Index: kicker/kicker/ui/service_mnu.h
+===================================================================
+--- kicker/kicker/ui/service_mnu.h.orig
+++ kicker/kicker/ui/service_mnu.h
-@@ -83,7 +83,8 @@
+@@ -83,7 +83,8 @@ protected slots:
protected:
void insertMenuItem(KService::Ptr & s, int nId, int nIndex = -1,
const QStringList *suppressGenericNames=0,
@@ -185,7 +191,9 @@
virtual PanelServiceMenu * newSubMenu(const QString & label,
const QString & relPath,
QWidget * parent, const char * name,
---- kicker/libkicker/kickerSettings.kcfg
+Index: kicker/libkicker/kickerSettings.kcfg
+===================================================================
+--- kicker/libkicker/kickerSettings.kcfg.orig
+++ kicker/libkicker/kickerSettings.kcfg
@@ -126,6 +126,11 @@
<default>true</default>
++++++ show-konqueror-in-menu.diff ++++++
--- /var/tmp/diff_new_pack.f14453/_old 2009-04-07 14:07:40.000000000 +0200
+++ /var/tmp/diff_new_pack.f14453/_new 2009-04-07 14:07:40.000000000 +0200
@@ -1,8 +1,8 @@
Index: konqueror/konqfilemgr.desktop
===================================================================
---- konqueror/konqfilemgr.desktop (revision 626993)
-+++ konqueror/konqfilemgr.desktop (working copy)
-@@ -5,7 +5,8 @@
+--- konqueror/konqfilemgr.desktop.orig
++++ konqueror/konqfilemgr.desktop
+@@ -4,7 +4,8 @@ Exec=kfmclient openProfile filemanagemen
Icon=kfm
DocPath=konqueror/index.html
@@ -14,18 +14,17 @@
Name[az]=Fayl İdarəcisi
Index: konqueror/Makefile.am
===================================================================
---- konqueror/Makefile.am (revision 626993)
-+++ konqueror/Makefile.am (working copy)
-@@ -69,11 +69,8 @@
- $(XGETTEXT) -kaliasLocal rc.cpp *.h *.cc *view/*h *view/*cc
kedit*/*.cpp about/*.h about/*.cc remoteencodingplugin/*.cpp
remoteencodingplugin/*.h shellcmdplugin/*.cpp -o `find sidebar -name "*.cpp"`
`find sidebar -name "*.h"` -o $(podir)/konqueror.pot
+--- konqueror/Makefile.am.orig
++++ konqueror/Makefile.am
+@@ -69,10 +69,7 @@ messages: rc.cpp
+ $(XGETTEXT) -kaliasLocal rc.cpp *.h *.cc *view/*h *view/*cc kedit*/*.h
kedit*/*.cpp about/*.h about/*.cc remoteencodingplugin/*.cpp
remoteencodingplugin/*.h shellcmdplugin/*.cpp -o `find sidebar -name "*.cpp"`
`find sidebar -name "*.h"` -o $(podir)/konqueror.pot
xdg_apps_DATA = kfmclient.desktop kfmclient_dir.desktop
kfmclient_html.desktop \
- kfmclient_war.desktop konqbrowser.desktop konquerorsu.desktop
Home.desktop
-+ kfmclient_war.desktop konqbrowser.desktop konquerorsu.desktop
Home.desktop konqfilemgr.desktop
-
+-
-konq_data4_DATA = konqfilemgr.desktop
-konq_data4dir = $(kde_appsdir)/.hidden
--
++ kfmclient_war.desktop konqbrowser.desktop konquerorsu.desktop
Home.desktop konqfilemgr.desktop
+
kde_kcfg_DATA = konqueror.kcfg
- ####### Build rules
++++++ spellcheck-default-utf8.diff ++++++
--- /var/tmp/diff_new_pack.f14453/_old 2009-04-07 14:07:40.000000000 +0200
+++ /var/tmp/diff_new_pack.f14453/_new 2009-04-07 14:07:40.000000000 +0200
@@ -1,8 +1,8 @@
Index: kcontrol/spellchecking/spellchecking.cpp
===================================================================
---- kcontrol/spellchecking/spellchecking.cpp (revision 652943)
-+++ kcontrol/spellchecking/spellchecking.cpp (working copy)
-@@ -67,7 +67,7 @@
+--- kcontrol/spellchecking/spellchecking.cpp.orig
++++ kcontrol/spellchecking/spellchecking.cpp
+@@ -67,7 +67,7 @@ void KSpellCheckingConfig::defaults()
spellConfig->setRunTogether(0);
spellConfig->setDictionary("");
spellConfig->setDictFromList(FALSE);
++++++ startkde.diff ++++++
--- /var/tmp/diff_new_pack.f14453/_old 2009-04-07 14:07:41.000000000 +0200
+++ /var/tmp/diff_new_pack.f14453/_new 2009-04-07 14:07:41.000000000 +0200
@@ -1,6 +1,9 @@
---- startkde 2007/02/20 14:19:03 1.1
-+++ startkde 2007/02/20 14:19:37
-@@ -4,5 +4,8 @@
+Index: startkde
+===================================================================
+--- startkde.orig
++++ startkde
+@@ -3,6 +3,9 @@
+ # DEFAULT KDE STARTUP SCRIPT ( KDE-3.5.10 )
#
+PATH=/opt/kde3/bin:${PATH/:\/opt\/kde3\/bin}
@@ -9,7 +12,7 @@
# When the X server dies we get a HUP signal from xinit. We must ignore it
# because we still need to do some cleanup.
trap 'echo GOT SIGHUP' HUP
-@@ -19,7 +22,7 @@
+@@ -19,7 +22,7 @@ fi
# people's heads. We use colours from the standard KDE palette for those with
# palettised displays.
if test -z "$XDM_MANAGED" || echo "$XDM_MANAGED" | grep ",auto" > /dev/null;
then
@@ -18,7 +21,7 @@
fi
# we have to unset this for Darwin since it will screw up KDE's
dynamic-loading
-@@ -62,7 +65,7 @@
+@@ -62,7 +65,7 @@ cat >$kdehome/share/config/startupconfig
kcminputrc Mouse cursorTheme ''
kcminputrc Mouse cursorSize ''
kpersonalizerrc General FirstLogin true
@@ -27,7 +30,7 @@
kcmrandrrc Display ApplyOnStartup false
kcmrandrrc [Screen0]
kcmrandrrc [Screen1]
-@@ -160,6 +163,16 @@
+@@ -160,6 +163,16 @@ Xft.dpi: 96
EOF
fi
@@ -44,7 +47,7 @@
# Source scripts found in <localprefix>/env/*.sh and <prefixes>/env/*.sh
# (where <localprefix> is $KDEHOME or ~/.kde, and <prefixes> is where KDE is
installed)
#
-@@ -283,7 +296,7 @@
+@@ -286,7 +299,7 @@ dcopserver_shutdown
echo 'startkde: Starting up...' 1>&2
# run KPersonalizer before the session, if this is the first login
@@ -53,7 +56,7 @@
# start only dcopserver, don't start whole kdeinit (takes too long)
echo 'startkde: Running kpersonalizer...' 1>&2
dcopserver
-@@ -302,6 +315,8 @@
+@@ -305,6 +318,8 @@ if test -z "$dl"; then
case "$ksplashrc_ksplash_theme" in
None)
;; # nothing
@@ -62,7 +65,7 @@
Simple)
if test "$kpersonalizerrc_general_firstlogin" = "true"; then
ksplashsimple
-@@ -384,11 +399,13 @@ done
+@@ -384,9 +399,11 @@ done
echo 'startkde: Shutting down...' 1>&2
# Clean up
@@ -75,5 +78,3 @@
# KDE4 support
kde4 kdeinit4_shutdown 2>/dev/null
- echo 'startkde: Running shutdown scripts...' 1>&2
-
++++++ suse_default_move.diff ++++++
--- /var/tmp/diff_new_pack.f14453/_old 2009-04-07 14:07:41.000000000 +0200
+++ /var/tmp/diff_new_pack.f14453/_new 2009-04-07 14:07:41.000000000 +0200
@@ -1,4 +1,6 @@
---- empty/Makefile.am
+Index: empty/Makefile.am
+===================================================================
+--- /dev/null
+++ empty/Makefile.am
@@ -0,0 +1,17 @@
+# set the include path for X, qt and KDE
@@ -18,7 +20,9 @@
+default_desktop_aligning_LDADD = $(LIB_KDEUI)
+
+KDesktopIface_DIR = $(srcdir)/../kdesktop
---- empty/moving.cpp
+Index: empty/moving.cpp
+===================================================================
+--- /dev/null
+++ empty/moving.cpp
@@ -0,0 +1,56 @@
+#include <kstandarddirs.h>
++++++ suspend-unmount.diff ++++++
--- /var/tmp/diff_new_pack.f14453/_old 2009-04-07 14:07:41.000000000 +0200
+++ /var/tmp/diff_new_pack.f14453/_new 2009-04-07 14:07:41.000000000 +0200
@@ -1,6 +1,8 @@
---- kioslave/media/libmediacommon/medium.cpp
+Index: kioslave/media/libmediacommon/medium.cpp
+===================================================================
+--- kioslave/media/libmediacommon/medium.cpp.orig
+++ kioslave/media/libmediacommon/medium.cpp
-@@ -42,6 +42,7 @@ Medium::Medium(const QString &id, const
+@@ -42,6 +42,7 @@ Medium::Medium(const QString &id, const
loadUserLabel();
m_halmounted = false;
@@ -19,7 +21,9 @@
}
const Medium Medium::create(const QStringList &properties)
---- kioslave/media/libmediacommon/medium.h
+Index: kioslave/media/libmediacommon/medium.h
+===================================================================
+--- kioslave/media/libmediacommon/medium.h.orig
+++ kioslave/media/libmediacommon/medium.h
@@ -82,18 +82,22 @@ public:
void setHalMounted(bool flag) const { m_halmounted = flag; }
@@ -46,7 +50,9 @@
{
QMap<QString,QString> valids;
---- kioslave/media/mediamanager/mediamanager.cpp
+Index: kioslave/media/mediamanager/mediamanager.cpp
+===================================================================
+--- kioslave/media/mediamanager/mediamanager.cpp.orig
+++ kioslave/media/mediamanager/mediamanager.cpp
@@ -330,6 +330,54 @@ void MediaManager::slotMediumChanged(con
emit mediumChanged(name);
@@ -103,7 +109,9 @@
extern "C" {
KDE_EXPORT KDEDModule *create_mediamanager(const QCString &obj)
---- kioslave/media/mediamanager/mediamanager.h
+Index: kioslave/media/mediamanager/mediamanager.h
+===================================================================
+--- kioslave/media/mediamanager/mediamanager.h.orig
+++ kioslave/media/mediamanager/mediamanager.h
@@ -58,6 +58,20 @@ k_dcop:
bool removableUnplug(const QString &devNode);
@@ -143,9 +151,11 @@
};
#endif
---- kioslave/media/mediamanager/halbackend.cpp
+Index: kioslave/media/mediamanager/halbackend.cpp
+===================================================================
+--- kioslave/media/mediamanager/halbackend.cpp.orig
+++ kioslave/media/mediamanager/halbackend.cpp
-@@ -442,6 +442,8 @@ void HALBackend::setVolumeProperties(Med
+@@ -459,6 +459,8 @@ void HALBackend::setVolumeProperties(Med
libhal_volume_get_fstype(halVolume), /* Filesystem
type */
libhal_volume_is_mounted(halVolume) ); /*
Mounted ? */
@@ -154,9 +164,11 @@
char* name = libhal_volume_policy_compute_display_name(halDrive,
halVolume, m_halStoragePolicy);
QString volume_name = QString::fromUtf8(name);
QString media_name = volume_name;
---- kioslave/media/mediamanager/halbackend.h
+Index: kioslave/media/mediamanager/halbackend.h
+===================================================================
+--- kioslave/media/mediamanager/halbackend.h.orig
+++ kioslave/media/mediamanager/halbackend.h
-@@ -96,6 +96,8 @@
+@@ -86,6 +86,8 @@ public:
QString mount(const Medium *medium);
QString unmount(const QString &id);
++++++ system-folder_man.diff ++++++
--- /var/tmp/diff_new_pack.f14453/_old 2009-04-07 14:07:41.000000000 +0200
+++ /var/tmp/diff_new_pack.f14453/_new 2009-04-07 14:07:41.000000000 +0200
@@ -1,9 +1,9 @@
Index: kioslave/system/entries/documents.desktop
===================================================================
---- kioslave/system/entries/documents.desktop (revision 711056)
-+++ kioslave/system/entries/documents.desktop (working copy)
-@@ -2,7 +2,7 @@
- Encoding=UTF-8
+--- kioslave/system/entries/documents.desktop.orig
++++ kioslave/system/entries/documents.desktop
+@@ -1,7 +1,7 @@
+ [Desktop Entry]
Type=Link
Path[$e]=$( kio_system_documenthelper )
-Icon=folder_important
++++++ systray_order.diff ++++++
--- /var/tmp/diff_new_pack.f14453/_old 2009-04-07 14:07:41.000000000 +0200
+++ /var/tmp/diff_new_pack.f14453/_new 2009-04-07 14:07:41.000000000 +0200
@@ -1,6 +1,8 @@
---- kicker/applets/systemtray/systemtrayapplet.cpp.sav 2006-10-31
17:42:31.000000000 +0100
-+++ kicker/applets/systemtray/systemtrayapplet.cpp 2006-11-16
16:50:33.000000000 +0100
-@@ -179,6 +179,7 @@ bool SystemTrayApplet::x11Event( XEvent
+Index: kicker/applets/systemtray/systemtrayapplet.cpp
+===================================================================
+--- kicker/applets/systemtray/systemtrayapplet.cpp.orig
++++ kicker/applets/systemtray/systemtrayapplet.cpp
+@@ -187,6 +187,7 @@ bool SystemTrayApplet::x11Event( XEvent
if( isWinManaged( (WId)e->xclient.data.l[2] ) ) // we already
manage it
return true;
embedWindow( e->xclient.data.l[2], false );
@@ -8,7 +10,7 @@
layoutTray();
return true;
}
-@@ -205,13 +206,12 @@ void SystemTrayApplet::preferences()
+@@ -213,13 +214,12 @@ void SystemTrayApplet::preferences()
connect(m_settingsDialog, SIGNAL(finished()), this,
SLOT(settingsDialogFinished()));
m_iconSelector = new KActionSelector(m_settingsDialog);
@@ -26,7 +28,7 @@
TrayEmbedList::const_iterator it = m_shownWins.begin();
TrayEmbedList::const_iterator itEnd = m_shownWins.end();
-@@ -253,26 +253,48 @@ void SystemTrayApplet::applySettings()
+@@ -261,26 +261,48 @@ void SystemTrayApplet::applySettings()
}
KConfig *conf = config();
@@ -89,7 +91,7 @@
}
conf->writeEntry("Hidden", m_hiddenIconList);
conf->sync();
-@@ -408,6 +430,9 @@ void SystemTrayApplet::loadSettings()
+@@ -416,6 +438,9 @@ void SystemTrayApplet::loadSettings()
conf->setGroup("HiddenTrayIcons");
m_hiddenIconList = conf->readListEntry("Hidden");
@@ -99,7 +101,7 @@
//Note This setting comes from kdeglobal.
conf->setGroup("System Tray");
m_iconSize = conf->readNumEntry("systrayIconWidth", 22);
-@@ -498,7 +523,9 @@ bool SystemTrayApplet::isWinManaged(WId
+@@ -505,7 +530,9 @@ bool SystemTrayApplet::isWinManaged(WId
bool SystemTrayApplet::shouldHide(WId w)
{
@@ -110,7 +112,7 @@
}
void SystemTrayApplet::updateVisibleWins()
-@@ -520,6 +547,35 @@ void SystemTrayApplet::updateVisibleWins
+@@ -529,6 +556,35 @@ void SystemTrayApplet::updateVisibleWins
(*emb)->hide();
}
}
@@ -146,9 +148,11 @@
}
void SystemTrayApplet::toggleExpanded()
---- kicker/applets/systemtray/systemtrayapplet.h.sav 2006-10-26
11:52:35.000000000 +0200
-+++ kicker/applets/systemtray/systemtrayapplet.h 2006-11-16
16:48:57.000000000 +0100
-@@ -93,6 +93,7 @@ private:
+Index: kicker/applets/systemtray/systemtrayapplet.h
+===================================================================
+--- kicker/applets/systemtray/systemtrayapplet.h.orig
++++ kicker/applets/systemtray/systemtrayapplet.h
+@@ -97,6 +97,7 @@ private:
TrayEmbedList m_shownWins;
TrayEmbedList m_hiddenWins;
QStringList m_hiddenIconList;
++++++ teach-minicli-lock.diff ++++++
--- /var/tmp/diff_new_pack.f14453/_old 2009-04-07 14:07:41.000000000 +0200
+++ /var/tmp/diff_new_pack.f14453/_new 2009-04-07 14:07:41.000000000 +0200
@@ -1,8 +1,8 @@
-Index: minicli.cpp
-================================================================================
---- kdesktop/minicli.cpp
+Index: kdesktop/minicli.cpp
+===================================================================
+--- kdesktop/minicli.cpp.orig
+++ kdesktop/minicli.cpp
-@@ -265,7 +265,9 @@
+@@ -265,7 +265,9 @@ void Minicli::accept()
}
bool logout = (cmd == "logout");
@@ -13,7 +13,7 @@
return;
m_dlg->cbCommand->addToHistory(
m_dlg->cbCommand->currentText().stripWhiteSpace() );
-@@ -278,6 +280,14 @@
+@@ -278,6 +280,14 @@ void Minicli::accept()
kapp->propagateSessionManager();
kapp->requestShutDown();
}
++++++ use-full-hinting-by-default.diff ++++++
--- /var/tmp/diff_new_pack.f14453/_old 2009-04-07 14:07:41.000000000 +0200
+++ /var/tmp/diff_new_pack.f14453/_new 2009-04-07 14:07:41.000000000 +0200
@@ -1,8 +1,8 @@
-Index: kcontrol/krdb/krdb.cpp
-================================================================================
---- kcontrol/fonts/fonts.cpp
+Index: kcontrol/fonts/fonts.cpp
+===================================================================
+--- kcontrol/fonts/fonts.cpp.orig
+++ kcontrol/fonts/fonts.cpp
-@@ -321,7 +321,7 @@
+@@ -332,7 +332,7 @@ bool FontAASettings::load( bool useDefau
kglobals.setReadDefaults( useDefaults );
kglobals.setGroup("General");
@@ -11,8 +11,8 @@
xft.setHintStyle(hStyle);
xft.apply(); // Save this setting
kglobals.writeEntry("XftHintStyle", KXftConfig::toStr(hStyle));
-@@ -439,7 +439,7 @@
-
if(hintingStyle->currentText()==i18n(KXftConfig::description((KXftConfig::Hint::Style)s).utf8()))
+@@ -450,7 +450,7 @@ KXftConfig::Hint::Style FontAASettings::
+
if(hintingStyle->currentText()==KXftConfig::description((KXftConfig::Hint::Style)s))
return (KXftConfig::Hint::Style)s;
- return KXftConfig::Hint::Medium;
@@ -20,9 +20,11 @@
}
#endif
---- kcontrol/krdb/krdb.cpp
+Index: kcontrol/krdb/krdb.cpp
+===================================================================
+--- kcontrol/krdb/krdb.cpp.orig
+++ kcontrol/krdb/krdb.cpp
-@@ -523,7 +523,7 @@
+@@ -524,7 +524,7 @@ void runRdb( uint flags )
if (kglobals.hasKey("XftHintStyle"))
{
++++++ use-pam-before-classic.diff ++++++
--- /var/tmp/diff_new_pack.f14453/_old 2009-04-07 14:07:41.000000000 +0200
+++ /var/tmp/diff_new_pack.f14453/_new 2009-04-07 14:07:41.000000000 +0200
@@ -1,6 +1,8 @@
---- kdesktop/lock/lockprocess.cc
+Index: kdesktop/lock/lockprocess.cc
+===================================================================
+--- kdesktop/lock/lockprocess.cc.orig
+++ kdesktop/lock/lockprocess.cc
-@@ -358,8 +358,10 @@ void LockProcess::configure()
+@@ -364,8 +364,10 @@ void LockProcess::configure()
readSaver();
mPlugins = KDesktopSettings::pluginsUnlock();
++++++ workaround-pdf-on64bit-nsplugin-bug.diff ++++++
--- /var/tmp/diff_new_pack.f14453/_old 2009-04-07 14:07:41.000000000 +0200
+++ /var/tmp/diff_new_pack.f14453/_new 2009-04-07 14:07:41.000000000 +0200
@@ -1,8 +1,8 @@
Index: nsplugins/nspluginloader.cpp
-================================================================================
---- nsplugins/nspluginloader.cpp
+===================================================================
+--- nsplugins/nspluginloader.cpp.orig
+++ nsplugins/nspluginloader.cpp
-@@ -257,7 +257,7 @@
+@@ -322,7 +322,7 @@ QString NSPluginLoader::lookup(const QSt
}
@@ -11,7 +11,7 @@
{
kdDebug() << "NSPluginLoader::loadViewer" << endl;
-@@ -281,7 +281,7 @@
+@@ -346,7 +346,7 @@ bool NSPluginLoader::loadViewer()
}
// find the external artsdsp process
@@ -20,7 +20,7 @@
kdDebug() << "trying to use artsdsp" << endl;
QString artsdsp = KGlobal::dirs()->findExe("artsdsp");
if (!artsdsp)
-@@ -395,7 +395,7 @@
+@@ -460,7 +460,7 @@ NSPluginInstance *NSPluginLoader::newIns
if ( !_viewer )
{
// load plugin viewer process
@@ -29,9 +29,11 @@
if ( !_viewer )
{
---- nsplugins/nspluginloader.h
+Index: nsplugins/nspluginloader.h
+===================================================================
+--- nsplugins/nspluginloader.h.orig
+++ nsplugins/nspluginloader.h
-@@ -87,7 +87,7 @@
+@@ -100,7 +100,7 @@ protected:
QString lookup(const QString &mimeType);
QString lookupMimeType(const QString &url);
++++++ xcursor.diff ++++++
--- /var/tmp/diff_new_pack.f14453/_old 2009-04-07 14:07:41.000000000 +0200
+++ /var/tmp/diff_new_pack.f14453/_new 2009-04-07 14:07:41.000000000 +0200
@@ -1,6 +1,8 @@
---- kcontrol/input/xcursor/themepage.cpp
+Index: kcontrol/input/xcursor/themepage.cpp
+===================================================================
+--- kcontrol/input/xcursor/themepage.cpp.orig
+++ kcontrol/input/xcursor/themepage.cpp
-@@ -73,6 +73,13 @@
+@@ -73,6 +73,13 @@ struct ThemeInfo {
};
@@ -14,7 +16,7 @@
ThemePage::ThemePage( QWidget* parent, const char* name )
: QWidget( parent, name ), selectedTheme( NULL ), currentTheme( NULL )
{
-@@ -333,7 +340,7 @@
+@@ -333,7 +340,7 @@ void ThemePage::insertTheme( const QStri
// Defaults in case there's no name or comment field.
QString name = dirName;
@@ -23,7 +25,7 @@
QString sample = "left_ptr";
KSimpleConfig c( path + "/index.theme", true ); // Open read-only
-@@ -480,7 +487,7 @@
+@@ -480,7 +487,7 @@ void ThemePage::insertThemes()
// Defaults in case there's no index.theme file or it
lacks
// a name and a comment field.
QString name = *it;
++++++ xinerama.patch ++++++
--- /var/tmp/diff_new_pack.f14453/_old 2009-04-07 14:07:41.000000000 +0200
+++ /var/tmp/diff_new_pack.f14453/_new 2009-04-07 14:07:41.000000000 +0200
@@ -1,6 +1,8 @@
---- kdesktop/minicli.cpp (revision 670386)
-+++ kdesktop/minicli.cpp (working copy)
-@@ -369,6 +369,17 @@ int Minicli::runCommand()
+Index: kdesktop/minicli.cpp
+===================================================================
+--- kdesktop/minicli.cpp.orig
++++ kdesktop/minicli.cpp
+@@ -379,6 +379,17 @@ int Minicli::runCommand()
cmd = uri.path();
else
cmd = uri.url();
@@ -18,7 +20,7 @@
// Determine whether the application should be run through
// the command line (terminal) interface...
-@@ -504,7 +515,7 @@ int Minicli::runCommand()
+@@ -514,7 +525,7 @@ int Minicli::runCommand()
case KURIFilterData::HELP:
{
// No need for kfmclient, KRun does it all (David)
@@ -27,7 +29,7 @@
return 0;
}
case KURIFilterData::EXECUTABLE:
-@@ -516,7 +527,7 @@ int Minicli::runCommand()
+@@ -526,7 +537,7 @@ int Minicli::runCommand()
if (service && service->isValid() && service->type() ==
"Application")
{
notifyServiceStarted(service);
@@ -36,7 +38,7 @@
return 0;
}
}
-@@ -551,7 +562,7 @@ int Minicli::runCommand()
+@@ -561,7 +572,7 @@ int Minicli::runCommand()
if (service && service->isValid() && service->type() ==
"Application")
{
notifyServiceStarted(service);
@@ -45,7 +47,7 @@
return 0;
}
-@@ -559,7 +570,7 @@ int Minicli::runCommand()
+@@ -569,7 +580,7 @@ int Minicli::runCommand()
if (service && service->isValid() && service->type() ==
"Application")
{
notifyServiceStarted(service);
@@ -54,7 +56,7 @@
return 0;
}
-@@ -571,7 +582,7 @@ int Minicli::runCommand()
+@@ -581,7 +592,7 @@ int Minicli::runCommand()
}
}
@@ -63,9 +65,11 @@
return 0;
else
{
---- kdesktop/desktop.cc (revision 670386)
-+++ kdesktop/desktop.cc (working copy)
-@@ -516,9 +516,12 @@ void KDesktop::popupExecuteCommand(const
+Index: kdesktop/desktop.cc
+===================================================================
+--- kdesktop/desktop.cc.orig
++++ kdesktop/desktop.cc
+@@ -520,9 +520,12 @@ void KDesktop::popupExecuteCommand(const
if ( m_miniCli->isVisible() ) {
KWin::forceActiveWindow( m_miniCli->winId() );
} else {
@@ -81,8 +85,10 @@
m_miniCli->show(); // non-modal
}
}
---- kwin/useractions.cpp (revision 670386)
-+++ kwin/useractions.cpp (working copy)
+Index: kwin/useractions.cpp
+===================================================================
+--- kwin/useractions.cpp.orig
++++ kwin/useractions.cpp
@@ -482,27 +482,33 @@ bool Client::performMouseCommand( Option
case Options::MouseActivateAndRaise:
replay = isActive(); // for clickraise mode
@@ -158,8 +164,10 @@
/*!
Maximizes the popup client
*/
---- kwin/options.h (revision 670386)
-+++ kwin/options.h (working copy)
+Index: kwin/options.h
+===================================================================
+--- kwin/options.h.orig
++++ kwin/options.h
@@ -124,6 +124,11 @@ class Options : public KDecorationOption
*/
enum AltTabStyle { KDE, CDE };
@@ -182,8 +190,10 @@
/**
MoveResizeMode, either Tranparent or Opaque.
---- kwin/workspace.h (revision 670386)
-+++ kwin/workspace.h (working copy)
+Index: kwin/workspace.h
+===================================================================
+--- kwin/workspace.h.orig
++++ kwin/workspace.h
@@ -91,6 +91,7 @@ class Workspace : public QObject, public
QRect clientArea( clientAreaOption, const QPoint& p, int desktop )
const;
@@ -222,7 +232,7 @@
QString desktopName( int desk ) const;
virtual void setDesktopLayout(int , int , int );
-@@ -299,6 +309,10 @@ class Workspace : public QObject, public
+@@ -301,6 +311,10 @@ class Workspace : public QObject, public
//void slotSwitchToWindow( int );
void slotWindowToDesktop( int );
//void slotWindowToListPosition( int );
@@ -233,7 +243,7 @@
void slotWindowMaximize();
void slotWindowMaximizeVertical();
-@@ -479,6 +493,7 @@ class Workspace : public QObject, public
+@@ -481,6 +495,7 @@ class Workspace : public QObject, public
int current_desktop;
int number_of_desktops;
QMemArray<int> desktop_focus_chain;
@@ -241,9 +251,11 @@
QWidget* active_popup;
Client* active_popup_client;
---- kwin/tabbox.cpp (revision 670386)
-+++ kwin/tabbox.cpp (working copy)
-@@ -23,7 +23,6 @@ License. See the file "COPYING" for the
+Index: kwin/tabbox.cpp
+===================================================================
+--- kwin/tabbox.cpp.orig
++++ kwin/tabbox.cpp
+@@ -23,7 +23,6 @@ License. See the file "COPYING" for the
#include <klocale.h>
#include <qapplication.h>
#include <qdesktopwidget.h>
@@ -311,8 +323,10 @@
// calculate height of 1 line
// fontheight + 1 pixel above + 1 pixel below, or 32x32 icon + 2 pixel
above + below
---- kwin/kcmkwin/kwinoptions/windows.h (revision 670386)
-+++ kwin/kcmkwin/kwinoptions/windows.h (working copy)
+Index: kwin/kcmkwin/kwinoptions/windows.h
+===================================================================
+--- kwin/kcmkwin/kwinoptions/windows.h.orig
++++ kwin/kcmkwin/kwinoptions/windows.h
@@ -86,6 +86,7 @@ private slots:
void delayFocusOnTog(bool);
void clickRaiseOnTog(bool);
@@ -339,8 +353,10 @@
QButtonGroup *kbdBox;
QCheckBox *altTabPopup;
---- kwin/kcmkwin/kwinoptions/windows.cpp (revision
670386)
-+++ kwin/kcmkwin/kwinoptions/windows.cpp (working copy)
+Index: kwin/kcmkwin/kwinoptions/windows.cpp
+===================================================================
+--- kwin/kcmkwin/kwinoptions/windows.cpp.orig
++++ kwin/kcmkwin/kwinoptions/windows.cpp
@@ -76,6 +76,8 @@
#define KWIN_SHADEHOVER_INTERVAL "ShadeHoverInterval"
#define KWIN_FOCUS_STEALING "FocusStealingPreventionLevel"
@@ -387,7 +403,7 @@
connect(altTabPopup, SIGNAL(clicked()), SLOT(changed()));
connect(traverseAll, SIGNAL(clicked()), SLOT(changed()));
connect(rollOverDesktops, SIGNAL(clicked()), SLOT(changed()));
-@@ -366,6 +391,22 @@ void KFocusConfig::delayFocusOnTog(bool
+@@ -366,6 +391,22 @@ void KFocusConfig::delayFocusOnTog(bool
void KFocusConfig::clickRaiseOnTog(bool ) {
}
@@ -441,8 +457,10 @@
setAltTabMode(true);
setTraverseAll( false );
setRollOverDesktops(true);
---- kwin/popupinfo.h (revision 670386)
-+++ kwin/popupinfo.h (working copy)
+Index: kwin/popupinfo.h
+===================================================================
+--- kwin/popupinfo.h.orig
++++ kwin/popupinfo.h
@@ -24,7 +24,7 @@ class PopupInfo : public QWidget
{
Q_OBJECT
@@ -460,8 +478,10 @@
};
} // namespace
---- kwin/options.cpp (revision 670386)
-+++ kwin/options.cpp (working copy)
+Index: kwin/options.cpp
+===================================================================
+--- kwin/options.cpp.orig
++++ kwin/options.cpp
@@ -71,6 +71,9 @@ unsigned long Options::updateSettings()
altTabStyle = KDE; // what a default :-)
if ( val == "CDE" )
@@ -472,7 +492,7 @@
rollOverDesktops = config->readBoolEntry("RollOverDesktops", TRUE);
-@@ -100,9 +103,10 @@ unsigned long Options::updateSettings()
+@@ -91,9 +94,10 @@ unsigned long Options::updateSettings()
delete gc;
placement = Placement::policyFromString( config->readEntry("Placement"),
true );
@@ -484,8 +504,10 @@
animateMinimize = config->readBoolEntry("AnimateMinimize", TRUE );
animateMinimizeSpeed = config->readNumEntry("AnimateMinimizeSpeed", 5 );
---- kwin/placement.cpp (revision 670386)
-+++ kwin/placement.cpp (working copy)
+Index: kwin/placement.cpp
+===================================================================
+--- kwin/placement.cpp.orig
++++ kwin/placement.cpp
@@ -473,7 +473,7 @@ void Placement::placeOnMainWindow(Client
it != mainwindows.end();
++it )
@@ -507,8 +529,10 @@
QRect geom = c->geometry();
geom.moveCenter( place_on->geometry().center());
c->move( geom.topLeft());
---- kwin/client.cpp (revision 670386)
-+++ kwin/client.cpp (working copy)
+Index: kwin/client.cpp
+===================================================================
+--- kwin/client.cpp.orig
++++ kwin/client.cpp
@@ -1255,6 +1255,20 @@ bool Client::isOnCurrentDesktop() const
return isOnDesktop( workspace()->currentDesktop());
}
@@ -530,9 +554,11 @@
// performs activation and/or raising of the window
void Client::takeActivity( int flags, bool handled, allowed_t )
{
---- kwin/popupinfo.cpp (revision 670386)
-+++ kwin/popupinfo.cpp (working copy)
-@@ -25,7 +25,6 @@ License. See the file "COPYING" for the
+Index: kwin/popupinfo.cpp
+===================================================================
+--- kwin/popupinfo.cpp.orig
++++ kwin/popupinfo.cpp
+@@ -25,7 +25,6 @@ License. See the file "COPYING" for the
#include <klocale.h>
#include <qapplication.h>
#include <qdesktopwidget.h>
@@ -540,7 +566,7 @@
#include <kstringhandler.h>
#include <kglobalsettings.h>
-@@ -34,8 +33,8 @@ License. See the file "COPYING" for the
+@@ -34,8 +33,8 @@ License. See the file "COPYING" for the
namespace KWinInternal
{
@@ -560,8 +586,10 @@
int w = fontMetrics().width( m_infoString ) + 30;
---- kwin/geometry.cpp (revision 670386)
-+++ kwin/geometry.cpp (working copy)
+Index: kwin/geometry.cpp
+===================================================================
+--- kwin/geometry.cpp.orig
++++ kwin/geometry.cpp
@@ -211,14 +211,11 @@ void Workspace::updateClientArea()
\sa geometry()
@@ -622,7 +650,7 @@
if( !isShade()) // TODO
{
int old_diff_x = workarea_diff_x;
-@@ -1721,6 +1728,7 @@ void Client::setGeometry( int x, int y,
+@@ -1722,6 +1729,7 @@ void Client::setGeometry( int x, int y,
sendSyntheticConfigureNotify();
updateWindowRules();
checkMaximizeGeometry();
@@ -630,7 +658,7 @@
}
void Client::plainResize( int w, int h, ForceGeometry_t force )
-@@ -1774,6 +1782,7 @@ void Client::plainResize( int w, int h,
+@@ -1775,6 +1783,7 @@ void Client::plainResize( int w, int h,
sendSyntheticConfigureNotify();
updateWindowRules();
checkMaximizeGeometry();
@@ -638,7 +666,7 @@
}
/*!
-@@ -1794,6 +1803,7 @@ void Client::move( int x, int y, ForceGe
+@@ -1795,6 +1804,7 @@ void Client::move( int x, int y, ForceGe
sendSyntheticConfigureNotify();
updateWindowRules();
checkMaximizeGeometry();
@@ -646,8 +674,10 @@
}
---- kwin/kwin.kcfg (revision 670386)
-+++ kwin/kwin.kcfg (working copy)
+Index: kwin/kwin.kcfg
+===================================================================
+--- kwin/kwin.kcfg.orig
++++ kwin/kwin.kcfg
@@ -60,6 +60,9 @@
<entry key="IgnorePositionClasses" type="StringList" />
<entry key="KillPingTimeout" type="Int" />
@@ -656,10 +686,12 @@
+ <entry key="ActiveMouseScreen" type="Bool" />
+ <entry key="XineramaPlacementScreen" type="Int" />
</group>
+
<group name="WM" >
- <entry key="frame" type="Color" />
---- kwin/client.h (revision 670386)
-+++ kwin/client.h (working copy)
+Index: kwin/client.h
+===================================================================
+--- kwin/client.h.orig
++++ kwin/client.h
@@ -118,6 +118,9 @@ class Client : public QObject, public KD
bool isOnCurrentDesktop() const;
bool isOnAllDesktops() const;
@@ -670,8 +702,10 @@
// !isMinimized() && not hidden, i.e. normally visible on some virtual
desktop
bool isShown( bool shaded_is_shown ) const;
---- kwin/manage.cpp (revision 670386)
-+++ kwin/manage.cpp (working copy)
+Index: kwin/manage.cpp
+===================================================================
+--- kwin/manage.cpp.orig
++++ kwin/manage.cpp
@@ -166,7 +166,7 @@ bool Client::manage( Window w, bool isMa
it != mainclients.end();
++it )
@@ -698,9 +732,11 @@
if( int type = checkFullScreenHack( geom ))
{
---- kwin/workspace.cpp (revision 670386)
-+++ kwin/workspace.cpp (working copy)
-@@ -71,6 +71,7 @@ Workspace::Workspace( bool restore )
+Index: kwin/workspace.cpp
+===================================================================
+--- kwin/workspace.cpp.orig
++++ kwin/workspace.cpp
+@@ -82,6 +82,7 @@ Workspace::Workspace( bool restore )
QObject (0, "workspace"),
current_desktop (0),
number_of_desktops(0),
@@ -708,7 +744,7 @@
active_popup( NULL ),
active_popup_client( NULL ),
desktop_widget (0),
-@@ -191,7 +192,7 @@ Workspace::Workspace( bool restore )
+@@ -202,7 +203,7 @@ Workspace::Workspace( bool restore )
client_keys = new KGlobalAccel( this );
initShortcuts();
tab_box = new TabBox( this );
@@ -717,7 +753,7 @@
init();
-@@ -290,6 +291,7 @@ void Workspace::init()
+@@ -304,6 +305,7 @@ void Workspace::init()
NET::WM2ExtendedStrut |
NET::WM2KDETemporaryRules |
NET::WM2ShowingDesktop |
@@ -725,7 +761,7 @@
NET::WM2DesktopLayout |
0
,
-@@ -1527,6 +1529,83 @@ void Workspace::setDesktopLayout( int, i
+@@ -1541,6 +1543,83 @@ void Workspace::setDesktopLayout( int, i
{ // DCOP-only, unused
}
@@ -809,9 +845,11 @@
void Workspace::updateDesktopLayout()
{
// rootInfo->desktopLayoutCorner(); // I don't find this worth bothering,
feel free to
---- kwin/activation.cpp (revision 670386)
-+++ kwin/activation.cpp (working copy)
-@@ -359,6 +359,8 @@ void Workspace::takeActivity( Client* c,
+Index: kwin/activation.cpp
+===================================================================
+--- kwin/activation.cpp.orig
++++ kwin/activation.cpp
+@@ -360,6 +360,8 @@ void Workspace::takeActivity( Client* c,
return;
}
c->takeActivity( flags, handled, Allowed );
@@ -820,7 +858,7 @@
}
void Workspace::handleTakeActivity( Client* c, Time /*timestamp*/, int flags )
-@@ -412,6 +414,13 @@ bool Workspace::activateNextClient( Clie
+@@ -413,6 +415,13 @@ bool Workspace::activateNextClient( Clie
{
if( !(*it)->isShown( false ) || !(*it)->isOnCurrentDesktop())
continue;
@@ -834,7 +872,7 @@
if( mainwindows.contains( *it ))
{
get_focus = *it;
-@@ -437,6 +446,31 @@ bool Workspace::activateNextClient( Clie
+@@ -438,6 +447,31 @@ bool Workspace::activateNextClient( Clie
return true;
}
@@ -866,7 +904,7 @@
void Workspace::gotFocusIn( const Client* c )
{
-@@ -859,6 +893,8 @@ void Client::startupIdChanged()
+@@ -860,6 +894,8 @@ void Client::startupIdChanged()
desktop = asn_data.desktop();
if( !isOnAllDesktops())
workspace()->sendClientToDesktop( this, desktop, true );
@@ -875,8 +913,10 @@
Time timestamp = asn_id.timestamp();
if( timestamp == 0 && asn_data.timestamp() != -1U )
timestamp = asn_data.timestamp();
---- kwin/kwinbindings.cpp (revision 670386)
-+++ kwin/kwinbindings.cpp (working copy)
+Index: kwin/kwinbindings.cpp
+===================================================================
+--- kwin/kwinbindings.cpp.orig
++++ kwin/kwinbindings.cpp
@@ -104,6 +104,15 @@
DEF( I18N_NOOP("Window One Desktop to the Left"), 0, 0,
slotWindowToDesktopLeft() );
DEF( I18N_NOOP("Window One Desktop Up"), 0, 0,
slotWindowToDesktopUp() );
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx
| < Previous | Next > |