diff options
| author | maya <maya@pkgsrc.org> | 2020-07-23 09:09:48 +0000 |
|---|---|---|
| committer | maya <maya@pkgsrc.org> | 2020-07-23 09:09:48 +0000 |
| commit | d3310f4bb24a079f344fc47ab7a18f18cd3c85d8 (patch) | |
| tree | cd7c2ac9284cb8b2ca14dd6098207e217a7a7bdc /x11 | |
| parent | 243b0d54e9a89a5a86560cb382d63f5fcab90602 (diff) | |
| download | pkgsrc-d3310f4bb24a079f344fc47ab7a18f18cd3c85d8.tar.gz | |
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 (limited to 'x11')
| -rw-r--r-- | x11/gtk3/distinfo | 4 | ||||
| -rw-r--r-- | x11/gtk3/patches/patch-gtk_gtklabel.c | 6 |
2 files changed, 7 insertions, 3 deletions
diff --git a/x11/gtk3/distinfo b/x11/gtk3/distinfo index 46691bd9bbd..783b36839a9 100644 --- a/x11/gtk3/distinfo +++ b/x11/gtk3/distinfo @@ -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-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 +SHA1 (patch-gtk_gtklabel.c) = 8ec7e9df8d2169f15698ff6a29cf8254ca44ea61 diff --git a/x11/gtk3/patches/patch-gtk_gtklabel.c b/x11/gtk3/patches/patch-gtk_gtklabel.c index bc32752a5c6..0a9041b08ab 100644 --- a/x11/gtk3/patches/patch-gtk_gtklabel.c +++ b/x11/gtk3/patches/patch-gtk_gtklabel.c @@ -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 @@ Fixes crash with glade, reproduce with: 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 |