summaryrefslogtreecommitdiff
path: root/devel
diff options
context:
space:
mode:
authordrochner <drochner>2009-01-25 16:56:20 +0000
committerdrochner <drochner>2009-01-25 16:56:20 +0000
commit14da234eb3022d3e26edfeb7e3bfabd61a8548b8 (patch)
tree5aca801072943f6039f8cf66a1facb45cd63805a /devel
parent5e8f0b416d07d5495bce3e4541a525f472ed94b7 (diff)
downloadpkgsrc-14da234eb3022d3e26edfeb7e3bfabd61a8548b8.tar.gz
fix a case where time_t==long is assumed, bump PKGREVISION
Diffstat (limited to 'devel')
-rw-r--r--devel/glib2/Makefile3
-rw-r--r--devel/glib2/distinfo3
-rw-r--r--devel/glib2/patches/patch-am31
3 files changed, 35 insertions, 2 deletions
diff --git a/devel/glib2/Makefile b/devel/glib2/Makefile
index 825bd08f2c8..81059f53c04 100644
--- a/devel/glib2/Makefile
+++ b/devel/glib2/Makefile
@@ -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 --git a/devel/glib2/distinfo b/devel/glib2/distinfo
index cc3f0412caa..80bdf647fcf 100644
--- a/devel/glib2/distinfo
+++ b/devel/glib2/distinfo
@@ -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-ai) = 30b371e345a1ab3a07ce1fe2fe9c599398d668eb
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 --git a/devel/glib2/patches/patch-am b/devel/glib2/patches/patch-am
new file mode 100644
index 00000000000..e4a793411be
--- /dev/null
+++ b/devel/glib2/patches/patch-am
@@ -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
+