Hello community,
here is the log from the commit of package kdebase3
checked in at Mon Oct 23 18:24:38 CEST 2006.
--------
--- KDE/kdebase3/kdebase3.changes 2006-10-23 10:46:17.000000000 +0200
+++ /mounts/work_src_done/STABLE/kdebase3/kdebase3.changes 2006-10-23 18:17:20.000000000 +0200
@@ -1,0 +2,12 @@
+Mon Oct 23 18:16:14 CEST 2006 - dmueller@suse.de
+
+- add patch for kdm config update problem (#211874)
+- add patch for WM configuration in session (FATE 301137)
+
+-------------------------------------------------------------------
+Mon Oct 23 17:25:49 CEST 2006 - dmueller@suse.de
+
+- adding more default actions for khotkeys to support laptop
+ extra keys by default (#210875)
+
+-------------------------------------------------------------------
New:
----
khotkeys-multimedia-action.diff
khotkeys-multimedia-action2.diff
optional-kwin.diff
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kdebase3.spec ++++++
--- /var/tmp/diff_new_pack.Ty57sd/_old 2006-10-23 18:24:16.000000000 +0200
+++ /var/tmp/diff_new_pack.Ty57sd/_new 2006-10-23 18:24:16.000000000 +0200
@@ -51,7 +51,7 @@
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Url: http://www.kde.org/
Version: 3.5.5
-Release: 20
+Release: 21
%define kde_version 3.5.5
Source0: kdebase-%{kde_version}.tar.bz2
Source3: startkde.suse.sh
@@ -172,6 +172,9 @@
Patch167: ksmserver-timed.diff
Patch168: home-url-desktop.diff
Patch169: systray_order.diff
+Patch170: khotkeys-multimedia-action.diff
+Patch171: khotkeys-multimedia-action2.diff
+Patch172: optional-kwin.diff
Provides: kdebase
%description
@@ -361,7 +364,7 @@
Summary: Set and list fileshares
Group: System/Management
Version: 2.0
-Release: 149
+Release: 150
%description -n fileshareset
This package contains the the fileshareset utility to allow users to
@@ -511,6 +514,9 @@
%patch125
%endif
%patch169
+%patch170
+%patch171
+%patch172
cp %SOURCE17 l10n/tw/flag.png
. /etc/opt/kde3/common_options
cd ../fileshareset2
@@ -1466,6 +1472,12 @@
%endif
%changelog -n kdebase3
+* Mon Oct 23 2006 - dmueller@suse.de
+- add patch for kdm config update problem (#211874)
+- add patch for WM configuration in session (FATE 301137)
+* Mon Oct 23 2006 - dmueller@suse.de
+- adding more default actions for khotkeys to support laptop
+ extra keys by default (#210875)
* Mon Oct 23 2006 - stbinner@suse.de
- fix file globbing build
- fix build for SUSE < 10.1
++++++ kdm-sysconfig-values.diff ++++++
--- /var/tmp/diff_new_pack.Ty57sd/_old 2006-10-23 18:24:17.000000000 +0200
+++ /var/tmp/diff_new_pack.Ty57sd/_new 2006-10-23 18:24:17.000000000 +0200
@@ -694,3 +694,35 @@
+appsdir = $(kde_datadir)/kdm
+apps_SCRIPTS = read_sysconfig.sh
+
+--- kdm/config.def 2006-10-23 17:54:19.000000000 +0200
++++ kdm.new/config.def 2006-10-23 17:52:35.000000000 +0200
+@@ -1119,7 +1119,7 @@
+ Type: string
+ # differs from xdm
+ Default: *"/etc/X11/xdm/Xaccess"
+-User: config(Xaccess)
++User: core
+ Instance: #""
+ Update: reset_sec_0_1
+ Comment:
+diff -ru kdm/kfrontend/genkdmconf.c kdm.new/kfrontend/genkdmconf.c
+--- kdm/kfrontend/genkdmconf.c 2006-10-23 17:54:19.000000000 +0200
++++ kdm.new/kfrontend/genkdmconf.c 2006-10-23 17:53:10.000000000 +0200
+@@ -1368,7 +1368,7 @@
+ static void
+ reset_sec_0_1( Entry *ce, Section *cs ATTR_UNUSED )
+ {
+- if (oldsusever == 0)
++ if (oldsusever == 0 || !ce->written )
+ {
+ ce->active = 0;
+ }
+@@ -2303,7 +2305,7 @@
+ }
+
+ #ifdef XDMCP
+- applydefs( kdmdefs_all, as(kdmdefs_all), path );
++ // applydefs( kdmdefs_all, as(kdmdefs_all), path );
+ #endif
+ susever = getfqval( "General", "SUSEConfigVersion", "" );
+ if (sscanf( susever, "%u", &oldsusever ) != 1)
++++++ khotkeys-multimedia-action.diff ++++++
--- khotkeys/data/multimedia_keys.khotkeys.sav
+++ khotkeys/data/multimedia_keys.khotkeys
@@ -0,0 +1,311 @@
+[Data]
+DataCount=1
+
+[Data_1]
+Comment=This group contains actions that are set up by default.\n
+DataCount=8
+Enabled=true
+Name=Preset Actions
+SystemGroup=0
+Type=ACTION_DATA_GROUP
+AllowMerge=true
+
+[Data_1Conditions]
+Comment=
+ConditionsCount=0
+
+[Data_1_1]
+Comment=Opens the My Computer window when the multimedia My Computer key is pressed.\n
+Enabled=true
+Name=My Computer
+Type=COMMAND_URL_SHORTCUT_ACTION_DATA
+
+[Data_1_1Actions]
+ActionsCount=1
+
+[Data_1_1Actions0]
+CommandURL=sysinfo:/
+Type=COMMAND_URL
+
+[Data_1_1Conditions]
+Comment=
+ConditionsCount=0
+
+[Data_1_1Triggers]
+Comment=Simple_action
+TriggersCount=1
+
+[Data_1_1Triggers0]
+Key=XF86MyComputer
+Type=SHORTCUT
+
+[Data_1_2]
+Comment=Launch or activate Amarok when the multimedia Media key is pressed.\n
+Enabled=true
+Name=Media
+Type=COMMAND_URL_SHORTCUT_ACTION_DATA
+
+[Data_1_2Actions]
+ActionsCount=1
+
+[Data_1_2Actions0]
+CommandURL=amarok
+Type=COMMAND_URL
+
+[Data_1_2Conditions]
+Comment=
+ConditionsCount=0
+
+[Data_1_2Triggers]
+Comment=Simple_action
+TriggersCount=1
+
+[Data_1_2Triggers0]
+Key=XF86AudioMedia
+Type=SHORTCUT
+
+[Data_1_3]
+Comment=When the multimedia Calculator key is pressed, KCalc is either launched or activated if it is already running.\n
+DataCount=2
+Enabled=true
+Name=Calculator
+SystemGroup=0
+Type=ACTION_DATA_GROUP
+
+[Data_1_3Conditions]
+Comment=
+ConditionsCount=0
+
+[Data_1_3_1]
+Comment=Runs KCalc if it is not already running.\n
+Enabled=true
+Name=Run KCalc
+Type=GENERIC_ACTION_DATA
+
+[Data_1_3_1Actions]
+ActionsCount=1
+
+[Data_1_3_1Actions0]
+CommandURL=kcalc
+Type=COMMAND_URL
+
+[Data_1_3_1Conditions]
+Comment=
+ConditionsCount=1
+
+[Data_1_3_1Conditions0]
+ConditionsCount=1
+Type=NOT
+
+[Data_1_3_1Conditions00]
+Type=EXISTING_WINDOW
+
+[Data_1_3_1Conditions00Window]
+Comment=kcalc
+WindowsCount=1
+
+[Data_1_3_1Conditions00Window0]
+Class=kcalc Kcalc
+ClassType=2
+Comment=kcalc
+Role=kcalc-mainwindow#1
+RoleType=0
+Title=KCalc
+TitleType=0
+Type=SIMPLE
+WindowTypes=1
+
+[Data_1_3_1Triggers]
+Comment=
+TriggersCount=1
+
+[Data_1_3_1Triggers0]
+Key=XF86Calculator
+Type=SHORTCUT
+
+[Data_1_3_2]
+Comment=Activates KCalc window if it is already running.\n
+Enabled=true
+Name=Activate KCalc
+Type=GENERIC_ACTION_DATA
+
+[Data_1_3_2Actions]
+ActionsCount=1
+
+[Data_1_3_2Actions0]
+Type=ACTIVATE_WINDOW
+
+[Data_1_3_2Actions0Window]
+Comment=kcalc
+WindowsCount=1
+
+[Data_1_3_2Actions0Window0]
+Class=kcalc Kcalc
+ClassType=2
+Comment=kcalc
+Role=kcalc-mainwindow#1
+RoleType=0
+Title=KCalc
+TitleType=0
+Type=SIMPLE
+WindowTypes=1
+
+[Data_1_3_2Conditions]
+Comment=
+ConditionsCount=1
+
+[Data_1_3_2Conditions0]
+Type=EXISTING_WINDOW
+
+[Data_1_3_2Conditions0Window]
+Comment=kcalc
+WindowsCount=1
+
+[Data_1_3_2Conditions0Window0]
+Class=kcalc Kcalc
+ClassType=2
+Comment=kcalc
+Role=kcalc-mainwindow#1
+RoleType=0
+Title=KCalc
+TitleType=0
+Type=SIMPLE
+WindowTypes=1
+
+[Data_1_3_2Triggers]
+Comment=
+TriggersCount=1
+
+[Data_1_3_2Triggers0]
+Key=XF86Calculator
+Type=SHORTCUT
+
+[Data_1_4]
+Comment=Launches the default terminal application when the multimedia Terminal key is pressed.\n
+Enabled=true
+Name=Terminal
+Type=COMMAND_URL_SHORTCUT_ACTION_DATA
+
+[Data_1_4Actions]
+ActionsCount=1
+
+[Data_1_4Actions0]
+CommandURL=KHOTKEYS_TERMINAL
+Type=COMMAND_URL
+
+[Data_1_4Conditions]
+Comment=
+ConditionsCount=0
+
+[Data_1_4Triggers]
+Comment=Simple_action
+TriggersCount=1
+
+[Data_1_4Triggers0]
+Key=XF86Terminal
+Type=SHORTCUT
+
+[Data_1_5]
+Comment=Opens the default browser when the multimedia WWW key is pressed.\n
+Enabled=true
+Name=Browser (HomePage)
+Type=COMMAND_URL_SHORTCUT_ACTION_DATA
+
+[Data_1_5Actions]
+ActionsCount=1
+
+[Data_1_5Actions0]
+CommandURL=KHOTKEYS_BROWSER
+Type=COMMAND_URL
+
+[Data_1_5Conditions]
+Comment=
+ConditionsCount=0
+
+[Data_1_5Triggers]
+Comment=Simple_action
+TriggersCount=1
+
+[Data_1_5Triggers0]
+Key=XF86WWW
+Type=SHORTCUT
+
+[Data_1_6]
+Comment=Ejecting when the multimedia Eject key is pressed.\n
+Enabled=true
+Name=Eject
+Type=COMMAND_URL_SHORTCUT_ACTION_DATA
+
+[Data_1_6Actions]
+ActionsCount=1
+
+[Data_1_6Actions0]
+CommandURL=kdeeject ""
+Type=COMMAND_URL
+
+[Data_1_6Conditions]
+Comment=
+ConditionsCount=0
+
+[Data_1_6Triggers]
+Comment=Simple_action
+TriggersCount=1
+
+[Data_1_6Triggers0]
+Key=XF86Eject
+Type=SHORTCUT
+
+[Data_1_7]
+Comment=Launches KFind when the multimedia Search key is pressed.\n
+Enabled=true
+Name=Search
+Type=COMMAND_URL_SHORTCUT_ACTION_DATA
+
+[Data_1_7Actions]
+ActionsCount=1
+
+[Data_1_7Actions0]
+CommandURL=kfind
+Type=COMMAND_URL
+
+[Data_1_7Conditions]
+Comment=
+ConditionsCount=0
+
+[Data_1_7Triggers]
+Comment=Simple_action
+TriggersCount=1
+
+[Data_1_7Triggers0]
+Key=XF86Search
+Type=SHORTCUT
+
+[Data_1_8]
+Comment=Opens a new mail composer window when the multimedia Mail key is pressed.\n
+Enabled=true
+Name=Launch Mail
+Type=COMMAND_URL_SHORTCUT_ACTION_DATA
+
+[Data_1_8Actions]
+ActionsCount=1
+
+[Data_1_8Actions0]
+CommandURL=mailto:?
+Type=COMMAND_URL
+
+[Data_1_8Conditions]
+Comment=
+ConditionsCount=0
+
+[Data_1_8Triggers]
+Comment=Simple_action
+TriggersCount=1
+
+[Data_1_8Triggers0]
+Key=XF86Mail
+Type=SHORTCUT
+
+[Main]
+Version=2
+ImportId=multimedia_keys
+
--- khotkeys/data/Makefile.am.sav
+++ khotkeys/data/Makefile.am
@@ -1,7 +1,9 @@
-khotkeys_data_DATA = kde32b1.khotkeys konqueror_gestures_kde321.khotkeys printscreen.khotkeys
+khotkeys_data_DATA = kde32b1.khotkeys konqueror_gestures_kde321.khotkeys printscreen.khotkeys \
+ multimedia_keys.khotkeys
khotkeys_datadir = $(kde_datadir)/khotkeys
-khotkeys_update_DATA = khotkeys_32b1_update.upd konqueror_gestures_kde321_update.upd khotkeys_printscreen.upd
+khotkeys_update_DATA = khotkeys_32b1_update.upd konqueror_gestures_kde321_update.upd khotkeys_printscreen.upd \
+ khotkeys_multimedia_keys.upd
khotkeys_updatedir = $(kde_datadir)/kconf_update
EXTRA_DIST = $(khotkeys_data_DATA) $(khotkeys_update_DATA)
--- khotkeys/data/khotkeys_multimedia_keys.upd.sav
+++ khotkeys/data/khotkeys_multimedia_keys.upd
@@ -0,0 +1,8 @@
+Id=multimedia_keys
+# the file is intentionally a dummy, as the binary will update khotkeysrc,
+# the khotkeys_update will just remember it has been done
+File=khotkeys_update
+Group=Dummy
+Options=overwrite
+ScriptArguments=--id multimedia_keys
+Script=khotkeys_update
++++++ khotkeys-multimedia-action2.diff ++++++
--- khotkeys/shared/actions.cpp.sav
+++ khotkeys/shared/actions.cpp
@@ -116,8 +116,10 @@
{
if( command_url().isEmpty())
return;
- KURIFilterData uri;
QString cmd = command_url();
+ if( substituteAndHandleSpecial( cmd ))
+ return;
+ KURIFilterData uri;
// int space_pos = command_url().find( ' ' );
// if( command_url()[ 0 ] != '\'' && command_url()[ 0 ] != '"' && space_pos > -1
// && command_url()[ space_pos - 1 ] != '\\' )
@@ -170,6 +172,29 @@
timeout.start( 1000, true ); // 1sec timeout
}
+// do special command substitutions, return true if also already handled
+bool Command_url_action::substituteAndHandleSpecial( QString& cmd )
+ {
+ if( cmd.contains( "KHOTKEYS_BROWSER" ))
+ { // the default browser
+ KConfig config( QString::fromLatin1("kfmclientrc")); // see KRun
+ config.setGroup("General");
+ QString browser = config.readEntry("BrowserApplication");
+ if( browser.startsWith( QString::fromLatin1( "!" )))
+ browser = browser.mid( 1 );
+ if( browser.isEmpty())
+ browser = QString::fromLatin1( "konqueror" ); // opens in webbrowsing profile by default
+ cmd = cmd.replace( "KHOTKEYS_BROWSER", browser );
+ }
+ if( cmd.contains( "KHOTKEYS_TERMINAL" ))
+ { // the default terminal application
+ KConfigGroup config( KGlobal::config(), "General" );
+ QString terminal = config.readPathEntry( "TerminalApplication", "konsole" );
+ cmd = cmd.replace( "KHOTKEYS_TERMINAL", terminal );
+ }
+ return false;
+ }
+
const QString Command_url_action::description() const
{
return i18n( "Command/URL : " ) + command_url();
--- khotkeys/shared/actions.h.sav
+++ khotkeys/shared/actions.h
@@ -75,6 +75,7 @@
protected:
QTimer timeout;
private:
+ bool substituteAndHandleSpecial( QString& cmd );
QString _command_url;
};
++++++ optional-kwin.diff ++++++
Index: ksmserver/startup.cpp
===================================================================
--- ksmserver/startup.cpp (revision 598312)
+++ ksmserver/startup.cpp (working copy)
@@ -64,6 +64,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE
#include