Hello community,
here is the log from the commit of package kdebase4-workspace for openSUSE:Factory
checked in at Fri Jan 9 14:41:38 CET 2009.
--------
--- KDE/kdebase4-workspace/kdebase4-wallpapers.changes 2009-01-08 18:26:32.000000000 +0100
+++ /mounts/work_src_done/STABLE/kdebase4-workspace/kdebase4-wallpapers.changes 2009-01-09 14:41:07.489981000 +0100
@@ -1,0 +2,17 @@
+Fri Jan 9 11:02:54 CET 2009 - llunak@suse.cz
+
+- review changes
+
+-------------------------------------------------------------------
+Wed Jan 7 12:19:09 PST 2009 - hoodedone@gmail.com
+
+- backport krdb fix for bloated libraryPath in Trolltech.conf
+ * added one-time cleanup to kconf_update
+
+-------------------------------------------------------------------
+Mon Jan 5 13:39:14 CET 2009 - llunak@suse.cz
+
+- Revert change in KDM that made it also grab the mouse, which
+ prevents xvkbd from working on tablet PCs (bnc#445726).
+
+-------------------------------------------------------------------
kdebase4-workspace.changes: same change
calling whatdependson for head-i586
New:
----
4_1_BRANCH_r882293.diff
4_1_BRANCH_r882363.diff
kdm-dont-grab-mouse.diff
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kdebase4-wallpapers.spec ++++++
--- /var/tmp/diff_new_pack.k20829/_old 2009-01-09 14:41:17.000000000 +0100
+++ /var/tmp/diff_new_pack.k20829/_new 2009-01-09 14:41:17.000000000 +0100
@@ -29,7 +29,7 @@
Summary: KDE 4 Wallpapers
Url: http://www.kde.org/
Version: 4.1.3
-Release: 12
+Release: 13
Source0: kdebase-workspace-%version.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildArch: noarch
@@ -66,6 +66,14 @@
/usr/share/wallpapers
%changelog
+* Fri Jan 09 2009 llunak@suse.cz
+- review changes
+* Wed Jan 07 2009 hoodedone@gmail.com
+- backport krdb fix for bloated libraryPath in Trolltech.conf
+ * added one-time cleanup to kconf_update
+* Mon Jan 05 2009 llunak@suse.cz
+- Revert change in KDM that made it also grab the mouse, which
+ prevents xvkbd from working on tablet PCs (bnc#445726).
* Sat Jan 03 2009 stbinner@suse.de
- fix missing device notifiert icon in tooltip (bnc#458532)
* Wed Dec 17 2008 stbinner@suse.de
++++++ kdebase4-workspace.spec ++++++
--- /var/tmp/diff_new_pack.k20829/_old 2009-01-09 14:41:17.000000000 +0100
+++ /var/tmp/diff_new_pack.k20829/_new 2009-01-09 14:41:17.000000000 +0100
@@ -37,7 +37,7 @@
Summary: The KDE Workspace Components
Url: http://www.kde.org/
Version: 4.1.3
-Release: 12
+Release: 13
Source0: kdebase-workspace-%version.tar.bz2
Source1: rediff-plasma.sh
Source2: titlebar_decor.png
@@ -85,6 +85,9 @@
Patch95: taskbarthumbnail.diff
Patch96: kdm-session-button.diff
Patch97: suspend-lock.diff
+Patch98: kdm-dont-grab-mouse.diff
+Patch99: 4_1_BRANCH_r882293.diff
+Patch100: 4_1_BRANCH_r882363.diff
Requires: kde4-kgreeter-plugins = %version
%kde4_runtime_requires
Requires: powerdevil
@@ -155,6 +158,9 @@
%patch95
%patch96
%patch97
+%patch98
+%patch99
+%patch100
cp %{SOURCE3} kwin/effects/data/cubecap.png
%build
@@ -524,6 +530,7 @@
#%_libdir/kde4/kickoff_plasma_applet_launcher.so
%dir /usr/%_lib/kconf_update_bin
/usr/%_lib/kconf_update_bin/khotkeys_update
+/usr/%_lib/kconf_update_bin/krdb_clearlibrarypath
/usr/%_lib/kde4/kcm_access.so
/usr/%_lib/kde4/kcm_bell.so
/usr/%_lib/kde4/kcm_clock.so
@@ -589,6 +596,7 @@
%_kde_share_dir/apps/kconf_update/mouse_cursor_theme.upd
%_kde_share_dir/apps/kconf_update/move_session_config.sh
%_kde_share_dir/apps/kconf_update/khotkeys_remove_shortcuts.upd
+%_kde_share_dir/apps/kconf_update/krdb.upd
%_kde_share_dir/apps/kcontrol
%_kde_share_dir/apps/kdisplay
%_kde_share_dir/apps/khotkeys
@@ -796,6 +804,14 @@
/usr/share/kde4/servicetypes/plasma-wallpaper.desktop
%changelog
+* Fri Jan 09 2009 llunak@suse.cz
+- review changes
+* Wed Jan 07 2009 hoodedone@gmail.com
+- backport krdb fix for bloated libraryPath in Trolltech.conf
+ * added one-time cleanup to kconf_update
+* Mon Jan 05 2009 llunak@suse.cz
+- Revert change in KDM that made it also grab the mouse, which
+ prevents xvkbd from working on tablet PCs (bnc#445726).
* Sat Jan 03 2009 stbinner@suse.de
- fix missing device notifiert icon in tooltip (bnc#458532)
* Wed Dec 17 2008 stbinner@suse.de
++++++ 4_1_BRANCH_r882293.diff ++++++
Index: kcontrol/krdb/krdb.cpp
===================================================================
--- kcontrol/krdb/krdb.cpp (revision 882292)
+++ kcontrol/krdb/krdb.cpp (revision 882293)
@@ -170,92 +170,54 @@
static void applyQtSettings( KConfigGroup kglobals, QSettings& settings )
{
- /* export kde's plugin library path to qtrc */
+ // export KDE's plugin library path to Trolltech.conf
+ // This is only needed for Qt applications that run outside of a KDE session but still should
+ // use a KDE style. In order to load the style (or any KDE code in that regard) Qt needs to
+ // know the plugin path of KDE.
- QMap pathDb;
- // OK, this isn't fun at all.
- // KApp adds paths ending with /, QApp those without slash, and if
- // one gives it something that is other way around, it will complain and scare
- // users. So we need to know whether a path being added is from KApp, and in this case
- // end it with.. So keep a QMap to bool, specifying whether the path is KDE-specified..
-
QString qversion = qVersion();
if ( qversion.count( '.' ) > 1 )
qversion.truncate( qversion.lastIndexOf( '.' ) );
if ( qversion.contains( '-' ) )
qversion.truncate( qversion.lastIndexOf( '-' ) );
- QStringList kdeAdded =
- settings.value("/qt/KDE/kdeAddedLibraryPaths").toStringList();
- QString libPathKey =
- QString("/qt/%1/libraryPath").arg( qversion );
+ // paths that KDE added
+ QStringList kdeAdded = settings.value("/qt/KDE/kdeAddedLibraryPaths").toStringList();
- //Read qt library path..
- QStringList plugins = settings.value(libPathKey, ':').toStringList();
- for (QStringList::ConstIterator it = plugins.begin(); it != plugins.end(); ++it)
- {
- QString path = *it;
- if (path.endsWith('/'))
- path.truncate(path.length()-1);
+ const QString &libPathKey = QString("/qt/%1/libraryPath").arg(qversion);
+ // paths that Qt currently adds. Don't use toStringList! That's a different storage format
+ QStringList libraryPath = settings.value(libPathKey, QString()).toString().split(QLatin1Char(':'), QString::SkipEmptyParts);
- pathDb[path]=false;
- }
+ // only keep entries that are not from KDE
+ foreach (const QString &path, const_cast(kdeAdded)) {
+ libraryPath.removeAll(path);
+ }
- //Get rid of old KDE-added ones...
- for (QStringList::ConstIterator it = kdeAdded.begin(); it != kdeAdded.end(); ++it)
- {
- //Normalize..
- QString path = *it;
- if (path.endsWith('/'))
- path.truncate(path.length()-1);
+ kdeAdded.clear();
- //Remove..
- pathDb.remove(path);
- }
-
- kdeAdded.clear();
-
- //Merge in KDE ones..
- plugins = KGlobal::dirs()->resourceDirs( "qtplugins" );
-
- for (QStringList::ConstIterator it = plugins.begin(); it != plugins.end(); ++it)
- {
- QString path = *it;
- if (path.endsWith('/'))
- path.truncate(path.length()-1);
-
- pathDb[path]=true;
-
- if(path.contains("/lib64/"))
- path.replace("/lib64/","/lib/");
- pathDb[path]=true;
- }
-
- QStringList paths;
- for (QMap ::ConstIterator it = pathDb.begin();
- it != pathDb.end(); ++it)
- {
- QString path = it.key();
- bool fromKDE = it.value();
-
- char new_path[PATH_MAX+1];
- if (realpath(QFile::encodeName(path), new_path))
- path = QFile::decodeName(new_path);
-
- if (fromKDE)
- {
- if (!path.endsWith('/'))
- path += '/';
- kdeAdded.push_back(path); //Add for the new list -- do it here to have it in the right form..
+ // paths that need to be in the list
+ const QStringList &plugins = KGlobal::dirs()->resourceDirs("qtplugins");
+ foreach (const QString &_path, plugins) {
+ QString path = QDir(_path).canonicalPath();
+ if (path.isEmpty() || kdeAdded.contains(path)) {
+ continue;
+ }
+ kdeAdded.prepend(path);
+ if (path.contains("/lib64/")) {
+ path.replace("/lib64/", "/lib/");
+ if (!kdeAdded.contains(path)) {
+ kdeAdded.prepend(path);
+ }
+ }
}
+ foreach (const QString &path, const_cast(kdeAdded)) {
+ libraryPath.append(path);
+ }
- paths.append(path);
- }
+ // Write the list out..
+ settings.setValue("/qt/KDE/kdeAddedLibraryPaths", kdeAdded);
+ settings.setValue(libPathKey, libraryPath.join(QLatin1String(":")));
- //Write the list out..
- settings.setValue("/qt/KDE/kdeAddedLibraryPaths", kdeAdded);
- settings.setValue(libPathKey, paths.join(QString(':')));
-
/* export widget style */
kglobals.changeGroup("General");
QString style = kglobals.readEntry("widgetStyle", KStyle::defaultStyle());
++++++ 4_1_BRANCH_r882363.diff ++++++
Index: kcontrol/krdb/krdb.upd
===================================================================
--- kcontrol/krdb/krdb.upd (revision 0)
+++ kcontrol/krdb/krdb.upd (revision 882363)
@@ -0,0 +1,2 @@
+Id=LibraryPathNeedsANewStart
+Script=krdb_clearlibrarypath
Index: kcontrol/krdb/krdb_clearlibrarypath.cpp
===================================================================
--- kcontrol/krdb/krdb_clearlibrarypath.cpp (revision 0)
+++ kcontrol/krdb/krdb_clearlibrarypath.cpp (revision 882363)
@@ -0,0 +1,70 @@
+/* This file is part of the KDE project
+ Copyright (C) 2008 Matthias Kretz
+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) version 3, or any
+ later version accepted by the membership of KDE e.V. (or its
+ successor approved by the membership of KDE e.V.), Trolltech ASA
+ (or its successors, if any) and the KDE Free Qt Foundation, which shall
+ act as a proxy defined in Section 6 of version 3 of the license.
+
+ This library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with this library. If not, see http://www.gnu.org/licenses/.
+
+*/
+
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+
+int main(int argc, char **argv)
+{
+ QCoreApplication app(argc, argv);
+ QSettings settings(QLatin1String("Trolltech"));
+ QString qversion = qVersion();
+ if (qversion.count('.') > 1) {
+ qversion.truncate(qversion.lastIndexOf('.'));
+ }
+ if (qversion.contains('-')) {
+ qversion.truncate(qversion.lastIndexOf('-'));
+ }
+ const QString &libPathKey = QString("/qt/%1/libraryPath").arg(qversion);
+
+ QStringList kdeAdded;
+ KComponentData kcd("krdb libraryPath fix");
+ const QStringList &plugins = KGlobal::dirs()->resourceDirs("qtplugins");
+ foreach (const QString &_path, plugins) {
+ QString path = QDir(_path).canonicalPath();
+ if (path.isEmpty() || kdeAdded.contains(path)) {
+ continue;
+ }
+ kdeAdded.prepend(path);
+ if (path.contains("/lib64/")) {
+ path.replace("/lib64/", "/lib/");
+ if (!kdeAdded.contains(path)) {
+ kdeAdded.prepend(path);
+ }
+ }
+ }
+ QStringList libraryPath;
+ foreach (const QString &path, const_cast(kdeAdded)) {
+ libraryPath.append(path);
+ }
+
+ // Write the list out..
+ settings.setValue("/qt/KDE/kdeAddedLibraryPaths", kdeAdded);
+ settings.setValue(libPathKey, libraryPath.join(QLatin1String(":")));
+
+ return 0;
+}
Index: kcontrol/krdb/CMakeLists.txt
===================================================================
--- kcontrol/krdb/CMakeLists.txt (revision 882362)
+++ kcontrol/krdb/CMakeLists.txt (revision 882363)
@@ -4,3 +4,9 @@
add_subdirectory( pics )
install( FILES kcmdisplayrc.upd DESTINATION ${KCONF_UPDATE_INSTALL_DIR} )
+
+install(FILES krdb.upd DESTINATION ${DATA_INSTALL_DIR}/kconf_update)
+
+kde4_add_executable(krdb_clearlibrarypath krdb_clearlibrarypath.cpp)
+target_link_libraries(krdb_clearlibrarypath ${KDE4_KDECORE_LIBS})
+install(TARGETS krdb_clearlibrarypath DESTINATION ${LIB_INSTALL_DIR}/kconf_update_bin)
++++++ kdm-dont-grab-mouse.diff ++++++
Subject: Do not grab mouse in KDM
From: Lubos Lunak
Patch-upstream: no (it's basically r732242 reverted)
Bug: bnc#445726
This patch reverts change in KDM that made it also grab the mouse, which
prevents xvkbd from working on tablet PCs.
--- kdm/kfrontend/kdm_greet.c.sav 2008-12-19 10:37:53.000000000 +0100
+++ kdm/kfrontend/kdm_greet.c 2008-12-19 10:41:30.000000000 +0100
@@ -466,7 +466,7 @@ secureInputs( Display *dpy )
{
debug( "secureInputs %s\n", dname );
secureKeyboard( dpy );
- securePointer( dpy );
+/* securePointer( dpy ); */
XSetInputFocus( dpy, None, None, CurrentTime );
debug( "secureInputs %s done\n", dname );
}
@@ -477,7 +477,7 @@ unsecureInputs( Display *dpy )
debug( "unsecureInputs %s\n", dname );
XSetInputFocus( dpy, PointerRoot, PointerRoot, CurrentTime );
XUngrabKeyboard( dpy, CurrentTime );
- XUngrabPointer( dpy, CurrentTime );
+/* XUngrabPointer( dpy, CurrentTime ); */
XSync( dpy, False );
}
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org