From 28827aac695d388e25f52601eae9552195763020 Mon Sep 17 00:00:00 2001
From: ajacoutot <ajacoutot@openbsd.org>
Date: Sun, 11 Jan 2009 17:06:26 +0000
Subject: [PATCH] - bugfix release to glib2-2.18.4 thanks to Benoit Lecocq for
 amd64 testing

---
 devel/glib2/Makefile                  |  6 +++---
 devel/glib2/distinfo                  | 10 +++++-----
 devel/glib2/patches/patch-gio_gfile_c |  8 ++++----
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/devel/glib2/Makefile b/devel/glib2/Makefile
index c0d0f15624a..93f2a32e557 100644
--- a/devel/glib2/Makefile
+++ b/devel/glib2/Makefile
@@ -1,12 +1,12 @@
-# $OpenBSD: Makefile,v 1.56 2008/12/21 14:02:39 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.57 2009/01/11 17:06:26 ajacoutot Exp $
 
 COMMENT-main=		general-purpose utility library
 COMMENT-docs=		glib2 documentation
 COMMENT-fam=		fam(3) gio module
 
-VERSION=		2.18.3
+VERSION=		2.18.4
 DISTNAME=		glib-${VERSION}
-PKGNAME-main=		glib2-${VERSION}p0
+PKGNAME-main=		glib2-${VERSION}
 PKGNAME-docs=		glib2-docs-${VERSION}
 PKGNAME-fam=		glib2-fam-${VERSION}
 
diff --git a/devel/glib2/distinfo b/devel/glib2/distinfo
index 079dcad918e..88c40abf930 100644
--- a/devel/glib2/distinfo
+++ b/devel/glib2/distinfo
@@ -1,5 +1,5 @@
-MD5 (glib-2.18.3.tar.bz2) = 8TmWp71XUl15amWT8mp3cQ==
-RMD160 (glib-2.18.3.tar.bz2) = z0P7ugQlC+yqvbe39VvN7FhPAZ4=
-SHA1 (glib-2.18.3.tar.bz2) = KT9jn7hepHNH6zThIjJ8YO92BuQ=
-SHA256 (glib-2.18.3.tar.bz2) = n3aehEnIzB2HibqYfkRr2sPtImcdcflGyXPHqtzMCzY=
-SIZE (glib-2.18.3.tar.bz2) = 4835503
+MD5 (glib-2.18.4.tar.bz2) = 7CXtJhU02HAUEACrc/Givw==
+RMD160 (glib-2.18.4.tar.bz2) = xHpxcI/ROt5w1y00Q3mdPnSgRZ0=
+SHA1 (glib-2.18.4.tar.bz2) = PiE5XGmA45cNUmC0bstrh/JILGE=
+SHA256 (glib-2.18.4.tar.bz2) = ausshF6f3DiJQ6zaui9jV+MAfF/6qNZmkEZ5z7QN4QA=
+SIZE (glib-2.18.4.tar.bz2) = 4809051
diff --git a/devel/glib2/patches/patch-gio_gfile_c b/devel/glib2/patches/patch-gio_gfile_c
index da0b82f1ad3..26c1416a9a1 100644
--- a/devel/glib2/patches/patch-gio_gfile_c
+++ b/devel/glib2/patches/patch-gio_gfile_c
@@ -1,11 +1,11 @@
-$OpenBSD: patch-gio_gfile_c,v 1.1 2008/12/21 14:02:40 ajacoutot Exp $
+$OpenBSD: patch-gio_gfile_c,v 1.2 2009/01/11 17:06:26 ajacoutot Exp $
 
 Lower bufer size to prevent memory access issues.
 See GNOME bugzilla #561939.
 
---- gio/gfile.c.orig	Sat Dec 20 21:45:00 2008
-+++ gio/gfile.c	Sat Dec 20 21:45:17 2008
-@@ -2194,7 +2194,7 @@ copy_stream_with_progress (GInputStream           *in,
+--- gio/gfile.c.orig	Fri Jan  9 07:01:02 2009
++++ gio/gfile.c	Sat Jan 10 12:13:16 2009
+@@ -2195,7 +2195,7 @@ copy_stream_with_progress (GInputStream           *in,
  {
    gssize n_read, n_written;
    goffset current_size;