[153469] trunk/dports/gnome/gtk3

[devans at macports.org]

Revision: 153469
          https://trac.macports.org/changeset/153469
Author:   devans at macports.org
Date:     2016-10-01 16:13:00 -0700 (Sat, 01 Oct 2016)
Log Message:
-----------
gtk3: update to version 3.22.1, drop upstream patch now included in distribution.

Modified Paths:
--------------
    trunk/dports/gnome/gtk3/Portfile

Removed Paths:
-------------
    trunk/dports/gnome/gtk3/files/bz765649-get-style-earlier.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-153221
/users/devans/GNOME-3/unstable/dports/gnome/gtk3:119539-125620,128305-134375,141777-146944,148129-152861
/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-153468
/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-10-01 23:07:06 UTC (rev 153468)
+++ trunk/dports/gnome/gtk3/Portfile	2016-10-01 23:13:00 UTC (rev 153469)
@@ -10,7 +10,7 @@
 name                gtk3
 set real_name       gtk+
 epoch               1
-version             3.22.0
+version             3.22.1
 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  ee7ee12424a7670a69f68402af1791e56c97903d \
-                    sha256  88d0bb584be7ecec965b82ba88a9cf0aafd6f03eff7447653295ab2341c74134
+checksums           rmd160  d8a27e02c5fbf96374838b5295f5bb98e0280ebc \
+                    sha256  127c8c5cfc32681f9ab3cb542eb0d5c16c1c02faba68bf8fcac9a3cf278ef471
 
 minimum_xcodeversions {9 3.1}
 
@@ -48,14 +48,13 @@
                     port:hicolor-icon-theme
 
 patchfiles          nawk.patch \
-                    bz765649-get-style-earlier.patch \
                     O_CLOEXEC-10.6-and-earlier.patch
 
 # gtk3 +quartz uses instancetype which is not available
 # before approximately Xcode 4.6 (#49391)
+# if building +x11 blacklist comilers that do not support C11
+# (redefinition of typedef ‘GdkX11Monitor’ at gdkscreen-x11.h:33)
 
-# blacklist compilers that do not support C11 (redefinition of typedef ‘GdkX11Monitor’ at gdkscreen-x11.h:33)
-
 if {[variant_isset quartz]} {
     compiler.blacklist  *gcc* {clang < 425}
 } else {

Deleted: trunk/dports/gnome/gtk3/files/bz765649-get-style-earlier.patch
===================================================================
--- trunk/dports/gnome/gtk3/files/bz765649-get-style-earlier.patch	2016-10-01 23:07:06 UTC (rev 153468)
+++ trunk/dports/gnome/gtk3/files/bz765649-get-style-earlier.patch	2016-10-01 23:13:00 UTC (rev 153469)
@@ -1,42 +0,0 @@
-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: <http://lists.macports.org/pipermail/macports-changes/attachments/20161001/68ace724/attachment-0002.html>