summaryrefslogtreecommitdiffstats
path: root/meta-efl/recipes-efl
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2011-12-13 09:49:07 +0100
committerMartin Jansa <Martin.Jansa@gmail.com>2011-12-20 14:53:58 +0100
commit458f724d9bdb716b6907ea797a92fe0f67f1f72b (patch)
treee18337d08518cf6aa916823e238d52b14671bd37 /meta-efl/recipes-efl
parent5b1dff8b4f52873060b75813eeba864d64a70083 (diff)
downloadmeta-openembedded-458f724d9bdb716b6907ea797a92fe0f67f1f72b.tar.gz
e-base: bump EFL_SRCREV remove EFL_SRCREV_1.* and applied patches from libeflvala, elsa and python-elementary
* elementary (Evas_GL) and e-wm (backlight) depends on trunk again.. 10:06:36 < JaMa> shouldn't elementary and e17 depend only on efl-1.1? | ./Elementary.h:372:21: fatal error: Evas_GL.h: No such file or directory and e/src/bin/e_backlight.c:43: undefined reference to `ecore_x_randr_output_backlight_available' 10:07:32 < JaMa> but I'll recheck my configs 10:08:20 < moa> hum, that evas_gl.h would be a problem indeed 10:08:36 < moa> for e, i don't know 10:08:57 <@raster> elm requires svn evas 10:09:02 <@raster> thats unfortunately how it is 10:09:12 <@raster> requires evas_gl 10:09:35 < JaMa> maybe this is missing in 1.1 branch for e17? r65838 10:09:42 <@raster> yes 10:09:46 <@raster> its missing 10:09:50 <@raster> as its in trunk 10:09:53 <@raster> its a "new feature" 10:09:58 <@raster> not in stable 10:10:15 <@raster> uy'd have to patch out the support to make elm from svn build 10:10:42 < JaMa> raster: ok then I just didn't understand the dependency on "only" efl-1.1 right.. I'll update the rest of efl to same rev (instead of keeping them on 1.1 release) Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-efl/recipes-efl')
-rw-r--r--meta-efl/recipes-efl/e17/expedite_svn.bb2
-rw-r--r--meta-efl/recipes-efl/efl/ecore_svn.bb2
-rw-r--r--meta-efl/recipes-efl/efl/edbus_svn.bb2
-rw-r--r--meta-efl/recipes-efl/efl/edje_svn.bb2
-rw-r--r--meta-efl/recipes-efl/efl/eet_svn.bb2
-rw-r--r--meta-efl/recipes-efl/efl/eeze_svn.bb2
-rw-r--r--meta-efl/recipes-efl/efl/efreet_svn.bb2
-rw-r--r--meta-efl/recipes-efl/efl/eina_svn.bb2
-rw-r--r--meta-efl/recipes-efl/efl/elsa/0001-elsa-fix-to-build-really-without-PAM-support-if-PAM-.patch179
-rw-r--r--meta-efl/recipes-efl/efl/elsa_svn.bb1
-rw-r--r--meta-efl/recipes-efl/efl/embryo_svn.bb2
-rw-r--r--meta-efl/recipes-efl/efl/evas_svn.bb2
-rw-r--r--meta-efl/recipes-efl/efl/libeflvala/0001-BINDINS-vala-update-genlist-gengrid-callbacks-s-labe.patch97
-rw-r--r--meta-efl/recipes-efl/efl/libeflvala_svn.bb1
14 files changed, 10 insertions, 288 deletions
diff --git a/meta-efl/recipes-efl/e17/expedite_svn.bb b/meta-efl/recipes-efl/e17/expedite_svn.bb
index dfcbcde08..e6dc0515f 100644
--- a/meta-efl/recipes-efl/e17/expedite_svn.bb
+++ b/meta-efl/recipes-efl/e17/expedite_svn.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Expedite is a comprehensive benchmarking suite for Evas"
2DEPENDS = "eet evas" 2DEPENDS = "eet evas"
3LICENSE = "MIT BSD" 3LICENSE = "MIT BSD"
4 4
5SRCREV = "${EFL_SRCREV_1.1.0}" 5SRCREV = "${EFL_SRCREV}"
6PV = "1.1.0+svnr${SRCPV}" 6PV = "1.1.0+svnr${SRCPV}"
7PR = "r1" 7PR = "r1"
8 8
diff --git a/meta-efl/recipes-efl/efl/ecore_svn.bb b/meta-efl/recipes-efl/efl/ecore_svn.bb
index 5cad73d8f..1d3706f27 100644
--- a/meta-efl/recipes-efl/efl/ecore_svn.bb
+++ b/meta-efl/recipes-efl/efl/ecore_svn.bb
@@ -1,6 +1,6 @@
1require ecore.inc 1require ecore.inc
2 2
3SRCREV = "${EFL_SRCREV_1.1.0}" 3SRCREV = "${EFL_SRCREV}"
4PV = "1.1.0+svnr${SRCPV}" 4PV = "1.1.0+svnr${SRCPV}"
5PR = "${INC_PR}.0" 5PR = "${INC_PR}.0"
6DEFAULT_PREFERENCE = "-1" 6DEFAULT_PREFERENCE = "-1"
diff --git a/meta-efl/recipes-efl/efl/edbus_svn.bb b/meta-efl/recipes-efl/efl/edbus_svn.bb
index 5d79c022f..ebe4312a8 100644
--- a/meta-efl/recipes-efl/efl/edbus_svn.bb
+++ b/meta-efl/recipes-efl/efl/edbus_svn.bb
@@ -1,6 +1,6 @@
1require edbus.inc 1require edbus.inc
2 2
3SRCREV = "${EFL_SRCREV_1.1.0}" 3SRCREV = "${EFL_SRCREV}"
4PV = "1.1.0+svnr${SRCPV}" 4PV = "1.1.0+svnr${SRCPV}"
5PR = "${INC_PR}.0" 5PR = "${INC_PR}.0"
6DEFAULT_PREFERENCE = "-1" 6DEFAULT_PREFERENCE = "-1"
diff --git a/meta-efl/recipes-efl/efl/edje_svn.bb b/meta-efl/recipes-efl/efl/edje_svn.bb
index c3e1a95b8..1fedfbcd5 100644
--- a/meta-efl/recipes-efl/efl/edje_svn.bb
+++ b/meta-efl/recipes-efl/efl/edje_svn.bb
@@ -1,6 +1,6 @@
1require edje.inc 1require edje.inc
2 2
3SRCREV = "${EFL_SRCREV_1.1.0}" 3SRCREV = "${EFL_SRCREV}"
4PV = "1.1.0+svnr${SRCPV}" 4PV = "1.1.0+svnr${SRCPV}"
5PR = "${INC_PR}.0" 5PR = "${INC_PR}.0"
6DEFAULT_PREFERENCE = "-1" 6DEFAULT_PREFERENCE = "-1"
diff --git a/meta-efl/recipes-efl/efl/eet_svn.bb b/meta-efl/recipes-efl/efl/eet_svn.bb
index aad311b8f..42439cba9 100644
--- a/meta-efl/recipes-efl/efl/eet_svn.bb
+++ b/meta-efl/recipes-efl/efl/eet_svn.bb
@@ -1,6 +1,6 @@
1require eet.inc 1require eet.inc
2 2
3SRCREV = "${EFL_SRCREV_1.1.0}" 3SRCREV = "${EFL_SRCREV}"
4PV = "1.5.0+svnr${SRCPV}" 4PV = "1.5.0+svnr${SRCPV}"
5PR = "${INC_PR}.0" 5PR = "${INC_PR}.0"
6DEFAULT_PREFERENCE = "-1" 6DEFAULT_PREFERENCE = "-1"
diff --git a/meta-efl/recipes-efl/efl/eeze_svn.bb b/meta-efl/recipes-efl/efl/eeze_svn.bb
index b7986e118..901634859 100644
--- a/meta-efl/recipes-efl/efl/eeze_svn.bb
+++ b/meta-efl/recipes-efl/efl/eeze_svn.bb
@@ -1,6 +1,6 @@
1require eeze.inc 1require eeze.inc
2 2
3SRCREV = "${EFL_SRCREV_1.1.0}" 3SRCREV = "${EFL_SRCREV}"
4PV = "1.1.0+svnr${SRCPV}" 4PV = "1.1.0+svnr${SRCPV}"
5PR = "${INC_PR}.0" 5PR = "${INC_PR}.0"
6DEFAULT_PREFERENCE = "-1" 6DEFAULT_PREFERENCE = "-1"
diff --git a/meta-efl/recipes-efl/efl/efreet_svn.bb b/meta-efl/recipes-efl/efl/efreet_svn.bb
index 6c7661cea..a711770ec 100644
--- a/meta-efl/recipes-efl/efl/efreet_svn.bb
+++ b/meta-efl/recipes-efl/efl/efreet_svn.bb
@@ -1,6 +1,6 @@
1require efreet.inc 1require efreet.inc
2 2
3SRCREV = "${EFL_SRCREV_1.1.0}" 3SRCREV = "${EFL_SRCREV}"
4PV = "1.1.0+svnr${SRCPV}" 4PV = "1.1.0+svnr${SRCPV}"
5PR = "${INC_PR}.0" 5PR = "${INC_PR}.0"
6DEFAULT_PREFERENCE = "-1" 6DEFAULT_PREFERENCE = "-1"
diff --git a/meta-efl/recipes-efl/efl/eina_svn.bb b/meta-efl/recipes-efl/efl/eina_svn.bb
index b5104491e..8256387e8 100644
--- a/meta-efl/recipes-efl/efl/eina_svn.bb
+++ b/meta-efl/recipes-efl/efl/eina_svn.bb
@@ -1,6 +1,6 @@
1require eina.inc 1require eina.inc
2 2
3SRCREV = "${EFL_SRCREV_1.1.0}" 3SRCREV = "${EFL_SRCREV}"
4PV = "1.1.0+svnr${SRCPV}" 4PV = "1.1.0+svnr${SRCPV}"
5PR = "${INC_PR}.0" 5PR = "${INC_PR}.0"
6DEFAULT_PREFERENCE = "-1" 6DEFAULT_PREFERENCE = "-1"
diff --git a/meta-efl/recipes-efl/efl/elsa/0001-elsa-fix-to-build-really-without-PAM-support-if-PAM-.patch b/meta-efl/recipes-efl/efl/elsa/0001-elsa-fix-to-build-really-without-PAM-support-if-PAM-.patch
deleted file mode 100644
index 2ccdb7206..000000000
--- a/meta-efl/recipes-efl/efl/elsa/0001-elsa-fix-to-build-really-without-PAM-support-if-PAM-.patch
+++ /dev/null
@@ -1,179 +0,0 @@
1From 0f97df8ddf1af3b7c8d670b8600a51e2ebe4e855 Mon Sep 17 00:00:00 2001
2From: Klaus 'mrmoku' Kurzmann <mok@mnet-online.de>
3Date: Sat, 19 Nov 2011 15:36:57 +0100
4Subject: [PATCH 1/2] elsa: fix to build really without PAM support if PAM is
5 disabled or not available
6
7* there as still issues in runtime without PAM, but at least it builds
8 now without PAM support and it's good start
9
10Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
11---
12 PROTO/elsa/configure.ac | 2 +-
13 PROTO/elsa/src/daemon/Makefile.am | 6 ++++--
14 PROTO/elsa/src/daemon/elsa.c | 8 ++++++++
15 PROTO/elsa/src/daemon/elsa.h | 2 ++
16 PROTO/elsa/src/daemon/elsa_session.c | 11 +++++++++--
17 5 files changed, 24 insertions(+), 5 deletions(-)
18
19diff --git a/configure.ac b/configure.ac
20index ac85872..82d0a3f 100644
21--- a/configure.ac
22+++ b/configure.ac
23@@ -123,7 +123,6 @@ if test "x${enable_pam}" = "xyes" ; then
24 fi
25
26
27-
28 ### Checks for header files
29
30 # Pam
31@@ -133,6 +132,7 @@ if test "x${have_pam}" = "xyes" ; then
32 [have_pam="no"])
33 fi
34
35+AM_CONDITIONAL(HAVE_PAM, [test "x${have_pam}" = "xyes"])
36
37 ### Checks for types
38
39diff --git a/src/daemon/Makefile.am b/src/daemon/Makefile.am
40index cf1cd72..7919d90 100644
41--- a/src/daemon/Makefile.am
42+++ b/src/daemon/Makefile.am
43@@ -29,8 +29,6 @@ elsa_session.h \
44 elsa_session.c \
45 elsa_xserver.h \
46 elsa_xserver.c \
47-elsa_pam.h \
48-elsa_pam.c \
49 ../event/elsa_event.c \
50 ../event/elsa_event.h \
51 elsa_server.h \
52@@ -42,6 +40,10 @@ elsa_action.c \
53 elsa.h \
54 elsa.c
55
56+if HAVE_PAM
57+elsa_SOURCES += elsa_pam.h elsa_pam.c
58+endif
59+
60 elsa_LDFLAGS =
61 elsa_LDADD = @ELSA_LIBS@ -lpam -lrt
62
63diff --git a/src/daemon/elsa.c b/src/daemon/elsa.c
64index 8bc243f..23f971d 100644
65--- a/src/daemon/elsa.c
66+++ b/src/daemon/elsa.c
67@@ -278,7 +278,9 @@ main (int argc, char ** argv)
68 }
69
70 elsa_user = getenv("ELSA_USER");
71+#ifdef HAVE_PAM
72 elsa_pam_init(PACKAGE, dname, elsa_user);
73+#endif
74 if (elsa_user)
75 {
76 char *quit;
77@@ -295,7 +297,9 @@ main (int argc, char ** argv)
78 exit(0);
79 }
80 sleep(3);
81+#ifdef HAVE_PAM
82 elsa_pam_init(PACKAGE, dname, NULL);
83+#endif
84 }
85 else
86 fprintf(stderr, "\n");
87@@ -322,7 +326,9 @@ main (int argc, char ** argv)
88 xcb_connection_t *disp = NULL;
89 disp = xcb_connect(dname, NULL);
90 ecore_main_loop_begin();
91+#ifdef HAVE_PAM
92 elsa_pam_item_set(ELSA_PAM_ITEM_USER, elsa_config->userlogin);
93+#endif
94 elsa_session_login(elsa_config->command.session_login, EINA_FALSE);
95 sleep(30);
96 xcb_disconnect(disp);
97@@ -347,8 +353,10 @@ main (int argc, char ** argv)
98 }
99 elsa_xserver_shutdown();
100 fprintf(stderr, PACKAGE": xserver shutdown\n");
101+#ifdef HAVE_PAM
102 elsa_pam_shutdown();
103 fprintf(stderr, PACKAGE": pam shutdown\n");
104+#endif
105 ecore_shutdown();
106 elsa_config_shutdown();
107 fprintf(stderr, PACKAGE": config shutdown\n");
108diff --git a/src/daemon/elsa.h b/src/daemon/elsa.h
109index 87d9f49..46f2584 100644
110--- a/src/daemon/elsa.h
111+++ b/src/daemon/elsa.h
112@@ -13,7 +13,9 @@
113 #include <Ecore_File.h>
114
115 #include "elsa_session.h"
116+#ifdef HAVE_PAM
117 #include "elsa_pam.h"
118+#endif
119 #include "elsa_config.h"
120 #include "elsa_xserver.h"
121 #include "elsa_server.h"
122diff --git a/src/daemon/elsa_session.c b/src/daemon/elsa_session.c
123index 3da70b3..d926db9 100644
124--- a/src/daemon/elsa_session.c
125+++ b/src/daemon/elsa_session.c
126@@ -91,7 +91,6 @@ _elsa_session_userid_set(struct passwd *pwd)
127 static Eina_Bool
128 _elsa_session_begin(struct passwd *pwd, const char *cookie)
129 {
130- char *term;
131 fprintf(stderr, PACKAGE": Session Init\n");
132 if (pwd->pw_shell[0] == '\0')
133 {
134@@ -99,7 +98,8 @@ _elsa_session_begin(struct passwd *pwd, const char *cookie)
135 strcpy(pwd->pw_shell, getusershell());
136 endusershell();
137 }
138- term = getenv("TERM");
139+#ifdef HAVE_PAM
140+ char *term = getenv("TERM");
141 if (term) elsa_pam_env_set("TERM", term);
142 elsa_pam_env_set("HOME", pwd->pw_dir);
143 elsa_pam_env_set("SHELL", pwd->pw_shell);
144@@ -109,6 +109,7 @@ _elsa_session_begin(struct passwd *pwd, const char *cookie)
145 elsa_pam_env_set("DISPLAY", ":0.0");
146 elsa_pam_env_set("MAIL", "");
147 elsa_pam_env_set("XAUTHORITY", cookie);
148+#endif
149 return EINA_TRUE;
150 }
151
152@@ -164,9 +165,11 @@ elsa_session_end(const char *user)
153 "%s %s ", elsa_config->command.session_stop, user);
154 if (-1 == system(buf))
155 fprintf(stderr, PACKAGE": Error on session stop command %s", buf);
156+#ifdef HAVE_PAM
157 elsa_pam_close_session();
158 elsa_pam_end();
159 elsa_pam_shutdown();
160+#endif
161 }
162
163 void
164@@ -234,8 +237,12 @@ elsa_session_shutdown()
165 Eina_Bool
166 elsa_session_authenticate(const char *login, const char *passwd)
167 {
168+#ifdef HAVE_PAM
169 return (!elsa_pam_auth_set(login, passwd)
170 && !elsa_pam_authenticate());
171+#else
172+ return (EINA_TRUE);
173+#endif
174 }
175
176 Eina_Bool
177--
1781.7.8.rc4
179
diff --git a/meta-efl/recipes-efl/efl/elsa_svn.bb b/meta-efl/recipes-efl/efl/elsa_svn.bb
index c21c2e560..949c7e1f8 100644
--- a/meta-efl/recipes-efl/efl/elsa_svn.bb
+++ b/meta-efl/recipes-efl/efl/elsa_svn.bb
@@ -7,7 +7,6 @@ SECTION = "e/apps"
7inherit e gettext 7inherit e gettext
8SRC_URI = "${E_SVN}/trunk/PROTO;module=${SRCNAME};proto=http;scmdata=keep \ 8SRC_URI = "${E_SVN}/trunk/PROTO;module=${SRCNAME};proto=http;scmdata=keep \
9 file://0001-pam-use-common-auth-instead-of-system-auth.patch \ 9 file://0001-pam-use-common-auth-instead-of-system-auth.patch \
10 file://0001-elsa-fix-to-build-really-without-PAM-support-if-PAM-.patch \
11 file://xserver-nodm.service \ 10 file://xserver-nodm.service \
12" 11"
13S = "${WORKDIR}/${SRCNAME}" 12S = "${WORKDIR}/${SRCNAME}"
diff --git a/meta-efl/recipes-efl/efl/embryo_svn.bb b/meta-efl/recipes-efl/efl/embryo_svn.bb
index 7c185e771..ad1bb1017 100644
--- a/meta-efl/recipes-efl/efl/embryo_svn.bb
+++ b/meta-efl/recipes-efl/efl/embryo_svn.bb
@@ -1,6 +1,6 @@
1require embryo.inc 1require embryo.inc
2 2
3SRCREV = "${EFL_SRCREV_1.1.0}" 3SRCREV = "${EFL_SRCREV}"
4PV = "1.1.0+svnr${SRCPV}" 4PV = "1.1.0+svnr${SRCPV}"
5PR = "${INC_PR}.0" 5PR = "${INC_PR}.0"
6DEFAULT_PREFERENCE = "-1" 6DEFAULT_PREFERENCE = "-1"
diff --git a/meta-efl/recipes-efl/efl/evas_svn.bb b/meta-efl/recipes-efl/efl/evas_svn.bb
index 284891e5a..a2641b984 100644
--- a/meta-efl/recipes-efl/efl/evas_svn.bb
+++ b/meta-efl/recipes-efl/efl/evas_svn.bb
@@ -1,6 +1,6 @@
1require evas.inc 1require evas.inc
2 2
3SRCREV = "${EFL_SRCREV_1.1.0}" 3SRCREV = "${EFL_SRCREV}"
4PV = "1.1.0+svnr${SRCPV}" 4PV = "1.1.0+svnr${SRCPV}"
5PR = "${INC_PR}.0" 5PR = "${INC_PR}.0"
6DEFAULT_PREFERENCE = "-1" 6DEFAULT_PREFERENCE = "-1"
diff --git a/meta-efl/recipes-efl/efl/libeflvala/0001-BINDINS-vala-update-genlist-gengrid-callbacks-s-labe.patch b/meta-efl/recipes-efl/efl/libeflvala/0001-BINDINS-vala-update-genlist-gengrid-callbacks-s-labe.patch
deleted file mode 100644
index 90c0de6e2..000000000
--- a/meta-efl/recipes-efl/efl/libeflvala/0001-BINDINS-vala-update-genlist-gengrid-callbacks-s-labe.patch
+++ /dev/null
@@ -1,97 +0,0 @@
1From 3e51778fdba36c81204b9eca81e67624c6401972 Mon Sep 17 00:00:00 2001
2From: Martin Jansa <Martin.Jansa@gmail.com>
3Date: Thu, 1 Dec 2011 17:28:38 +0100
4Subject: [PATCH] BINDINS/vala: update genlist/gengrid callbacks
5 s/label_get/text_get/g
6
7Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
8---
9 BINDINGS/vala/examples/elementary/genlist.vala | 2 +-
10 BINDINGS/vala/vapi/elementary.vapi | 16 ++++++++--------
11 2 files changed, 9 insertions(+), 9 deletions(-)
12
13diff --git a/examples/elementary/genlist.vala b/examples/elementary/genlist.vala
14index b9fb42b..3a4a3b1 100644
15--- a/examples/elementary/genlist.vala
16+++ b/examples/elementary/genlist.vala
17@@ -53,7 +53,7 @@ public class T.Genlist : T.Abstract
18 public static string getText( Elm.Object obj, string part )
19 {
20 int number = (int)obj;
21- debug( "label_get: %p", obj );
22+ debug( "text_get: %p", obj );
23 return "This is list item #%d".printf( number );
24 }
25 public static Elm.Object? getContent( Elm.Object obj, string part )
26diff --git a/vapi/elementary.vapi b/vapi/elementary.vapi
27index 8a6cc17..90b50f5c7 100644
28--- a/vapi/elementary.vapi
29+++ b/vapi/elementary.vapi
30@@ -842,7 +842,7 @@ public class MenuItem
31 public Elm.Object object_get();
32 public void label_set( string label );
33 //public void del_cb_set( ... );
34- public unowned string label_get();
35+ public unowned string text_get();
36 public void icon_set( Elm.Object icon );
37 public void disabled_set( bool disabled );
38 public void* item_data_get();
39@@ -908,7 +908,7 @@ public class Slider : Elm.Object
40 public Slider( Elm.Object? parent );
41
42 public void label_set( string label );
43- public unowned string label_get();
44+ public unowned string text_get();
45 public void icon_set( Elm.Object icon );
46 public Elm.Object icon_get();
47 public void span_size_set( Evas.Coord size );
48@@ -931,8 +931,8 @@ public enum GenlistItemFlags
49 SUBITEMS,
50 }
51
52-[CCode (cname = "Elm_Gen_Item_Label_Get_Cb", has_target = false)]
53-public delegate string GenlistItemLabelGetFunc( Elm.Object obj, string part );
54+[CCode (cname = "Elm_Gen_Item_Text_Get_Cb", has_target = false)]
55+public delegate string GenlistItemTextGetFunc( Elm.Object obj, string part );
56 [CCode (cname = "Elm_Gen_Item_Content_Get_Cb", has_target = false)]
57 public delegate Elm.Object? GenlistItemContentGetFunc( Elm.Object obj, string part );
58 [CCode (cname = "Elm_Gen_Item_State_Get_Cb", has_target = false)]
59@@ -944,7 +944,7 @@ public delegate void GenlistItemDelFunc( Elm.Object obj );
60 [CCode (cname = "Elm_Gen_Item_Class_Func", destroy_function = "")]
61 public struct GenlistItemClassFunc
62 {
63- public GenlistItemLabelGetFunc text_get;
64+ public GenlistItemTextGetFunc text_get;
65 public GenlistItemContentGetFunc content_get;
66 public GenlistItemStateGetFunc state_get;
67 public GenlistItemDelFunc del;
68@@ -1027,7 +1027,7 @@ public class Check : Elm.Object
69 public Check( Elm.Object? parent );
70
71 public void label_set( string label );
72- public unowned string label_get();
73+ public unowned string text_get();
74 public void icon_set( Elm.Object icon );
75 public Elm.Object icon_get();
76 public void state_set( bool state );
77@@ -1044,7 +1044,7 @@ public class Radio : Elm.Object
78 public Radio( Elm.Object? parent );
79
80 public void label_set( string label );
81- public unowned string label_get();
82+ public unowned string text_get();
83 public void icon_set( Elm.Object icon );
84 public Elm.Object icon_get();
85 public void group_add( Elm.Object group );
86@@ -1256,7 +1256,7 @@ public class ListItem
87 public void selected_set( bool selected );
88 public void show();
89 public void* data_get();
90- public unowned string label_get();
91+ public unowned string text_get();
92 public void label_set( string label );
93 public Elm.Object icon_get();
94 public void icon_set( Elm.Object icon );
95--
961.7.8.rc4
97
diff --git a/meta-efl/recipes-efl/efl/libeflvala_svn.bb b/meta-efl/recipes-efl/efl/libeflvala_svn.bb
index e2450aa89..c18c8c98d 100644
--- a/meta-efl/recipes-efl/efl/libeflvala_svn.bb
+++ b/meta-efl/recipes-efl/efl/libeflvala_svn.bb
@@ -13,7 +13,6 @@ SRCNAME = "vala"
13inherit e-base autotools pkgconfig vala 13inherit e-base autotools pkgconfig vala
14 14
15SRC_URI = "${E_SVN}/trunk/BINDINGS;module=${SRCNAME};proto=http \ 15SRC_URI = "${E_SVN}/trunk/BINDINGS;module=${SRCNAME};proto=http \
16 file://0001-BINDINS-vala-update-genlist-gengrid-callbacks-s-labe.patch \
17" 16"
18S = "${WORKDIR}/${SRCNAME}" 17S = "${WORKDIR}/${SRCNAME}"
19 18