Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_159525597595330"
MIME-Version: 1.0
Date: Mon, 20 Jul 2020 14:39:35 +0000
From: "Maya Rashish" <maya@netbsd.org>
Subject: CVS commit: pkgsrc/x11/gtk3
To: pkgsrc-changes@NetBSD.org
Reply-To: maya@netbsd.org
Message-Id: <20200720143935.3AA44FB28@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
Precedence: bulk

This is a multi-part message in MIME format.

--_----------=_159525597595330
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="US-ASCII"

Module Name:	pkgsrc
Committed By:	maya
Date:		Mon Jul 20 14:39:35 UTC 2020

Modified Files:
	pkgsrc/x11/gtk3: Makefile distinfo
Added Files:
	pkgsrc/x11/gtk3/patches: patch-gtk_gtklabel.c

Log Message:
gtk3: avoid crash when using glade. repro mentioned in patch comment.

bump PKGREVISION


To generate a diff of this commit:
cvs rdiff -u -r1.151 -r1.152 pkgsrc/x11/gtk3/Makefile
cvs rdiff -u -r1.79 -r1.80 pkgsrc/x11/gtk3/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/x11/gtk3/patches/patch-gtk_gtklabel.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


--_----------=_159525597595330
Content-Disposition: inline
Content-Length: 2379
Content-Transfer-Encoding: binary
Content-Type: text/x-diff; charset=us-ascii

Modified files:

Index: pkgsrc/x11/gtk3/Makefile
diff -u pkgsrc/x11/gtk3/Makefile:1.151 pkgsrc/x11/gtk3/Makefile:1.152
--- pkgsrc/x11/gtk3/Makefile:1.151	Wed Jul  8 06:51:00 2020
+++ pkgsrc/x11/gtk3/Makefile	Mon Jul 20 14:39:34 2020
@@ -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

Index: pkgsrc/x11/gtk3/distinfo
diff -u pkgsrc/x11/gtk3/distinfo:1.79 pkgsrc/x11/gtk3/distinfo:1.80
--- pkgsrc/x11/gtk3/distinfo:1.79	Wed Jul  8 06:51:00 2020
+++ pkgsrc/x11/gtk3/distinfo	Mon Jul 20 14:39:34 2020
@@ -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) = c
 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

Added files:

Index: pkgsrc/x11/gtk3/patches/patch-gtk_gtklabel.c
diff -u /dev/null pkgsrc/x11/gtk3/patches/patch-gtk_gtklabel.c:1.1
--- /dev/null	Mon Jul 20 14:39:35 2020
+++ pkgsrc/x11/gtk3/patches/patch-gtk_gtklabel.c	Mon Jul 20 14:39:35 2020
@@ -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);
+ 


--_----------=_159525597595330--