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 ---------------------- meta/recipes-support/libical/libical_0.48.bb | 16 ------- meta/recipes-support/libical/libical_1.0.0.bb | 13 ++++++ 3 files changed, 13 insertions(+), 68 deletions(-) delete mode 100644 meta/recipes-support/libical/files/pthread-fix.patch delete mode 100644 meta/recipes-support/libical/libical_0.48.bb create mode 100644 meta/recipes-support/libical/libical_1.0.0.bb 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; - } - - diff --git a/meta/recipes-support/libical/libical_0.48.bb b/meta/recipes-support/libical/libical_0.48.bb deleted file mode 100644 index f464026f8c..0000000000 --- a/meta/recipes-support/libical/libical_0.48.bb +++ /dev/null @@ -1,16 +0,0 @@ -SUMMARY = "iCal and scheduling (RFC 2445, 2446, 2447) library" -HOMEPAGE = "http://sourceforge.net/projects/freeassociation/" -BUGTRACKER = "http://sourceforge.net/tracker/?group_id=16077&atid=116077" -LICENSE = "LGPLv2.1 | MPL-1" -LIC_FILES_CHKSUM = "file://COPYING;md5=d4fc58309d8ed46587ac63bb449d82f8 \ - file://LICENSE;md5=d1a0891cd3e582b3e2ec8fe63badbbb6" -SECTION = "libs" - - -SRC_URI = "${SOURCEFORGE_MIRROR}/project/freeassociation/${BPN}/${P}/${BPN}-${PV}.tar.gz\ - file://pthread-fix.patch" - -SRC_URI[md5sum] = "e549f434d5fbf9cd156c60ed4943618f" -SRC_URI[sha256sum] = "2ae78b0757f0dd13431acf42a9a8d038339fd4767fd5134e650bf60ee0b4dff0" - -inherit autotools diff --git a/meta/recipes-support/libical/libical_1.0.0.bb b/meta/recipes-support/libical/libical_1.0.0.bb new file mode 100644 index 0000000000..07b549ecf2 --- /dev/null +++ b/meta/recipes-support/libical/libical_1.0.0.bb @@ -0,0 +1,13 @@ +SUMMARY = "iCal and scheduling (RFC 2445, 2446, 2447) library" +HOMEPAGE = "https://github.com/libical/libical" +BUGTRACKER = "https://github.com/libical/libical/issues" +LICENSE = "LGPLv2.1 | MPL-1" +LIC_FILES_CHKSUM = "file://COPYING;md5=d4fc58309d8ed46587ac63bb449d82f8 \ + file://LICENSE;md5=d1a0891cd3e582b3e2ec8fe63badbbb6" +SECTION = "libs" + +SRC_URI = "https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz" +SRC_URI[md5sum] = "f4b8e33ae5efb2f025eb43ce69682a36" +SRC_URI[sha256sum] = "0072e83834092315772e6719b85fc8b11530b1ff53f4d108315fb38cddbce8c2" + +inherit autotools -- cgit 1.2.3-korg