[pkgsrc/trunk]: pkgsrc/x11/gtk2 Avoid a nested mutex lock that was causing mi...

[jmmv <jmmv%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/039ddab84330
branches:  trunk
changeset: 486895:039ddab84330
user:      jmmv <jmmv%pkgsrc.org@localhost>
date:      Tue Jan 04 23:52:16 2005 +0000

description:
Avoid a nested mutex lock that was causing misterious application crashes
when using the SVG loader.  Bump PKGREVISION to 2.

Problem seen in vino when using the Nuvola theme (vino-preferences refuses
to start with a SIGABRT and a libpthread assertion is triggered).

diffstat:

 x11/gtk2/Makefile         |   4 ++--
 x11/gtk2/distinfo         |   3 ++-
 x11/gtk2/patches/patch-ad |  31 +++++++++++++++++++++++++++++++
 3 files changed, 35 insertions(+), 3 deletions(-)

diffs (63 lines):

diff -r 8eb1e55fa9e2 -r 039ddab84330 x11/gtk2/Makefile
--- a/x11/gtk2/Makefile Tue Jan 04 23:51:00 2005 +0000
+++ b/x11/gtk2/Makefile Tue Jan 04 23:52:16 2005 +0000
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.70 2004/12/28 23:18:21 reed Exp $
+# $NetBSD: Makefile,v 1.71 2005/01/04 23:52:16 jmmv Exp $
 #
 
 DISTNAME=              gtk+-2.6.0
 PKGNAME=               ${DISTNAME:S/gtk/gtk2/}
-PKGREVISION=           1
+PKGREVISION=           2
 CATEGORIES=            x11
 MASTER_SITES=          ftp://ftp.gtk.org/pub/gtk/v2.6/ \
                        ftp://ftp.cs.umn.edu/pub/gimp/gtk/v2.6/ \
diff -r 8eb1e55fa9e2 -r 039ddab84330 x11/gtk2/distinfo
--- a/x11/gtk2/distinfo Tue Jan 04 23:51:00 2005 +0000
+++ b/x11/gtk2/distinfo Tue Jan 04 23:52:16 2005 +0000
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.35 2004/12/24 10:04:39 jmmv Exp $
+$NetBSD: distinfo,v 1.36 2005/01/04 23:52:16 jmmv Exp $
 
 SHA1 (gtk+-2.6.0.tar.bz2) = 2f98456c135aacc89d82d47e2b257cb917bcd31f
 Size (gtk+-2.6.0.tar.bz2) = 10924415 bytes
 SHA1 (patch-aa) = ab8a71ffa3b44816bb6f53ced068f80132b67c09
 SHA1 (patch-ab) = 9a9d10c91160886f48b80367297216f1217c2a44
 SHA1 (patch-ac) = 42dff743263b141029a814d7dec9fdc5637a3cff
+SHA1 (patch-ad) = 95eaa8383c54d434070c1629bf41aa501c377c87
diff -r 8eb1e55fa9e2 -r 039ddab84330 x11/gtk2/patches/patch-ad
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/gtk2/patches/patch-ad Tue Jan 04 23:52:16 2005 +0000
@@ -0,0 +1,31 @@
+$NetBSD: patch-ad,v 1.9 2005/01/04 23:52:16 jmmv Exp $
+
+--- gdk-pixbuf/gdk-pixbuf-animation.c.orig     2004-12-05 13:43:47.000000000 +0100
++++ gdk-pixbuf/gdk-pixbuf-animation.c
+@@ -139,7 +139,7 @@ gdk_pixbuf_animation_new_from_file (cons
+       guchar buffer [128];
+       GdkPixbufModule *image_module;
+         gchar *display_name;
+-        gboolean locked;
++        gboolean locked = FALSE;
+ 
+       g_return_val_if_fail (filename != NULL, NULL);
+         g_return_val_if_fail (error == NULL || *error == NULL, NULL);
+@@ -184,8 +184,6 @@ gdk_pixbuf_animation_new_from_file (cons
+                         return NULL;
+                 }
+ 
+-        locked = _gdk_pixbuf_lock (image_module);
+-
+       if (image_module->load_animation == NULL) {
+               GdkPixbuf *pixbuf;
+ 
+@@ -221,6 +219,8 @@ gdk_pixbuf_animation_new_from_file (cons
+ 
+                 g_object_unref (pixbuf);
+       } else {
++              locked = _gdk_pixbuf_lock (image_module);
++
+               fseek (f, 0, SEEK_SET);
+               animation = (* image_module->load_animation) (f, error);
+