Hello community,
here is the log from the commit of package kdebase4-workspace for
openSUSE:Factory checked in at 2013-09-11 12:17:23
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/kdebase4-workspace (Old)
and /work/SRC/openSUSE:Factory/.kdebase4-workspace.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kdebase4-workspace"
Changes:
--------
--- /work/SRC/openSUSE:Factory/kdebase4-workspace/kdebase4-workspace.changes
2013-09-09 11:12:43.000000000 +0200
+++
/work/SRC/openSUSE:Factory/.kdebase4-workspace.new/kdebase4-workspace.changes
2013-09-11 12:17:25.000000000 +0200
@@ -1,0 +2,14 @@
+Tue Sep 10 21:35:42 UTC 2013 - [email protected]
+
+- Added kscreensaver-disable-sessionmanagement.diff:
+ disable session management for screensavers
+ prevents screensaver windows popping up at login (kde#314859, bnc#809835)
+
+-------------------------------------------------------------------
+Mon Sep 9 16:04:02 UTC 2013 - [email protected]
+
+- Added 0003-Delay-KDE-class-initialization-to-main-loop.patch from
+ upstream 4.11 branch for resolving kde#324574 - 'Application specific
+ icon now doesn't work' bug
+
+-------------------------------------------------------------------
New:
----
0003-Delay-KDE-class-initialization-to-main-loop.patch
kscreensaver-disable-sessionmanagement.diff
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kdebase4-workspace.spec ++++++
--- /var/tmp/diff_new_pack.blVsSm/_old 2013-09-11 12:17:26.000000000 +0200
+++ /var/tmp/diff_new_pack.blVsSm/_new 2013-09-11 12:17:26.000000000 +0200
@@ -145,6 +145,8 @@
Patch65: kdm-backend-session.patch
# PATCH-FIX-OPENSUSE add-calculator-hotkey.patch -- Adds hotkey for Calculator
button (bnc#726550)
Patch66: add-calculator-hotkey.patch
+# PATCH-FIX-OPENSUSE kscreensaver-disable-sessionmanagement.diff -- disables
session mangement for screensavers (kde#314859, bnc#809835)
+Patch67: kscreensaver-disable-sessionmanagement.diff
# PATCH-FIX-OPENSUSE helper_actions_syspath.patch -- disables
org.kde.powerdevil.backlighthelper.syspath policy, until bnc#825256 gets
resolved
Patch1000: helper_actions_syspath.patch
# NOTE -- Following two krunner patches are from kde-workspace master branch!
@@ -154,6 +156,8 @@
# PATCH-FIX-UPSTREAM
0002-Add-the-full-name-of-completion-matches-to-history.patch -- fill the
history combo box with the actual hit you executed,
# instead of half-complete strings that don't make sense until you actually
select them.
Patch1051: 0002-Add-the-full-name-of-completion-matches-to-history.patch
+# PATCH-FIX-UPSTREAM 0003-Delay-KDE-class-initialization-to-main-loop.patch --
kde#324574
+Patch2000: 0003-Delay-KDE-class-initialization-to-main-loop.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Requires: %{name}-branding = %{_kde_branding_version}
Requires: %{name}-ksysguardd = %{version}
@@ -368,11 +372,13 @@
%patch64 -p1
%patch65 -p1
%patch66 -p1
+%patch67 -p0
%if 0%{?suse_version} <= 1230
%patch1000 -p1
%endif
%patch1050 -p1
%patch1051 -p1
+%patch2000 -p1
cp %{SOURCE3} kwin/effects/cube/data/cubecap.png
%build
++++++ 0003-Delay-KDE-class-initialization-to-main-loop.patch ++++++
>From 2e5a2450762f8dedf9ffd77028ed06b3a39a807d Mon Sep 17 00:00:00 2001
From: Weng Xuetian <[email protected]>
Date: Mon, 9 Sep 2013 11:43:06 -0400
Subject: [PATCH 1/1] Delay KDE class initialization to main loop
Gui platform plugin is loaded during QApplication construction, but it
relies on some KApplication/QApplication data to work correctly.
This patch delays the initialization to main loop, to ensure
KApplication/QApplication is already constructed.
BUG: 324574
FIXED-IN: 4.11.2
REVIEW: 112602
---
qguiplatformplugin_kde/qguiplatformplugin_kde.cpp | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)
diff --git a/qguiplatformplugin_kde/qguiplatformplugin_kde.cpp
b/qguiplatformplugin_kde/qguiplatformplugin_kde.cpp
index ce22622..4f67cc5 100644
--- a/qguiplatformplugin_kde/qguiplatformplugin_kde.cpp
+++ b/qguiplatformplugin_kde/qguiplatformplugin_kde.cpp
@@ -28,6 +28,7 @@
#include <KDE/KFileDialog>
#include <KDE/KColorDialog>
#include <QtCore/QHash>
+#include <QtCore/QTimer>
#include <QtGui/QFileDialog>
#include <QtGui/QColorDialog>
#include <QtGui/QApplication>
@@ -153,9 +154,7 @@ class KQGuiPlatformPlugin : public QGuiPlatformPlugin
public:
KQGuiPlatformPlugin()
{
- connect(KIconLoader::global(), SIGNAL(iconLoaderSettingsChanged()),
this, SLOT(updateToolbarIcons()));
- connect(KGlobalSettings::self(),
SIGNAL(toolbarAppearanceChanged(int)), this, SLOT(updateToolbarStyle()));
- connect(KGlobalSettings::self(), SIGNAL(kdisplayStyleChanged()), this,
SLOT(updateWidgetStyle()));
+ QMetaObject::invokeMethod(this, "init", Qt::QueuedConnection);
}
virtual QStringList keys() const { return QStringList() <<
QLatin1String("kde"); }
@@ -340,6 +339,13 @@ public: // ColorDialog
}
private slots:
+ void init()
+ {
+ connect(KIconLoader::global(), SIGNAL(iconLoaderSettingsChanged()),
this, SLOT(updateToolbarIcons()));
+ connect(KGlobalSettings::self(),
SIGNAL(toolbarAppearanceChanged(int)), this, SLOT(updateToolbarStyle()));
+ connect(KGlobalSettings::self(), SIGNAL(kdisplayStyleChanged()), this,
SLOT(updateWidgetStyle()));
+ }
+
void updateToolbarStyle()
{
//from gtksymbol.cpp
--
1.8.4
++++++ kscreensaver-disable-sessionmanagement.diff ++++++
diff --git kscreensaver/libkscreensaver/main.cpp
kscreensaver/libkscreensaver/main.cpp
index 6851ba1..561205a 100644
--- kscreensaver/libkscreensaver/main.cpp
+++ kscreensaver/libkscreensaver/main.cpp
@@ -147,6 +147,9 @@ int kScreenSaverMain( int argc, char** argv,
KScreenSaverInterface& screenSaverI
// Set a useful default icon.
app.setWindowIcon(KIcon("preferences-desktop-screensaver"));
+ // Disable session management so screensaver windows don't get restored on
login (bug#314859)
+ app.disableSessionManagement();
+
if (!pipe(termPipe))
{
--
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
