cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't hardcode path to true(1).

Browse Source 
glib-compile-schemas: write informational messages to stdout instead of
stderr.
This commit is contained in:
ajacoutot 2011-05-28 07:38:01 +00:00
parent e336dd0283
commit def1350a98
3 changed files with 41 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
devel/glib2/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.117 2011/05/28 07:32:06 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.118 2011/05/28 07:38:01 ajacoutot Exp $
COMMENT-main= general-purpose utility library
COMMENT-docs= glib2 documentation
@ -8,7 +8,7 @@ DISTNAME= glib-${VERSION}
PKGNAME-main= glib2-${VERSION}
PKGNAME-docs= glib2-docs-${VERSION}
REVISION-main= 3
REVISION-main= 4
CATEGORIES= devel

26
devel/glib2/patches/patch-gio_glib-compile-schemas_c Normal file
View File

@ -0,0 +1,26 @@
$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;
}

26
devel/glib2/patches/patch-tests_child-test_c
View File

@ -1,18 +1,18 @@
$OpenBSD: patch-tests_child-test_c,v 1.3 2011/05/27 08:25:14 ajacoutot Exp $
$OpenBSD: patch-tests_child-test_c,v 1.4 2011/05/28 07:38:01 ajacoutot Exp $
https://bugzilla.gnome.org/show_bug.cgi?id=651219
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 Mon Sep 27 20:48:34 2010
+++ tests/child-test.c Fri May 27 10:17:00 2011
@@ -172,8 +172,10 @@ main (int argc, char *argv[])
#endif
main_loop = g_main_loop_new (NULL, FALSE);
-#ifdef G_OS_WIN32
+#if defined(G_OS_WIN32)
--- 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");
+#elif defined(__OpenBSD__)
+ system ("/usr/bin/true");
#else
system ("/bin/true");
- system ("/bin/true");
+ system ("true");
#endif
alive = 2;