[oe-commits] Martin Jansa : ffalarms: fix building agains newer libeflvala

[git version control]

Module: openembedded.git
Branch: org.openembedded.dev
Commit: 23e87adb78cf9ba4f18807d46a7351d09b41d2a2
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=23e87adb78cf9ba4f18807d46a7351d09b41d2a2

Author: Martin Jansa <Martin.Jansa at gmail.com>
Date:   Tue Feb  2 19:16:35 2010 +0100

ffalarms: fix building agains newer libeflvala

* rename SmartCallback to Callback in libeflvala a18c70a312d98cc90e0e7978f845601e82460b39
* drop inwin_style_set in f359a4d36bdcae114b0d88e9215c30455570c232

Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>

---

 ....a18c70a312d98cc90e0e7978f845601e82460b39.patch |   30 ++++++++++++++++++++
 recipes/ffalarms/ffalarms_svn.bb                   |    5 ++-
 2 files changed, 33 insertions(+), 2 deletions(-)

diff --git a/recipes/ffalarms/ffalarms/libeflvala.a18c70a312d98cc90e0e7978f845601e82460b39.patch b/recipes/ffalarms/ffalarms/libeflvala.a18c70a312d98cc90e0e7978f845601e82460b39.patch
new file mode 100644
index 0000000..609cefc
--- /dev/null
+++ b/recipes/ffalarms/ffalarms/libeflvala.a18c70a312d98cc90e0e7978f845601e82460b39.patch
@@ -0,0 +1,30 @@
+Index: ffalarms.vala
+===================================================================
+--- ffalarms.vala	(revision 67)
++++ 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_svn.bb
index 8bc619a..be9fbbe 100644
--- a/recipes/ffalarms/ffalarms_svn.bb
+++ b/recipes/ffalarms/ffalarms_svn.bb
@@ -8,7 +8,7 @@ PRIORITY = "optional"
 DEPENDS = "elementary libeflvala libical"
 
 PV = "0.3.1+svnr${SRCPV}"
-PR = "r1"
+PR = "r2"
 
 # needed because there is do_stage_append in vala.bbclass and do_stage() was removed..
 do_stage() {
@@ -17,7 +17,8 @@ do_stage() {
 
 inherit vala
 
-SRC_URI = "svn://svn.projects.openmoko.org/svnroot/ffalarms;module=trunk;proto=https"
+SRC_URI = "svn://svn.projects.openmoko.org/svnroot/ffalarms;module=trunk;proto=https \
+           file://libeflvala.a18c70a312d98cc90e0e7978f845601e82460b39.patch;patch=1"
 
 S = "${WORKDIR}/trunk"