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 | |
| parent | 84ac2a95e2eb18e8265ffc61dd6df33e42f61b7f (diff) | |
| download | meta-openembedded-contrib-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>
| -rw-r--r-- | meta-efl/recipes-efl/efl/edje/r79484.patch | 52 | ||||
| -rw-r--r-- | meta-efl/recipes-efl/efl/edje_1.7.1.bb | 1 |
2 files changed, 53 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 @@ +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; diff --git a/meta-efl/recipes-efl/efl/edje_1.7.1.bb b/meta-efl/recipes-efl/efl/edje_1.7.1.bb index b676c1ab52..67cf95ec69 100644 --- a/meta-efl/recipes-efl/efl/edje_1.7.1.bb +++ b/meta-efl/recipes-efl/efl/edje_1.7.1.bb @@ -4,6 +4,7 @@ PR = "${INC_PR}.0" SRC_URI = "\ ${E_MIRROR}/${SRCNAME}-${SRCVER}.tar.gz \ + file://r79484.patch \ " SRC_URI[md5sum] = "f0be474e4b4d51704dc64ec27941c2ad" |