diff options
| author | wiz <wiz> | 2014-05-26 22:29:23 +0000 |
|---|---|---|
| committer | wiz <wiz> | 2014-05-26 22:29:23 +0000 |
| commit | e37088424e99665d2c24ebbf892cb9236cfde9d2 (patch) | |
| tree | f0d921f749134cccd6e056e9803f0568ff020e47 /devel/glib2 | |
| parent | e75316b315616bd39474d7aa67d6e6332cdf620c (diff) | |
| download | pkgsrc-e37088424e99665d2c24ebbf892cb9236cfde9d2.tar.gz | |
Bug 730332 - glib uses wrong timezone transition with zoneinfo 2014c and up
Patch from John Ralls.
Bump PKGREVISION.
Diffstat (limited to 'devel/glib2')
| -rw-r--r-- | devel/glib2/Makefile | 3 | ||||
| -rw-r--r-- | devel/glib2/distinfo | 3 | ||||
| -rw-r--r-- | devel/glib2/patches/patch-glib_gtimezone.c | 20 |
3 files changed, 24 insertions, 2 deletions
diff --git a/devel/glib2/Makefile b/devel/glib2/Makefile index d59f86e0d6d..112bb50e5f5 100644 --- a/devel/glib2/Makefile +++ b/devel/glib2/Makefile @@ -1,8 +1,9 @@ -# $NetBSD: Makefile,v 1.217 2013/08/17 11:52:36 richard Exp $ +# $NetBSD: Makefile,v 1.218 2014/05/26 22:29:23 wiz Exp $ .include "Makefile.common" CATEGORIES= devel gnome +PKGREVISION= 1 COMMENT= Some useful routines for C programming (glib2) diff --git a/devel/glib2/distinfo b/devel/glib2/distinfo index cdcf8d0a593..e10653e3f60 100644 --- a/devel/glib2/distinfo +++ b/devel/glib2/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.198 2013/12/25 11:47:09 tron Exp $ +$NetBSD: distinfo,v 1.199 2014/05/26 22:29:23 wiz Exp $ SHA1 (glib-2.38.2.tar.xz) = 685c5a4215b776b83dd5330ab9084c5dcb0a51b8 RMD160 (glib-2.38.2.tar.xz) = 1dcc15ce6dac0faafaee448f393284bb038f2a76 @@ -31,3 +31,4 @@ SHA1 (patch-gio_gdbusmessage.c) = 63030dac620e2e098acf079e5288e356f1f44504 SHA1 (patch-gio_gfile.c) = 6ad65bb17e6afe7bb9bca552ae1b1a7d8b7b2ee0 SHA1 (patch-gio_glocalfile.c) = b09c78199ef2696905ce8a49e0c3590d243a83c8 SHA1 (patch-gio_gresource-tool.c) = 4eb7c9df25e9ac3e977edf3be8fb977a6fb39182 +SHA1 (patch-glib_gtimezone.c) = 36f74724347f2947c71839bda4784b81e8b94a47 diff --git a/devel/glib2/patches/patch-glib_gtimezone.c b/devel/glib2/patches/patch-glib_gtimezone.c new file mode 100644 index 00000000000..5550ddffb8b --- /dev/null +++ b/devel/glib2/patches/patch-glib_gtimezone.c @@ -0,0 +1,20 @@ +$NetBSD: patch-glib_gtimezone.c,v 1.1 2014/05/26 22:29:23 wiz Exp $ + +Bug 730332 - glib uses wrong timezone transition with zoneinfo 2014c and up + +Patch from John Ralls. + +--- glib/gtimezone.c.orig 2013-11-07 15:29:13.000000000 +0000 ++++ glib/gtimezone.c +@@ -1558,7 +1558,11 @@ interval_end (GTimeZone *tz, + guint interval) + { + if (tz->transitions && interval < tz->transitions->len) ++ { ++ if ((TRANSITION(interval)).time == G_MININT64) ++ return G_MININT64; + return (TRANSITION(interval)).time - 1; ++ } + return G_MAXINT64; + } + |