From 00c31b00f84cb455e86158f91b1cf621ea08160b Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Tue, 23 Feb 2010 17:36:19 +0100 Subject: ffalarms: moved from svn to git, update PV, remove applied patch Signed-off-by: Martin Jansa --- ....a18c70a312d98cc90e0e7978f845601e82460b39.patch | 30 ------------------ recipes/ffalarms/ffalarms_git.bb | 37 ++++++++++++++++++++++ recipes/ffalarms/ffalarms_svn.bb | 37 ---------------------- 3 files changed, 37 insertions(+), 67 deletions(-) delete mode 100644 recipes/ffalarms/ffalarms/libeflvala.a18c70a312d98cc90e0e7978f845601e82460b39.patch create mode 100644 recipes/ffalarms/ffalarms_git.bb delete mode 100644 recipes/ffalarms/ffalarms_svn.bb (limited to 'recipes/ffalarms') diff --git a/recipes/ffalarms/ffalarms/libeflvala.a18c70a312d98cc90e0e7978f845601e82460b39.patch b/recipes/ffalarms/ffalarms/libeflvala.a18c70a312d98cc90e0e7978f845601e82460b39.patch deleted file mode 100644 index dc3f73c672..0000000000 --- a/recipes/ffalarms/ffalarms/libeflvala.a18c70a312d98cc90e0e7978f845601e82460b39.patch +++ /dev/null @@ -1,30 +0,0 @@ -Index: a/ffalarms.vala -=================================================================== ---- a/ffalarms.vala (revision 67) -+++ b/ffalarms.vala (working copy) -@@ -1407,7 +1407,6 @@ - bx.pack_end(bt); - bx.pack_end(frame("pad_small")); - w.inwin_content_set(bx); -- w.inwin_style_set("minimal_vertical"); - bt.show(); - w.inwin_activate(); - } -@@ -1476,7 +1475,7 @@ - this.parent = parent; - } - -- public unowned Button add(string label, Evas.SmartCallback cb) -+ public unowned Button add(string label, Evas.Callback cb) - { - unowned Button b; - -@@ -1505,7 +1504,7 @@ - hover.content_set("top", box); - } - -- public new unowned Button add(string label, Evas.SmartCallback cb) -+ public new unowned Button add(string label, Evas.Callback cb) - { - unowned Button b = base.add(label, cb); - b.smart_callback_add("clicked", hover.hide); diff --git a/recipes/ffalarms/ffalarms_git.bb b/recipes/ffalarms/ffalarms_git.bb new file mode 100644 index 0000000000..3fd9e24017 --- /dev/null +++ b/recipes/ffalarms/ffalarms_git.bb @@ -0,0 +1,37 @@ +DESCRIPTION = "Finger friendly alarms" +HOMEPAGE = "http://ffalarms.projects.openmoko.org/" +LICENSE = "GPLv3" +AUTHOR = "Lukasz Pankowski " +MAINTAINER = "Lukasz Pankowski " +SECTION = "x11/applications" +PRIORITY = "optional" +DEPENDS = "elementary libeflvala libical" + +SRCREV = "b054defaaa5a09a83e1ddbd5b43229bdd1ab107e" +PV = "0.3.2+gitr${SRCPV}" +PR = "r0" + +# needed because there is do_stage_append in vala.bbclass and do_stage() was removed.. +do_stage() { + +} + +inherit vala + +SRC_URI = "git://git.shr-project.org/repo/ffalarms.git;protocol=http;branch=master" + +S = "${WORKDIR}/git" + +FILES_${PN} += "${datadir}/${PN} ${datadir}/applications ${datadir}/pixmaps" + +RDEPENDS = "atd alsa-utils-amixer alsa-utils-alsactl virtual/alsa-scenarios ttf-dejavu-sans libical" + +RSUGGESTS = "mplayer alsa-utils-aplay frameworkd" + +do_compile() { + oe_runmake VAPIDIR=${STAGING_DATADIR}/vala/vapi +} + +do_install() { + oe_runmake install DESTDIR=${D} +} diff --git a/recipes/ffalarms/ffalarms_svn.bb b/recipes/ffalarms/ffalarms_svn.bb deleted file mode 100644 index be9fbbec41..0000000000 --- a/recipes/ffalarms/ffalarms_svn.bb +++ /dev/null @@ -1,37 +0,0 @@ -DESCRIPTION = "Finger friendly alarms" -HOMEPAGE = "http://ffalarms.projects.openmoko.org/" -LICENSE = "GPLv3" -AUTHOR = "Lukasz Pankowski " -MAINTAINER = "Lukasz Pankowski " -SECTION = "x11/applications" -PRIORITY = "optional" -DEPENDS = "elementary libeflvala libical" - -PV = "0.3.1+svnr${SRCPV}" -PR = "r2" - -# needed because there is do_stage_append in vala.bbclass and do_stage() was removed.. -do_stage() { - -} - -inherit vala - -SRC_URI = "svn://svn.projects.openmoko.org/svnroot/ffalarms;module=trunk;proto=https \ - file://libeflvala.a18c70a312d98cc90e0e7978f845601e82460b39.patch;patch=1" - -S = "${WORKDIR}/trunk" - -FILES_${PN} += "${datadir}/${PN} ${datadir}/applications ${datadir}/pixmaps" - -RDEPENDS = "atd alsa-utils-amixer alsa-utils-alsactl virtual/alsa-scenarios ttf-dejavu-sans libical" - -RSUGGESTS = "mplayer alsa-utils-aplay frameworkd" - -do_compile() { - oe_runmake VAPIDIR=${STAGING_DATADIR}/vala/vapi -} - -do_install() { - oe_runmake install DESTDIR=${D} -} -- cgit v1.2.3 From ef928c44368a9ed8ed2cdbfe52a6888df6de159b Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Tue, 23 Feb 2010 17:53:37 +0100 Subject: ffalarms: oe-stylize Signed-off-by: Martin Jansa --- recipes/ffalarms/ffalarms_git.bb | 36 ++++++++++++++++-------------------- 1 file changed, 16 insertions(+), 20 deletions(-) (limited to 'recipes/ffalarms') diff --git a/recipes/ffalarms/ffalarms_git.bb b/recipes/ffalarms/ffalarms_git.bb index 3fd9e24017..4e1b164f1c 100644 --- a/recipes/ffalarms/ffalarms_git.bb +++ b/recipes/ffalarms/ffalarms_git.bb @@ -1,37 +1,33 @@ DESCRIPTION = "Finger friendly alarms" -HOMEPAGE = "http://ffalarms.projects.openmoko.org/" -LICENSE = "GPLv3" AUTHOR = "Lukasz Pankowski " -MAINTAINER = "Lukasz Pankowski " +HOMEPAGE = "http://ffalarms.projects.openmoko.org/" SECTION = "x11/applications" PRIORITY = "optional" +LICENSE = "GPLv3" DEPENDS = "elementary libeflvala libical" - -SRCREV = "b054defaaa5a09a83e1ddbd5b43229bdd1ab107e" +RDEPENDS = "atd alsa-utils-amixer alsa-utils-alsactl virtual/alsa-scenarios ttf-dejavu-sans libical" +RSUGGESTS = "mplayer alsa-utils-aplay frameworkd" PV = "0.3.2+gitr${SRCPV}" PR = "r0" -# needed because there is do_stage_append in vala.bbclass and do_stage() was removed.. -do_stage() { - -} - -inherit vala - SRC_URI = "git://git.shr-project.org/repo/ffalarms.git;protocol=http;branch=master" +SRCREV = "b054defaaa5a09a83e1ddbd5b43229bdd1ab107e" S = "${WORKDIR}/git" -FILES_${PN} += "${datadir}/${PN} ${datadir}/applications ${datadir}/pixmaps" - -RDEPENDS = "atd alsa-utils-amixer alsa-utils-alsactl virtual/alsa-scenarios ttf-dejavu-sans libical" - -RSUGGESTS = "mplayer alsa-utils-aplay frameworkd" +inherit vala do_compile() { - oe_runmake VAPIDIR=${STAGING_DATADIR}/vala/vapi + oe_runmake VAPIDIR=${STAGING_DATADIR}/vala/vapi } - do_install() { - oe_runmake install DESTDIR=${D} + oe_runmake install DESTDIR=${D} } +# needed because there is do_stage_append in vala.bbclass and do_stage() was removed.. +do_stage() { + +} + +FILES_${PN} += "${datadir}/${PN} ${datadir}/applications ${datadir}/pixmaps" + +MAINTAINER = "Lukasz Pankowski " -- cgit v1.2.3 From 6eb74e2f10a11e241d8b32dff2327a3e4266becf Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Tue, 23 Feb 2010 18:01:04 +0100 Subject: ffalarms: kill SRCPV --- recipes/ffalarms/ffalarms_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'recipes/ffalarms') diff --git a/recipes/ffalarms/ffalarms_git.bb b/recipes/ffalarms/ffalarms_git.bb index 4e1b164f1c..f054fe4b20 100644 --- a/recipes/ffalarms/ffalarms_git.bb +++ b/recipes/ffalarms/ffalarms_git.bb @@ -7,7 +7,7 @@ LICENSE = "GPLv3" DEPENDS = "elementary libeflvala libical" RDEPENDS = "atd alsa-utils-amixer alsa-utils-alsactl virtual/alsa-scenarios ttf-dejavu-sans libical" RSUGGESTS = "mplayer alsa-utils-aplay frameworkd" -PV = "0.3.2+gitr${SRCPV}" +PV = "0.3.2+gitr${SRCREV}" PR = "r0" SRC_URI = "git://git.shr-project.org/repo/ffalarms.git;protocol=http;branch=master" -- cgit v1.2.3 From 68f8a8b618174270275d8d785ff9b30415ee92a1 Mon Sep 17 00:00:00 2001 From: Sebastian Spaeth Date: Thu, 4 Mar 2010 14:39:03 +0100 Subject: ffalarms: bump git version as current vala syntax failed The .next() iterator has changed to .get_next(), so we need to bump ffalarms for current vala. Signed-off-by: Sebastian Spaeth --- recipes/ffalarms/ffalarms_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'recipes/ffalarms') diff --git a/recipes/ffalarms/ffalarms_git.bb b/recipes/ffalarms/ffalarms_git.bb index f054fe4b20..6628907694 100644 --- a/recipes/ffalarms/ffalarms_git.bb +++ b/recipes/ffalarms/ffalarms_git.bb @@ -12,7 +12,7 @@ PR = "r0" SRC_URI = "git://git.shr-project.org/repo/ffalarms.git;protocol=http;branch=master" -SRCREV = "b054defaaa5a09a83e1ddbd5b43229bdd1ab107e" +SRCREV = "af7deb209172bfd79614aee10e618127bcfc8a32" S = "${WORKDIR}/git" inherit vala -- cgit v1.2.3 From 5b51c0a7b8a47ee725f3745105f0307afc542d83 Mon Sep 17 00:00:00 2001 From: Sebastian Spaeth Date: Fri, 5 Mar 2010 11:27:14 +0100 Subject: ffalarms: directly RDEPEND on alsa-scenarii-shr virtual/alsa-scenarios is usually (and correctly) provided by fsodeviced directly. However, the current ffalarms code is explicitely looking for the location of alsa-scenarii-shr, so it makes sense to just depend on that until the source code has been updated. Signed-off-by: Sebastian Spaeth --- recipes/ffalarms/ffalarms_git.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'recipes/ffalarms') diff --git a/recipes/ffalarms/ffalarms_git.bb b/recipes/ffalarms/ffalarms_git.bb index 6628907694..6dc6545f41 100644 --- a/recipes/ffalarms/ffalarms_git.bb +++ b/recipes/ffalarms/ffalarms_git.bb @@ -5,10 +5,10 @@ SECTION = "x11/applications" PRIORITY = "optional" LICENSE = "GPLv3" DEPENDS = "elementary libeflvala libical" -RDEPENDS = "atd alsa-utils-amixer alsa-utils-alsactl virtual/alsa-scenarios ttf-dejavu-sans libical" +RDEPENDS = "atd alsa-utils-amixer alsa-utils-alsactl alsa-scenarii-shr ttf-dejavu-sans libical" RSUGGESTS = "mplayer alsa-utils-aplay frameworkd" PV = "0.3.2+gitr${SRCREV}" -PR = "r0" +PR = "r1" SRC_URI = "git://git.shr-project.org/repo/ffalarms.git;protocol=http;branch=master" -- cgit v1.2.3