Hello community,
here is the log from the commit of package kdebase4-workspace for
openSUSE:Factory checked in at 2013-12-02 12:36:50
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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-10-17 17:39:30.000000000 +0200
+++
/work/SRC/openSUSE:Factory/.kdebase4-workspace.new/kdebase4-workspace.changes
2013-12-02 12:36:52.000000000 +0100
@@ -1,0 +2,32 @@
+Sun Nov 10 01:01:29 UTC 2013 - [email protected]
+
+- Due to upstream chages in kde-workspace release policy (only 4.11.x
+ bugfixes) require kdeartwork4, kdebase4-wallpaper-default and
+ python-kde4 equal or greater than kde-workspace version
+- Added adjust-to-upower-0.99.patch which ports Powerdevil to new
+ UPower API/ABI/DBus interface
+
+-------------------------------------------------------------------
+Sat Nov 2 15:01:54 UTC 2013 - [email protected]
+
+- Update to 4.11.3
+ * KDE 4.11.3 bugfix release
+ * See http://www.kde.org/announcements/announce-4.11.3.php
+- Drop helper_actions_syspath.patch, and create rpmlintrc file during
+ build phase for older openSUSE versions
+
+-------------------------------------------------------------------
+Sat Nov 2 14:58:30 UTC 2013 - [email protected]
+
+- Drop patches due to upstream inclusion:
+ * 0001-QDeclarativeRepeaterCrashFix_kde#311871.patch
+ * fix-click-on-trash-plasmoid.diff
+
+-------------------------------------------------------------------
+Sun Oct 27 11:15:28 UTC 2013 - [email protected]
+
+- Added 0001-QDeclarativeRepeaterCrashFix_kde#311871.patch, fixes
+ annoying plasma crash when notifications would get shown,
+ (kde#311871, bnc#812536, bnc#808656)
+
+-------------------------------------------------------------------
Old:
----
fix-click-on-trash-plasmoid.diff
helper_actions_syspath.patch
kde-workspace-4.11.2.tar.xz
New:
----
adjust-to-upower-0.99.patch
kde-workspace-4.11.3.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kdebase4-workspace.spec ++++++
--- /var/tmp/diff_new_pack.XmDTrW/_old 2013-12-02 12:36:54.000000000 +0100
+++ /var/tmp/diff_new_pack.XmDTrW/_new 2013-12-02 12:36:54.000000000 +0100
@@ -23,7 +23,7 @@
%endif
Name: kdebase4-workspace
-Version: 4.11.2
+Version: 4.11.3
Release: 0
Summary: The KDE Workspace Components
License: GPL-2.0+
@@ -147,10 +147,8 @@
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
-# PATCH-FIX-UPSTREAM fix-click-on-trash-plasmoid.diff -- Fix click on trashcan
plasmoid when on desktop and widgets are unlocked (kde#325330)
-Patch2000: fix-click-on-trash-plasmoid.diff
+# PATCH-FIX-UPSTREAM adjust-to-upower-0.99.patch -- ports Powerdevil to new
UPower API/ABI/DBus interface
+Patch1000: adjust-to-upower-0.99.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Requires: %{name}-branding = %{_kde_branding_version}
Requires: %{name}-ksysguardd = %{version}
@@ -204,8 +202,8 @@
Summary: The KDE Workspace Components
Group: System/GUI/KDE
Provides: %{name}-branding = %{_kde_branding_version}
-Requires: kdebase4-artwork = %{version}
-Requires: kdebase4-wallpaper-default = %{version}
+Requires: kdebase4-artwork >= %{version}
+Requires: kdebase4-wallpaper-default >= %{version}
Supplements: packageand(%{name}:branding-upstream)
Conflicts: otherproviders(%{name}-branding)
@@ -317,7 +315,7 @@
%package -n python-kdebase4
Summary: Python bindings for KDE 4 desktop shell
Group: System/GUI/KDE
-Requires: python-kde4 = %{version}
+Requires: python-kde4 => %{version}
%description -n python-kdebase4
Python bindings for Plasma, the KDE 4 desktop shell. These bindings
@@ -368,10 +366,7 @@
%patch65 -p1
%patch66 -p1
%patch67 -p0
-%if 0%{?suse_version} <= 1230
%patch1000 -p1
-%endif
-%patch2000 -p0
cp %{SOURCE3} kwin/effects/cube/data/cubecap.png
%build
@@ -434,6 +429,11 @@
popd
done
+%if 0%{?suse_version} < 1310
+echo "setBadness('suse-dbus-unauthorized-service', 0)" >
$RPM_SOURCE_DIR/%name-rpmlintrc
+echo "setBadness('polkit-unauthorized-privilege', 0)" >>
$RPM_SOURCE_DIR/%name-rpmlintrc
+%endif
+
%fdupes -s %{buildroot}
%kde_post_install
++++++ adjust-to-upower-0.99.patch ++++++
From: Lukáš Tinkl <[email protected]>
Date: Tue, 05 Nov 2013 11:58:54 +0000
Subject: update/adjust to UPower >= 0.99.0
X-Git-Url:
http://quickgit.kde.org/?p=kde-workspace.git&a=commitdiff&h=c53d60647b90db11a610531c47a37a3e6e6f570a
---
update/adjust to UPower >= 0.99.0
---
--- a/powerdevil/daemon/backends/upower/powerdevilupowerbackend.cpp
+++ b/powerdevil/daemon/backends/upower/powerdevilupowerbackend.cpp
@@ -43,7 +43,7 @@
QDBusInterface systemdIface("org.freedesktop.systemd1",
"/org/freedesktop/systemd1", "org.freedesktop.systemd1.Manager",
QDBusConnection::systemBus(), 0);
- uint version = systemdIface.property("Version").toString().section(' ',
1).toUInt(&ok);
+ const uint version = systemdIface.property("Version").toString().section('
', 1).toUInt(&ok);
if (ok) {
return (version >= requiredVersion);
} else {
@@ -166,10 +166,22 @@
// devices
enumerateDevices();
+
connect(m_upowerInterface, SIGNAL(Changed()), this,
SLOT(slotPropertyChanged()));
+ // for UPower >= 0.99.0, missing Changed() signal
+ QDBusConnection::systemBus().connect(UPOWER_SERVICE, UPOWER_PATH,
"org.freedesktop.DBus.Properties", "PropertiesChanged", this,
+
SLOT(onPropertiesChanged(QString,QVariantMap,QStringList)));
+
connect(m_upowerInterface, SIGNAL(DeviceAdded(QString)), this,
SLOT(slotDeviceAdded(QString)));
connect(m_upowerInterface, SIGNAL(DeviceRemoved(QString)), this,
SLOT(slotDeviceRemoved(QString)));
+ // for UPower >= 0.99.0, changed signature :o/
+ QDBusConnection::systemBus().connect(UPOWER_SERVICE, UPOWER_PATH,
UPOWER_IFACE, "DeviceAdded",
+ this,
SLOT(slotDeviceAdded(QDBusObjectPath)));
+ QDBusConnection::systemBus().connect(UPOWER_SERVICE, UPOWER_PATH,
UPOWER_IFACE, "DeviceRemoved",
+ this,
SLOT(slotDeviceRemoved(QDBusObjectPath)));
+
connect(m_upowerInterface, SIGNAL(DeviceChanged(QString)), this,
SLOT(slotDeviceChanged(QString)));
+ // for UPower >= 0.99.0, see slotDeviceAdded(const QString & device)
// Brightness Controls available
BrightnessControlsList controls;
@@ -428,6 +440,10 @@
new OrgFreedesktopUPowerDeviceInterface(UPOWER_SERVICE, device,
QDBusConnection::systemBus(), this);
m_devices.insert(device, upowerDevice);
+ // for UPower >= 0.99.0 which doesn't emit the DeviceChanged(QString)
signal
+ QDBusConnection::systemBus().connect(UPOWER_SERVICE, device,
"org.freedesktop.DBus.Properties", "PropertiesChanged", this,
+
SLOT(onPropertiesChanged(QString,QVariantMap,QStringList)));
+
updateDeviceProps();
}
@@ -440,6 +456,16 @@
updateDeviceProps();
}
+void PowerDevilUPowerBackend::slotDeviceAdded(const QDBusObjectPath &path)
+{
+ slotDeviceAdded(path.path());
+}
+
+void PowerDevilUPowerBackend::slotDeviceRemoved(const QDBusObjectPath &path)
+{
+ slotDeviceRemoved(path.path());
+}
+
void PowerDevilUPowerBackend::slotDeviceChanged(const QString & /*device*/)
{
updateDeviceProps();
@@ -450,9 +476,9 @@
qlonglong remainingTime = 0;
foreach(OrgFreedesktopUPowerDeviceInterface * upowerDevice, m_devices) {
- uint type = upowerDevice->type();
+ const uint type = upowerDevice->type();
if (( type == 2 || type == 3) && upowerDevice->powerSupply()) {
- uint state = upowerDevice->state();
+ const uint state = upowerDevice->state();
if (state == 1) // charging
remainingTime += upowerDevice->timeToFull();
else if (state == 2) //discharging
@@ -467,7 +493,7 @@
{
// check for lid button changes
if (m_lidIsPresent) {
- bool lidIsClosed = m_upowerInterface->lidIsClosed();
+ const bool lidIsClosed = m_upowerInterface->lidIsClosed();
if (lidIsClosed != m_lidIsClosed) {
if (lidIsClosed)
setButtonPressed(LidClose);
@@ -478,7 +504,7 @@
}
// check for AC adapter changes
- bool onBattery = m_upowerInterface->onBattery();
+ const bool onBattery = m_upowerInterface->onBattery();
if (m_onBattery != onBattery) {
if (onBattery)
setAcAdapterState(Unplugged);
@@ -489,6 +515,26 @@
m_onBattery = onBattery;
}
+void PowerDevilUPowerBackend::onPropertiesChanged(const QString &ifaceName,
const QVariantMap &changedProps, const QStringList &invalidatedProps)
+{
+ Q_UNUSED(changedProps);
+ Q_UNUSED(invalidatedProps);
+
+ if (ifaceName == UPOWER_IFACE) {
+ slotPropertyChanged(); // TODO maybe process the 2 properties
separately?
+ }
+}
+
+void PowerDevilUPowerBackend::onDevicePropertiesChanged(const QString
&ifaceName, const QVariantMap &changedProps, const QStringList
&invalidatedProps)
+{
+ Q_UNUSED(changedProps);
+ Q_UNUSED(invalidatedProps);
+
+ if (ifaceName == UPOWER_IFACE_DEVICE) {
+ updateDeviceProps(); // TODO maybe process the properties separately?
+ }
+}
+
void PowerDevilUPowerBackend::slotLogin1Resuming(bool active)
{
if (!active) {
--- a/powerdevil/daemon/backends/upower/powerdevilupowerbackend.h
+++ b/powerdevil/daemon/backends/upower/powerdevilupowerbackend.h
@@ -35,6 +35,10 @@
#include "udevqt.h"
#define UPOWER_SERVICE "org.freedesktop.UPower"
+#define UPOWER_PATH "/org/freedesktop/UPower"
+#define UPOWER_IFACE "org.freedesktop.UPower"
+#define UPOWER_IFACE_DEVICE "org.freedesktop.UPower.Device"
+
#define LOGIN1_SERVICE "org.freedesktop.login1"
class UdevHelper;
@@ -65,12 +69,17 @@
void updateDeviceProps();
void slotDeviceAdded(const QString &);
void slotDeviceRemoved(const QString &);
+ void slotDeviceAdded(const QDBusObjectPath & path);
+ void slotDeviceRemoved(const QDBusObjectPath & path);
void slotDeviceChanged(const QString &);
void slotPropertyChanged();
void slotLogin1Resuming(bool active);
void slotScreenBrightnessChanged();
void onDeviceChanged(const UdevQt::Device &device);
void onKeyboardBrightnessChanged(int);
+
+ void onPropertiesChanged(const QString &ifaceName, const QVariantMap
&changedProps, const QStringList &invalidatedProps);
+ void onDevicePropertiesChanged(const QString &ifaceName, const QVariantMap
&changedProps, const QStringList &invalidatedProps);
private:
// upower devices
++++++ kde-workspace-4.11.2.tar.xz -> kde-workspace-4.11.3.tar.xz ++++++
/work/SRC/openSUSE:Factory/kdebase4-workspace/kde-workspace-4.11.2.tar.xz
/work/SRC/openSUSE:Factory/.kdebase4-workspace.new/kde-workspace-4.11.3.tar.xz
differ: char 26, line 1
--
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
