[153220] users/devans/GNOME-3/stable/dports/gnome/gtk3

[devans at macports.org]

Revision: 153220
          https://trac.macports.org/changeset/153220
Author:   devans at macports.org
Date:     2016-09-27 08:24:08 -0700 (Tue, 27 Sep 2016)
Log Message:
-----------
GNOME-3/stable: gtk3, apply upstream post-release patch that fixes issue with missing document type icons in the file chooser dialog (#51296).

Modified Paths:
--------------
    users/devans/GNOME-3/stable/dports/gnome/gtk3/Portfile

Added Paths:
-----------
    users/devans/GNOME-3/stable/dports/gnome/gtk3/files/bz765649-get-style-earlier.patch

Modified: users/devans/GNOME-3/stable/dports/gnome/gtk3/Portfile
===================================================================
--- users/devans/GNOME-3/stable/dports/gnome/gtk3/Portfile	2016-09-27 14:26:31 UTC (rev 153219)
+++ users/devans/GNOME-3/stable/dports/gnome/gtk3/Portfile	2016-09-27 15:24:08 UTC (rev 153220)
@@ -47,7 +47,8 @@
 depends_run         port:shared-mime-info \
                     port:hicolor-icon-theme
 
-patchfiles          nawk.patch
+patchfiles          nawk.patch \
+                    bz765649-get-style-earlier.patch
 
 # gtk3 +quartz uses instancetype which is not available
 # before approximately Xcode 4.6 (#49391)

Added: users/devans/GNOME-3/stable/dports/gnome/gtk3/files/bz765649-get-style-earlier.patch
===================================================================
--- users/devans/GNOME-3/stable/dports/gnome/gtk3/files/bz765649-get-style-earlier.patch	                        (rev 0)
+++ users/devans/GNOME-3/stable/dports/gnome/gtk3/files/bz765649-get-style-earlier.patch	2016-09-27 15:24:08 UTC (rev 153220)
@@ -0,0 +1,42 @@
+From fa23641992e0fc1e7ec64c56975d7b13d7d0de1b Mon Sep 17 00:00:00 2001
+From: Daniel Drake <drake at endlessm.com>
+Date: Mon, 26 Sep 2016 13:18:59 -0600
+Subject: _gtk_icon_helper_draw: get style earlier
+
+After checking for rendered_surface, the call to gtk_css_node_get_style
+can invalidate the style and result in rendered_surface being set to
+NULL. This was result in some icon views appearing blank on
+Endless OS on armv7hl, and this error:
+
+Gtk-CRITICAL **: gtk_css_style_render_icon_surface: assertion 'surface != NULL' failed
+
+Call gtk_css_node_get_style earlier to ensure we always pass a valid
+surface to gtk_css_style_render_icon_surface.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=765649
+https://phabricator.endlessm.com/T13524
+---
+ gtk/gtkiconhelper.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/gtk/gtkiconhelper.c b/gtk/gtkiconhelper.c
+index b8737e7..7ef33ae 100644
+--- gtk/gtkiconhelper.c
++++ gtk/gtkiconhelper.c
+@@ -892,11 +892,12 @@ _gtk_icon_helper_draw (GtkIconHelper *self,
+                        gdouble x,
+                        gdouble y)
+ {
++  GtkCssStyle *style = gtk_css_node_get_style (gtk_css_gadget_get_node (GTK_CSS_GADGET (self)));
+   gtk_icon_helper_ensure_surface (self);
+ 
+   if (self->priv->rendered_surface != NULL)
+     {
+-      gtk_css_style_render_icon_surface (gtk_css_node_get_style (gtk_css_gadget_get_node (GTK_CSS_GADGET (self))),
++      gtk_css_style_render_icon_surface (style,
+                                          cr,
+                                          self->priv->rendered_surface,
+                                          x, y);
+-- 
+cgit v0.12
+
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20160927/f7c090ba/attachment.html>