From f04f12f919d5502e64d1b31ef96701660f0ce72c Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Thu, 1 Dec 2011 17:30:05 +0100 Subject: [PATCH] libeflvala: try to fix build (From meta-openembedded rev: 4ae0bea8d39f6dab75b99dcc19410ee086fcdae7) Signed-off-by: Martin Jansa Signed-off-by: Patrick Ohly --- ...a-update-genlist-gengrid-callbacks-s-labe.patch | 97 ++++++++++++++++++++++ .../meta-efl/recipes-efl/efl/libeflvala_svn.bb | 4 +- 2 files changed, 100 insertions(+), 1 deletion(-) create mode 100644 meta-openembedded/meta-efl/recipes-efl/efl/libeflvala/0001-BINDINS-vala-update-genlist-gengrid-callbacks-s-labe.patch diff --git a/meta-openembedded/meta-efl/recipes-efl/efl/libeflvala/0001-BINDINS-vala-update-genlist-gengrid-callbacks-s-labe.patch b/meta-openembedded/meta-efl/recipes-efl/efl/libeflvala/0001-BINDINS-vala-update-genlist-gengrid-callbacks-s-labe.patch new file mode 100644 index 0000000..90c0de6 --- /dev/null +++ b/meta-openembedded/meta-efl/recipes-efl/efl/libeflvala/0001-BINDINS-vala-update-genlist-gengrid-callbacks-s-labe.patch @@ -0,0 +1,97 @@ +From 3e51778fdba36c81204b9eca81e67624c6401972 Mon Sep 17 00:00:00 2001 +From: Martin Jansa +Date: Thu, 1 Dec 2011 17:28:38 +0100 +Subject: [PATCH] BINDINS/vala: update genlist/gengrid callbacks + s/label_get/text_get/g + +Signed-off-by: Martin Jansa +--- + BINDINGS/vala/examples/elementary/genlist.vala | 2 +- + BINDINGS/vala/vapi/elementary.vapi | 16 ++++++++-------- + 2 files changed, 9 insertions(+), 9 deletions(-) + +diff --git a/examples/elementary/genlist.vala b/examples/elementary/genlist.vala +index b9fb42b..3a4a3b1 100644 +--- a/examples/elementary/genlist.vala ++++ b/examples/elementary/genlist.vala +@@ -53,7 +53,7 @@ public class T.Genlist : T.Abstract + public static string getText( Elm.Object obj, string part ) + { + int number = (int)obj; +- debug( "label_get: %p", obj ); ++ debug( "text_get: %p", obj ); + return "This is list item #%d".printf( number ); + } + public static Elm.Object? getContent( Elm.Object obj, string part ) +diff --git a/vapi/elementary.vapi b/vapi/elementary.vapi +index 8a6cc17..90b50f5c7 100644 +--- a/vapi/elementary.vapi ++++ b/vapi/elementary.vapi +@@ -842,7 +842,7 @@ public class MenuItem + public Elm.Object object_get(); + public void label_set( string label ); + //public void del_cb_set( ... ); +- public unowned string label_get(); ++ public unowned string text_get(); + public void icon_set( Elm.Object icon ); + public void disabled_set( bool disabled ); + public void* item_data_get(); +@@ -908,7 +908,7 @@ public class Slider : Elm.Object + public Slider( Elm.Object? parent ); + + public void label_set( string label ); +- public unowned string label_get(); ++ public unowned string text_get(); + public void icon_set( Elm.Object icon ); + public Elm.Object icon_get(); + public void span_size_set( Evas.Coord size ); +@@ -931,8 +931,8 @@ public enum GenlistItemFlags + SUBITEMS, + } + +-[CCode (cname = "Elm_Gen_Item_Label_Get_Cb", has_target = false)] +-public delegate string GenlistItemLabelGetFunc( Elm.Object obj, string part ); ++[CCode (cname = "Elm_Gen_Item_Text_Get_Cb", has_target = false)] ++public delegate string GenlistItemTextGetFunc( Elm.Object obj, string part ); + [CCode (cname = "Elm_Gen_Item_Content_Get_Cb", has_target = false)] + public delegate Elm.Object? GenlistItemContentGetFunc( Elm.Object obj, string part ); + [CCode (cname = "Elm_Gen_Item_State_Get_Cb", has_target = false)] +@@ -944,7 +944,7 @@ public delegate void GenlistItemDelFunc( Elm.Object obj ); + [CCode (cname = "Elm_Gen_Item_Class_Func", destroy_function = "")] + public struct GenlistItemClassFunc + { +- public GenlistItemLabelGetFunc text_get; ++ public GenlistItemTextGetFunc text_get; + public GenlistItemContentGetFunc content_get; + public GenlistItemStateGetFunc state_get; + public GenlistItemDelFunc del; +@@ -1027,7 +1027,7 @@ public class Check : Elm.Object + public Check( Elm.Object? parent ); + + public void label_set( string label ); +- public unowned string label_get(); ++ public unowned string text_get(); + public void icon_set( Elm.Object icon ); + public Elm.Object icon_get(); + public void state_set( bool state ); +@@ -1044,7 +1044,7 @@ public class Radio : Elm.Object + public Radio( Elm.Object? parent ); + + public void label_set( string label ); +- public unowned string label_get(); ++ public unowned string text_get(); + public void icon_set( Elm.Object icon ); + public Elm.Object icon_get(); + public void group_add( Elm.Object group ); +@@ -1256,7 +1256,7 @@ public class ListItem + public void selected_set( bool selected ); + public void show(); + public void* data_get(); +- public unowned string label_get(); ++ public unowned string text_get(); + public void label_set( string label ); + public Elm.Object icon_get(); + public void icon_set( Elm.Object icon ); +-- +1.7.8.rc4 + diff --git a/meta-openembedded/meta-efl/recipes-efl/efl/libeflvala_svn.bb b/meta-openembedded/meta-efl/recipes-efl/efl/libeflvala_svn.bb index f70f953..e2450aa 100644 --- a/meta-openembedded/meta-efl/recipes-efl/efl/libeflvala_svn.bb +++ b/meta-openembedded/meta-efl/recipes-efl/efl/libeflvala_svn.bb @@ -12,7 +12,9 @@ SRCNAME = "vala" inherit e-base autotools pkgconfig vala -SRC_URI = "${E_SVN}/trunk/BINDINGS;module=${SRCNAME};proto=http" +SRC_URI = "${E_SVN}/trunk/BINDINGS;module=${SRCNAME};proto=http \ + file://0001-BINDINS-vala-update-genlist-gengrid-callbacks-s-labe.patch \ +" S = "${WORKDIR}/${SRCNAME}" PACKAGES =+ "${PN}-examples" -- 2.7.4