Fix for 64-bit time_t.

looked over by kettenis@
This commit is contained in:
ajacoutot 2013-09-10 07:20:53 +00:00
parent bf27c65553
commit 48418978fb
3 changed files with 15 additions and 31 deletions

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.204 2013/08/15 16:07:27 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.205 2013/09/10 07:20:53 ajacoutot Exp $
# XXX textproc/highlight
@ -13,7 +13,7 @@ GNOME_VERSION= 3.8.5
PKGNAME-main= ${DISTNAME}
PKGNAME-plugins= evolution-plugins-${GNOME_VERSION}
REVISION-main= 1
REVISION-main= 2
# NOTE: when R changes, increment EVO_VERSION accordingly and bump:
# mail/evolution-ews

View File

@ -1,42 +1,26 @@
$OpenBSD: patch-calendar_alarm-notify_alarm_c,v 1.6 2013/08/15 16:07:27 ajacoutot Exp $
$OpenBSD: patch-calendar_alarm-notify_alarm_c,v 1.7 2013/09/10 07:20:53 ajacoutot Exp $
XXX remove when we have a 64-bit time_t
https://bugzilla.gnome.org/show_bug.cgi?id=707829
--- calendar/alarm-notify/alarm.c.orig Sun Nov 11 01:13:47 2012
+++ calendar/alarm-notify/alarm.c Sun Nov 11 19:14:54 2012
@@ -76,7 +76,7 @@ pop_alarm (void)
static gboolean
alarm_ready_cb (gpointer data)
{
- time_t now;
+ long now;
if (!alarms) {
g_warning ("Alarm triggered, but no alarm present\n");
--- calendar/alarm-notify/alarm.c.orig Tue Jul 23 14:52:26 2013
+++ calendar/alarm-notify/alarm.c Sat Aug 31 14:31:05 2013
@@ -97,7 +97,7 @@ alarm_ready_cb (gpointer data)
if (ar->trigger > now)
break;
- debug (("Process alarm with trigger %lu", ar->trigger));
+ debug (("Process alarm with trigger %lu", (long)ar->trigger));
+ debug (("Process alarm with trigger %lld", (long long)ar->trigger));
notify_id = ar;
ar_copy = *ar;
@@ -131,7 +131,7 @@ setup_timeout (void)
{
const AlarmRecord *ar;
guint diff;
- time_t now;
+ long now;
@@ -153,8 +153,8 @@ setup_timeout (void)
if (!alarms) {
g_warning ("No alarm to setup\n");
@@ -154,7 +154,7 @@ setup_timeout (void)
/* Add the time out */
debug (
("Setting timeout for %d.%2d (from now) %lu %lu",
- ("Setting timeout for %d.%2d (from now) %lu %lu",
- diff / 60, diff % 60, ar->trigger, now));
+ diff / 60, diff % 60, (long)ar->trigger, now));
+ ("Setting timeout for %d.%2d (from now) %lld %lld",
+ diff / 60, diff % 60, (long long)ar->trigger, (long long)now));
debug ((" %s", ctime (&ar->trigger)));
debug ((" %s", ctime (&now)));
timeout_id = g_timeout_add_seconds (diff, alarm_ready_cb, NULL);

View File

@ -1,11 +1,11 @@
$OpenBSD: patch-configure,v 1.24 2013/08/15 16:07:27 ajacoutot Exp $
$OpenBSD: patch-configure,v 1.25 2013/09/10 07:20:53 ajacoutot Exp $
XXX patch evo_krb5_support.m4 to use krb5-config(1) and push upstream
(and remove the call to krb5-config from MODGNOME_CPPFLAGS)
--- configure.orig Fri Jun 14 10:42:47 2013
+++ configure Fri Jun 14 10:43:20 2013
@@ -16846,7 +16846,7 @@ $as_echo_n "checking for Kerberos 5... " >&6; }
--- configure.orig Sun Aug 11 13:42:23 2013
+++ configure Sat Aug 31 10:57:17 2013
@@ -16843,7 +16843,7 @@ $as_echo_n "checking for Kerberos 5... " >&6; }
esac
mitlibs="-lkrb5 -lk5crypto -lcom_err -lgssapi_krb5"