diff options
| author | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2006-10-19 05:21:34 +0800 |
|---|---|---|
| committer | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2006-10-19 05:21:34 +0800 |
| commit | ba071757b3316d82b90ca83cc710c11e9479bbe1 (patch) | |
| tree | 1b274308b866e794c2d73a24ddfc783a01d0f05a /databases | |
| parent | c66fe59deec2e2909f20e268bc49f133962c785b (diff) | |
| download | marcuscom-ports-ba071757b3316d82b90ca83cc710c11e9479bbe1.tar marcuscom-ports-ba071757b3316d82b90ca83cc710c11e9479bbe1.tar.gz marcuscom-ports-ba071757b3316d82b90ca83cc710c11e9479bbe1.tar.bz2 marcuscom-ports-ba071757b3316d82b90ca83cc710c11e9479bbe1.tar.lz marcuscom-ports-ba071757b3316d82b90ca83cc710c11e9479bbe1.tar.xz marcuscom-ports-ba071757b3316d82b90ca83cc710c11e9479bbe1.tar.zst marcuscom-ports-ba071757b3316d82b90ca83cc710c11e9479bbe1.zip | |
Restore a lost patch to fix memory allocation problems on 64-bit
architectures.
Obtained from: ports
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@7817 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'databases')
| -rw-r--r-- | databases/evolution-data-server/Makefile | 3 | ||||
| -rw-r--r-- | databases/evolution-data-server/files/patch-camel_camel-object.c | 22 |
2 files changed, 24 insertions, 1 deletions
diff --git a/databases/evolution-data-server/Makefile b/databases/evolution-data-server/Makefile index a4f67fddc..30d00445c 100644 --- a/databases/evolution-data-server/Makefile +++ b/databases/evolution-data-server/Makefile @@ -3,11 +3,12 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/databases/evolution-data-server/Makefile,v 1.99 2006/10/03 00:13:42 ahze Exp $ +# $MCom: ports/databases/evolution-data-server/Makefile,v 1.101 2006/10/18 07:44:32 marcus Exp $ # PORTNAME= evolution-data-server PORTVERSION= 1.9.1 +PORTREVISION= 1 CATEGORIES= databases gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} diff --git a/databases/evolution-data-server/files/patch-camel_camel-object.c b/databases/evolution-data-server/files/patch-camel_camel-object.c new file mode 100644 index 000000000..9aef5b739 --- /dev/null +++ b/databases/evolution-data-server/files/patch-camel_camel-object.c @@ -0,0 +1,22 @@ +--- camel/camel-object.c.orig Wed Oct 18 15:53:34 2006 ++++ camel/camel-object.c Wed Oct 18 15:55:01 2006 +@@ -457,7 +457,7 @@ + } + + /* we batch up the properties and set them in one go */ +- if (!(argv = g_try_malloc ((gulong)(sizeof (*argv) + (count - CAMEL_ARGV_MAX) * sizeof (argv->argv[0]))))) ++ if (!(argv = g_try_malloc ((guint32)(sizeof (*argv) + (count - CAMEL_ARGV_MAX) * sizeof (argv->argv[0]))))) + return -1; + + argv->argc = 0; +@@ -537,8 +537,8 @@ + + count = g_slist_length(props); + +- arggetv = g_malloc0(sizeof(*arggetv) + (count - CAMEL_ARGV_MAX) * sizeof(arggetv->argv[0])); +- argv = g_malloc0(sizeof(*argv) + (count - CAMEL_ARGV_MAX) * sizeof(argv->argv[0])); ++ arggetv = g_malloc0((guint32)(sizeof(*arggetv) + (count - CAMEL_ARGV_MAX) * sizeof(arggetv->argv[0]))); ++ argv = g_malloc0((guint32)(sizeof(*argv) + (count - CAMEL_ARGV_MAX) * sizeof(argv->argv[0]))); + l = props; + i = 0; + while (l) { |