[151620] trunk/dports/gnome/gtk3

[devans at macports.org]

Revision: 151620
          https://trac.macports.org/changeset/151620
Author:   devans at macports.org
Date:     2016-08-18 11:23:13 -0700 (Thu, 18 Aug 2016)
Log Message:
-----------
gtk3: update to version 3.20.8, cups patch now included upstream, add iconhelper patch from gnome bz765649 although it doesn't really seem to help (#51296).

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

Added Paths:
-----------
    trunk/dports/gnome/gtk3/files/0001-iconhelper-check-if-surface-was-invalidated.patch

Removed Paths:
-------------
    trunk/dports/gnome/gtk3/files/cups.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-149001
/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-151619
/users/devans/GNOME-3/unstable/dports/gnome/gtk3:119539-125620,128305-134375,141777-146944
/users/rmstonecipher/gnome/gtk3:102363-103172

Modified: trunk/dports/gnome/gtk3/Portfile
===================================================================
--- trunk/dports/gnome/gtk3/Portfile	2016-08-18 17:10:43 UTC (rev 151619)
+++ trunk/dports/gnome/gtk3/Portfile	2016-08-18 18:23:13 UTC (rev 151620)
@@ -11,7 +11,7 @@
 name                gtk3
 set real_name       gtk+
 epoch               1
-version             3.20.6
+version             3.20.8
 set branch          [join [lrange [split ${version} .] 0 1] .]
 categories          gnome x11
 license             LGPL-2.1+
@@ -31,8 +31,8 @@
 
 master_sites        gnome:sources/gtk+/${branch}/
 
-checksums           rmd160  5ae385f38ec164ffa72b0f9dec4dc30d50c04feb \
-                    sha256  3f8016563a96b1cfef4ac9e795647f6316deb2978ff939b19e4e4f8f936fa4b2
+checksums           rmd160  2aa4280d5827ba42e6490842b3da5848e38dd776 \
+                    sha256  9841bd9b4d23c045c474b10fdde9da958af904b63783701e796391d55d4396f3
 
 minimum_xcodeversions {9 3.1}
 
@@ -54,7 +54,8 @@
                     lib/libpango-1.0.dylib \
                     lib/libtiff.dylib
 
-patchfiles          nawk.patch cups.patch
+patchfiles          nawk.patch \
+                    0001-iconhelper-check-if-surface-was-invalidated.patch
 
 # gtk3 +quartz uses instancetype which is not available
 # before approximately Xcode 4.6 (#49391)

Copied: trunk/dports/gnome/gtk3/files/0001-iconhelper-check-if-surface-was-invalidated.patch (from rev 151619, users/devans/GNOME-3/stable/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	                        (rev 0)
+++ trunk/dports/gnome/gtk3/files/0001-iconhelper-check-if-surface-was-invalidated.patch	2016-08-18 18:23:13 UTC (rev 151620)
@@ -0,0 +1,41 @@
+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)
+

Deleted: trunk/dports/gnome/gtk3/files/cups.patch
===================================================================
--- trunk/dports/gnome/gtk3/files/cups.patch	2016-08-18 17:10:43 UTC (rev 151619)
+++ trunk/dports/gnome/gtk3/files/cups.patch	2016-08-18 18:23:13 UTC (rev 151620)
@@ -1,12 +0,0 @@
---- configure.orig	2016-05-10 20:25:04.000000000 -0700
-+++ configure	2016-05-10 20:25:37.000000000 -0700
-@@ -25784,7 +25784,7 @@ fi
-     CUPS_API_MAJOR=`echo $ECHO_N $CUPS_API_VERSION | awk -F. '{print $1}'`
-     CUPS_API_MINOR=`echo $ECHO_N $CUPS_API_VERSION | awk -F. '{print $2}'`
- 
--    if test $CUPS_API_MAJOR -gt 1 -o \
-+    if test $CUPS_API_MAJOR -lt 1 -o \
-             $CUPS_API_MAJOR -eq 1 -a $CUPS_API_MINOR -lt 2; then
-       as_fn_error $? "CUPS >= 1.2 not found" "$LINENO" 5
-     fi
-
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20160818/180452f4/attachment-0001.html>