diff options
| author | Sergey Lapin <slapin@ossfans.org> | 2010-03-22 18:13:56 +0300 |
|---|---|---|
| committer | Sergey Lapin <slapin@ossfans.org> | 2010-03-22 18:13:56 +0300 |
| commit | 3937c88166a493900a694ea8fe53b860f4099d83 (patch) | |
| tree | 57597245b6efd4cf27c1f4c9ff21c0515e530c15 /recipes/ffalarms | |
| parent | df2ace6d59e22b42e50bcf4e8a9c92b580602c2e (diff) | |
| parent | 3510d2ed15a4b477aa7af802a839e11a87b981ed (diff) | |
Merge branch 'org.openembedded.dev' of git@git.openembedded.net:openembedded into org.openembedded.dev
Diffstat (limited to 'recipes/ffalarms')
| -rw-r--r-- | recipes/ffalarms/ffalarms/libeflvala.a18c70a312d98cc90e0e7978f845601e82460b39.patch | 30 | ||||
| -rw-r--r-- | recipes/ffalarms/ffalarms_git.bb (renamed from recipes/ffalarms/ffalarms_svn.bb) | 42 |
2 files changed, 19 insertions, 53 deletions
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_svn.bb b/recipes/ffalarms/ffalarms_git.bb index be9fbbec41..6dc6545f41 100644 --- a/recipes/ffalarms/ffalarms_svn.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 <lukpank@o2.pl>" -MAINTAINER = "Lukasz Pankowski <lukpank@o2.pl>" +HOMEPAGE = "http://ffalarms.projects.openmoko.org/" SECTION = "x11/applications" PRIORITY = "optional" +LICENSE = "GPLv3" DEPENDS = "elementary libeflvala 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 = "r1" -PV = "0.3.1+svnr${SRCPV}" -PR = "r2" +SRC_URI = "git://git.shr-project.org/repo/ffalarms.git;protocol=http;branch=master" -# needed because there is do_stage_append in vala.bbclass and do_stage() was removed.. -do_stage() { - -} +SRCREV = "af7deb209172bfd79614aee10e618127bcfc8a32" +S = "${WORKDIR}/git" 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 + 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 <lukpank@o2.pl>" |