Bugfix update to glib 2.32.2.
This commit is contained in:
ajacoutot
parent
39c9e10fa3
commit
dd99bb690a
@ -1,17 +1,15 @@
|
||||
# $OpenBSD: Makefile,v 1.172 2012/04/23 12:49:47 ajacoutot Exp $
|
||||
# $OpenBSD: Makefile,v 1.173 2012/05/01 06:17:01 ajacoutot Exp $
|
||||
|
||||
COMMENT-main= general-purpose utility library
|
||||
COMMENT-docs= glib2 documentation
|
||||
|
||||
VERSION= 2.32.1
|
||||
VERSION= 2.32.2
|
||||
DISTNAME= glib-${VERSION}
|
||||
EXTRACT_SUFX= .tar.xz
|
||||
|
||||
PKGNAME-main= glib2-${VERSION}
|
||||
PKGNAME-docs= glib2-docs-${VERSION}
|
||||
|
||||
REVISION-main= 3
|
||||
|
||||
CATEGORIES= devel
|
||||
|
||||
HOMEPAGE= http://www.gtk.org/
|
||||
|
||||
@ -1,10 +1,10 @@
|
||||
MD5 (glib-2.32.1.tar.xz) = Ayx8+YaMmqGGtJCxVaQRRA==
|
||||
MD5 (glib-2.32.2.tar.xz) = W/22GXr7kOTbx7G7mPDq4A==
|
||||
MD5 (glib-gio-kqueue-2.32.1-v1.patch) = xg4eGZat8VTGr3/lA+EBPw==
|
||||
RMD160 (glib-2.32.1.tar.xz) = 1Wq2YlApFldOIob5LCxW3IqtIQ0=
|
||||
RMD160 (glib-2.32.2.tar.xz) = LsgoxUwx8H2dKNGC8dboOY4RKSg=
|
||||
RMD160 (glib-gio-kqueue-2.32.1-v1.patch) = bSqOsBSCLHc0xs16cz1R+kyoENQ=
|
||||
SHA1 (glib-2.32.1.tar.xz) = P5RzPQ555f8Q1cqHNa5dfxHy7cA=
|
||||
SHA1 (glib-2.32.2.tar.xz) = WJgWXljI+UbCsf0FuRD+RHa2QWQ=
|
||||
SHA1 (glib-gio-kqueue-2.32.1-v1.patch) = RJjhE5a8M6xIpbfCcFaRT2aVGjI=
|
||||
SHA256 (glib-2.32.1.tar.xz) = SE1bf8CfP6OYNVra90s2l2j1hZhmwpnyKcmXIZkPg5g=
|
||||
SHA256 (glib-2.32.2.tar.xz) = sXZKvwC6yW4Ok+KfuXFc5181g1eaysQGSOGHcdQ9YTY=
|
||||
SHA256 (glib-gio-kqueue-2.32.1-v1.patch) = oXaLBaL0UkhlGfy1DCgx6jHx3x1LMmhzqlA93agtdDo=
|
||||
SIZE (glib-2.32.1.tar.xz) = 6138200
|
||||
SIZE (glib-2.32.2.tar.xz) = 6117764
|
||||
SIZE (glib-gio-kqueue-2.32.1-v1.patch) = 100340
|
||||
|
||||
@ -1,26 +0,0 @@
|
||||
$OpenBSD: patch-configure_ac,v 1.5 2012/04/22 16:58:42 ajacoutot Exp $
|
||||
|
||||
From a147004b83ee48265e266e33da7656a3a09c7edb Mon Sep 17 00:00:00 2001
|
||||
From: William Hua <william@attente.ca>
|
||||
Date: Wed, 18 Apr 2012 03:49:47 +0000
|
||||
Subject: Use Cocoa header for Cocoa test instead of Foundation.
|
||||
|
||||
From b3f814883f460ec9b309552a501652ecdecfb2dc Mon Sep 17 00:00:00 2001
|
||||
From: Alexandre Rostovtsev <tetromino@gentoo.org>
|
||||
Date: Mon, 16 Apr 2012 02:57:25 +0000
|
||||
Subject: Do not detect GNUstep as Cocoa
|
||||
|
||||
--- configure.ac.orig Fri Apr 13 15:39:41 2012
|
||||
+++ configure.ac Sun Apr 22 18:21:55 2012
|
||||
@@ -178,7 +178,10 @@ AC_MSG_RESULT([$glib_have_carbon])
|
||||
glib_have_cocoa=no
|
||||
AC_MSG_CHECKING([for Mac OS X Cocoa support])
|
||||
AC_TRY_CPP([
|
||||
-#include <Foundation/Foundation.h>
|
||||
+#include <Cocoa/Cocoa.h>
|
||||
+#ifdef GNUSTEP_BASE_VERSION
|
||||
+#error "Detected GNUstep, not Cocoa"
|
||||
+#endif
|
||||
], glib_have_cocoa=yes)
|
||||
|
||||
AC_MSG_RESULT([$glib_have_cocoa])
|
||||
@ -1,28 +0,0 @@
|
||||
$OpenBSD: patch-gio_gresource_c,v 1.2 2012/04/22 16:58:42 ajacoutot Exp $
|
||||
|
||||
From 5ef34e5f11b4f71a66615b6506108ee540cc3420 Mon Sep 17 00:00:00 2001
|
||||
From: Christian Persch <chpe@gnome.org>
|
||||
Date: Mon, 09 Apr 2012 13:34:10 +0000
|
||||
Subject: resources: compiler: Fix resources on big endian architectures
|
||||
|
||||
--- gio/gresource.c.orig Fri Apr 13 15:39:41 2012
|
||||
+++ gio/gresource.c Tue Apr 17 15:25:54 2012
|
||||
@@ -287,7 +287,7 @@ gboolean do_lookup (GResource *resource,
|
||||
free_path[path_len-1] = 0;
|
||||
}
|
||||
|
||||
- value = gvdb_table_get_value (resource->table, path);
|
||||
+ value = gvdb_table_get_raw_value (resource->table, path);
|
||||
|
||||
if (value == NULL)
|
||||
{
|
||||
@@ -304,6 +304,9 @@ gboolean do_lookup (GResource *resource,
|
||||
&_size,
|
||||
&_flags,
|
||||
&array);
|
||||
+
|
||||
+ _size = GUINT32_FROM_LE (_size);
|
||||
+ _flags = GUINT32_FROM_LE (_flags);
|
||||
|
||||
if (size)
|
||||
*size = _size;
|
||||
@ -1,93 +0,0 @@
|
||||
$OpenBSD: patch-glib_gmain_c,v 1.14 2012/04/16 22:56:33 ajacoutot Exp $
|
||||
|
||||
From a49568ceccb133c5a99524f3fdb842f0c05eb0b3 Mon Sep 17 00:00:00 2001
|
||||
From: Dan Winship <danw@gnome.org>
|
||||
Date: Wed, 11 Apr 2012 19:21:17 +0000
|
||||
Subject: gmain: block child sources when blocking the parent
|
||||
|
||||
--- glib/gmain.c.orig Mon Apr 2 05:08:41 2012
|
||||
+++ glib/gmain.c Mon Apr 16 10:41:41 2012
|
||||
@@ -191,7 +191,8 @@ typedef struct _GSourceCallback GSourceCallback;
|
||||
typedef enum
|
||||
{
|
||||
G_SOURCE_READY = 1 << G_HOOK_FLAG_USER_SHIFT,
|
||||
- G_SOURCE_CAN_RECURSE = 1 << (G_HOOK_FLAG_USER_SHIFT + 1)
|
||||
+ G_SOURCE_CAN_RECURSE = 1 << (G_HOOK_FLAG_USER_SHIFT + 1),
|
||||
+ G_SOURCE_BLOCKED = 1 << (G_HOOK_FLAG_USER_SHIFT + 2)
|
||||
} GSourceFlags;
|
||||
|
||||
typedef struct _GMainWaiter GMainWaiter;
|
||||
@@ -313,8 +314,7 @@ struct _GSourcePrivate
|
||||
#define G_THREAD_SELF g_thread_self ()
|
||||
|
||||
#define SOURCE_DESTROYED(source) (((source)->flags & G_HOOK_FLAG_ACTIVE) == 0)
|
||||
-#define SOURCE_BLOCKED(source) (((source)->flags & G_HOOK_FLAG_IN_CALL) != 0 && \
|
||||
- ((source)->flags & G_SOURCE_CAN_RECURSE) == 0)
|
||||
+#define SOURCE_BLOCKED(source) (((source)->flags & G_SOURCE_BLOCKED) != 0)
|
||||
|
||||
#define SOURCE_UNREF(source, context) \
|
||||
G_STMT_START { \
|
||||
@@ -2426,12 +2426,24 @@ block_source (GSource *source)
|
||||
|
||||
g_return_if_fail (!SOURCE_BLOCKED (source));
|
||||
|
||||
+ source->flags |= G_SOURCE_BLOCKED;
|
||||
+
|
||||
tmp_list = source->poll_fds;
|
||||
while (tmp_list)
|
||||
{
|
||||
g_main_context_remove_poll_unlocked (source->context, tmp_list->data);
|
||||
tmp_list = tmp_list->next;
|
||||
}
|
||||
+
|
||||
+ if (source->priv && source->priv->child_sources)
|
||||
+ {
|
||||
+ tmp_list = source->priv->child_sources;
|
||||
+ while (tmp_list)
|
||||
+ {
|
||||
+ block_source (tmp_list->data);
|
||||
+ tmp_list = tmp_list->next;
|
||||
+ }
|
||||
+ }
|
||||
}
|
||||
|
||||
/* HOLDS: source->context's lock */
|
||||
@@ -2440,15 +2452,27 @@ unblock_source (GSource *source)
|
||||
{
|
||||
GSList *tmp_list;
|
||||
|
||||
- g_return_if_fail (!SOURCE_BLOCKED (source)); /* Source already unblocked */
|
||||
+ g_return_if_fail (SOURCE_BLOCKED (source)); /* Source already unblocked */
|
||||
g_return_if_fail (!SOURCE_DESTROYED (source));
|
||||
|
||||
+ source->flags &= ~G_SOURCE_BLOCKED;
|
||||
+
|
||||
tmp_list = source->poll_fds;
|
||||
while (tmp_list)
|
||||
{
|
||||
g_main_context_add_poll_unlocked (source->context, source->priority, tmp_list->data);
|
||||
tmp_list = tmp_list->next;
|
||||
}
|
||||
+
|
||||
+ if (source->priv && source->priv->child_sources)
|
||||
+ {
|
||||
+ tmp_list = source->priv->child_sources;
|
||||
+ while (tmp_list)
|
||||
+ {
|
||||
+ unblock_source (tmp_list->data);
|
||||
+ tmp_list = tmp_list->next;
|
||||
+ }
|
||||
+ }
|
||||
}
|
||||
|
||||
/* HOLDS: context's lock */
|
||||
@@ -2527,8 +2551,7 @@ g_main_dispatch (GMainContext *context)
|
||||
if (!was_in_call)
|
||||
source->flags &= ~G_HOOK_FLAG_IN_CALL;
|
||||
|
||||
- if ((source->flags & G_SOURCE_CAN_RECURSE) == 0 &&
|
||||
- !SOURCE_DESTROYED (source))
|
||||
+ if (SOURCE_BLOCKED (source) && !SOURCE_DESTROYED (source))
|
||||
unblock_source (source);
|
||||
|
||||
/* Note: this depends on the fact that we can't switch
|
||||
@ -1,4 +1,4 @@
|
||||
@comment $OpenBSD: PLIST-main,v 1.30 2012/04/14 07:47:55 ajacoutot Exp $
|
||||
@comment $OpenBSD: PLIST-main,v 1.31 2012/05/01 06:17:01 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.1-gdb.py
|
||||
share/gdb/auto-load/libgobject-2.0.so.0.3200.1-gdb.py
|
||||
share/gdb/auto-load/libglib-2.0.so.0.3200.2-gdb.py
|
||||
share/gdb/auto-load/libgobject-2.0.so.0.3200.2-gdb.py
|
||||
share/glib-2.0/
|
||||
share/glib-2.0/gdb/
|
||||
share/glib-2.0/gdb/glib.py
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user