diff options
| author | tnn <tnn> | 2007-08-16 18:11:44 +0000 |
|---|---|---|
| committer | tnn <tnn> | 2007-08-16 18:11:44 +0000 |
| commit | 5b1ca31ef0e0b89364a425fda93496d795d97ac3 (patch) | |
| tree | c9f6816449992b78f28594b23dc11602f5a0397e | |
| parent | f3f636a5b4d855dbbdf669e9c754459de72d960a (diff) | |
| download | pkgsrc-5b1ca31ef0e0b89364a425fda93496d795d97ac3.tar.gz | |
Patch an evil typecast that was losing the volatile qualifier on a pointer.
This caused the build of net/wireshark to fail.
Will submit upstream. PKGREVISION++
| -rw-r--r-- | devel/glib2/Makefile | 3 | ||||
| -rw-r--r-- | devel/glib2/distinfo | 3 | ||||
| -rw-r--r-- | devel/glib2/patches/patch-al | 13 |
3 files changed, 17 insertions, 2 deletions
diff --git a/devel/glib2/Makefile b/devel/glib2/Makefile index 6f331c023ea..c173c443e98 100644 --- a/devel/glib2/Makefile +++ b/devel/glib2/Makefile @@ -1,8 +1,9 @@ -# $NetBSD: Makefile,v 1.119 2007/08/16 17:28:18 tron Exp $ +# $NetBSD: Makefile,v 1.120 2007/08/16 18:11:44 tnn Exp $ # When updating glib2, please apply patch-ak to configure.in # Then run a matching version of autoconf to regen patch-aa. DISTNAME= glib-2.14.0 +PKGREVISION= 1 PKGNAME= ${DISTNAME:S/glib/glib2/} CATEGORIES= devel MASTER_SITES= ftp://ftp.gtk.org/pub/glib/2.14/ \ diff --git a/devel/glib2/distinfo b/devel/glib2/distinfo index ddc35a3a9ed..0b4927557c7 100644 --- a/devel/glib2/distinfo +++ b/devel/glib2/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.83 2007/08/15 22:09:13 tnn Exp $ +$NetBSD: distinfo,v 1.84 2007/08/16 18:11:44 tnn Exp $ SHA1 (glib-2.14.0.tar.bz2) = a0ebfd3e170b3c47af44453b8861d3caceb9b7c4 RMD160 (glib-2.14.0.tar.bz2) = b929764eaac40afc0064424f094cd6d8a76dfcf4 @@ -13,3 +13,4 @@ SHA1 (patch-ah) = 8b65c137b07659351b97089c10db0dac61f04905 SHA1 (patch-ai) = baf3466a38ed09e956c4e8423a64415395690de7 SHA1 (patch-aj) = a8c4e79113828e6dadf0b158777bb860aa44de3e SHA1 (patch-ak) = 86ead0dc2836ee2ced420cca62e2f116ece316aa +SHA1 (patch-al) = 2cea566231c2dd1367fc898e616386e274bb9c1d diff --git a/devel/glib2/patches/patch-al b/devel/glib2/patches/patch-al new file mode 100644 index 00000000000..6e6c91146ce --- /dev/null +++ b/devel/glib2/patches/patch-al @@ -0,0 +1,13 @@ +$NetBSD: patch-al,v 1.1 2007/08/16 18:11:44 tnn Exp $ + +--- glib/gthread.h.orig 2007-08-03 19:52:48.000000000 +0200 ++++ glib/gthread.h +@@ -332,7 +332,7 @@ void g_once_init_leav + G_INLINE_FUNC gboolean + g_once_init_enter (volatile gsize *value_location) + { +- if G_LIKELY (g_atomic_pointer_get ((void**) value_location) !=0) ++ if G_LIKELY (g_atomic_pointer_get ((volatile gpointer*) value_location) !=0) + return FALSE; + else + return g_once_init_enter_impl (value_location); |