Hello community, here is the log from the commit of package kpowersave checked in at Mon Mar 12 00:29:06 CET 2007. -------- --- arch/i386/kpowersave/kpowersave.changes 2007-02-14 19:21:28.000000000 +0100 +++ /mounts/work_src_done/STABLE/kpowersave/kpowersave.changes 2007-03-11 20:18:58.000000000 +0100 @@ -1,0 +2,6 @@ +Sun Mar 11 20:17:29 CET 2007 - schwab@suse.de + +- Fix crash. +- Properly fall back to userspace governor. + +------------------------------------------------------------------- New: ---- kpowersave-0.7.2.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kpowersave.spec ++++++ --- /var/tmp/diff_new_pack.z18728/_old 2007-03-12 00:28:12.000000000 +0100 +++ /var/tmp/diff_new_pack.z18728/_new 2007-03-12 00:28:12.000000000 +0100 @@ -11,6 +11,7 @@ # norootforbuild Name: kpowersave +URL: http://sourceforge.net/projects/powersave/ %if 0%{?sles_version} > 0 # needed to detect in configure if this is a Enterprise product and set the correct bugzilla website BuildRequires: dbus-1-qt3-devel hal-devel kdelibs3-devel lsb sles-release @@ -20,21 +21,22 @@ License: GNU General Public License (GPL) Group: System/GUI/KDE BuildRoot: %{_tmppath}/%{name}-%{version}-build -Summary: KDE Front-End to powersave Package, Battery Monitor, and General Power Management Support +Summary: KDE Frontend for Battery Monitoring, Suspend, CPU Freq and General Power Management Support Version: 0.7.2 -Release: 1 +Release: 4 ExclusiveArch: %ix86 x86_64 ia64 ppc Requires: yast2-power-management /sbin/pidof xorg-x11 Source: %{name}-%{version}.tar.bz2 +Patch: %{name}-%{version}.diff %description -The package provides battery monitoring and suspend and standby -triggers. It is based on the powersave package and therefore supports -APM and ACPI. Together with the powersave package and the YaST power -management module, it is the preferred package that should be used for -battery monitoring and control of power management related tasks. See -the powersave package for additional features, such as CPU frequency -scaling (SpeedStep and PowerNow). +KPowersave provides battery monitoring, CPU frequency control and +suspend/standby triggers, and more power management features for KDE. +It uses HAL (formerly the powersave daemon) and supports APM and ACPI +for several architectures. Together with the powersave package and the +YaST power management module, it is the preferred package that should +be used for battery monitoring and control of power management related +tasks. @@ -45,6 +47,7 @@ %prep %setup -n %{name}-%{version} -q +%patch . /etc/opt/kde3/common_options update_admin @@ -85,7 +88,10 @@ /opt/kde3/lib*/kde3/kpowersave.* /opt/kde3/lib*/libkdeinit_kpowersave.* -%changelog -n kpowersave +%changelog +* Sun Mar 11 2007 - schwab@suse.de +- Fix crash. +- Properly fall back to userspace governor. * Wed Feb 14 2007 - dkukawka@suse.de - released new version 0.7.2: - changes (for more see NEWS/Changelog file in the source): ++++++ kpowersave-0.7.2.diff ++++++ --- src/hardware.cpp +++ src/hardware.cpp @@ -953,6 +953,7 @@ } char *governor; + int reply; int consider = getAcAdapter(); switch (cpufreq) { @@ -960,6 +961,8 @@ governor = "performance"; if (!dbus_HAL->dbusSystemMethodCall( HAL_SERVICE, HAL_COMPUTER_UDI, HAL_CPUFREQ_IFACE, "SetCPUFreqGovernor", + &reply, + DBUS_TYPE_INVALID, DBUS_TYPE_STRING, &governor, DBUS_TYPE_INVALID)) { myDebug("Could not set CPU Freq to performance policy"); @@ -970,26 +973,29 @@ governor = "ondemand"; if (!dbus_HAL->dbusSystemMethodCall( HAL_SERVICE, HAL_COMPUTER_UDI, HAL_CPUFREQ_IFACE, "SetCPUFreqGovernor", + &reply, + DBUS_TYPE_INVALID, DBUS_TYPE_STRING, &governor, - DBUS_TYPE_INVALID) || - (checkCurrentCPUFreqPolicy() != cpufreq)){ + DBUS_TYPE_INVALID)) { myDebug("Couldn't set CPUFreq to ondemand, try now userspace"); governor = "userspace"; if (!dbus_HAL->dbusSystemMethodCall( HAL_SERVICE, HAL_COMPUTER_UDI, HAL_CPUFREQ_IFACE, "SetCPUFreqGovernor", + &reply, + DBUS_TYPE_INVALID, DBUS_TYPE_STRING, &governor, - DBUS_TYPE_INVALID) || - (checkCurrentCPUFreqPolicy() != cpufreq)) { + DBUS_TYPE_INVALID)) { myDebug("Couldn't set CPUFreq to userspace, try conservative"); governor = "conservative"; if (!dbus_HAL->dbusSystemMethodCall( HAL_SERVICE, HAL_COMPUTER_UDI, HAL_CPUFREQ_IFACE, "SetCPUFreqGovernor", + &reply, + DBUS_TYPE_INVALID, DBUS_TYPE_STRING, &governor, - DBUS_TYPE_INVALID) || - (checkCurrentCPUFreqPolicy() != cpufreq)) { + DBUS_TYPE_INVALID)) { myDebug("Couldn't set CPUFreq to DYNAMIC, not to " "ondemand, userspace nor to conservative"); return false; @@ -1021,6 +1027,8 @@ governor = "powersave"; if (!dbus_HAL->dbusSystemMethodCall( HAL_SERVICE, HAL_COMPUTER_UDI, HAL_CPUFREQ_IFACE, "SetCPUFreqGovernor", + &reply, + DBUS_TYPE_INVALID, DBUS_TYPE_STRING, &governor, DBUS_TYPE_INVALID)) { myDebug("Could not set CPU Freq to performance policy"); --- src/kpowersave.cpp +++ src/kpowersave.cpp @@ -1603,7 +1603,7 @@ // Maybe nothing ?! } } - } else if ((!strcmp(getenv("DESKTOP_SESSION"), "gnome")) && (display->checkScreenSaverStatus() == 11)) { + } else if (getenv("DESKTOP_SESSION") && !strcmp(getenv("DESKTOP_SESSION"), "gnome") && (display->checkScreenSaverStatus() == 11)) { // use this to set XScreensaver back to default settings this should // also cover the DPMS settings for GNOME/XScreensaver ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org