From: Kirtika Ruchandani Date: Sun, 28 Jun 2009 17:35:12 +0000 (+0530) Subject: Added alarm with lots of cues from the poky recipes and an ugly hack to build with... X-Git-Url: http://vcs.maemo.org/git/?p=oespirit1;a=commitdiff_plain;h=5021d2af2707e76941e729052ee05f24ad03b14d Added alarm with lots of cues from the poky recipes and an ugly hack to build with the mer pathc --- diff --git a/alarmd-patches/mer-changes.patch b/alarmd-patches/mer-changes.patch new file mode 100755 index 0000000..0e00337 --- /dev/null +++ b/alarmd-patches/mer-changes.patch @@ -0,0 +1,122 @@ +--- alarmd-0.5.20/rpc-mce.c ++++ alarmd-0.5.20/rpc-mce.c +@@ -29,39 +29,39 @@ + + void mce_set_alarm_visibility(DBusConnection *system_bus, gboolean visible) + { +- const gchar *mode = visible ? MCE_ALARM_VISIBLE : MCE_ALARM_OFF; ++/* const gchar *mode = visible ? MCE_ALARM_VISIBLE : MCE_ALARM_OFF; */ + ENTER_FUNC; + + DEBUG("Telling mce alarm is %s", visible ? "visible" : "off"); + +- dbus_do_call(system_bus, NULL, FALSE, ++/* dbus_do_call(system_bus, NULL, FALSE, + MCE_SERVICE, MCE_REQUEST_PATH, MCE_REQUEST_IF, + MCE_ALARM_MODE_CHANGE_REQ, + DBUS_TYPE_STRING, &mode, +- DBUS_TYPE_INVALID); ++ DBUS_TYPE_INVALID); */ + LEAVE_FUNC; + } + + void mce_request_powerup(DBusConnection *system_bus) + { + ENTER_FUNC; +- dbus_do_call(system_bus, NULL, FALSE, ++/* dbus_do_call(system_bus, NULL, FALSE, + MCE_SERVICE, + MCE_REQUEST_PATH, + MCE_REQUEST_IF, + MCE_POWERUP_REQ, +- DBUS_TYPE_INVALID); ++ DBUS_TYPE_INVALID); */ + LEAVE_FUNC; + } + + void mce_request_shutdown(DBusConnection *system_bus) + { + ENTER_FUNC; +- dbus_do_call(system_bus, NULL, FALSE, ++/* dbus_do_call(system_bus, NULL, FALSE, + MCE_SERVICE, + MCE_REQUEST_PATH, + MCE_REQUEST_IF, + MCE_SHUTDOWN_REQ, +- DBUS_TYPE_INVALID); ++ DBUS_TYPE_INVALID); */ + LEAVE_FUNC; + } +--- alarmd-0.5.20/libalarm.pc ++++ alarmd-0.5.20/libalarm.pc +@@ -0,0 +1,9 @@ ++includedir=/usr/include/alarmd ++libdir=/usr/lib ++ ++Name: libalarm ++Description: Alarm API. ++Version: 0.5.20mer2 ++ ++Libs: -L${libdir} -lalarm ++Cflags: -I${includedir} +--- alarmd-0.5.20/alarmd.sh ++++ alarmd-0.5.20/alarmd.sh +@@ -0,0 +1,5 @@ ++#!/bin/sh ++ ++rm -f /var/lib/alarmd/alarm_queue.xml ++rm -f /var/lib/alarmd/next_alarm_time ++rm -f /var/lib/alarmd/next_alarm_mode +--- alarmd-0.5.20/alarmd.conf ++++ alarmd-0.5.20/alarmd.conf +@@ -0,0 +1,7 @@ ++ ++ ++ ++ /var/lib/alarmd/alarm_queue.xml ++ ++ ++ +--- alarmd-0.5.20/Makefile ++++ alarmd-0.5.20/Makefile +@@ -40,7 +40,6 @@ + PACKAGE=alarmd + TARGETS=alarmd libalarm.la libgtimeout.la libretu.la alarmtool apitest dbustest + +-WARNINGS += -Werror + WARNINGS += -W -Wall -Wpointer-arith -Wundef -Wcast-align + WARNINGS += -Wbad-function-cast -Wwrite-strings -Wsign-compare + WARNINGS += -Waggregate-return -Wmissing-noreturn -Wnested-externs +@@ -113,12 +112,12 @@ + alarmtool_SOURCES := alarmtool.c + + apitest_CFLAGS += -I`pwd`/include +-apitest_DIR := /usr/share/alarmd/tests ++apitest_DIR := ${DESTDIR}/usr/share/alarmd/tests + apitest_LDFLAGS += libalarm.la + apitest_SOURCES := tests/apitest.c + + dbustest_CFLAGS += -I`pwd`/include `pkg-config dbus-glib-1 glib-2.0 --cflags` +-dbustest_DIR := /usr/share/alarmd/tests ++dbustest_DIR := ${DESTDIR}/usr/share/alarmd/tests + dbustest_LDFLAGS += libalarm.la `pkg-config dbus-glib-1 glib-2.0 --libs` + dbustest_SOURCES := tests/dbustest.c + +--- alarmd-0.5.20/debian/changelog ++++ alarmd-0.5.20/debian/changelog +@@ -1,3 +1,15 @@ ++alarmd (0.5.20-mer4) jaunty; urgency=low ++ ++ * Removed obsolete MCE statements (XXX) ++ ++ -- Carsten V. Munk Thu, 07 May 2009 10:13:48 +0000 ++ ++alarmd (0.5.20-mer1) jaunty; urgency=low ++ ++ * Removed -Werror. ++ ++ -- Carsten V. Munk Sat, 10 Jan 2009 14:46:33 +0000 ++ + alarmd (0.5.20) unstable; urgency=low + + * Fix alarmd busylooping. Fixes: NB#83269 diff --git a/alarmd_0.5.20.bb b/alarmd_0.5.20.bb new file mode 100644 index 0000000..72b2767 --- /dev/null +++ b/alarmd_0.5.20.bb @@ -0,0 +1,68 @@ +# Copyright (C) 2009 Kirtika Ruchandani +# Released under the MIT license (see COPYING.MIT for the terms) + +DESCRIPTION = "Cron like daemon functionality" +HOMEPAGE = "http://maemo.org" +LICENSE = "GNU Lesser General Public License-version 2.1" +SECTION = "base" +DEPENDS = "dbus dbus-glib glib-2.0 libconic osso-systemui-dbus-dev dsme mce-dev statusbar-alarm " +PR = "r0" + +SRC_URI = "http://repository.maemo.org/pool/diablo/free/a/${PN}/${PN}_${PV}.tar.gz \ + file://alarmd-patches/mer-changes.patch;patch=1" + + +inherit autotools pkgconfig + +PARALLEL_MAKE = "" +EXTRA_OEMAKE = "LIBTOOL=arm-${DISTRO}-linux-gnueabi-libtool" + + + + +do_configure_prepend(){ + for i in `grep -l -r Werror *`; + do sed -i s:-Werror::g $i; + done +} + + +# FIXME Ugly hack follows +# Need to know why that file is created with +# 0 value for permisions +do_install_prepend(){ + chmod --recursive 777 ${S}/.pc +} + + + +do_install(){ + install -d ${D}${bindir} ${D}${libdir} ${D}${includedir} + install -m 0755 ${S}/.libs/alarmd ${D}${bindir} + install -m 0755 ${S}/.libs/alarmtool ${D}${bindir} + install -m 0755 ${S}/.libs/apitest ${D}${bindir} + install -m 0755 ${S}/.libs/dbustest ${D}${bindir} + oe_libinstall -so libalarm ${D}${libdir} + oe_libinstall -so libretu ${D}${libdir} + oe_libinstall -so libgtimeout ${D}${libdir} + install -m 0644 ${S}/include/*.h ${D}${includedir} +} + +do_stage(){ + install -d ${STAGING_INCDIR} ${STAGING_LIBDIR} + oe_libinstall -so libalarm ${STAGING_LIBDIR} + oe_libinstall -so libretu ${STAGING_LIBDIR} + oe_libinstall -so libgtimeout ${STAGING_LIBDIR} + install -m 0644 ${S}/include/*.h ${STAGING_INCDIR} +} + +PACKAGES += " alarmtool libalarm0" + +#Keeping in tune with Maemo packaging +FILES_${PN} += "${libdir}/libretu.so \ + ${libdir}/libgtimeout.so" +FILES_alarmtool = "${bindir}/alarmtool" + +FILES_libalarm = "${libdir}/libalarm.so.*" + + diff --git a/checksums.ini b/checksums.ini index 5dd90bb..34452df 100644 --- a/checksums.ini +++ b/checksums.ini @@ -27613,3 +27613,7 @@ sha256=399507d68734c503b0b7bc9a9e50f0d02e3c2f541a190d5ba3ae19c21d48a05e [http://repository.maemo.org/pool/fremantle/free/w/wpeditor/wpeditor_2.22-0+0m5.tar.gz] md5=1978e3267262b148739fe70c6ecc5168 sha256=01fcee085c23396899bddfe07378f89055fe12da7f2df439b0adb062f0aa4ca6 + +[http://repository.maemo.org/pool/diablo/free/a/alarmd/alarmd_0.5.20.tar.gz] +md5=9730a07d6990422a92559f9795a694f5 +sha256=0a2cfda6701b344eed3e760089e306c50bfd71699592e4e0711c4609814a23ba