I have made the following changes intended for : CE:MW:Shared / contextkit-maemo
Please review and accept or decline. BOSS has already run some checks on this request. See the "Messages from BOSS" section below. https://build.pub.meego.com//request/show/5234 Thank You, Marko Saukko [This message was auto-generated] --- Request # 5234: Messages from BOSS: State: review at 2012-07-19T07:17:01 by bossbot Reviews: accepted by bossbot : Prechecks succeeded. new for CE-maintainers : Please replace this text with a review and approve/reject the review (not the SR). BOSS will take care of the rest Changes: submit: home:sage:branches:CE:MW:Shared / contextkit-maemo -> CE:MW:Shared / contextkit-maemo changes files: -------------- --- contextkit-maemo.changes +++ contextkit-maemo.changes @@ -0,0 +1,3 @@ +* Thu Jul 19 2012 Marko Saukko <[email protected]> - 0.7.30 +- Added contextkit-maemo-0.7.30-fix-udev.patch to fix build with new udev. + old: ---- Makefile new: ---- contextkit-maemo-0.7.30-fix-udev.patch spec files: ----------- --- contextkit-maemo.spec +++ contextkit-maemo.spec @@ -1,11 +1,13 @@ # # Do NOT Edit the Auto-generated Part! -# Generated by: spectacle version 0.23 +# Generated by: spectacle version 0.25 # + +Name: contextkit-maemo + # >> macros # << macros -Name: contextkit-maemo Summary: ContextKit Maemo specific providers Version: 0.7.30 Release: 1 @@ -17,6 +19,7 @@ Patch0: contextkit-maemo-0.7.30-disable-battery.patch Patch1: contextkit-maemo-0.7.30-disable-mce.patch Patch2: contextkit-maemo-0.7.30-disable-presence.patch +Patch3: contextkit-maemo-0.7.30-fix-udev.patch BuildRequires: pkgconfig(QtGui) BuildRequires: pkgconfig(contextprovider-1.0) BuildRequires: pkgconfig(contextsubscriber-1.0) >= 0.5.25 @@ -25,7 +28,6 @@ BuildRequires: pkgconfig(x11) BuildRequires: python - %description This is ContextKit, a framework for collecting contextual information from the bowels of the system, cleaning them up @@ -41,7 +43,6 @@ - %prep %setup -q -n %{name}-%{version} @@ -51,6 +52,8 @@ %patch1 -p1 # contextkit-maemo-0.7.30-disable-presence.patch %patch2 -p1 +# contextkit-maemo-0.7.30-fix-udev.patch +%patch3 -p1 # >> setup # << setup @@ -65,6 +68,7 @@ # >> build post # << build post + %install rm -rf %{buildroot} # >> install pre @@ -75,10 +79,6 @@ # << install post - - - - %files %defattr(-,root,root,-) %{_bindir}/contextd @@ -96,5 +96,3 @@ %{_datadir}/dbus-1/services/org.maemo.contextd.service # >> files # << files - - other changes: -------------- ++++++ contextkit-maemo-0.7.30-fix-udev.patch (new) --- contextkit-maemo-0.7.30-fix-udev.patch +++ contextkit-maemo-0.7.30-fix-udev.patch @@ -0,0 +1,28 @@ +From 05ac16b3e55fa9998b5f1fb8ca274f6d768a604b Mon Sep 17 00:00:00 2001 +From: Marko Saukko <[email protected]> +Date: Thu, 19 Jul 2012 07:07:21 +0000 +Subject: [PATCH] Fix build with new udev. + +Signed-off-by: Marko Saukko <[email protected]> +--- + libcontextsubscriber-plugins/kbslider/kbsliderplugin.cpp | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/libcontextsubscriber-plugins/kbslider/kbsliderplugin.cpp b/libcontextsubscriber-plugins/kbslider/kbsliderplugin.cpp +index 4a9106c..666bb5a 100644 +--- a/libcontextsubscriber-plugins/kbslider/kbsliderplugin.cpp ++++ b/libcontextsubscriber-plugins/kbslider/kbsliderplugin.cpp +@@ -89,8 +89,8 @@ void KbSliderPlugin::readKbPresent() + return; + } + +- QString sysPath = QString("%1/%2") +- .arg(udev_get_sys_path(udev)).arg(findKeypadDevice()); ++ QString sysPath = QString("/sys/%1") ++ .arg(findKeypadDevice()); + + struct udev_device* originalDev = udev_device_new_from_syspath(udev, + sysPath.toAscii().constData()); +-- +1.7.10.3 + ++++++ contextkit-maemo.yaml --- contextkit-maemo.yaml +++ contextkit-maemo.yaml @@ -11,6 +11,7 @@ - contextkit-maemo-0.7.30-disable-battery.patch - contextkit-maemo-0.7.30-disable-mce.patch - contextkit-maemo-0.7.30-disable-presence.patch + - contextkit-maemo-0.7.30-fix-udev.patch Description: | This is ContextKit, a framework for collecting contextual information from the bowels of the system, cleaning them up ++++++ deleted files: --- Makefile
