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

Minor update to glib2-2.32.1.

Browse Source 
Note that some paths in gsettings have been deprecated
(/apps/, /desktop/ and /system/) which means that glib-compile-schemas
will now complain about them (just a warning).
It is up to the application itself to fix its schemas.
This commit is contained in:
ajacoutot 2012-04-14 07:47:55 +00:00
parent 4e04a5d009
commit e81cd91952
6 changed files with 10 additions and 88 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.167 2012/04/13 16:00:46 dcoppa Exp $
# $OpenBSD: Makefile,v 1.168 2012/04/14 07:47:55 ajacoutot Exp $
COMMENT-main= general-purpose utility library
COMMENT-docs= glib2 documentation
VERSION= 2.32.0
VERSION= 2.32.1
DISTNAME= glib-${VERSION}
EXTRACT_SUFX= .tar.xz
PKGNAME-main= glib2-${VERSION}
PKGNAME-docs= glib2-docs-${VERSION}
REVISION-main= 6
CATEGORIES= devel
HOMEPAGE= http://www.gtk.org/

10
devel/glib2/distinfo
View File

@ -1,10 +1,10 @@
MD5 (glib-2.32.0.tar.xz) = xfp2+/kYTSDfsEr2a1mBkA==
MD5 (glib-2.32.1.tar.xz) = Ayx8+YaMmqGGtJCxVaQRRA==
MD5 (glib-gio-kqueue-2.28.8-v4.patch) = WCtO2bIuSQ6dQ1DfBov3ig==
RMD160 (glib-2.32.0.tar.xz) = R1lBqBk8GdxEMBK6iTG0Vkgqr1U=
RMD160 (glib-2.32.1.tar.xz) = 1Wq2YlApFldOIob5LCxW3IqtIQ0=
RMD160 (glib-gio-kqueue-2.28.8-v4.patch) = /pjB0I1QRZWBfUtg/moiehOi0v4=
SHA1 (glib-2.32.0.tar.xz) = xPm2/rdrGyNk1hMvxVWZ2ShiLwo=
SHA1 (glib-2.32.1.tar.xz) = P5RzPQ555f8Q1cqHNa5dfxHy7cA=
SHA1 (glib-gio-kqueue-2.28.8-v4.patch) = d6PnhaWHp3+Cry7u23QHWlkqcZw=
SHA256 (glib-2.32.0.tar.xz) = zenZ8l7WSAacVH4yOJetk3mXTh+Ta0R3+lG88bsmGuQ=
SHA256 (glib-2.32.1.tar.xz) = SE1bf8CfP6OYNVra90s2l2j1hZhmwpnyKcmXIZkPg5g=
SHA256 (glib-gio-kqueue-2.28.8-v4.patch) = 4QvJFfg8LRpyxPCTEG9Lfna8bKTw7gqy3bYdMK27i6g=
SIZE (glib-2.32.0.tar.xz) = 6090792
SIZE (glib-2.32.1.tar.xz) = 6138200
SIZE (glib-gio-kqueue-2.28.8-v4.patch) = 100339

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

@ -1,36 +0,0 @@
$OpenBSD: patch-configure_ac,v 1.2 2012/04/06 10:44:38 ajacoutot Exp $
From 27d95bd81fabd41367cf000566ee2ccf3651652c Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@redhat.com>
Date: Mon, 02 Apr 2012 12:53:20 +0000
Subject: Rework the libelf configure checks one more time
--- configure.ac.orig Fri Apr 6 12:21:33 2012
+++ configure.ac Fri Apr 6 12:24:01 2012
@@ -1810,12 +1810,23 @@ dnl ************************
dnl *** check for libelf ***
dnl ************************
-AC_CHECK_LIB([elf], [elf_begin], have_libelf=yes, have_libelf=no)
+PKG_CHECK_MODULES([LIBELF], [libelf], [have_libelf=yes], [have_libelf=maybe])
+
+if test $have_libelf = maybe; then
+ AC_CHECK_LIB([elf], [elf_begin], , [have_libelf=no])
+ AC_CHECK_LIB([elf], [elf_getshdrstrndx], , [have_libelf=no])
+ AC_CHECK_LIB([elf], [elf_getshdrnum], , [have_libelf=no])
+ AC_CHECK_HEADER([libelf.h], , [have_libelf=no])
+
+ if test $have_libelf != no; then
+ LIBELF_LIBS=-lelf
+ have_libelf = yes
+ fi
+fi
+
if test $have_libelf = yes; then
AC_DEFINE(HAVE_LIBELF, 1, [Define if libelf is available])
- ELF_LIBS=-lelf
fi
-AC_SUBST(ELF_LIBS)
dnl ****************************************
dnl *** platform dependent source checks ***

22
devel/glib2/patches/patch-gio_Makefile_am
View File

@ -1,22 +0,0 @@
$OpenBSD: patch-gio_Makefile_am,v 1.1 2012/03/31 18:27:35 ajacoutot Exp $
From 14945449580d394b5e1e009f71792ccac51fc41e Mon Sep 17 00:00:00 2001
From: Antoine Jacoutot <ajacoutot@gnome.org>
Date: Sat, 31 Mar 2012 18:20:19 +0000
Subject: gresource: libelf, try pkg-config first then fall-back to AC_CHECK_LIB
--- gio/Makefile.am.orig Fri Mar 30 20:03:58 2012
+++ gio/Makefile.am Fri Mar 30 20:05:54 2012
@@ -710,10 +710,11 @@ EXTRA_DIST += $(completion_DATA)
bin_PROGRAMS += gresource
gresource_SOURCES = gresource-tool.c
+gresource_CPPFLAGS = $(LIBELF_CFLAGS) $(AM_CPPFLAGS)
gresource_LDADD = libgio-2.0.la \
$(top_builddir)/glib/libglib-2.0.la \
$(top_builddir)/gobject/libgobject-2.0.la \
- $(ELF_LIBS)
+ $(LIBELF_LIBS)
# ------------------------------------------------------------------------

18
devel/glib2/patches/patch-glib_gthread-posix_c
View File

@ -1,18 +0,0 @@
$OpenBSD: patch-glib_gthread-posix_c,v 1.1 2012/04/13 16:00:46 dcoppa Exp $
From 829db4cec3fa59e1ec905e226851ae719858c8d4 Mon Sep 17 00:00:00 2001
From: Antoine Jacoutot <ajacoutot@gnome.org>
Date: Sat, 31 Mar 2012 20:48:42 +0000
Subject: gthread-posix: fix typo in error message
--- glib/gthread-posix.c.orig Wed Apr 11 14:48:56 2012
+++ glib/gthread-posix.c Wed Apr 11 14:50:24 2012
@@ -225,7 +225,7 @@ g_mutex_unlock (GMutex *mutex)
gint status;
if G_UNLIKELY ((status = pthread_mutex_unlock (g_mutex_get_impl (mutex))) != 0)
- g_thread_abort (status, "pthread_mutex_lock");
+ g_thread_abort (status, "pthread_mutex_unlock");
}
/**

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

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-main,v 1.29 2012/04/04 13:41:38 ajacoutot Exp $
@comment $OpenBSD: PLIST-main,v 1.30 2012/04/14 07:47:55 ajacoutot Exp $
@conflict glib2-fam-*
@pkgpath devel/glib2
@pkgpath devel/glib2,-fam
@ -342,8 +342,8 @@ share/examples/glib2/gio-kqueue.conf
@sample ${SYSCONFDIR}/gio-kqueue.conf
share/gdb/
share/gdb/auto-load/
share/gdb/auto-load/libglib-2.0.so.0.3200.0-gdb.py
share/gdb/auto-load/libgobject-2.0.so.0.3200.0-gdb.py
share/gdb/auto-load/libglib-2.0.so.0.3200.1-gdb.py
share/gdb/auto-load/libgobject-2.0.so.0.3200.1-gdb.py
share/glib-2.0/
share/glib-2.0/gdb/
share/glib-2.0/gdb/glib.py