mirror of
https://git.freebsd.org/ports.git
synced 2025-07-18 09:49:18 -04:00
Restore a patch that was lost in the GNOME 2.16 update and re-fix the
problem where Evolution would run out of memory on 64-bit platforms. Reported by: cokane Approved by: portmgr (implicit)
This commit is contained in:
parent
9200d02e75
commit
ee6369fc3c
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=175392
2 changed files with 23 additions and 0 deletions
|
@ -8,6 +8,7 @@
|
||||||
|
|
||||||
PORTNAME= evolution-data-server
|
PORTNAME= evolution-data-server
|
||||||
PORTVERSION= 1.8.1
|
PORTVERSION= 1.8.1
|
||||||
|
PORTREVISION= 1
|
||||||
CATEGORIES= databases gnome
|
CATEGORIES= databases gnome
|
||||||
MASTER_SITES= ${MASTER_SITE_GNOME}
|
MASTER_SITES= ${MASTER_SITE_GNOME}
|
||||||
MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
|
MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
|
||||||
|
|
|
@ -0,0 +1,22 @@
|
||||||
|
--- camel-object.c.orig Wed Oct 18 15:53:34 2006
|
||||||
|
+++ 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) {
|
Loading…
Add table
Reference in a new issue