diff options
| author | maya <maya@pkgsrc.org> | 2020-07-20 14:39:34 +0000 |
|---|---|---|
| committer | maya <maya@pkgsrc.org> | 2020-07-20 14:39:34 +0000 |
| commit | 4d17d5badf08781c047711814f6af7d7f225056f (patch) | |
| tree | 5e2e142b9f3ef9a6c8718267e0f985c007b53cfc /x11/gtk3 | |
| parent | fc7f44c3d44815a9759f40a39cf0447caee73661 (diff) | |
| download | pkgsrc-4d17d5badf08781c047711814f6af7d7f225056f.tar.gz | |
gtk3: avoid crash when using glade. repro mentioned in patch comment.
bump PKGREVISION
Diffstat (limited to 'x11/gtk3')
| -rw-r--r-- | x11/gtk3/Makefile | 3 | ||||
| -rw-r--r-- | x11/gtk3/distinfo | 3 | ||||
| -rw-r--r-- | x11/gtk3/patches/patch-gtk_gtklabel.c | 26 |
3 files changed, 30 insertions, 2 deletions
diff --git a/x11/gtk3/Makefile b/x11/gtk3/Makefile index a9eb00b17c0..9d0eab3c23b 100644 --- a/x11/gtk3/Makefile +++ b/x11/gtk3/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.151 2020/07/08 06:51:00 adam Exp $ +# $NetBSD: Makefile,v 1.152 2020/07/20 14:39:34 maya Exp $ DISTNAME= gtk+-3.24.21 PKGNAME= ${DISTNAME:S/gtk/gtk3/} +PKGREVISION= 1 CATEGORIES= x11 gnome MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gtk+/${PKGVERSION_NOREV:R}/} EXTRACT_SUFX= .tar.xz diff --git a/x11/gtk3/distinfo b/x11/gtk3/distinfo index 34146f4a281..46691bd9bbd 100644 --- a/x11/gtk3/distinfo +++ b/x11/gtk3/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.79 2020/07/08 06:51:00 adam Exp $ +$NetBSD: distinfo,v 1.80 2020/07/20 14:39:34 maya Exp $ SHA1 (gtk+-3.24.21.tar.xz) = c34360a46556732d0143b2fd010f4065e9c3987b RMD160 (gtk+-3.24.21.tar.xz) = a5d96f7ea194c24adc3468328aed19c631d5421e @@ -15,3 +15,4 @@ SHA1 (patch-gdk_x11_gdkwindow-x11.h) = c80f7c9d5a570817e54fd74fa903a53400dc6f64 SHA1 (patch-gtk_a11y_gtkaccessibility.c) = 13232c85bd570f21ea03153dacde4ca98c7c76a8 SHA1 (patch-gtk_fallback-c89.c) = eaf5ac8aace9eab673eed0e265d4cb2617bf1fcd SHA1 (patch-gtk_gtkfontchooserwidget.c) = 5ca98e5417865d8c60333c8c2b2ba757755ef547 +SHA1 (patch-gtk_gtklabel.c) = 7d82975b02c76d489cfc3661903e113a03222c8a diff --git a/x11/gtk3/patches/patch-gtk_gtklabel.c b/x11/gtk3/patches/patch-gtk_gtklabel.c new file mode 100644 index 00000000000..bc32752a5c6 --- /dev/null +++ b/x11/gtk3/patches/patch-gtk_gtklabel.c @@ -0,0 +1,26 @@ +$NetBSD: patch-gtk_gtklabel.c,v 1.1 2020/07/20 14:39:35 maya Exp $ + +Don't deref label before we check if it's (among other things) +non-NULL. + +Fixes crash with glade, reproduce with: +1. New project +2. Toplevel -> GtkAssistant +3. Press assistant anywhere + +--- gtk/gtklabel.c.orig 2020-02-03 11:45:12.000000000 +0000 ++++ gtk/gtklabel.c +@@ -2297,10 +2297,12 @@ void + gtk_label_set_attributes (GtkLabel *label, + PangoAttrList *attrs) + { +- GtkLabelPrivate *priv = label->priv; ++ GtkLabelPrivate *priv; + + g_return_if_fail (GTK_IS_LABEL (label)); + ++ priv = label->priv; ++ + if (attrs) + pango_attr_list_ref (attrs); + |