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

Minor update to glib 2.30.3.

Browse Source
This commit is contained in:
ajacoutot 2012-03-12 07:21:06 +00:00
parent 2e730f0425
commit c59d36a1fa
8 changed files with 28 additions and 108 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
devel/glib2/Makefile
View File

@ -1,17 +1,15 @@
# $OpenBSD: Makefile,v 1.154 2012/03/06 11:39:17 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.155 2012/03/12 07:21:06 ajacoutot Exp $
COMMENT-main= general-purpose utility library
COMMENT-docs= glib2 documentation
VERSION= 2.30.2
VERSION= 2.30.3
DISTNAME= glib-${VERSION}
EXTRACT_SUFX= .tar.xz
PKGNAME-main= glib2-${VERSION}
PKGNAME-docs= glib2-docs-${VERSION}
REVISION-main= 7
CATEGORIES= devel
HOMEPAGE= http://www.gtk.org/

10
devel/glib2/distinfo
View File

@ -1,10 +1,10 @@
MD5 (glib-2.30.2.tar.xz) = t90mqoPeC1nIZ6C565+UYg==
MD5 (glib-2.30.3.tar.xz) = D5+jKcbBAS0P2GGtPYpFIA==
MD5 (glib-gio-kqueue-2.28.8-v3.patch) = UJgRcpBOLZXErtqPv+4kyA==
RMD160 (glib-2.30.2.tar.xz) = 2Px8h2vRXqOpJV1NCmfXReN5BIg=
RMD160 (glib-2.30.3.tar.xz) = CIewji//dcMl7R+xEjuq9C3Jd5s=
RMD160 (glib-gio-kqueue-2.28.8-v3.patch) = ukhZ1DNttQustr2qzple52EwaoU=
SHA1 (glib-2.30.2.tar.xz) = vHvoVyEimX5NX8ZpH1FgLyjNTjo=
SHA1 (glib-2.30.3.tar.xz) = 7JfdZZhi3KBdGAk6bqbDCdz/DN0=
SHA1 (glib-gio-kqueue-2.28.8-v3.patch) = 1QvuFM5yIBw+wrgtDkmMiCj72MI=
SHA256 (glib-2.30.2.tar.xz) = 8OkeYzMyHdtI+hK1xm9Ww9XwUyV0jGbdLpAWwnj/joI=
SHA256 (glib-2.30.3.tar.xz) = 5suyfHHERZkzRueF6GCcx1zqKUHjIxLlRIcv66Vy3Sc=
SHA256 (glib-gio-kqueue-2.28.8-v3.patch) = pNcpl5J9m/6gD4TkCW0ubP9N7DpTJDtFWs2Ztcj5N30=
SIZE (glib-2.30.2.tar.xz) = 5818860
SIZE (glib-2.30.3.tar.xz) = 5642448
SIZE (glib-gio-kqueue-2.28.8-v3.patch) = 89920

14
devel/glib2/patches/patch-gio_kqueue_kqueue-thread_c
View File

@ -1,6 +1,14 @@
$OpenBSD: patch-gio_kqueue_kqueue-thread_c,v 1.1 2012/02/16 22:08:39 ajacoutot Exp $
--- gio/kqueue/kqueue-thread.c.orig Fri Feb 10 18:52:27 2012
+++ gio/kqueue/kqueue-thread.c Fri Feb 10 18:56:23 2012
$OpenBSD: patch-gio_kqueue_kqueue-thread_c,v 1.2 2012/03/12 07:21:06 ajacoutot Exp $
--- gio/kqueue/kqueue-thread.c.orig Mon Mar 12 07:46:36 2012
+++ gio/kqueue/kqueue-thread.c Mon Mar 12 07:46:36 2012
@@ -21,6 +21,7 @@
*******************************************************************************/
#include "config.h"
+#include <sys/types.h>
#include <sys/event.h>
#include <sys/time.h>
#include <unistd.h>
@@ -228,8 +229,11 @@ _kqueue_thread_func (void *arg)
if (ret == -1)

8
devel/glib2/patches/patch-glib_gmain_c
View File

@ -1,12 +1,12 @@
$OpenBSD: patch-glib_gmain_c,v 1.9 2012/03/06 11:39:17 ajacoutot Exp $
$OpenBSD: patch-glib_gmain_c,v 1.10 2012/03/12 07:21:06 ajacoutot Exp $
Rewrote upstream, but provides similar functionnality.
(test with GDM that the following does not happen:
Failed to read from child watch wake up pipe: Interrupted system call)
--- glib/gmain.c.orig Fri Nov 11 18:56:52 2011
+++ glib/gmain.c Wed Nov 16 15:46:52 2011
@@ -4564,7 +4568,12 @@ unix_signal_helper_thread (gpointer data)
--- glib/gmain.c.orig Sun Mar 11 22:43:28 2012
+++ glib/gmain.c Mon Mar 12 07:46:36 2012
@@ -4564,7 +4564,12 @@ unix_signal_helper_thread (gpointer data)
gboolean sigint_received = FALSE;
gboolean sighup_received = FALSE;

61
devel/glib2/patches/patch-glib_goption_c
View File

@ -1,61 +0,0 @@
$OpenBSD: patch-glib_goption_c,v 1.1 2012/02/02 07:10:18 ajacoutot Exp $
From e43a98c00091f5e293d2d9d72df2c04081802abe Mon Sep 17 00:00:00 2001
From: Antoine Jacoutot <ajacoutot@gnome.org>
Date: Mon, 30 Jan 2012 15:17:06 +0000
Subject: goption: implement platform_get_argv0() for OpenBSD
--- glib/goption.c.orig Tue Aug 16 02:51:30 2011
+++ glib/goption.c Mon Jan 30 15:58:16 2012
@@ -139,6 +139,13 @@
#include <stdio.h>
#include <errno.h>
+#if defined __OpenBSD__
+#include <sys/types.h>
+#include <unistd.h>
+#include <sys/param.h>
+#include <sys/sysctl.h>
+#endif
+
#include "goption.h"
#include "gprintf.h"
@@ -1665,7 +1672,7 @@ free_pending_nulls (GOptionContext *context,
static char *
platform_get_argv0 (void)
{
-#ifdef __linux
+#if defined __linux
char *cmdline;
char *base_arg0;
gsize len;
@@ -1683,6 +1690,28 @@ platform_get_argv0 (void)
* could be large.
*/
base_arg0 = g_path_get_basename (cmdline);
+ g_free (cmdline);
+ return base_arg0;
+#elif defined __OpenBSD__
+ char **cmdline = NULL;
+ char *base_arg0;
+ gsize len = PATH_MAX;
+
+ int mib[] = { CTL_KERN, KERN_PROC_ARGS, getpid(), KERN_PROC_ARGV };
+
+ cmdline = (char **) realloc (cmdline, len);
+
+ if (sysctl (mib, nitems (mib), cmdline, &len, NULL, 0) == -1)
+ {
+ g_free (cmdline);
+ return NULL;
+ }
+
+ /* We could just return cmdline, but I think it's better
+ * to hold on to a smaller malloc block; the arguments
+ * could be large.
+ */
+ base_arg0 = g_path_get_basename (*cmdline);
g_free (cmdline);
return base_arg0;
#endif

27
devel/glib2/patches/patch-glib_tests_option-argv0_c
View File

@ -1,27 +0,0 @@
$OpenBSD: patch-glib_tests_option-argv0_c,v 1.1 2012/02/02 07:10:18 ajacoutot Exp $
From e43a98c00091f5e293d2d9d72df2c04081802abe Mon Sep 17 00:00:00 2001
From: Antoine Jacoutot <ajacoutot@gnome.org>
Date: Mon, 30 Jan 2012 15:17:06 +0000
Subject: goption: implement platform_get_argv0() for OpenBSD
--- glib/tests/option-argv0.c.orig Mon Jan 30 10:16:25 2012
+++ glib/tests/option-argv0.c Mon Jan 30 10:17:27 2012
@@ -27,7 +27,7 @@
#include <stdio.h>
#include <string.h>
-#ifdef __linux
+#if defined __linux || defined __OpenBSD__
static void
test_platform_argv0 (void)
{
@@ -55,7 +55,7 @@ main (int argc,
/* Note - we can't actually use g_test_* because g_test_init mutates
* g_get_prgname() which is exactly what we wanted to test =/
*/
-#ifdef __linux
+#if defined __linux || defined __OpenBSD__
g_print ("/option/argv0: ");
test_platform_argv0 ();
g_print ("OK\n");

4
devel/glib2/pkg/PLIST-docs
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-docs,v 1.23 2011/10/14 15:25:40 ajacoutot Exp $
@comment $OpenBSD: PLIST-docs,v 1.24 2012/03/12 07:21:06 ajacoutot Exp $
@conflict glib2-<2.4.6
share/gtk-doc/
share/gtk-doc/html/
@ -169,6 +169,8 @@ share/gtk-doc/html/gio/gio-GDBusError.html
share/gtk-doc/html/gio/gio-GFileAttribute.html
share/gtk-doc/html/gio/gio-GIOError.html
share/gtk-doc/html/gio/gio-GIOScheduler.html
share/gtk-doc/html/gio/gio-GWin32InputStream.html
share/gtk-doc/html/gio/gio-GWin32OutputStream.html
share/gtk-doc/html/gio/gio-Owning-Bus-Names.html
share/gtk-doc/html/gio/gio-TLS-Overview.html
share/gtk-doc/html/gio/gio-Unix-Mounts.html

6
devel/glib2/pkg/PLIST-main
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-main,v 1.24 2012/01/01 09:00:46 ajacoutot Exp $
@comment $OpenBSD: PLIST-main,v 1.25 2012/03/12 07:21:06 ajacoutot Exp $
@conflict glib2-fam-*
@pkgpath devel/glib2
@pkgpath devel/glib2,-fam
@ -311,8 +311,8 @@ share/aclocal/gsettings.m4
share/doc/pkg-readmes/${FULLPKGNAME}
share/gdb/
share/gdb/auto-load/
share/gdb/auto-load/libglib-2.0.so.0.3000.2-gdb.py
share/gdb/auto-load/libgobject-2.0.so.0.3000.2-gdb.py
share/gdb/auto-load/libglib-2.0.so.0.3000.3-gdb.py
share/gdb/auto-load/libgobject-2.0.so.0.3000.3-gdb.py
share/glib-2.0/
share/glib-2.0/gdb/
share/glib-2.0/gdb/glib.py