[pkgsrc/trunk]: pkgsrc/devel/glib2 fix a case where time_t==long is assumed, ...

[drochner <drochner%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/e15cf04ba9a5
branches:  trunk
changeset: 553585:e15cf04ba9a5
user:      drochner <drochner%pkgsrc.org@localhost>
date:      Sun Jan 25 16:56:20 2009 +0000

description:
fix a case where time_t==long is assumed, bump PKGREVISION

diffstat:

 devel/glib2/Makefile         |   3 ++-
 devel/glib2/distinfo         |   3 ++-
 devel/glib2/patches/patch-am |  31 +++++++++++++++++++++++++++++++
 3 files changed, 35 insertions(+), 2 deletions(-)

diffs (66 lines):

diff -r 88765e081deb -r e15cf04ba9a5 devel/glib2/Makefile
--- a/devel/glib2/Makefile      Sun Jan 25 16:56:01 2009 +0000
+++ b/devel/glib2/Makefile      Sun Jan 25 16:56:20 2009 +0000
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.153 2009/01/12 13:06:15 wiz Exp $
+# $NetBSD: Makefile,v 1.154 2009/01/25 16:56:20 drochner Exp $
 
 # When updating glib2, please apply patch-ak to configure.in
 # Then run a matching version of autoconf to regen patch-aa.
 DISTNAME=              glib-2.18.4
 PKGNAME=               ${DISTNAME:S/glib/glib2/}
+PKGREVISION=           1
 CATEGORIES=            devel
 MASTER_SITES=          ftp://ftp.gtk.org/pub/glib/2.18/ \
                        ftp://ftp.cs.umn.edu/pub/gimp/pub/glib/2.18/ \
diff -r 88765e081deb -r e15cf04ba9a5 devel/glib2/distinfo
--- a/devel/glib2/distinfo      Sun Jan 25 16:56:01 2009 +0000
+++ b/devel/glib2/distinfo      Sun Jan 25 16:56:20 2009 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.109 2009/01/12 13:06:15 wiz Exp $
+$NetBSD: distinfo,v 1.110 2009/01/25 16:56:20 drochner Exp $
 
 SHA1 (glib-2.18.4.tar.bz2) = 3e21395c6980e3970d5260b46ecb6b87f2482c61
 RMD160 (glib-2.18.4.tar.bz2) = c47a71708fd13ade70d72d3443799d3e74a0459d
@@ -15,5 +15,6 @@
 SHA1 (patch-aj) = a8c4e79113828e6dadf0b158777bb860aa44de3e
 SHA1 (patch-ak) = f382189966f073b3b6e6de89ea7709571241a9a0
 SHA1 (patch-al) = de5135c328027b3c4543bb09994d31b6ffedeafa
+SHA1 (patch-am) = 510c052c8aea9341a5bf12061879a8bd4eb30a0e
 SHA1 (patch-ba) = 767a4880a749c5491836510de1011d9c4e8887f0
 SHA1 (patch-cb) = 0f084c33fb67fbb8e12448034450699da26289ff
diff -r 88765e081deb -r e15cf04ba9a5 devel/glib2/patches/patch-am
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/glib2/patches/patch-am      Sun Jan 25 16:56:20 2009 +0000
@@ -0,0 +1,31 @@
+$NetBSD: patch-am,v 1.1 2009/01/25 16:56:20 drochner Exp $
+
+--- ./glib/gtimer.c.orig       2009-01-09 06:36:18.000000000 +0100
++++ ./glib/gtimer.c
+@@ -416,6 +416,7 @@ g_time_val_to_iso8601 (GTimeVal *time_)
+ {
+   gchar *retval;
+   struct tm *tm;
++  time_t secs;
+ #ifdef HAVE_GMTIME_R
+   struct tm tm_;
+ #endif
+@@ -424,14 +425,15 @@ g_time_val_to_iso8601 (GTimeVal *time_)
+ 
+ #ifdef _WIN32
+   {
+-    time_t secs = time_->tv_sec;
++    secs = time_->tv_sec;
+     tm = gmtime (&secs);
+   }
+ #else
++  secs = time_->tv_sec;
+ #ifdef HAVE_GMTIME_R
+-  tm = gmtime_r (&time_->tv_sec, &tm_);
++  tm = gmtime_r (&secs, &tm_);
+ #else
+-  tm = gmtime (&time_->tv_sec);
++  tm = gmtime (&secs);
+ #endif
+ #endif
+