[142533] trunk/dports/devel/libical
mk at macports.org
mk at macports.org
Sat Dec 12 06:09:39 PST 2015
Revision: 142533
https://trac.macports.org/changeset/142533
Author: mk at macports.org
Date: 2015-11-14 08:25:14 -0800 (Sat, 14 Nov 2015)
Log Message:
-----------
libical(-devel): fixing Portfile to also build devel subport
Modified Paths:
--------------
trunk/dports/devel/libical/Portfile
Added Paths:
-----------
trunk/dports/devel/libical/files/patch-fix_timezone_crash.diff
trunk/dports/devel/libical/files/patch-make_recursive_mutex.diff
Removed Paths:
-------------
trunk/dports/devel/libical/files/fix_timezone_crash.patch
trunk/dports/devel/libical/files/make_recursive_mutex.patch
Modified: trunk/dports/devel/libical/Portfile
===================================================================
--- trunk/dports/devel/libical/Portfile 2015-11-14 14:55:41 UTC (rev 142532)
+++ trunk/dports/devel/libical/Portfile 2015-11-14 16:25:14 UTC (rev 142533)
@@ -3,17 +3,31 @@
PortSystem 1.0
PortGroup cmake 1.0
+PortGroup github 1.0
+
cmake.out_of_source yes
name libical
+
+if {${subport} eq "${name}"} {
+ # version 1.0.1 currently doesn't compile on OSX, thus still use 1.0.0
+ github.setup libical libical 1.0.0 v
+ revision 1
+ conflicts libical-devel
+} else {
+ # libical-devel:
+ github.setup libical libical 25bc500e15bafcef7324ec9b6472982b56dcdc6d
+ version 1.0.1.351
+ conflicts libical
+}
+
categories devel
license {LGPL-2.1 MPL-1}
maintainers nomaintainer
description An implementation of iCalendar protocols and data formats
long_description ${description}
platforms darwin
-homepage http://sourceforge.net/projects/freeassociation/
-master_sites sourceforge:freeassociation
+homepage https://github.com/libical
subport libical-devel {
description-append \
@@ -23,27 +37,23 @@
}
if {${subport} eq "${name}"} {
- version 1.0
- revision 1
- checksums rmd160 1c78b07c37c80e8fe068fb3164bbf8614f02e67f \
- sha256 7c39b3448e4927a2de2775d853f52b3aaeb42400970a3db0b01a78987e6ec0b7
+ # v 1.0.0
+ checksums rmd160 67142db7d1af937082d29326a4dda108da07afb3 \
+ sha256 b11bb6d9f97f9bc6b0798197a41c5ea9a0e939736e4afdb08b43a105377a1dac
+
+ # v 1.0.1
+ #checksums rmd160 780f9fb08b324536af362f8812ff671e4d1082d0 \
+ # sha256 b3898c9ca3522ba4f0454e8b7c26a85b2b1259e16d670cccf7abb035c8a6caa9
+
patchfiles-append \
- fix_timezone_crash.patch \
- make_recursive_mutex.patch
+ patch-fix_timezone_crash.diff \
+ patch-make_recursive_mutex.diff
} else {
# v1.0.1-351-g25bc500
+ checksums rmd160 4379c5d6d31a78ecb2ceaff6e64a8900e9b30cfe \
+ sha256 f7c22344a461f8ee1ce65e3efa477e9846b1ca39f44af622a149ce37f3850332
+
maintainers gmail.com:rjvbertin openmaintainer
- if {[file exists ${filespath}/libical-git/.git]} {
- fetch.type git
- git.url ${filespath}/libical-git
- git.branch 25bc500e15bafcef7324ec9b6472982b56dcdc6d
- } else {
- PortGroup github 1.0
- git.url http://github.com/libical/libical
- github.setup \
- libical libical 25bc500e15bafcef7324ec9b6472982b56dcdc6d
- }
- version 1.0.1.351
distname ${name}-git
}
@@ -52,5 +62,5 @@
patch.pre_args -p1
-livecheck.url http://sourceforge.net/projects/freeassociation/files/
+livecheck.url https://github.com/libical/libical/releases
livecheck.regex "${name}-(\\d+(?:\\.\\d+)*)${extract.suffix}"
Deleted: trunk/dports/devel/libical/files/fix_timezone_crash.patch
===================================================================
--- trunk/dports/devel/libical/files/fix_timezone_crash.patch 2015-11-14 14:55:41 UTC (rev 142532)
+++ trunk/dports/devel/libical/files/fix_timezone_crash.patch 2015-11-14 16:25:14 UTC (rev 142533)
@@ -1,24 +0,0 @@
-Description: work around heap corruption bug
-Author: Robie Basak <robie.basak at canonical.com>
-Last-Update: 2012-04-04
-Forwarded: http://sourceforge.net/mailarchive/message.php?msg_id=29084189
-Bug-Ubuntu: https://bugs.launchpad.net/bugs/956843
-Bug: https://sourceforge.net/tracker/?func=detail&aid=3514871&group_id=16077&atid=116077
-
----
- src/libical/icaltimezone.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-Index: libical-1.0/src/libical/icaltimezone.c
-===================================================================
---- libical-1.0.orig/src/libical/icaltimezone.c 2013-06-11 15:34:23.913446943 +0100
-+++ libical-1.0/src/libical/icaltimezone.c 2013-06-11 15:34:23.905446943 +0100
-@@ -1686,7 +1686,7 @@
- icalerror_assert (builtin_timezones == NULL,
- "Parsing zones.tab file multiple times");
-
-- builtin_timezones = icalarray_new (sizeof (icaltimezone), 32);
-+ builtin_timezones = icalarray_new (sizeof (icaltimezone), 1024);
-
- #ifndef USE_BUILTIN_TZDATA
- filename_len = strlen ((char *) icaltzutil_get_zone_directory()) + strlen (ZONES_TAB_SYSTEM_FILENAME)
Deleted: trunk/dports/devel/libical/files/make_recursive_mutex.patch
===================================================================
--- trunk/dports/devel/libical/files/make_recursive_mutex.patch 2015-11-14 14:55:41 UTC (rev 142532)
+++ trunk/dports/devel/libical/files/make_recursive_mutex.patch 2015-11-14 16:25:14 UTC (rev 142533)
@@ -1,15 +0,0 @@
---- libical-1.0/src/libical/orig.icaltimezone.c 2014-07-28 17:05:08.000000000 +0200
-+++ libical-1.0/src/libical/icaltimezone.c 2014-07-28 17:07:13.000000000 +0200
-@@ -47,7 +47,10 @@
-
- #ifdef HAVE_PTHREAD
- #include <pthread.h>
--static pthread_mutex_t builtin_mutex = PTHREAD_MUTEX_INITIALIZER;
-+// static pthread_mutex_t builtin_mutex = PTHREAD_MUTEX_INITIALIZER;
-+// It seems the same thread can attempt to lock builtin_mutex multiple times
-+// (at least when using builtin tzdata), so make it builtin_mutex recursive:
-+static pthread_mutex_t builtin_mutex = PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP;
- #endif
-
- #ifdef WIN32
-
Copied: trunk/dports/devel/libical/files/patch-fix_timezone_crash.diff (from rev 142532, trunk/dports/devel/libical/files/fix_timezone_crash.patch)
===================================================================
--- trunk/dports/devel/libical/files/patch-fix_timezone_crash.diff (rev 0)
+++ trunk/dports/devel/libical/files/patch-fix_timezone_crash.diff 2015-11-14 16:25:14 UTC (rev 142533)
@@ -0,0 +1,24 @@
+Description: work around heap corruption bug
+Author: Robie Basak <robie.basak at canonical.com>
+Last-Update: 2012-04-04
+Forwarded: http://sourceforge.net/mailarchive/message.php?msg_id=29084189
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/956843
+Bug: https://sourceforge.net/tracker/?func=detail&aid=3514871&group_id=16077&atid=116077
+
+---
+ src/libical/icaltimezone.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+Index: libical-1.0/src/libical/icaltimezone.c
+===================================================================
+--- libical-1.0.orig/src/libical/icaltimezone.c 2013-06-11 15:34:23.913446943 +0100
++++ libical-1.0/src/libical/icaltimezone.c 2013-06-11 15:34:23.905446943 +0100
+@@ -1686,7 +1686,7 @@
+ icalerror_assert (builtin_timezones == NULL,
+ "Parsing zones.tab file multiple times");
+
+- builtin_timezones = icalarray_new (sizeof (icaltimezone), 32);
++ builtin_timezones = icalarray_new (sizeof (icaltimezone), 1024);
+
+ #ifndef USE_BUILTIN_TZDATA
+ filename_len = strlen ((char *) icaltzutil_get_zone_directory()) + strlen (ZONES_TAB_SYSTEM_FILENAME)
Copied: trunk/dports/devel/libical/files/patch-make_recursive_mutex.diff (from rev 142532, trunk/dports/devel/libical/files/make_recursive_mutex.patch)
===================================================================
--- trunk/dports/devel/libical/files/patch-make_recursive_mutex.diff (rev 0)
+++ trunk/dports/devel/libical/files/patch-make_recursive_mutex.diff 2015-11-14 16:25:14 UTC (rev 142533)
@@ -0,0 +1,15 @@
+--- libical-1.0/src/libical/orig.icaltimezone.c 2014-07-28 17:05:08.000000000 +0200
++++ libical-1.0/src/libical/icaltimezone.c 2014-07-28 17:07:13.000000000 +0200
+@@ -47,7 +47,10 @@
+
+ #ifdef HAVE_PTHREAD
+ #include <pthread.h>
+-static pthread_mutex_t builtin_mutex = PTHREAD_MUTEX_INITIALIZER;
++// static pthread_mutex_t builtin_mutex = PTHREAD_MUTEX_INITIALIZER;
++// It seems the same thread can attempt to lock builtin_mutex multiple times
++// (at least when using builtin tzdata), so make it builtin_mutex recursive:
++static pthread_mutex_t builtin_mutex = PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP;
+ #endif
+
+ #ifdef WIN32
+
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20151212/8052591a/attachment-0001.html>
More information about the macports-changes
mailing list