diff options
| author | jmmv <jmmv@pkgsrc.org> | 2005-01-04 23:52:16 +0000 |
|---|---|---|
| committer | jmmv <jmmv@pkgsrc.org> | 2005-01-04 23:52:16 +0000 |
| commit | 46ed1c85cf71a9a05174490f470ee83749a43e03 (patch) | |
| tree | 7cac7a3d42cd9f5d33e231eec2f961778bb433db /x11/gtk2 | |
| parent | 5243486b9c01d57975d9e5ed35870866c5b606bf (diff) | |
| download | pkgsrc-46ed1c85cf71a9a05174490f470ee83749a43e03.tar.gz | |
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 (limited to 'x11/gtk2')
| -rw-r--r-- | x11/gtk2/Makefile | 4 | ||||
| -rw-r--r-- | x11/gtk2/distinfo | 3 | ||||
| -rw-r--r-- | x11/gtk2/patches/patch-ad | 31 |
3 files changed, 35 insertions, 3 deletions
diff --git a/x11/gtk2/Makefile b/x11/gtk2/Makefile index 72cfaeaef84..c28882da0c1 100644 --- a/x11/gtk2/Makefile +++ b/x11/gtk2/Makefile @@ -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 --git a/x11/gtk2/distinfo b/x11/gtk2/distinfo index 6169515b3ce..9d21964c083 100644 --- a/x11/gtk2/distinfo +++ b/x11/gtk2/distinfo @@ -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 --git a/x11/gtk2/patches/patch-ad b/x11/gtk2/patches/patch-ad new file mode 100644 index 00000000000..fdc961e0440 --- /dev/null +++ b/x11/gtk2/patches/patch-ad @@ -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); + |