From 11f95603e8582c2cf63304f8b0a020ccbbd778e4 Mon Sep 17 00:00:00 2001 From: Cristian Iorga Date: Fri, 29 Aug 2014 16:10:42 +0300 Subject: libical: upgrade to 1.0.0 pthread-fix.patch no longer needed, included upstream; Switched to new website, new bug tracker, new source repo. Signed-off-by: Cristian Iorga Signed-off-by: Richard Purdie --- .../libical/files/pthread-fix.patch | 52 ---------------------- 1 file changed, 52 deletions(-) delete mode 100644 meta/recipes-support/libical/files/pthread-fix.patch (limited to 'meta/recipes-support/libical/files/pthread-fix.patch') diff --git a/meta/recipes-support/libical/files/pthread-fix.patch b/meta/recipes-support/libical/files/pthread-fix.patch deleted file mode 100644 index 877b808fc0..0000000000 --- a/meta/recipes-support/libical/files/pthread-fix.patch +++ /dev/null @@ -1,52 +0,0 @@ -New added pthread feature leads to some deadlock with some unlock code missing. -This patch fix it. - -Signed-off-by: Zhai Edwin - -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; - } - - -- cgit v1.2.3