Update to 2.34.3.

git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@17152 df743ca5-7f9a-e211-a948-0013205c9059

6 files changed, 35 insertions, 15 deletions

diff --git a/devel/gio-fam-backend/Makefile b/devel/gio-fam-backend/Makefile
index f06abc99d..399220fb7 100644
--- a/devel/gio-fam-backend/Makefile
+++ b/devel/gio-fam-backend/Makefile
@@ -1,9 +1,9 @@
 # Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
 # $FreeBSD$
-#   $MCom: ports/devel/gio-fam-backend/Makefile,v 1.94 2012/07/26 09:09:58 kwm Exp $
+#   $MCom: ports/devel/gio-fam-backend/Makefile,v 1.95 2012/10/19 16:57:55 kwm Exp $
 
 PORTNAME=	gio-fam-backend
-PORTVERSION=	2.34.1
+PORTVERSION=	2.34.3
 PORTREVISION=	0
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNOME:S,%SUBDIR%,sources/glib/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/},} \
diff --git a/devel/gio-fam-backend/distinfo b/devel/gio-fam-backend/distinfo
index d12cd6987..57207bc60 100644
--- a/devel/gio-fam-backend/distinfo
+++ b/devel/gio-fam-backend/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gnome2/glib-2.34.1.tar.xz) = 6e84dc9d84b104725b34d255421ed7ac3629e49f437d37addde5ce3891c2e2f1
-SIZE (gnome2/glib-2.34.1.tar.xz) = 6363332
+SHA256 (gnome2/glib-2.34.3.tar.xz) = 855fcbf87cb93065b488358e351774d8a39177281023bae58c286f41612658a7
+SIZE (gnome2/glib-2.34.3.tar.xz) = 6334872
diff --git a/devel/glib20/Makefile b/devel/glib20/Makefile
index 4e09f839b..afc21958e 100644
--- a/devel/glib20/Makefile
+++ b/devel/glib20/Makefile
@@ -1,10 +1,10 @@
 # Created by: Vanilla I. Shu <vanilla@FreeBSD.org>
 # $FreeBSD$
-#   $MCom: ports/devel/glib20/Makefile,v 1.227 2012/09/19 13:17:02 kwm Exp $
+#   $MCom: ports/devel/glib20/Makefile,v 1.228 2012/10/19 16:57:55 kwm Exp $
 # !! DON'T FORGET ABOUT devel/gio-fam-backend !!
 
 PORTNAME=	glib
-PORTVERSION=	2.34.1
+PORTVERSION=	2.34.3
 PORTREVISION?=	0
 CATEGORIES=	devel
 MASTER_SITES=	GNOME
diff --git a/devel/glib20/distinfo b/devel/glib20/distinfo
index d12cd6987..57207bc60 100644
--- a/devel/glib20/distinfo
+++ b/devel/glib20/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gnome2/glib-2.34.1.tar.xz) = 6e84dc9d84b104725b34d255421ed7ac3629e49f437d37addde5ce3891c2e2f1
-SIZE (gnome2/glib-2.34.1.tar.xz) = 6363332
+SHA256 (gnome2/glib-2.34.3.tar.xz) = 855fcbf87cb93065b488358e351774d8a39177281023bae58c286f41612658a7
+SIZE (gnome2/glib-2.34.3.tar.xz) = 6334872
diff --git a/devel/glib20/files/patch-glib_gthread-posix.c b/devel/glib20/files/patch-glib_gthread-posix.c
index 0b3505616..f19007f8c 100644
--- a/devel/glib20/files/patch-glib_gthread-posix.c
+++ b/devel/glib20/files/patch-glib_gthread-posix.c
@@ -1,15 +1,15 @@
---- glib/gthread-posix.c.orig	2012-05-13 18:23:49.000000000 -0400
-+++ glib/gthread-posix.c	2012-05-13 18:30:37.000000000 -0400
-@@ -89,7 +89,7 @@ g_mutex_impl_new (void)
+--- glib/gthread-posix.c.orig	2012-11-10 03:24:06.000000000 +0000
++++ glib/gthread-posix.c	2012-11-12 18:06:36.000000000 +0000
+@@ -89,7 +89,7 @@
    if G_UNLIKELY (mutex == NULL)
      g_thread_abort (errno, "malloc");
  
 -#ifdef PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP
 +#if defined(PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP) && !defined(__FreeBSD__)
-   pthread_mutexattr_t attr;
-   pthread_mutexattr_init (&attr);
-   pthread_mutexattr_settype (&attr, PTHREAD_MUTEX_ADAPTIVE_NP);
-@@ -99,7 +99,7 @@ g_mutex_impl_new (void)
+   {
+     pthread_mutexattr_t attr;
+     pthread_mutexattr_init (&attr);
+@@ -101,7 +101,7 @@
    if G_UNLIKELY ((status = pthread_mutex_init (mutex, pattr)) != 0)
      g_thread_abort (status, "pthread_mutex_init");
  
diff --git a/devel/glib20/files/patch-glib_tests_gdatetime.c b/devel/glib20/files/patch-glib_tests_gdatetime.c
new file mode 100644
index 000000000..8a8774254
--- /dev/null
+++ b/devel/glib20/files/patch-glib_tests_gdatetime.c
@@ -0,0 +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;
+   gint i1, i2;
+ 
+-  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;
+   gint i1, i2;
+ 
+-  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;