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

[devans at macports.org]

Revision: 152862
          https://trac.macports.org/changeset/152862
Author:   devans at macports.org
Date:     2016-09-19 19:53:25 -0700 (Mon, 19 Sep 2016)
Log Message:
-----------
GNOME-3/stable: gtk3, merge unstable to stable and update to version 3.22.0, drop patch incorporated upstream.

Modified Paths:
--------------
    users/devans/GNOME-3/stable/dports/gnome/gtk3/Portfile
    users/devans/GNOME-3/stable/dports/gnome/gtk3/files/nawk.patch

Removed Paths:
-------------
    users/devans/GNOME-3/stable/dports/gnome/gtk3/files/0001-iconhelper-check-if-surface-was-invalidated.patch

Property Changed:
----------------
    users/devans/GNOME-3/stable/dports/gnome/gtk3/


Property changes on: users/devans/GNOME-3/stable/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
/trunk/dports/gnome/gtk3:119527-152288
/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
/trunk/dports/gnome/gtk3:119527-152288
/users/devans/GNOME-3/unstable/dports/gnome/gtk3:119539-125620,128305-134375,141777-146944,148129-152861
/users/rmstonecipher/gnome/gtk3:102363-103172

Modified: users/devans/GNOME-3/stable/dports/gnome/gtk3/Portfile
===================================================================
--- users/devans/GNOME-3/stable/dports/gnome/gtk3/Portfile	2016-09-20 00:55:35 UTC (rev 152861)
+++ users/devans/GNOME-3/stable/dports/gnome/gtk3/Portfile	2016-09-20 02:53:25 UTC (rev 152862)
@@ -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}
 
@@ -47,8 +47,7 @@
 depends_run         port:shared-mime-info \
                     port:hicolor-icon-theme
 
-patchfiles          nawk.patch \
-                    0001-iconhelper-check-if-surface-was-invalidated.patch
+patchfiles          nawk.patch
 
 # gtk3 +quartz uses instancetype which is not available
 # before approximately Xcode 4.6 (#49391)

Deleted: users/devans/GNOME-3/stable/dports/gnome/gtk3/files/0001-iconhelper-check-if-surface-was-invalidated.patch
===================================================================
--- users/devans/GNOME-3/stable/dports/gnome/gtk3/files/0001-iconhelper-check-if-surface-was-invalidated.patch	2016-09-20 00:55:35 UTC (rev 152861)
+++ users/devans/GNOME-3/stable/dports/gnome/gtk3/files/0001-iconhelper-check-if-surface-was-invalidated.patch	2016-09-20 02:53:25 UTC (rev 152862)
@@ -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)
-

Modified: users/devans/GNOME-3/stable/dports/gnome/gtk3/files/nawk.patch
===================================================================
--- users/devans/GNOME-3/stable/dports/gnome/gtk3/files/nawk.patch	2016-09-20 00:55:35 UTC (rev 152861)
+++ users/devans/GNOME-3/stable/dports/gnome/gtk3/files/nawk.patch	2016-09-20 02:53:25 UTC (rev 152862)
@@ -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/20160919/82d9e5de/attachment.html>