diff options
| author | Martin Jansa <Martin.Jansa@gmail.com> | 2012-11-21 09:27:53 +0100 |
|---|---|---|
| committer | Koen Kooi <koen@dominion.thruhere.net> | 2012-11-29 11:04:53 +0100 |
| commit | 4b355ae8bcbd053e662fc340804195e3af055815 (patch) | |
| tree | 7e83f86f53dd1ac1236649fca1925999ce329da0 /meta-efl/recipes-efl/efl/edje | |
| parent | 84ac2a95e2eb18e8265ffc61dd6df33e42f61b7f (diff) | |
| download | meta-openembedded-4b355ae8bcbd053e662fc340804195e3af055815.tar.gz | |
edje: backport patch to fix e-wm build
* 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>
Diffstat (limited to 'meta-efl/recipes-efl/efl/edje')
| -rw-r--r-- | meta-efl/recipes-efl/efl/edje/r79484.patch | 52 |
1 files changed, 52 insertions, 0 deletions
diff --git a/meta-efl/recipes-efl/efl/edje/r79484.patch b/meta-efl/recipes-efl/efl/edje/r79484.patch new file mode 100644 index 0000000000..68dc02d611 --- /dev/null +++ b/meta-efl/recipes-efl/efl/edje/r79484.patch | |||
| @@ -0,0 +1,52 @@ | |||
| 1 | Upstream-Status: backport | ||
| 2 | |||
| 3 | Index: src/bin/edje_cc_out.c | ||
| 4 | =================================================================== | ||
| 5 | --- a/src/bin/edje_cc_out.c (revision 79483) | ||
| 6 | +++ b/src/bin/edje_cc_out.c (revision 79484) | ||
| 7 | @@ -1900,27 +1900,32 @@ | ||
| 8 | { | ||
| 9 | for (i = 0 ; i < pc->programs.fnmatch_count ; i++) | ||
| 10 | { | ||
| 11 | - if (!strcmp(pl->u.ep->name, pc->programs.fnmatch[i]->name)) | ||
| 12 | + if (pl->u.ep->name && pc->programs.fnmatch[i]->name && | ||
| 13 | + !strcmp(pl->u.ep->name, pc->programs.fnmatch[i]->name)) | ||
| 14 | data_queue_anonymous_lookup(pc, pc->programs.fnmatch[i], dest); | ||
| 15 | } | ||
| 16 | for (i = 0 ; i < pc->programs.strcmp_count ; i++) | ||
| 17 | { | ||
| 18 | - if (!strcmp(pl->u.ep->name, pc->programs.strcmp[i]->name)) | ||
| 19 | + if (pl->u.ep->name && pc->programs.strcmp[i]->name && | ||
| 20 | + !strcmp(pl->u.ep->name, pc->programs.strcmp[i]->name)) | ||
| 21 | data_queue_anonymous_lookup(pc, pc->programs.strcmp[i], dest); | ||
| 22 | } | ||
| 23 | for (i = 0 ; i < pc->programs.strncmp_count ; i++) | ||
| 24 | { | ||
| 25 | - if (!strcmp(pl->u.ep->name, pc->programs.strncmp[i]->name)) | ||
| 26 | + if (pl->u.ep->name && pc->programs.strncmp[i]->name && | ||
| 27 | + !strcmp(pl->u.ep->name, pc->programs.strncmp[i]->name)) | ||
| 28 | data_queue_anonymous_lookup(pc, pc->programs.strncmp[i], dest); | ||
| 29 | } | ||
| 30 | for (i = 0 ; i < pc->programs.strrncmp_count ; i++) | ||
| 31 | { | ||
| 32 | - if (!strcmp(pl->u.ep->name, pc->programs.strrncmp[i]->name)) | ||
| 33 | + if (pl->u.ep->name && pc->programs.strrncmp[i]->name && | ||
| 34 | + !strcmp(pl->u.ep->name, pc->programs.strrncmp[i]->name)) | ||
| 35 | data_queue_anonymous_lookup(pc, pc->programs.strrncmp[i], dest); | ||
| 36 | } | ||
| 37 | for (i = 0 ; i < pc->programs.nocmp_count ; i++) | ||
| 38 | { | ||
| 39 | - if (!strcmp(pl->u.ep->name, pc->programs.nocmp[i]->name)) | ||
| 40 | + if (pl->u.ep->name && pc->programs.nocmp[i]->name && | ||
| 41 | + !strcmp(pl->u.ep->name, pc->programs.nocmp[i]->name)) | ||
| 42 | data_queue_anonymous_lookup(pc, pc->programs.nocmp[i], dest); | ||
| 43 | } | ||
| 44 | } | ||
| 45 | @@ -2466,6 +2471,7 @@ | ||
| 46 | _data_queue_part_lookup(Edje_Part_Collection *pc, char *name, char *ptr, int len) | ||
| 47 | { | ||
| 48 | Code_Lookup *cl; | ||
| 49 | + | ||
| 50 | cl = mem_alloc(SZ(Code_Lookup)); | ||
| 51 | cl->ptr = ptr; | ||
| 52 | cl->len = len; | ||
