[pkgsrc/trunk]: pkgsrc/x11/gtk3 gtk3: note that the patch shouldn't be upstre...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/eeb429c5e942
branches:  trunk
changeset: 436002:eeb429c5e942
user:      maya <maya%pkgsrc.org@localhost>
date:      Thu Jul 23 09:09:48 2020 +0000

description:
gtk3: note that the patch shouldn't be upstreamed.

the glade fix requires some work to adapt to the released version, leaving
in this note in the meantime.

diffstat:

 x11/gtk3/distinfo                     |  4 ++--
 x11/gtk3/patches/patch-gtk_gtklabel.c |  6 +++++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diffs (35 lines):

diff -r ef925e592732 -r eeb429c5e942 x11/gtk3/distinfo
--- a/x11/gtk3/distinfo Thu Jul 23 07:44:36 2020 +0000
+++ b/x11/gtk3/distinfo Thu Jul 23 09:09:48 2020 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.80 2020/07/20 14:39:34 maya Exp $
+$NetBSD: distinfo,v 1.81 2020/07/23 09:09:48 maya Exp $
 
 SHA1 (gtk+-3.24.21.tar.xz) = c34360a46556732d0143b2fd010f4065e9c3987b
 RMD160 (gtk+-3.24.21.tar.xz) = a5d96f7ea194c24adc3468328aed19c631d5421e
@@ -15,4 +15,4 @@
 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
+SHA1 (patch-gtk_gtklabel.c) = 8ec7e9df8d2169f15698ff6a29cf8254ca44ea61
diff -r ef925e592732 -r eeb429c5e942 x11/gtk3/patches/patch-gtk_gtklabel.c
--- a/x11/gtk3/patches/patch-gtk_gtklabel.c     Thu Jul 23 07:44:36 2020 +0000
+++ b/x11/gtk3/patches/patch-gtk_gtklabel.c     Thu Jul 23 09:09:48 2020 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-gtk_gtklabel.c,v 1.1 2020/07/20 14:39:35 maya Exp $
+$NetBSD: patch-gtk_gtklabel.c,v 1.2 2020/07/23 09:09:48 maya Exp $
 
 Don't deref label before we check if it's (among other things)
 non-NULL.
@@ -8,6 +8,10 @@
 2. Toplevel -> GtkAssistant
 3. Press assistant anywhere
 
+Note: this patch was rejected on GTK upstream and glade was patched
+to avoid this crash. Will become unnecessary once gtk3 or glade are
+updated.
+
 --- gtk/gtklabel.c.orig        2020-02-03 11:45:12.000000000 +0000
 +++ gtk/gtklabel.c
 @@ -2297,10 +2297,12 @@ void