Bugfix update to glib2-2.28.8.

Remove patches applied upstream.
This commit is contained in:
ajacoutot 2011-06-06 06:22:19 +00:00
parent 0cac5e487c
commit 3be8bdfc2e
5 changed files with 11 additions and 57 deletions

View File

@ -1,15 +1,13 @@
# $OpenBSD: Makefile,v 1.123 2011/06/03 16:54:05 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.124 2011/06/06 06:22:19 ajacoutot Exp $
COMMENT-main= general-purpose utility library
COMMENT-docs= glib2 documentation
VERSION= 2.28.7
VERSION= 2.28.8
DISTNAME= glib-${VERSION}
PKGNAME-main= glib2-${VERSION}
PKGNAME-docs= glib2-docs-${VERSION}
REVISION-main= 7
CATEGORIES= devel
HOMEPAGE= http://www.gtk.org/

View File

@ -1,5 +1,5 @@
MD5 (glib-2.28.7.tar.bz2) = /toWUMhkatOcewHZWwN2aw==
RMD160 (glib-2.28.7.tar.bz2) = H7tkRj2JR48Oe0xMiBjuZkTBd1E=
SHA1 (glib-2.28.7.tar.bz2) = gup5/Cxz3ynaHG0z4PoCfmx37Gg=
SHA256 (glib-2.28.7.tar.bz2) = Dhs4FqiTQ3HU6iMT374l0Q0WyVD40C4KeHmuENkbFjE=
SIZE (glib-2.28.7.tar.bz2) = 6972304
MD5 (glib-2.28.8.tar.bz2) = eJ51IPccakvwi8aD7HZNJA==
RMD160 (glib-2.28.8.tar.bz2) = 8IenFEXrQPrl6rRaFMt01OI51eY=
SHA1 (glib-2.28.8.tar.bz2) = IM1jcFqIBSYNoDIMZbl5Iz8uPBg=
SHA256 (glib-2.28.8.tar.bz2) = Ii8wVdbEE0F7UJAQCMZUhl5aMRxz8K6RiwqZeNH5Rm8=
SIZE (glib-2.28.8.tar.bz2) = 7017806

View File

@ -1,26 +0,0 @@
$OpenBSD: patch-gio_glib-compile-schemas_c,v 1.1 2011/05/28 07:38:01 ajacoutot Exp $
From 7d0eac03e9cd88b33f68a7a451992d1f222573a2 Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@redhat.com>
Date: Fri, 27 May 2011 22:30:45 +0000
Subject: glib-compile-schemas: write informational messages to stdout
--- gio/glib-compile-schemas.c.orig Sat May 21 05:29:24 2011
+++ gio/glib-compile-schemas.c Sat May 28 09:34:09 2011
@@ -1965,13 +1965,13 @@ main (int argc, char **argv)
if (files->len == 0)
{
- fprintf (stderr, _("No schema files found: "));
+ fprintf (stdout, _("No schema files found: "));
if (g_unlink (target))
- fprintf (stderr, _("doing nothing.\n"));
+ fprintf (stdout, _("doing nothing.\n"));
else
- fprintf (stderr, _("removed existing output file.\n"));
+ fprintf (stdout, _("removed existing output file.\n"));
return 0;
}

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-glib_gmain_c,v 1.2 2011/05/24 09:10:23 ajacoutot Exp $
--- glib/gmain.c.orig Sat May 21 05:29:24 2011
+++ glib/gmain.c Tue May 24 10:50:15 2011
@@ -2054,7 +2054,9 @@ g_get_monotonic_time (void)
$OpenBSD: patch-glib_gmain_c,v 1.3 2011/06/06 06:22:19 ajacoutot Exp $
--- glib/gmain.c.orig Mon Jun 6 01:18:49 2011
+++ glib/gmain.c Mon Jun 6 08:01:27 2011
@@ -2055,7 +2055,9 @@ g_get_monotonic_time (void)
if G_UNLIKELY (!checked)
{

View File

@ -1,18 +0,0 @@
$OpenBSD: patch-tests_child-test_c,v 1.4 2011/05/28 07:38:01 ajacoutot Exp $
From 2ee470a71fdc3707cf4e093b22ab0f46ffab82e2 Mon Sep 17 00:00:00 2001
From: Antoine Jacoutot <ajacoutot@openbsd.org>
Date: Fri, 27 May 2011 15:39:38 +0000
Subject: Don't hardcode path to true(1).
--- tests/child-test.c.orig Sat May 28 09:32:42 2011
+++ tests/child-test.c Sat May 28 09:32:48 2011
@@ -175,7 +175,7 @@ main (int argc, char *argv[])
#ifdef G_OS_WIN32
system ("ipconfig /all");
#else
- system ("/bin/true");
+ system ("true");
#endif
alive = 2;