summaryrefslogtreecommitdiff
path: root/devel/glib20/files/patch-glib_tests_gdatetime.c
diff options
context:
space:
mode:
authorKoop Mast <kwm@FreeBSD.org>2013-07-31 11:57:45 +0000
committerKoop Mast <kwm@FreeBSD.org>2013-07-31 11:57:45 +0000
commita5f590e51d3b147b9b5085ac6a2920189b42967a (patch)
treecee27e48f57eafc0ae5948472d8e095072bb5222 /devel/glib20/files/patch-glib_tests_gdatetime.c
parent- Convert to new perl framework (diff)
The FreeBSD GNOME team presents a Glib and Gtk+ 3 update.
This update updates Glib20 to 2.36 and Gtk+ 3.8 * The gio-fam-backend port that used gamin for the GFileMonitor API is gone. It is replaced by a GIO kqueue implementation developed as part of a NetBSD GSoC 2011 project by Dimitry Matveev. * Fix a bug in the glib20 Makefile so it includes -lintl in the glib-2.0 pkgconfig file [1]. This broke static linking and newer binutils. * Add introspection USE_GNOME component which sets GI_SCANNER_DISABLE_CACHE to prevent creation of / root/.cache dir. Defaults to build & run depend, but :build and :run switches available. * New x11-toolkits/pangox-compat port and companion USE_GNOME component for pangox support which was removed from the pango port. Add it to ports still using pangox API. Exp-run by: bapt@ PR: ports/178958 [1] Submitted by: emaste@ [1]
Diffstat (limited to 'devel/glib20/files/patch-glib_tests_gdatetime.c')
-rw-r--r--devel/glib20/files/patch-glib_tests_gdatetime.c24
1 files changed, 12 insertions, 12 deletions
diff --git a/devel/glib20/files/patch-glib_tests_gdatetime.c b/devel/glib20/files/patch-glib_tests_gdatetime.c
index 8a8774254f95..e86fb7ffde09 100644
--- a/devel/glib20/files/patch-glib_tests_gdatetime.c
+++ b/devel/glib20/files/patch-glib_tests_gdatetime.c
@@ -1,20 +1,20 @@
---- glib/tests/gdatetime.c.orig 2012-08-17 00:06:25.000000000 +0000
-+++ glib/tests/gdatetime.c 2012-10-23 12:38:55.000000000 +0000
-@@ -1230,7 +1230,7 @@
- gint64 u;
+--- glib/tests/gdatetime.c.orig 2013-03-13 13:39:09.000000000 +0000
++++ glib/tests/gdatetime.c 2013-03-28 10:15:49.000000000 +0000
+@@ -1276,7 +1276,7 @@
gint i1, i2;
+ #ifdef G_OS_UNIX
- tz = g_time_zone_new ("Canada/Eastern");
+ tz = g_time_zone_new ("America/Montreal");
- dt = g_date_time_new_utc (2010, 11, 7, 1, 30, 0);
- u = g_date_time_to_unix (dt);
-
-@@ -1259,7 +1259,7 @@
- gint64 u, u2;
+ #elif defined G_OS_WIN32
+ tz = g_time_zone_new ("Eastern Standard Time");
+ #endif
+@@ -1309,7 +1309,7 @@
gint i1, i2;
+ #ifdef G_OS_UNIX
- tz = g_time_zone_new ("Canada/Eastern");
+ tz = g_time_zone_new ("America/Montreal");
- dt = g_date_time_new_utc (2010, 11, 7, 1, 30, 0);
- u = g_date_time_to_unix (dt);
- u2 = u;
+ #elif defined G_OS_WIN32
+ tz = g_time_zone_new ("Eastern Standard Time");
+ #endif