Hello community, here is the log from the commit of package kdebase4-workspace for openSUSE:Factory checked in at 2013-03-14 11:28:23 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kdebase4-workspace (Old) and /work/SRC/openSUSE:Factory/.kdebase4-workspace.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kdebase4-workspace", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/kdebase4-workspace/kdebase4-workspace.changes 2013-03-01 10:48:30.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.kdebase4-workspace.new/kdebase4-workspace.changes 2013-03-14 11:28:25.000000000 +0100 @@ -1,0 +2,24 @@ +Thu Mar 7 08:18:25 UTC 2013 - [email protected] + +- Add patch validate_systemd_version_for_upower.diff. this patch + checks if the version of systemd supports suspend/hibernate and + resolves the current issue on openSUSE 12.2 + +------------------------------------------------------------------- +Mon Mar 4 19:07:24 UTC 2013 - [email protected] + +- changed plasma-kickoff-newly-collapsing.diff: + * use KService ptr instead of name for specialTitle map, so it + still works correctly when there are entries with equal names + (bnc#807301) + +------------------------------------------------------------------- +Sat Mar 2 15:33:10 UTC 2013 - [email protected] + +- Update to 4.10.1 + * Contains bug fixes. See http://www.kde.org/announcements/ + for more information +- Drop plasma_expire_suse_paste.diff, powerdevil-logind.patch and + respect_screenlock_settings.diff, all applied upstream + +------------------------------------------------------------------- Old: ---- kde-workspace-4.10.0.tar.xz plasma_expire_suse_paste.diff powerdevil-logind.patch respect_screenlock_settings.diff New: ---- kde-workspace-4.10.1.tar.xz validate_systemd_version_for_upower.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdebase4-workspace.spec ++++++ --- /var/tmp/diff_new_pack.45vDlG/_old 2013-03-14 11:28:29.000000000 +0100 +++ /var/tmp/diff_new_pack.45vDlG/_new 2013-03-14 11:28:29.000000000 +0100 @@ -23,7 +23,7 @@ %endif Name: kdebase4-workspace -Version: 4.10.0 +Version: 4.10.1 Release: 0 Summary: The KDE Workspace Components License: GPL-2.0+ @@ -125,8 +125,6 @@ # Downside is that ConsoleKit is no longer supported and requires that NetworkManager and PolKit # are also both build with systemd support. Not activated at the moment due to sysvinit fallback!! Patch214: workspace_systemd_initial_support.patch -#PATCH-FIX-OPENSUSE (?) Make powerdevil understand/talk with systemd-logind -Patch215: powerdevil-logind.patch %endif # Patch from Fedora to enable plymouth support in KDM. # Patch is based on the changes within GDM to detect running plymouth @@ -138,14 +136,12 @@ Patch402: opensuse-kinfocenter.diff # PATCH-FIX-OPENSUSE storage.diff (created by Alin M. Elena to add unique names for partitions in kinfocenter) Patch403: storage.diff -# PATCH-FIX-UPSTREAM respect_screenlock_settings.diff Upstream fix for the screenlocker to respect its settings. -Patch404: respect_screenlock_settings.diff # PATCH-FIX-OPENSUSE pager.diff Use plasma theme color for pager text -Patch405: pager.diff -# PATCH-FIx-OPENSUSE plasma_expire_suse_paste.diff (expire pastes via pastebin) -Patch406: plasma_expire_suse_paste.diff +Patch404: pager.diff # PATCH-FIX-UPSTREAM fix-plasma-theme-workaround-tabbox.patch -- Fix tabbox drawing (exposed in default openSUSE 12.3 plasma theme) -Patch407: fix-plasma-theme-workaround-tabbox.patch +Patch405: fix-plasma-theme-workaround-tabbox.patch +# PATCH-FIX-UPSTREAM validate_systemd_version_for_upower.diff -- Check if systemd really supports suspend/hibernate +Patch900: validate_systemd_version_for_upower.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %if %suse_version > 1200 Requires: %{name}-branding = %{version} @@ -387,7 +383,6 @@ %patch213 -p1 %if %{with_systemd} %patch214 -p1 -%patch215 -p1 %endif %patch400 -p0 %patch401 -p1 @@ -395,8 +390,7 @@ %patch403 -p1 %patch404 -p1 %patch405 -p1 -%patch406 -p1 -%patch407 -p1 +%patch900 -p1 cp %{SOURCE3} kwin/effects/cube/data/cubecap.png %build ++++++ kde-workspace-4.10.0.tar.xz -> kde-workspace-4.10.1.tar.xz ++++++ /work/SRC/openSUSE:Factory/kdebase4-workspace/kde-workspace-4.10.0.tar.xz /work/SRC/openSUSE:Factory/.kdebase4-workspace.new/kde-workspace-4.10.1.tar.xz differ: char 25, line 1 ++++++ plasma-kickoff-newly-collapsing.diff ++++++ --- /var/tmp/diff_new_pack.45vDlG/_old 2013-03-14 11:28:29.000000000 +0100 +++ /var/tmp/diff_new_pack.45vDlG/_new 2013-03-14 11:28:29.000000000 +0100 @@ -174,7 +174,7 @@ - QHash<QString, KService::Ptr> existingServices; + KSortableList<KSharedPtr<KSycocaEntry>,QByteArray> slist; + KSortableList<KSharedPtr<KSycocaEntry>,QByteArray> glist; -+ QMap<QString,QString> specialTitle; ++ QMap<KService::Ptr,QString> specialTitle; + QMap<QString,QString> categoryIcon; + QMap<QString,QString> shortenedMenuPath; @@ -224,7 +224,7 @@ + if( !s->genericName().isEmpty() && serviceGroup->caption()!=s->genericName()) + key = serviceGroup->caption() + " (" + s->name() + ")"; + } -+ specialTitle.insert( _e->name(), key ); ++ specialTitle.insert( s, key ); + categoryIcon.insert( _e->name(), s->icon() ); + if( primaryNamePolicy == ApplicationModel::GenericNamePrimary && !s->genericName().isEmpty() ) + slist.insert( s->genericName().toLocal8Bit(), _e ); @@ -305,7 +305,7 @@ + if (icon.isEmpty()) + icon = service->icon(); + -+ QString name = specialTitle[service->name()]; ++ QString name = specialTitle[service]; + if (name.isEmpty()) + name = service->name(); + ++++++ validate_systemd_version_for_upower.diff ++++++ commit 36bf6b7d0b269b35b9b5a6bcae77f764ab7ab0cd Author: Raymond Wooninck <[email protected]> Date: Thu Mar 7 08:56:36 2013 +0100 Also check if the version of systemd is supporting the upower functions diff --git a/powerdevil/daemon/backends/upower/powerdevilupowerbackend.cpp b/powerdevil/daemon/backends/upower/powerdevilupowerbackend.cpp index f9503b3..d463a40 100644 --- a/powerdevil/daemon/backends/upower/powerdevilupowerbackend.cpp +++ b/powerdevil/daemon/backends/upower/powerdevilupowerbackend.cpp @@ -35,6 +35,21 @@ #define HELPER_ID "org.kde.powerdevil.backlighthelper" +bool checkSystemdVersion(uint requiredVersion) +{ + bool ok; + + 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); + if (ok) { + return (version >= requiredVersion); + } else { + kDebug() << "Unknown version string from Systemd"; + return false; + } +} + PowerDevilUPowerBackend::PowerDevilUPowerBackend(QObject* parent) : BackendInterface(parent), m_brightnessControl(0), @@ -123,7 +138,7 @@ void PowerDevilUPowerBackend::init() // Supported suspend methods SuspendMethods supported = UnknownSuspendMethod; - if (m_login1Interface) { + if (m_login1Interface && checkSystemdVersion(195)) { QDBusPendingReply<QString> canSuspend = m_login1Interface.data()->asyncCall("CanSuspend"); canSuspend.waitForFinished(); if (canSuspend.isValid() && (canSuspend.value() == "yes" || canSuspend.value() == "challenge")) @@ -151,11 +166,7 @@ void PowerDevilUPowerBackend::init() } // "resuming" signal - QDBusInterface systemdIface("org.freedesktop.systemd1", "/org/freedesktop/systemd1", "org.freedesktop.systemd1.Manager", - QDBusConnection::systemBus(), this); - int version = systemdIface.property("Version").toString().section(' ', 1).toInt(); - - if (m_login1Interface && version > 197) { + if (m_login1Interface && checkSystemdVersion(198)) { connect(m_login1Interface.data(), SIGNAL(PrepareForSleep(bool)), this, SLOT(slotLogin1Resuming(bool))); } else { connect(m_upowerInterface, SIGNAL(Resuming()), this, SIGNAL(resumeFromSuspend())); @@ -280,7 +291,7 @@ bool PowerDevilUPowerBackend::setBrightness(float brightnessValue, PowerDevil::B KJob* PowerDevilUPowerBackend::suspend(PowerDevil::BackendInterface::SuspendMethod method) { - if (m_login1Interface) { + if (m_login1Interface && checkSystemdVersion(195)) { return new Login1SuspendJob(m_login1Interface.data(), method, supportedSuspendMethods()); } else { return new UPowerSuspendJob(m_upowerInterface, method, supportedSuspendMethods()); -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
