<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[151620] trunk/dports/gnome/gtk3</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://trac.macports.org/changeset/151620">151620</a></dd>
<dt>Author</dt> <dd>devans@macports.org</dd>
<dt>Date</dt> <dd>2016-08-18 11:23:13 -0700 (Thu, 18 Aug 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>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).</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsgnomegtk3Portfile">trunk/dports/gnome/gtk3/Portfile</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkdportsgnomegtk3files0001iconhelpercheckifsurfacewasinvalidatedpatch">trunk/dports/gnome/gtk3/files/0001-iconhelper-check-if-surface-was-invalidated.patch</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkdportsgnomegtk3filescupspatch">trunk/dports/gnome/gtk3/files/cups.patch</a></li>
</ul>
<h3>Property Changed</h3>
<ul>
<li><a href="#trunkdportsgnomegtk3">trunk/dports/gnome/gtk3/</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsgnomegtk3"></a>
<div class="propset"><h4>Property changes: trunk/dports/gnome/gtk3</h4>
<pre class="diff"><span>
</span></pre></div>
<a id="svnmergeinfo"></a>
<div class="modfile"><h4>Modified: svn:mergeinfo</h4></div>
<span class="cx">/users/devans/GNOME-3/stable/dports/gnome/gtk3:119527-149001
</span><span class="cx">/users/devans/GNOME-3/unstable/dports/gnome/gtk3:119539-125620,128305-134375,141777-146944
</span><span class="cx">/users/rmstonecipher/gnome/gtk3:102363-103172
</span><span class="cx"> + /branches/mld-qt-481/dports/gnome/gtk3:92720,92813,92891,92963,93522,93556,93699,93743,93771-93773,93806,93817-93818,93856
</span><span class="cx">/users/devans/GNOME-3/stable/dports/gnome/gtk3:119527-151619
</span><span class="cx">/users/devans/GNOME-3/unstable/dports/gnome/gtk3:119539-125620,128305-134375,141777-146944
</span><span class="cx">/users/rmstonecipher/gnome/gtk3:102363-103172
</span><a id="trunkdportsgnomegtk3Portfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/gnome/gtk3/Portfile (151619 => 151620)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -11,7 +11,7 @@
</span><span class="cx"> name gtk3
</span><span class="cx"> set real_name gtk+
</span><span class="cx"> epoch 1
</span><del>-version 3.20.6
</del><ins>+version 3.20.8
</ins><span class="cx"> set branch [join [lrange [split ${version} .] 0 1] .]
</span><span class="cx"> categories gnome x11
</span><span class="cx"> license LGPL-2.1+
</span><span class="lines">@@ -31,8 +31,8 @@
</span><span class="cx">
</span><span class="cx"> master_sites gnome:sources/gtk+/${branch}/
</span><span class="cx">
</span><del>-checksums rmd160 5ae385f38ec164ffa72b0f9dec4dc30d50c04feb \
- sha256 3f8016563a96b1cfef4ac9e795647f6316deb2978ff939b19e4e4f8f936fa4b2
</del><ins>+checksums rmd160 2aa4280d5827ba42e6490842b3da5848e38dd776 \
+ sha256 9841bd9b4d23c045c474b10fdde9da958af904b63783701e796391d55d4396f3
</ins><span class="cx">
</span><span class="cx"> minimum_xcodeversions {9 3.1}
</span><span class="cx">
</span><span class="lines">@@ -54,7 +54,8 @@
</span><span class="cx"> lib/libpango-1.0.dylib \
</span><span class="cx"> lib/libtiff.dylib
</span><span class="cx">
</span><del>-patchfiles nawk.patch cups.patch
</del><ins>+patchfiles nawk.patch \
+ 0001-iconhelper-check-if-surface-was-invalidated.patch
</ins><span class="cx">
</span><span class="cx"> # gtk3 +quartz uses instancetype which is not available
</span><span class="cx"> # before approximately Xcode 4.6 (#49391)
</span></span></pre></div>
<a id="trunkdportsgnomegtk3files0001iconhelpercheckifsurfacewasinvalidatedpatchfromrev151619usersdevansGNOME3stabledportsgnomegtk3files0001iconhelpercheckifsurfacewasinvalidatedpatch"></a>
<div class="copfile"><h4>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) (0 => 151620)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -0,0 +1,41 @@
</span><ins>+From a4037730e68cfc37288badc64f4ddaf6c1fa51e8 Mon Sep 17 00:00:00 2001
+From: Christian Hergert <chergert@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)
+
</ins></span></pre></div>
<a id="trunkdportsgnomegtk3filescupspatch"></a>
<div class="delfile"><h4>Deleted: trunk/dports/gnome/gtk3/files/cups.patch (151619 => 151620)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,12 +0,0 @@
</span><del>---- 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
-
</del></span></pre>
</div>
</div>
</body>
</html>