rpms/kdebase-workspace/F-11 kdebase-workspace-4.3.4-calendar-akonadi.patch, NONE, 1.1 kdebase-workspace-4.3.4-solid_hal_0_5_14.patch, NONE, 1.1 .cvsignore, 1.36, 1.37 kdebase-workspace.spec, 1.251, 1.252
Rex Dieter
rdieter at fedoraproject.org
Mon Jan 11 17:45:05 UTC 2010
Author: rdieter
Update of /cvs/pkgs/rpms/kdebase-workspace/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30654
Modified Files:
.cvsignore kdebase-workspace.spec
Added Files:
kdebase-workspace-4.3.4-calendar-akonadi.patch
kdebase-workspace-4.3.4-solid_hal_0_5_14.patch
Log Message:
* Tue Jan 05 2010 Jaroslav Reznik <jreznik at redhat.com> 4.3.4-4
- do not link calendar data engine with Akonadi, move to main package (#552473)
- s/plasma-engine/plasma-dataengine/
kdebase-workspace-4.3.4-calendar-akonadi.patch:
CMakeLists.txt | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
--- NEW FILE kdebase-workspace-4.3.4-calendar-akonadi.patch ---
diff -up kdebase-workspace-4.3.4/plasma/dataengines/calendar/CMakeLists.txt.calendar-akonadi kdebase-workspace-4.3.4/plasma/dataengines/calendar/CMakeLists.txt
--- kdebase-workspace-4.3.4/plasma/dataengines/calendar/CMakeLists.txt.calendar-akonadi 2009-04-28 15:46:20.000000000 +0200
+++ kdebase-workspace-4.3.4/plasma/dataengines/calendar/CMakeLists.txt 2010-01-05 12:52:18.724518279 +0100
@@ -16,10 +16,9 @@ kde4_add_plugin(plasma_engine_calendar $
target_link_libraries(
plasma_engine_calendar
kholidays
- ${KDE4_KDECORE_LIBS} ${KDE4_AKONADI_LIBS}
+ ${KDE4_KDECORE_LIBS}
${KDE4_PLASMA_LIBS}
${KDE4_KMIME_LIBS}
- ${KDE4_AKONADI_KMIME_LIBS}
)
install(TARGETS plasma_engine_calendar DESTINATION ${PLUGIN_INSTALL_DIR})
kdebase-workspace-4.3.4-solid_hal_0_5_14.patch:
libs/solid/control/powermanager.cpp | 2 +-
solid/hal/halpower.cpp | 14 ++++++++------
2 files changed, 9 insertions(+), 7 deletions(-)
--- NEW FILE kdebase-workspace-4.3.4-solid_hal_0_5_14.patch ---
diff -up kdebase-workspace-4.3.4/libs/solid/control/powermanager.cpp.hal kdebase-workspace-4.3.4/libs/solid/control/powermanager.cpp
--- kdebase-workspace-4.3.4/libs/solid/control/powermanager.cpp.hal 2009-12-14 08:49:30.623026679 -0600
+++ kdebase-workspace-4.3.4/libs/solid/control/powermanager.cpp 2009-12-14 08:50:50.842767523 -0600
@@ -203,7 +203,7 @@ float Solid::Control::PowerManager::brig
else
{
return_SOLID_CALL(Ifaces::PowerManager *, globalPowerManager->managerBackend(),
- false, brightness(controls.keys().at(0)));
+ false, brightness(controls.keys(Solid::Control::PowerManager::Screen).at(0)));
}
}
else
diff -up kdebase-workspace-4.3.4/solid/hal/halpower.cpp.hal kdebase-workspace-4.3.4/solid/hal/halpower.cpp
--- kdebase-workspace-4.3.4/solid/hal/halpower.cpp.hal 2009-02-26 03:12:20.000000000 -0600
+++ kdebase-workspace-4.3.4/solid/hal/halpower.cpp 2009-12-14 08:56:30.768778165 -0600
@@ -378,15 +378,17 @@ float HalPower::brightness(const QString
if(m_halManager.call("FindDeviceByCapability", "laptop_panel").arguments().at(0).toStringList().contains(device))
{
QDBusInterface deviceInterface("org.freedesktop.Hal", device, "org.freedesktop.Hal.Device.LaptopPanel", QDBusConnection::systemBus());
- brightness = deviceInterface.call("GetBrightness").arguments().at(0).toDouble();
- if(deviceInterface.lastError().isValid())
+ QDBusReply<int> brightnessReply = deviceInterface.call("GetBrightness");
+ if(!brightnessReply.isValid())
{
- return 0;
+ return 0.0;
}
- else
+ brightness = brightnessReply;
+ QDBusInterface propertyInterface("org.freedesktop.Hal", device, "org.freedesktop.Hal.Device", QDBusConnection::systemBus());
+ QDBusReply<int> levelsReply = propertyInterface.call("GetProperty", "laptop_panel.num_levels");
+ if (levelsReply.isValid())
{
- QDBusInterface propertyInterface("org.freedesktop.Hal", device, "org.freedesktop.Hal.Device", QDBusConnection::systemBus());
- int levels = propertyInterface.call("GetProperty", "laptop_panel.num_levels").arguments().at(0).toInt();
+ int levels = levelsReply;
return (float)(100*(brightness/(levels-1)));
}
}
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-workspace/F-11/.cvsignore,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -p -r1.36 -r1.37
--- .cvsignore 9 Nov 2009 13:26:30 -0000 1.36
+++ .cvsignore 11 Jan 2010 17:45:04 -0000 1.37
@@ -1 +1,2 @@
kdebase-workspace-4.3.3.tar.bz2
+kdebase-workspace-4.3.4.tar.bz2
Index: kdebase-workspace.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-workspace/F-11/kdebase-workspace.spec,v
retrieving revision 1.251
retrieving revision 1.252
diff -u -p -r1.251 -r1.252
--- kdebase-workspace.spec 5 Dec 2009 15:25:53 -0000 1.251
+++ kdebase-workspace.spec 11 Jan 2010 17:45:05 -0000 1.252
@@ -7,7 +7,7 @@
Summary: K Desktop Environment - Workspace
Name: kdebase-workspace
Version: 4.3.4
-Release: 1%{?dist}
+Release: 4%{?dist}
Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdebase-workspace-%{version}.tar.bz2
License: GPLv2
@@ -36,12 +36,16 @@ Patch16: kdebase-workspace-4.3.0-battery
# default Leave submenu
Patch17: kdebase-workspace-4.3.1-classicmenu-logout.patch
Patch18: kdebase-workspace-4.3.3-kdm_plymouth.patch
+# do not link calendar data engine with Akonadi
+Patch19: kdebase-workspace-4.3.4-calendar-akonadi.patch
# upstream patches:
# "keyboard stops working", https://bugs.kde.org/show_bug.cgi?id=171685#c135
Patch50: kdebase-workspace-4.3.3-kde#171685.patch
# kubuntu working to upstream this
Patch51: http://bazaar.launchpad.net/~kubuntu-members/kdebase-workspace/ubuntu/download/head:/kubuntu_101_brightne-20091019223214-s1uoamqahgp3uee7-1/kubuntu_101_brightness_fn_keys_and_osd.diff
+# fixups for hal-0.5.14 compat
+Patch52: kdebase-workspace-4.3.4-solid_hal_0_5_14.patch
# 4.3 branch
# trunk
@@ -101,6 +105,8 @@ BuildRequires: python-devel
# used for the Logitech mouse KCM, disabled until #399931 is fixed
# BuildRequires: libusb-devel
+Provides: plasma-dataengine-calendar = %{version}-%{release}
+
Requires: %{name}-libs%{?_isa} = %{version}-%{release}
%{?_kde4_macros_api:Requires: kde4-macros(api) = %{_kde4_macros_api} }
@@ -131,7 +137,7 @@ Requires: solar-kde-theme
Requires: leonidas-kde-theme
%endif
-%if 0%{?fedora} > 11 || 0%{?rhel} > 5
+%if 0%{?fedora} > 11
Requires: system-backgrounds-kde
Requires: system-ksplash-theme
%endif
@@ -248,8 +254,7 @@ Requires: PyKDE4 >= %{version}
%package akonadi
Summary: Akonadi integration for KDE Workspace
Group: User Interface/Desktops
-Provides: plasma-engine-akonadi = %{version}-%{release}
-Provides: plasma-engine-calendar = %{version}-%{release}
+Provides: plasma-dataengine-akonadi = %{version}-%{release}
Requires: %{name} = %{version}-%{release}
Requires: akonadi
%description akonadi
@@ -276,10 +281,12 @@ Requires: akonadi
%patch16 -p1 -b .showremainingtime
%patch17 -p1 -b .classicmenu-logout
%patch18 -p1 -b .kdm_plymouth
+%patch19 -p1 -b .calendar-akonadi
# upstream patches
%patch50 -p1 -b .kde#171685
%patch51 -p1 -b .brightness_keys
+%patch52 -p1 -b .solid_hal_0_5_14
%build
@@ -505,8 +512,6 @@ fi
# akonadi
%exclude %{_kde4_libdir}/kde4/plasma_engine_akonadi.so
%exclude %{_kde4_datadir}/kde4/services/plasma-engine-akonadi.desktop
-%exclude %{_kde4_libdir}/kde4/plasma_engine_calendar.so
-%exclude %{_kde4_datadir}/kde4/services/plasma-dataengine-calendar.desktop
%if 0%{?with_polkit_09}
# PolicyKit-kde
%exclude %{_kde4_sharedir}/kde4/services/kcm_pkk_authorization.desktop
@@ -609,11 +614,19 @@ fi
%defattr(-,root,root,-)
%{_kde4_libdir}/kde4/plasma_engine_akonadi.so
%{_kde4_datadir}/kde4/services/plasma-engine-akonadi.desktop
-%{_kde4_libdir}/kde4/plasma_engine_calendar.so
-%{_kde4_datadir}/kde4/services/plasma-dataengine-calendar.desktop
%changelog
+* Tue Jan 05 2010 Jaroslav Reznik <jreznik at redhat.com> 4.3.4-4
+- do not link calendar data engine with Akonadi, move to main package (#552473)
+- s/plasma-engine/plasma-dataengine/
+
+* Mon Dec 14 2009 Rex Dieter <rdieter at fedoraproject.org> 4.3.4-3
+- hal-0.5.14-1 and failures with brightness controls (#545258)
+
+* Sun Dec 06 2009 Than Ngo <than at redhat.com> - 4.3.4-2
+- fix conditional for RHEL
+
* Tue Dec 01 2009 Than Ngo <than at redhat.com> - 4.3.4-1
- 4.3.4
- kdm_plymouth patch (#475890)
More information about the scm-commits
mailing list