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

Bugfix update to glib2-2.30.1.

Browse Source
This commit is contained in:
ajacoutot 2011-10-14 15:25:40 +00:00
parent b6775f2cfa
commit 75974108f8
5 changed files with 9 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
devel/glib2/Makefile
View File

@ -1,17 +1,15 @@
# $OpenBSD: Makefile,v 1.139 2011/10/08 08:29:56 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.140 2011/10/14 15:25:40 ajacoutot Exp $
COMMENT-main= general-purpose utility library
COMMENT-docs= glib2 documentation
VERSION= 2.30.0
VERSION= 2.30.1
DISTNAME= glib-${VERSION}
EXTRACT_SUFX= .tar.xz
PKGNAME-main= glib2-${VERSION}
PKGNAME-docs= glib2-docs-${VERSION}
REVISION-main= 2
CATEGORIES= devel
HOMEPAGE= http://www.gtk.org/
@ -84,8 +82,7 @@ CONFIGURE_ARGS += --disable-maintainer-mode
# currently don't have most of the _POSIX_* defines in unistd.h (e.g.
# _POSIX_MONOTONIC_CLOCK 200112L) and the associated sysconf(3)
# _SC_MONOTONIC_CLOCK variable.
# (see also: patches/patch-glib_gmain_c
# patches/patch-gthread_gthread-posix_c)
# (see also: patches/patch-gthread_gthread-posix_c)
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include \
-D_POSIX_MONOTONIC_CLOCK=200112L" \
LDFLAGS="-L${LOCALBASE}/lib -pthread"

10
devel/glib2/distinfo
View File

@ -1,5 +1,5 @@
MD5 (glib-2.30.0.tar.xz) = aKyVFiMwRPJ+dld9T05t6Q==
RMD160 (glib-2.30.0.tar.xz) = fjAP9UnjpKFWwDdQXg6kklD+URw=
SHA1 (glib-2.30.0.tar.xz) = f3AzCBy668y/FaKw/B6iA9lAsQk=
SHA256 (glib-2.30.0.tar.xz) = 1kwAtDQJ6ruJqteFAfyxqZKwArMUpEFKm9BpWFy3zcE=
SIZE (glib-2.30.0.tar.xz) = 5744640
MD5 (glib-2.30.1.tar.xz) = GVTcppmU+49gKANB2j/irg==
RMD160 (glib-2.30.1.tar.xz) = K/0QbrVtGtSvS+VW8jmJkeU+GCU=
SHA1 (glib-2.30.1.tar.xz) = FdSXEGzMOJomKXcl+Nxt438sA3E=
SHA256 (glib-2.30.1.tar.xz) = gv3iIuozoPqsiOm1D1sff8/CNchhqTcej+R+wSweJ/k=
SIZE (glib-2.30.1.tar.xz) = 5809220

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

@ -1,18 +0,0 @@
$OpenBSD: patch-glib_gmain_c,v 1.4 2011/09/20 21:09:34 ajacoutot Exp $
--- glib/gmain.c.orig Sun Sep 18 15:36:48 2011
+++ glib/gmain.c Mon Sep 19 23:28:57 2011
@@ -2054,10 +2054,14 @@ g_get_monotonic_time (void)
{
clockid_t best_clockid;
+#ifndef __OpenBSD__
if (sysconf (_SC_MONOTONIC_CLOCK) >= 0)
best_clockid = CLOCK_MONOTONIC;
else
best_clockid = CLOCK_REALTIME;
+#else
+ best_clockid = CLOCK_MONOTONIC;
+#endif
g_once_init_leave (&clockid, (gsize)best_clockid);
}
#endif

20
devel/glib2/patches/patch-m4macros_glib-gettext_m4
View File

@ -1,20 +0,0 @@
$OpenBSD: patch-m4macros_glib-gettext_m4,v 1.3 2011/10/04 14:39:10 ajacoutot Exp $
From 8f58c2c0c43fadc19463aec214b27bc41c6a1651 Mon Sep 17 00:00:00 2001
From: Antoine Jacoutot <ajacoutot@openbsd.org>
Date: Tue, 04 Oct 2011 05:52:10 +0000
Subject: Fix DATADIRNAME on OpenBSD.
--- m4macros/glib-gettext.m4.orig Sun Oct 2 08:43:44 2011
+++ m4macros/glib-gettext.m4 Sat Oct 1 16:03:29 2011
@@ -239,6 +239,10 @@ msgstr ""
[CATOBJEXT=.mo
DATADIRNAME=lib])
;;
+ *-*-openbsd*)
+ CATOBJEXT=.mo
+ DATADIRNAME=share
+ ;;
*)
CATOBJEXT=.mo
DATADIRNAME=lib

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

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-docs,v 1.22 2011/09/20 21:09:34 ajacoutot Exp $
@comment $OpenBSD: PLIST-docs,v 1.23 2011/10/14 15:25:40 ajacoutot Exp $
@conflict glib2-<2.4.6
share/gtk-doc/
share/gtk-doc/html/
@ -175,7 +175,6 @@ share/gtk-doc/html/gio/gio-Unix-Mounts.html
share/gtk-doc/html/gio/gio-Watching-Bus-Names.html
share/gtk-doc/html/gio/gio-hierarchy.html
share/gtk-doc/html/gio/gio-querymodules.html
share/gtk-doc/html/gio/gio.devhelp
share/gtk-doc/html/gio/gio.devhelp2
share/gtk-doc/html/gio/glib-compile-schemas.html
share/gtk-doc/html/gio/gsettings-tool.html
@ -306,7 +305,6 @@ share/gtk-doc/html/glib/glib-regex-syntax.html
share/gtk-doc/html/glib/glib-resources.html
share/gtk-doc/html/glib/glib-running.html
share/gtk-doc/html/glib/glib-utilities.html
share/gtk-doc/html/glib/glib.devhelp
share/gtk-doc/html/glib/glib.devhelp2
share/gtk-doc/html/glib/glib.html
share/gtk-doc/html/glib/gtester-report.html
@ -365,7 +363,6 @@ share/gtk-doc/html/gobject/gobject-Varargs-Value-Collection.html
share/gtk-doc/html/gobject/gobject-memory.html
share/gtk-doc/html/gobject/gobject-properties.html
share/gtk-doc/html/gobject/gobject-query.html
share/gtk-doc/html/gobject/gobject.devhelp
share/gtk-doc/html/gobject/gobject.devhelp2
share/gtk-doc/html/gobject/gtype-conventions.html
share/gtk-doc/html/gobject/gtype-instantiable-classed.html