[153232] trunk/dports/gnome/gtk3
devans at macports.org
devans at macports.org
Tue Sep 27 09:16:02 PDT 2016
Revision: 153232
https://trac.macports.org/changeset/153232
Author: devans at macports.org
Date: 2016-09-27 09:16:02 -0700 (Tue, 27 Sep 2016)
Log Message:
-----------
gtk3: update to version 3.22.0, apply upstream post-release patch that fixes issue with missing document type icons in the file chooser dialog (#51296).
Modified Paths:
--------------
trunk/dports/gnome/gtk3/Portfile
trunk/dports/gnome/gtk3/files/nawk.patch
Added Paths:
-----------
trunk/dports/gnome/gtk3/files/bz765649-get-style-earlier.patch
Removed Paths:
-------------
trunk/dports/gnome/gtk3/files/0001-iconhelper-check-if-surface-was-invalidated.patch
Property Changed:
----------------
trunk/dports/gnome/gtk3/
Property changes on: trunk/dports/gnome/gtk3
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/mld-qt-481/dports/gnome/gtk3:92720,92813,92891,92963,93522,93556,93699,93743,93771-93773,93806,93817-93818,93856
/users/devans/GNOME-3/stable/dports/gnome/gtk3:119527-151811
/users/devans/GNOME-3/unstable/dports/gnome/gtk3:119539-125620,128305-134375,141777-146944
/users/rmstonecipher/gnome/gtk3:102363-103172
+ /branches/mld-qt-481/dports/gnome/gtk3:92720,92813,92891,92963,93522,93556,93699,93743,93771-93773,93806,93817-93818,93856
/users/devans/GNOME-3/stable/dports/gnome/gtk3:119527-153221
/users/devans/GNOME-3/unstable/dports/gnome/gtk3:119539-125620,128305-134375,141777-146944,148129-152861
/users/rmstonecipher/gnome/gtk3:102363-103172
Modified: trunk/dports/gnome/gtk3/Portfile
===================================================================
--- trunk/dports/gnome/gtk3/Portfile 2016-09-27 16:14:11 UTC (rev 153231)
+++ trunk/dports/gnome/gtk3/Portfile 2016-09-27 16:16:02 UTC (rev 153232)
@@ -10,7 +10,7 @@
name gtk3
set real_name gtk+
epoch 1
-version 3.20.9
+version 3.22.0
set branch [join [lrange [split ${version} .] 0 1] .]
categories gnome x11
license LGPL-2.1+
@@ -30,8 +30,8 @@
master_sites gnome:sources/gtk+/${branch}/
-checksums rmd160 18b94aee023518068f7837895b711b63fdf1eb13 \
- sha256 83a609ba2f3424b5509e73967c49c67833af466d6f91081b24ee5c64fce6ac17
+checksums rmd160 ee7ee12424a7670a69f68402af1791e56c97903d \
+ sha256 88d0bb584be7ecec965b82ba88a9cf0aafd6f03eff7447653295ab2341c74134
minimum_xcodeversions {9 3.1}
@@ -48,7 +48,7 @@
port:hicolor-icon-theme
patchfiles nawk.patch \
- 0001-iconhelper-check-if-surface-was-invalidated.patch
+ bz765649-get-style-earlier.patch
# gtk3 +quartz uses instancetype which is not available
# before approximately Xcode 4.6 (#49391)
Deleted: trunk/dports/gnome/gtk3/files/0001-iconhelper-check-if-surface-was-invalidated.patch
===================================================================
--- trunk/dports/gnome/gtk3/files/0001-iconhelper-check-if-surface-was-invalidated.patch 2016-09-27 16:14:11 UTC (rev 153231)
+++ trunk/dports/gnome/gtk3/files/0001-iconhelper-check-if-surface-was-invalidated.patch 2016-09-27 16:16:02 UTC (rev 153232)
@@ -1,41 +0,0 @@
-From a4037730e68cfc37288badc64f4ddaf6c1fa51e8 Mon Sep 17 00:00:00 2001
-From: Christian Hergert <chergert at redhat.com>
-Date: Wed, 27 Apr 2016 16:51:25 -0700
-Subject: [PATCH] iconhelper: check if surface was invalidated
-
-Fetching the style may cause the surface to be invalidated.
-
-We don't want to fetch the style unless we already have a surface,
-so just do a second surface check after fetching the style.
----
- gtk/gtkiconhelper.c | 14 ++++++++++----
- 1 file changed, 10 insertions(+), 4 deletions(-)
-
-diff --git a/gtk/gtkiconhelper.c b/gtk/gtkiconhelper.c
-index b8737e7..a80418d 100644
---- gtk/gtkiconhelper.c
-+++ gtk/gtkiconhelper.c
-@@ -896,10 +896,16 @@ _gtk_icon_helper_draw (GtkIconHelper *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))),
-- cr,
-- self->priv->rendered_surface,
-- x, y);
-+ GtkCssStyle *style;
-+
-+ style = gtk_css_node_get_style (gtk_css_gadget_get_node (GTK_CSS_GADGET (self)));
-+
-+ /* Fetching the style might cause rendered_surface to be invalidated */
-+ if (self->priv->rendered_surface != NULL)
-+ gtk_css_style_render_icon_surface (style,
-+ cr,
-+ self->priv->rendered_surface,
-+ x, y);
- }
- }
-
---
-2.3.2 (Apple Git-55)
-
Copied: trunk/dports/gnome/gtk3/files/bz765649-get-style-earlier.patch (from rev 153221, users/devans/GNOME-3/stable/dports/gnome/gtk3/files/bz765649-get-style-earlier.patch)
===================================================================
--- trunk/dports/gnome/gtk3/files/bz765649-get-style-earlier.patch (rev 0)
+++ trunk/dports/gnome/gtk3/files/bz765649-get-style-earlier.patch 2016-09-27 16:16:02 UTC (rev 153232)
@@ -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
+
Modified: trunk/dports/gnome/gtk3/files/nawk.patch
===================================================================
--- trunk/dports/gnome/gtk3/files/nawk.patch 2016-09-27 16:14:11 UTC (rev 153231)
+++ trunk/dports/gnome/gtk3/files/nawk.patch 2016-09-27 16:16:02 UTC (rev 153232)
@@ -1,6 +1,6 @@
--- configure.orig 2015-11-16 12:32:00.000000000 -0600
+++ configure 2015-11-18 00:20:49.000000000 -0600
-@@ -3432,7 +3432,7 @@
+@@ -3629,7 +3629,7 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5
$as_echo "$MKDIR_P" >&6; }
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20160927/2b83bbc7/attachment.html>
More information about the macports-changes
mailing list