summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCristian Iorga <cristian.iorga@intel.com>2014-08-29 16:10:42 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-08-31 23:40:49 +0100
commite2d64c1ba75e15cdf99dc5caf4f4ef5c222ebdd0 (patch)
tree6ba903db7acc4eef2b1b77030653641036328f8b
parent243837b39da90fcda9444af4675df35fc3e2349d (diff)
downloadpoky-e2d64c1ba75e15cdf99dc5caf4f4ef5c222ebdd0.tar.gz
libical: upgrade to 1.0.0
pthread-fix.patch no longer needed, included upstream; Switched to new website, new bug tracker, new source repo. (From OE-Core rev: 11f95603e8582c2cf63304f8b0a020ccbbd778e4) Signed-off-by: Cristian Iorga <cristian.iorga@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-support/libical/files/pthread-fix.patch52
-rw-r--r--meta/recipes-support/libical/libical_0.48.bb16
-rw-r--r--meta/recipes-support/libical/libical_1.0.0.bb13
3 files changed, 13 insertions, 68 deletions
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 @@
1New added pthread feature leads to some deadlock with some unlock code missing.
2This patch fix it.
3
4Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
5
6Upstream-Status: Pending
7
8Index: libical-0.47/src/libical/icaltimezone.c
9===================================================================
10--- libical-0.47.orig/src/libical/icaltimezone.c 2011-12-16 13:42:25.000000000 +0800
11+++ libical-0.47/src/libical/icaltimezone.c 2011-12-16 14:16:25.000000000 +0800
12@@ -1773,7 +1773,7 @@
13 filename = (char*) malloc (filename_len);
14 if (!filename) {
15 icalerror_set_errno(ICAL_NEWFAILED_ERROR);
16- return;
17+ goto out;
18 }
19
20 snprintf (filename, filename_len, "%s/%s.ics", get_zone_directory(),
21@@ -1783,7 +1783,7 @@
22 free (filename);
23 if (!fp) {
24 icalerror_set_errno(ICAL_FILE_ERROR);
25- return;
26+ goto out;
27 }
28
29
30@@ -1807,7 +1807,7 @@
31
32 if (!subcomp) {
33 icalerror_set_errno(ICAL_PARSE_ERROR);
34- return;
35+ goto out;
36 }
37
38 icaltimezone_get_vtimezone_properties (zone, subcomp);
39@@ -1817,10 +1817,12 @@
40 icalcomponent_free(comp);
41 }
42 #endif
43-#ifdef HAVE_PTHREAD
44+
45 out:
46+#ifdef HAVE_PTHREAD
47 pthread_mutex_unlock(&builtin_mutex);
48 #endif
49+ return;
50 }
51
52
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 @@
1SUMMARY = "iCal and scheduling (RFC 2445, 2446, 2447) library"
2HOMEPAGE = "http://sourceforge.net/projects/freeassociation/"
3BUGTRACKER = "http://sourceforge.net/tracker/?group_id=16077&atid=116077"
4LICENSE = "LGPLv2.1 | MPL-1"
5LIC_FILES_CHKSUM = "file://COPYING;md5=d4fc58309d8ed46587ac63bb449d82f8 \
6 file://LICENSE;md5=d1a0891cd3e582b3e2ec8fe63badbbb6"
7SECTION = "libs"
8
9
10SRC_URI = "${SOURCEFORGE_MIRROR}/project/freeassociation/${BPN}/${P}/${BPN}-${PV}.tar.gz\
11 file://pthread-fix.patch"
12
13SRC_URI[md5sum] = "e549f434d5fbf9cd156c60ed4943618f"
14SRC_URI[sha256sum] = "2ae78b0757f0dd13431acf42a9a8d038339fd4767fd5134e650bf60ee0b4dff0"
15
16inherit 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 @@
1SUMMARY = "iCal and scheduling (RFC 2445, 2446, 2447) library"
2HOMEPAGE = "https://github.com/libical/libical"
3BUGTRACKER = "https://github.com/libical/libical/issues"
4LICENSE = "LGPLv2.1 | MPL-1"
5LIC_FILES_CHKSUM = "file://COPYING;md5=d4fc58309d8ed46587ac63bb449d82f8 \
6 file://LICENSE;md5=d1a0891cd3e582b3e2ec8fe63badbbb6"
7SECTION = "libs"
8
9SRC_URI = "https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz"
10SRC_URI[md5sum] = "f4b8e33ae5efb2f025eb43ce69682a36"
11SRC_URI[sha256sum] = "0072e83834092315772e6719b85fc8b11530b1ff53f4d108315fb38cddbce8c2"
12
13inherit autotools