Patchwork [3/3] libical: remove

login
register
mail settings
Submitter Ross Burton
Date Oct. 22, 2012, 10:53 a.m.
Message ID <1350903186-20334-3-git-send-email-ross.burton@intel.com>
Download mbox | patch
Permalink /patch/38405/
State Accepted
Commit 754ddbf1c57e6b9d0650498538840effebe4f7a2
Headers show

Comments

Ross Burton - Oct. 22, 2012, 10:53 a.m.
This was only used by evolution-data-server and is now maintained in
meta-oe/meta-gnome.

Signed-off-by: Ross Burton <ross.burton@intel.com>
---
 meta/recipes-sato/libical/files/pthread-fix.patch |   52 ---------------------
 meta/recipes-sato/libical/libical_0.48.bb         |   17 -------
 2 files changed, 69 deletions(-)
 delete mode 100644 meta/recipes-sato/libical/files/pthread-fix.patch
 delete mode 100644 meta/recipes-sato/libical/libical_0.48.bb

Patch

diff --git a/meta/recipes-sato/libical/files/pthread-fix.patch b/meta/recipes-sato/libical/files/pthread-fix.patch
deleted file mode 100644
index aa7767f..0000000
--- a/meta/recipes-sato/libical/files/pthread-fix.patch
+++ /dev/null
@@ -1,52 +0,0 @@ 
-New added pthread feathre leads 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;
- }
- 
- 
diff --git a/meta/recipes-sato/libical/libical_0.48.bb b/meta/recipes-sato/libical/libical_0.48.bb
deleted file mode 100644
index 80f629c..0000000
--- a/meta/recipes-sato/libical/libical_0.48.bb
+++ /dev/null
@@ -1,17 +0,0 @@ 
-DESCRIPTION = "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"
-
-PR = "r0"
-
-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