aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Zimmermann <ml@vdm-design.de>2011-02-28 21:44:02 +0100
committerThomas Zimmermann <zimmermann@vdm-design.de>2011-02-28 21:48:08 +0100
commit0521794e8e57b15fedca7ff9669b01830cb042c3 (patch)
tree07aa44777f929b3f6deb423c05585a1b99b3fd39
parent4d1761916d930fe1fae1c061f118eb540b97fcbd (diff)
downloadopenembedded-0521794e8e57b15fedca7ff9669b01830cb042c3.tar.gz
efreet: fix segfault
* when installing a new .desktop file on the desktop e segfaults if there is a file without . in that dir * this fixes SHR bug #1295 Signed-off-by: Thomas Zimmermann <ml@vdm-design.de>
-rw-r--r--recipes/efl1/efreet/changeset_trunk_r57435.patch11
-rw-r--r--recipes/efl1/efreet_1.0.0.bb3
2 files changed, 13 insertions, 1 deletions
diff --git a/recipes/efl1/efreet/changeset_trunk_r57435.patch b/recipes/efl1/efreet/changeset_trunk_r57435.patch
new file mode 100644
index 0000000000..f652af2164
--- /dev/null
+++ b/recipes/efl1/efreet/changeset_trunk_r57435.patch
@@ -0,0 +1,11 @@
+Index: efreet/src/lib/efreet_desktop.c
+===================================================================
+--- efreet/src/lib/efreet_desktop.c (revision 57257)
++++ efreet/src/lib/efreet_desktop.c (revision 57435)
+@@ -1206,5 +1206,5 @@
+ case ECORE_FILE_EVENT_MODIFIED:
+ ext = strrchr(path, '.');
+- if (!strcmp(ext, ".desktop") || !strcmp(ext, ".directory"))
++ if (ext && (!strcmp(ext, ".desktop") || !strcmp(ext, ".directory")))
+ efreet_cache_desktop_update();
+ break;
diff --git a/recipes/efl1/efreet_1.0.0.bb b/recipes/efl1/efreet_1.0.0.bb
index dd50c62e23..d2d7f2fd86 100644
--- a/recipes/efl1/efreet_1.0.0.bb
+++ b/recipes/efl1/efreet_1.0.0.bb
@@ -1,9 +1,10 @@
require efreet.inc
-PR = "${INC_PR}.0"
+PR = "${INC_PR}.1"
SRC_URI = "\
${E_MIRROR}/${SRCNAME}-${PV}.tar.gz \
+ file://changeset_trunk_r57435.patch \
"
SRC_URI[md5sum] = "ce7dd05138335312c7eb9ac8e5e62467"