diff options
author | wen <wen@FreeBSD.org> | 2011-03-14 15:01:38 +0800 |
---|---|---|
committer | wen <wen@FreeBSD.org> | 2011-03-14 15:01:38 +0800 |
commit | 125a1787962b2b5548de913a30b389ba70edb2d5 (patch) | |
tree | 9fb51811074a9a2c8a0758d6a527d977bb770726 /deskutils | |
parent | 0721bc7f66808dda6779d508f825e1055a05b3db (diff) | |
download | freebsd-ports-gnome-125a1787962b2b5548de913a30b389ba70edb2d5.tar.gz freebsd-ports-gnome-125a1787962b2b5548de913a30b389ba70edb2d5.tar.zst freebsd-ports-gnome-125a1787962b2b5548de913a30b389ba70edb2d5.zip |
- Upstream bugfix for a crash issue:
http://gitorious.org/libgcal/libgcal/commit/2ac14a59fd7f9236f19a2625d9b81ec5e676fc18
- Added LICENSE
- Removed MD5
PR: ports/155001
Submitted by: Lapo Luchini <lapo@lapo.it>
Approved by: maintainer(timeout, >14 days)
Diffstat (limited to 'deskutils')
-rw-r--r-- | deskutils/libgcal/Makefile | 4 | ||||
-rw-r--r-- | deskutils/libgcal/distinfo | 1 | ||||
-rw-r--r-- | deskutils/libgcal/files/patch-src_atom_parser.c | 32 |
3 files changed, 36 insertions, 1 deletions
diff --git a/deskutils/libgcal/Makefile b/deskutils/libgcal/Makefile index 7f3ee671240e..f1a37ccf577c 100644 --- a/deskutils/libgcal/Makefile +++ b/deskutils/libgcal/Makefile @@ -7,6 +7,7 @@ PORTNAME= libgcal PORTVERSION= 0.9.5 +PORTREVISION= 1 CATEGORIES= deskutils MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE} @@ -17,6 +18,9 @@ LIB_DEPENDS= curl:${PORTSDIR}/ftp/curl \ iconv:${PORTSDIR}/converters/libiconv \ xml2:${PORTSDIR}/textproc/libxml2 +LICENSE= BSD +LICENSE_FILE= ${WRKSRC}/COPYING + USE_BZIP2= yes USE_CMAKE= yes CMAKE_ARGS= -DCMAKE_INSTALL_PREFIX="${PREFIX}" \ diff --git a/deskutils/libgcal/distinfo b/deskutils/libgcal/distinfo index ac7d9539c35a..b2ffc0a4ab1c 100644 --- a/deskutils/libgcal/distinfo +++ b/deskutils/libgcal/distinfo @@ -1,3 +1,2 @@ -MD5 (libgcal-0.9.5.tar.bz2) = dc6dfabc7c955bd096e7c888a6a18349 SHA256 (libgcal-0.9.5.tar.bz2) = d371139b40f498590f078aaafa82dfab565cd5ded967e6b5e80e74c0d1153a76 SIZE (libgcal-0.9.5.tar.bz2) = 142360 diff --git a/deskutils/libgcal/files/patch-src_atom_parser.c b/deskutils/libgcal/files/patch-src_atom_parser.c new file mode 100644 index 000000000000..cbbc26ec9504 --- /dev/null +++ b/deskutils/libgcal/files/patch-src_atom_parser.c @@ -0,0 +1,32 @@ +--- src/atom_parser.c.orig 2010-06-20 20:26:34.000000000 +0200 ++++ src/atom_parser.c 2011-02-24 12:28:51.710766352 +0100 +@@ -282,7 +282,8 @@ static int extract_and_check_multi(xmlDo + if (attr2) { + if (xmlHasProp(node->nodeTab[i], attr2)) { + tmp = xmlGetProp(node->nodeTab[i], attr2); +- (*types)[i] = strdup(strchr(tmp,'#') + 1); ++ if (strchr(tmp,'#')) ++ (*types)[i] = strdup(strchr(tmp,'#') + 1); + xmlFree(tmp); + } + else +@@ -292,7 +293,8 @@ static int extract_and_check_multi(xmlDo + if (attr3) { + if (xmlHasProp(node->nodeTab[i], attr3)) { + tmp = xmlGetProp(node->nodeTab[i], attr3); +- (*protocols)[i] = strdup(strchr(tmp,'#') + 1); ++ if (strchr(tmp,'#')) ++ (*protocols)[i] = strdup(strchr(tmp,'#') + 1); + xmlFree(tmp); + } + else +@@ -383,7 +385,8 @@ static int extract_and_check_multisub(xm + if (attr1) { + if (xmlHasProp(node->nodeTab[i], attr1)) { + tmp = xmlGetProp(node->nodeTab[i], attr1); +- (*types)[i] = strdup(strchr(tmp,'#') + 1); ++ if (strchr(tmp,'#')) ++ (*types)[i] = strdup(strchr(tmp,'#') + 1); + xmlFree(tmp); + } else + (*types)[i] = strdup(""); |