diff options
| author |   Martin Jansa <Martin.Jansa@gmail.com> | 2010-02-23 17:36:19 +0100 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2010-02-23 17:58:03 +0100 |
| commit | 00c31b00f84cb455e86158f91b1cf621ea08160b (patch) | |
| tree | 5abc5cd217a5723e903d0eea3721fec11dfb8691 | |
| parent | 5c3846f9bbf1dbb4a9ee1d916107747c2f9dc909 (diff) | |
| download | openembedded-00c31b00f84cb455e86158f91b1cf621ea08160b.tar.gz | |
ffalarms: moved from svn to git, update PV, remove applied patch
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
| -rw-r--r-- | conf/distro/include/sane-srcrevs.inc | 1 | ||||
| -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) | 10 |
3 files changed, 5 insertions, 36 deletions
diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc index 545cc87d76..e62e1c70d4 100644 --- a/conf/distro/include/sane-srcrevs.inc +++ b/conf/distro/include/sane-srcrevs.inc @@ -72,7 +72,6 @@ SRCREV_pn-ezx-boot-usb-native ?= "2371" SRCREV_pn-ezx-gen-blob ?= "2426" SRCREV_pn-ezxd ?= "2074" SRCREV_pn-fbgrab-viewer-native ?= "1943" -SRCREV_pn-ffalarms ?= "67" SRCREV_pn-flashrom ?= "3682" SRCREV_pn-fltk2 ?= "6916" SRCREV_pn-frameworkd-config-shr ?= "ec04ab4bc92f9d4c4e398df9a2ee1330e3660373" 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..3fd9e24017 100644 --- a/recipes/ffalarms/ffalarms_svn.bb +++ b/recipes/ffalarms/ffalarms_git.bb @@ -7,8 +7,9 @@ SECTION = "x11/applications" PRIORITY = "optional" DEPENDS = "elementary libeflvala libical" -PV = "0.3.1+svnr${SRCPV}" -PR = "r2" +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() { @@ -17,10 +18,9 @@ do_stage() { inherit vala -SRC_URI = "svn://svn.projects.openmoko.org/svnroot/ffalarms;module=trunk;proto=https \ - file://libeflvala.a18c70a312d98cc90e0e7978f845601e82460b39.patch;patch=1" +SRC_URI = "git://git.shr-project.org/repo/ffalarms.git;protocol=http;branch=master" -S = "${WORKDIR}/trunk" +S = "${WORKDIR}/git" FILES_${PN} += "${datadir}/${PN} ${datadir}/applications ${datadir}/pixmaps" |