summaryrefslogtreecommitdiffstats
path: root/databases
diff options
context:
space:
mode:
authormarcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059>2007-04-28 15:18:25 +0800
committermarcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059>2007-04-28 15:18:25 +0800
commite0ad0738a7862c8df085fe758479188dcc724eb2 (patch)
tree3e7aa26021947f46ecbd896cf44dc402ebe100e7 /databases
parent5c204db903c46fc59da21ebd4d568e918992525f (diff)
downloadmarcuscom-ports-e0ad0738a7862c8df085fe758479188dcc724eb2.tar
marcuscom-ports-e0ad0738a7862c8df085fe758479188dcc724eb2.tar.gz
marcuscom-ports-e0ad0738a7862c8df085fe758479188dcc724eb2.tar.bz2
marcuscom-ports-e0ad0738a7862c8df085fe758479188dcc724eb2.tar.lz
marcuscom-ports-e0ad0738a7862c8df085fe758479188dcc724eb2.tar.xz
marcuscom-ports-e0ad0738a7862c8df085fe758479188dcc724eb2.tar.zst
marcuscom-ports-e0ad0738a7862c8df085fe758479188dcc724eb2.zip
Merge timezone file patch from ports.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@8662 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'databases')
-rw-r--r--databases/evolution-data-server/Makefile4
-rw-r--r--databases/evolution-data-server/files/patch-calendar_libical_src_libical_icaltimezone.c13
2 files changed, 15 insertions, 2 deletions
diff --git a/databases/evolution-data-server/Makefile b/databases/evolution-data-server/Makefile
index 2c4d6a27b..65ca82b92 100644
--- a/databases/evolution-data-server/Makefile
+++ b/databases/evolution-data-server/Makefile
@@ -3,12 +3,12 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/databases/evolution-data-server/Makefile,v 1.112 2007/03/13 04:35:01 marcus Exp $
+# $MCom: ports/databases/evolution-data-server/Makefile,v 1.114 2007/04/28 07:15:21 marcus Exp $
#
PORTNAME= evolution-data-server
PORTVERSION= 1.10.1
-PORTREVISION= 1
+PORTREVISION= 2
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-calendar_libical_src_libical_icaltimezone.c b/databases/evolution-data-server/files/patch-calendar_libical_src_libical_icaltimezone.c
new file mode 100644
index 000000000..cf14e5df6
--- /dev/null
+++ b/databases/evolution-data-server/files/patch-calendar_libical_src_libical_icaltimezone.c
@@ -0,0 +1,13 @@
+Index: calendar/libical/src/libical/icaltimezone.c
+===================================================================
+--- calendar/libical/src/libical/icaltimezone.c (révision 593)
++++ calendar/libical/src/libical/icaltimezone.c (copie de travail)
+@@ -1433,7 +1433,7 @@
+
+ z_offset = get_offset(zone);
+
+- if (z_offset == offset && !strcmp(tzname, zone->tznames))
++ if (z_offset == offset && zone->tznames && !strcmp(tzname, zone->tznames))
+ return zone;
+ }
+