<!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>[142845] users/devans/GNOME-3/stable/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/142845">142845</a></dd>
<dt>Author</dt> <dd>devans@macports.org</dd>
<dt>Date</dt> <dd>2015-11-24 11:53:04 -0800 (Tue, 24 Nov 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>GNOME-3/stable: gtk3, when building +quartz blacklist compilers that don't support instancetype, when selecting cursors check that cursor type exists, fixes +quartz builds where Xcode < 4.6 (possibly some 10.7, 10.6 and earlier) (#49391).</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#usersdevansGNOME3stabledportsgnomegtk3Portfile">users/devans/GNOME-3/stable/dports/gnome/gtk3/Portfile</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#usersdevansGNOME3stabledportsgnomegtk3filespatchgdk_quartz_gdkcursorquartz10_6_compatdiff">users/devans/GNOME-3/stable/dports/gnome/gtk3/files/patch-gdk_quartz_gdkcursor-quartz-10_6_compat.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="usersdevansGNOME3stabledportsgnomegtk3Portfile"></a>
<div class="modfile"><h4>Modified: users/devans/GNOME-3/stable/dports/gnome/gtk3/Portfile (142844 => 142845)</h4>
<pre class="diff"><span>
<span class="info">--- users/devans/GNOME-3/stable/dports/gnome/gtk3/Portfile 2015-11-24 19:13:39 UTC (rev 142844)
+++ users/devans/GNOME-3/stable/dports/gnome/gtk3/Portfile 2015-11-24 19:53:04 UTC (rev 142845)
</span><span class="lines">@@ -6,6 +6,7 @@
</span><span class="cx"> PortGroup muniversal 1.0
</span><span class="cx"> PortGroup xcodeversion 1.0
</span><span class="cx"> PortGroup active_variants 1.1
</span><ins>+PortGroup compiler_blacklist_versions 1.0
</ins><span class="cx">
</span><span class="cx"> name gtk3
</span><span class="cx"> set real_name gtk+
</span><span class="lines">@@ -55,7 +56,13 @@
</span><span class="cx">
</span><span class="cx"> patchfiles nawk.patch
</span><span class="cx">
</span><ins>+# gtk3 +quartz uses instancetype which is not available
+# before approximately Xcode 4.6 (#49391)
</ins><span class="cx">
</span><ins>+if {[variant_isset quartz]} {
+ compiler.blacklist *gcc* {clang < 425}
+}
+
</ins><span class="cx"> # gobject-introspection uses g-ir-scanner, which uses $CC from env
</span><span class="cx">
</span><span class="cx"> if {[variant_isset universal]} {
</span><span class="lines">@@ -123,18 +130,25 @@
</span><span class="cx"> reinplace "s|${destroot}||" ${destroot}${prefix}/etc/gtk-3.0/gtk.immodules
</span><span class="cx"> }
</span><span class="cx">
</span><del>-platform darwin 8 {
- # The rules enabled by gobject-introspection require GNU make 3.81+
- depends_build-append port:gmake
- build.cmd ${prefix}/bin/gmake
</del><ins>+platform darwin {
+ if {${os.major} <= 8} {
+ # The rules enabled by gobject-introspection require GNU make 3.81+
+ depends_build-append port:gmake
+ build.cmd ${prefix}/bin/gmake
</ins><span class="cx">
</span><del>- if {[variant_isset quartz] || ![variant_isset x11]} {
- configure.ldflags-append -framework Cocoa -framework Carbon
</del><ins>+ if {[variant_isset quartz] || ![variant_isset x11]} {
+ configure.ldflags-append -framework Cocoa -framework Carbon
+ }
+
+ configure.args-append --disable-cups
</ins><span class="cx"> }
</span><del>-}
</del><span class="cx">
</span><del>-if {${os.major} <= 8} {
- configure.args-append --disable-cups
</del><ins>+ if {${os.major} <= 10} {
+ # OS X 10.6 and earlier do not supply all cursors specified by gtk3 +quartz (#49391)
+ if {[variant_isset quartz]} {
+ patchfiles-append patch-gdk_quartz_gdkcursor-quartz-10_6_compat.diff
+ }
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if {[variant_isset universal]} {
</span></span></pre></div>
<a id="usersdevansGNOME3stabledportsgnomegtk3filespatchgdk_quartz_gdkcursorquartz10_6_compatdiff"></a>
<div class="addfile"><h4>Added: users/devans/GNOME-3/stable/dports/gnome/gtk3/files/patch-gdk_quartz_gdkcursor-quartz-10_6_compat.diff (0 => 142845)</h4>
<pre class="diff"><span>
<span class="info">--- users/devans/GNOME-3/stable/dports/gnome/gtk3/files/patch-gdk_quartz_gdkcursor-quartz-10_6_compat.diff (rev 0)
+++ users/devans/GNOME-3/stable/dports/gnome/gtk3/files/patch-gdk_quartz_gdkcursor-quartz-10_6_compat.diff 2015-11-24 19:53:04 UTC (rev 142845)
</span><span class="lines">@@ -0,0 +1,15 @@
</span><ins>+--- gdk/quartz/gdkcursor-quartz.c.old 2015-11-23 21:43:17.000000000 +0100
++++ gdk/quartz/gdkcursor-quartz.c 2015-11-23 21:43:52.000000000 +0100
+@@ -402,6 +402,12 @@
+ selector = NSSelectorFromString(test->selector);
+ break;
+ }
++
++ if (! [[gdkCoreCursor class] respondsToSelector:selector])
++ {
++ selector = @selector(arrowCursor);
++ }
++
+ nscursor = [[gdkCoreCursor class] performSelector:selector];
+
+ [nscursor retain];
</ins></span></pre>
</div>
</div>
</body>
</html>