aboutsummaryrefslogtreecommitdiffstats
path: root/meta/recipes-support/libical/files
diff options
context:
space:
mode:
authorCristian Iorga <cristian.iorga@intel.com>2013-03-11 15:56:48 +0200
committerSaul Wold <sgw@linux.intel.com>2013-03-14 11:29:11 -0700
commitea5ae40d4b124eef946ab87d867640937be8af17 (patch)
tree59a02ab7f5ecdfda8475be7beedeadcbc5e42f29 /meta/recipes-support/libical/files
parentbd03014c8fd080e04dd0a96a6b4b9211568c1cf1 (diff)
downloadopenembedded-core-contrib-ea5ae40d4b124eef946ab87d867640937be8af17.tar.gz
openembedded-core-contrib-ea5ae40d4b124eef946ab87d867640937be8af17.tar.bz2
openembedded-core-contrib-ea5ae40d4b124eef946ab87d867640937be8af17.zip
libical: add recipe back in oe-core
version: 0.48. reason: libical is needed by bluez. Signed-off-by: Cristian Iorga <cristian.iorga@intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com>
Diffstat (limited to 'meta/recipes-support/libical/files')
-rw-r--r--meta/recipes-support/libical/files/pthread-fix.patch52
1 files changed, 52 insertions, 0 deletions
diff --git a/meta/recipes-support/libical/files/pthread-fix.patch b/meta/recipes-support/libical/files/pthread-fix.patch
new file mode 100644
index 0000000000..877b808fc0
--- /dev/null
+++ b/meta/recipes-support/libical/files/pthread-fix.patch
@@ -0,0 +1,52 @@
+New added pthread feature leads to some deadlock with some unlock code missing.
+This patch fix it.
+
+Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
+
+Upstream-Status: Pending
+
+Index: libical-0.47/src/libical/icaltimezone.c
+===================================================================
+--- libical-0.47.orig/src/libical/icaltimezone.c 2011-12-16 13:42:25.000000000 +0800
++++ libical-0.47/src/libical/icaltimezone.c 2011-12-16 14:16:25.000000000 +0800
+@@ -1773,7 +1773,7 @@
+ filename = (char*) malloc (filename_len);
+ if (!filename) {
+ icalerror_set_errno(ICAL_NEWFAILED_ERROR);
+- return;
++ goto out;
+ }
+
+ snprintf (filename, filename_len, "%s/%s.ics", get_zone_directory(),
+@@ -1783,7 +1783,7 @@
+ free (filename);
+ if (!fp) {
+ icalerror_set_errno(ICAL_FILE_ERROR);
+- return;
++ goto out;
+ }
+
+
+@@ -1807,7 +1807,7 @@
+
+ if (!subcomp) {
+ icalerror_set_errno(ICAL_PARSE_ERROR);
+- return;
++ goto out;
+ }
+
+ icaltimezone_get_vtimezone_properties (zone, subcomp);
+@@ -1817,10 +1817,12 @@
+ icalcomponent_free(comp);
+ }
+ #endif
+-#ifdef HAVE_PTHREAD
++
+ out:
++#ifdef HAVE_PTHREAD
+ pthread_mutex_unlock(&builtin_mutex);
+ #endif
++ return;
+ }
+
+