mirrors/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2026-06-05 02:50:46 +00:00
Code Issues Projects Releases Wiki Activity

edje: backport patch to fix e-wm build

Browse Source 
* 1.7.2 wont be released before E17 is finished, until then we need to backport
  mandatory patches or use conf/distro/include/efl-from-svn-recipes.inc

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
This commit is contained in:
Martin Jansa
2012-11-21 09:27:53 +01:00
committed by Koen Kooi
parent 84ac2a95e2
commit 4b355ae8bc
2 changed files with 53 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-efl/recipes-efl/efl/edje/r79484.patch
+52
View File
@@ -0,0 +1,52 @@
Upstream-Status: backport
Index: src/bin/edje_cc_out.c
===================================================================
--- a/src/bin/edje_cc_out.c (revision 79483)
+++ b/src/bin/edje_cc_out.c (revision 79484)
@@ -1900,27 +1900,32 @@
{
for (i = 0 ; i < pc->programs.fnmatch_count ; i++)
{
- if (!strcmp(pl->u.ep->name, pc->programs.fnmatch[i]->name))
+ if (pl->u.ep->name && pc->programs.fnmatch[i]->name &&
+ !strcmp(pl->u.ep->name, pc->programs.fnmatch[i]->name))
data_queue_anonymous_lookup(pc, pc->programs.fnmatch[i], dest);
}
for (i = 0 ; i < pc->programs.strcmp_count ; i++)
{
- if (!strcmp(pl->u.ep->name, pc->programs.strcmp[i]->name))
+ if (pl->u.ep->name && pc->programs.strcmp[i]->name &&
+ !strcmp(pl->u.ep->name, pc->programs.strcmp[i]->name))
data_queue_anonymous_lookup(pc, pc->programs.strcmp[i], dest);
}
for (i = 0 ; i < pc->programs.strncmp_count ; i++)
{
- if (!strcmp(pl->u.ep->name, pc->programs.strncmp[i]->name))
+ if (pl->u.ep->name && pc->programs.strncmp[i]->name &&
+ !strcmp(pl->u.ep->name, pc->programs.strncmp[i]->name))
data_queue_anonymous_lookup(pc, pc->programs.strncmp[i], dest);
}
for (i = 0 ; i < pc->programs.strrncmp_count ; i++)
{
- if (!strcmp(pl->u.ep->name, pc->programs.strrncmp[i]->name))
+ if (pl->u.ep->name && pc->programs.strrncmp[i]->name &&
+ !strcmp(pl->u.ep->name, pc->programs.strrncmp[i]->name))
data_queue_anonymous_lookup(pc, pc->programs.strrncmp[i], dest);
}
for (i = 0 ; i < pc->programs.nocmp_count ; i++)
{
- if (!strcmp(pl->u.ep->name, pc->programs.nocmp[i]->name))
+ if (pl->u.ep->name && pc->programs.nocmp[i]->name &&
+ !strcmp(pl->u.ep->name, pc->programs.nocmp[i]->name))
data_queue_anonymous_lookup(pc, pc->programs.nocmp[i], dest);
}
}
@@ -2466,6 +2471,7 @@
_data_queue_part_lookup(Edje_Part_Collection *pc, char *name, char *ptr, int len)
{
Code_Lookup *cl;
+
cl = mem_alloc(SZ(Code_Lookup));
cl->ptr = ptr;
cl->len = len;
meta-efl/recipes-efl/efl/edje_1.7.1.bb
+1
View File
@@ -4,6 +4,7 @@ PR = "${INC_PR}.0"
SRC_URI = "\
${E_MIRROR}/${SRCNAME}-${SRCVER}.tar.gz \
file://r79484.patch \
"
SRC_URI[md5sum] = "f0be474e4b4d51704dc64ec27941c2ad"