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

Update to glib2-2.40.2.

Browse Source
This commit is contained in:
ajacoutot 2014-09-23 06:15:21 +00:00
parent d9eeeec77e
commit eeed2634d0
5 changed files with 13 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
devel/glib2/Makefile
View File

@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.235 2014/09/20 16:23:45 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.236 2014/09/23 06:15:21 ajacoutot Exp $
COMMENT= general-purpose utility library
GNOME_PROJECT= glib
GNOME_VERSION= 2.40.1
GNOME_VERSION= 2.40.2
PKGNAME= ${DISTNAME:S/glib/glib2/}
CATEGORIES= devel
@ -12,11 +12,11 @@ HOMEPAGE= http://www.gtk.org/
MAINTAINER= Antoine Jacoutot <ajacoutot@openbsd.org>
SHARED_LIBS += glib-2.0 4000.0 # 4001.0
SHARED_LIBS += gmodule-2.0 4000.0 # 4001.0
SHARED_LIBS += gthread-2.0 4000.0 # 4001.0
SHARED_LIBS += gobject-2.0 4000.0 # 4001.0
SHARED_LIBS += gio-2.0 4000.0 # 4001.0
SHARED_LIBS += glib-2.0 4000.0 # 4002.0
SHARED_LIBS += gmodule-2.0 4000.0 # 4002.0
SHARED_LIBS += gthread-2.0 4000.0 # 4002.0
SHARED_LIBS += gobject-2.0 4000.0 # 4002.0
SHARED_LIBS += gio-2.0 4000.0 # 4002.0
# LGPLv2
PERMIT_PACKAGE_CDROM= Yes

4
devel/glib2/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (glib-2.40.1.tar.xz) = xrZ+ohLo107gZ297JTlFH9dLBXzyG7XgB0cU4zWQZr8=
SIZE (glib-2.40.1.tar.xz) = 7002452
SHA256 (glib-2.40.2.tar.xz) = 6P+K8pUIl+gFQISAxFTEFdHq3k5nDsX7UH9eWFNybHo=
SIZE (glib-2.40.2.tar.xz) = 7001344

26
devel/glib2/patches/patch-configure_ac
View File

@ -1,15 +1,10 @@
$OpenBSD: patch-configure_ac,v 1.15 2014/09/20 16:23:45 ajacoutot Exp $
$OpenBSD: patch-configure_ac,v 1.16 2014/09/23 06:15:21 ajacoutot Exp $
From 74ec947079e9159c71b28b98439b8a7ad9c415ee Mon Sep 17 00:00:00 2001
From: Antoine Jacoutot <ajacoutot@gnome.org>
Date: Thu, 10 Apr 2014 10:40:16 +0200
Subject: openbsd: remove -pthread
From 6c7972a05c2901d67d793be2db64817fec94e8e7 Mon Sep 17 00:00:00 2001
From: Antoine Jacoutot <ajacoutot@gnome.org>
Date: Thu, 10 Apr 2014 11:16:44 +0200
Subject: build: also unset LIBS when LDFLAGS is unset
--- configure.ac.orig Sat Sep 20 16:26:47 2014
+++ configure.ac Sat Sep 20 17:55:22 2014
@@ -2272,9 +2272,6 @@ case $host in
@ -22,22 +17,3 @@ Subject: build: also unset LIBS when LDFLAGS is unset
*)
G_THREAD_LIBS_FOR_GTHREAD="$G_THREAD_LIBS"
;;
@@ -3448,15 +3445,16 @@ dnl
AC_ARG_ENABLE(Bsymbolic,
[AS_HELP_STRING([--disable-Bsymbolic],
[avoid linking with -Bsymbolic])],,
- [SAVED_LDFLAGS="${LDFLAGS}"
+ [SAVED_LDFLAGS="${LDFLAGS}" SAVED_LIBS="${LIBS}"
AC_MSG_CHECKING([for -Bsymbolic-functions linker flag])
LDFLAGS=-Wl,-Bsymbolic-functions
+ LIBS=
AC_TRY_LINK([], [int main (void) { return 0; }],
AC_MSG_RESULT(yes)
enable_Bsymbolic=yes,
AC_MSG_RESULT(no)
enable_Bsymbolic=no)
- LDFLAGS="${SAVED_LDFLAGS}"])
+ LDFLAGS="${SAVED_LDFLAGS}" LIBS="${SAVED_LIBS}"])
if test "x${enable_Bsymbolic}" = "xyes"; then
GLIB_LINK_FLAGS=-Wl,-Bsymbolic-functions

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

@ -1,39 +0,0 @@
$OpenBSD: patch-glib_goption_c,v 1.9 2014/04/20 21:18:53 ajacoutot Exp $
From 58abc1fc198a8579667ea2164c33964b250a0435 Mon Sep 17 00:00:00 2001
From: Antoine Jacoutot <ajacoutot@gnome.org>
Date: Wed, 16 Apr 2014 10:27:09 +0200
Subject: platform_get_argv0: drop unneeded headers for OpenBSD
--- glib/goption.c.orig Sat Feb 22 16:29:07 2014
+++ glib/goption.c Sun Apr 20 23:16:20 2014
@@ -185,9 +185,7 @@
#include <errno.h>
#if defined __OpenBSD__
-#include <sys/types.h>
#include <unistd.h>
-#include <sys/param.h>
#include <sys/sysctl.h>
#endif
@@ -1763,13 +1761,16 @@ platform_get_argv0 (void)
g_free (cmdline);
return base_arg0;
#elif defined __OpenBSD__
- char **cmdline = NULL;
+ char **cmdline;
char *base_arg0;
- gsize len = PATH_MAX;
+ gsize len;
int mib[] = { CTL_KERN, KERN_PROC_ARGS, getpid(), KERN_PROC_ARGV };
- cmdline = (char **) realloc (cmdline, len);
+ if (sysctl (mib, G_N_ELEMENTS (mib), NULL, &len, NULL, 0) == -1)
+ return NULL;
+
+ cmdline = g_malloc0 (len);
if (sysctl (mib, G_N_ELEMENTS (mib), cmdline, &len, NULL, 0) == -1)
{

6
devel/glib2/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.36 2014/09/20 16:23:45 ajacoutot Exp $
@comment $OpenBSD: PLIST,v 1.37 2014/09/23 06:15:21 ajacoutot Exp $
@conflict glib2-docs-*
@conflict glib2-fam-*
@pkgpath devel/glib2,-docs
@ -333,8 +333,8 @@ share/bash-completion/completions/gsettings
share/doc/pkg-readmes/${FULLPKGNAME}
share/gdb/
share/gdb/auto-load/
share/gdb/auto-load/libglib-2.0.so.0.4001.0-gdb.py
share/gdb/auto-load/libgobject-2.0.so.0.4001.0-gdb.py
share/gdb/auto-load/libglib-2.0.so.0.4002.0-gdb.py
share/gdb/auto-load/libgobject-2.0.so.0.4002.0-gdb.py
share/glib-2.0/
share/glib-2.0/codegen/
share/glib-2.0/codegen/__init__.py