Hi, The fix is needed as SHR recently switched to fsotdld and fsotdld is API incompatible with frameworkd otimed, the former uses AddAlarm (allows multiple alarms per dbus name) the later uses SetAlarm (allows only one alarm per dbus name). I now support both.
The ffalarms bump patch (0002) not tested from shr git repo, as OE is failing and underdocumented, I should probably not bother to prepare it at all.
>From 548cc678ba81257baf329dde35ea033cfc51a1c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Pankowski?= <[email protected]> Date: Tue, 20 Apr 2010 22:05:18 +0200 Subject: [PATCH 1/2] atd-over-fso: also support for fsotdld API (incompatible to frameworkd otimed) --- recipes/ffalarms/atd-over-fso/run-over-fso.patch | 33 ++++++++++++++-------- recipes/ffalarms/atd-over-fso_0.70.bb | 2 +- 2 files changed, 22 insertions(+), 13 deletions(-) diff --git a/recipes/ffalarms/atd-over-fso/run-over-fso.patch b/recipes/ffalarms/atd-over-fso/run-over-fso.patch index 425aca4..be79ea0 100644 --- a/recipes/ffalarms/atd-over-fso/run-over-fso.patch +++ b/recipes/ffalarms/atd-over-fso/run-over-fso.patch @@ -1,5 +1,5 @@ --- src/atd.c-orig 2004-02-02 16:30:39.000000000 +0100 -+++ src/atd.c 2009-09-15 22:57:35.000000000 +0200 ++++ src/atd.c 2010-04-20 19:23:10.000000000 +0200 @@ -7,10 +7,12 @@ * Copyright (C) 1996, Paul Gortmaker * Copyright (C) 2001, Russell Nelson @@ -184,7 +184,7 @@ } -@@ -345,11 +242,223 @@ +@@ -345,11 +242,232 @@ } @@ -300,20 +300,29 @@ + +void atd_alarm_waitfor(AtdAlarm *self, time_t t) +{ -+GError *error; ++GError *error1, *error2; + + if (!t) + return; + + rtc_set_time(); -+ error = NULL; ++ error1 = error2 = NULL; + if (self->alarm_proxy == NULL) { -+ g_printerr(OTIMED " not running, could not call SetAlarm\n"); -+ } else if (!dbus_g_proxy_call(self->alarm_proxy, "SetAlarm", &error, -+ G_TYPE_STRING, DBUS_NAME, -+ G_TYPE_INT, t, G_TYPE_INVALID, -+ G_TYPE_INVALID)) { -+ display_free_g_error(&error); ++ g_printerr(OTIMED " not running, could not call" ++ " AddAlarm or SetAlarm\n"); ++ } else if (dbus_g_proxy_call(self->alarm_proxy, "AddAlarm", &error1, ++ G_TYPE_STRING, DBUS_NAME, ++ G_TYPE_INT, t, G_TYPE_INVALID, ++ G_TYPE_INVALID) || ++ dbus_g_proxy_call(self->alarm_proxy, "SetAlarm", &error2, ++ G_TYPE_STRING, DBUS_NAME, ++ G_TYPE_INT, t, G_TYPE_INVALID, ++ G_TYPE_INVALID)) { ++ if (error1 != NULL) ++ g_error_free(error1); ++ } else { ++ display_free_g_error(&error1); ++ display_free_g_error(&error2); + } +#ifdef DEBUG + printf("DBus waitfor: %d\n", (int) t); @@ -410,7 +419,7 @@ argv0 = strrchr(argv[0], '/'); if (!argv0) -@@ -362,17 +471,36 @@ +@@ -362,17 +480,36 @@ die("cannot chdir"); if (!strcmp (argv0, "atq")) exit_atq(); @@ -452,7 +461,7 @@ /* run all the jobs in the past */ now = time (NULL); scan_from_top (); -@@ -402,8 +530,7 @@ +@@ -402,8 +539,7 @@ #endif if (next == ULONG_MAX) next = 0; diff --git a/recipes/ffalarms/atd-over-fso_0.70.bb b/recipes/ffalarms/atd-over-fso_0.70.bb index b92169e..940eefc 100644 --- a/recipes/ffalarms/atd-over-fso_0.70.bb +++ b/recipes/ffalarms/atd-over-fso_0.70.bb @@ -13,7 +13,7 @@ RPROVIDES_${PN}-dev = "atd-dev" DEPENDS = "dbus-glib pkgconfig" RDEPENDS += "dbus dbus-glib frameworkd" -PR = "r3" +PR = "r4" SRC_URI = "${HANDHELDS_CVS};module=apps/atd;tag=ATD-0_70 \ file://atd-startup.patch;patch=1;pnum=0 \ -- 1.7.0.4
>From 81f3601c8ab303fd739660a3d661eb9569c48011 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Pankowski?= <[email protected]> Date: Tue, 20 Apr 2010 23:07:06 +0200 Subject: [PATCH 2/2] ffalarms: bump git version fix snooze when using fsotdld --- recipes/ffalarms/ffalarms_git.bb | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/recipes/ffalarms/ffalarms_git.bb b/recipes/ffalarms/ffalarms_git.bb index f9d05b1..2cf01ff 100644 --- a/recipes/ffalarms/ffalarms_git.bb +++ b/recipes/ffalarms/ffalarms_git.bb @@ -12,7 +12,7 @@ PR = "r1" SRC_URI = "git://git.shr-project.org/repo/ffalarms.git;protocol=http;branch=master" -SRCREV = "f8175d83d7807eea9577a555016d6e41210196bb" +SRCREV = "084e4268045b4f3d1c644fe3a1d5a9c49b161713" S = "${WORKDIR}/git" inherit vala -- 1.7.0.4
_______________________________________________ Shr-devel mailing list [email protected] http://lists.shr-project.org/mailman/listinfo/shr-devel
