<!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>[142168] trunk/dports/graphics/ufraw</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/142168">142168</a></dd>
<dt>Author</dt> <dd>devans@macports.org</dd>
<dt>Date</dt> <dd>2015-11-05 04:29:58 -0800 (Thu, 05 Nov 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>ufraw: add +x11 +quartz variants requiring the appropriate variant of gtk2, patch to fix +quartz build on 10.11+ (#49584).</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsgraphicsufrawPortfile">trunk/dports/graphics/ufraw/Portfile</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkdportsgraphicsufrawfilespatchuf_gtkccdiff">trunk/dports/graphics/ufraw/files/patch-uf_gtk.cc.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsgraphicsufrawPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/graphics/ufraw/Portfile (142167 => 142168)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/graphics/ufraw/Portfile 2015-11-05 09:27:01 UTC (rev 142167)
+++ trunk/dports/graphics/ufraw/Portfile 2015-11-05 12:29:58 UTC (rev 142168)
</span><span class="lines">@@ -1,10 +1,12 @@
</span><span class="cx"> # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
</span><span class="cx"> # $Id$
</span><del>-
</del><ins>+
</ins><span class="cx"> PortSystem 1.0
</span><ins>+PortGroup active_variants 1.1
</ins><span class="cx">
</span><span class="cx"> name ufraw
</span><span class="cx"> version 0.22
</span><ins>+revision 1
</ins><span class="cx"> license GPL-2+
</span><span class="cx"> categories graphics
</span><span class="cx"> maintainers devans openmaintainer
</span><span class="lines">@@ -39,7 +41,8 @@
</span><span class="cx"> port:lensfun \
</span><span class="cx"> port:tiff
</span><span class="cx">
</span><del>-patchfiles patch-ufraw-gimp.c.diff
</del><ins>+patchfiles patch-ufraw-gimp.c.diff \
+ patch-uf_gtk.cc.diff
</ins><span class="cx">
</span><span class="cx"> platform darwin {
</span><span class="cx"> if {${os.major} < 11} {
</span><span class="lines">@@ -49,6 +52,22 @@
</span><span class="cx">
</span><span class="cx"> configure.args --enable-contrast
</span><span class="cx">
</span><ins>+#
+# the following dummy variants are used
+# to identify this port's binary dependencies
+# based on which variant of gtk2 is used for the build
+#
+
+variant x11 conflicts quartz {}
+variant quartz conflicts x11 {}
+
+if {[variant_isset quartz]} {
+ require_active_variants port:gtk2 quartz
+} else {
+ default_variants +x11
+ require_active_variants port:gtk2 x11
+}
+
</ins><span class="cx"> post-destroot {
</span><span class="cx"> set docdir ${destroot}${prefix}/share/doc/${name}
</span><span class="cx"> xinstall -d ${docdir}
</span></span></pre></div>
<a id="trunkdportsgraphicsufrawfilespatchuf_gtkccdiff"></a>
<div class="addfile"><h4>Added: trunk/dports/graphics/ufraw/files/patch-uf_gtk.cc.diff (0 => 142168)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/graphics/ufraw/files/patch-uf_gtk.cc.diff (rev 0)
+++ trunk/dports/graphics/ufraw/files/patch-uf_gtk.cc.diff 2015-11-05 12:29:58 UTC (rev 142168)
</span><span class="lines">@@ -0,0 +1,35 @@
</span><ins>+--- uf_gtk.cc.orig 2015-06-15 20:58:38.000000000 -0700
++++ uf_gtk.cc 2015-11-05 01:49:48.000000000 -0800
+@@ -19,6 +19,7 @@
+ #include <Carbon/Carbon.h>
+ #include <ApplicationServices/ApplicationServices.h>
+ #include <CoreServices/CoreServices.h>
++#include <Availability.h>
+ #endif
+
+ #ifdef G_OS_WIN32
+@@ -163,6 +164,15 @@
+ g_free(atom_name);
+
+ #elif defined GDK_WINDOWING_QUARTZ
++#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100
++//
++// ColorSync Manager API, deprecated in Mac OS X 10.6,
++// was finally removed in Mac OS X 10.11 (El Capitan).
++//
++// If 10.11 or later just return with no profile.
++//
++ return;
++#else
+ GdkScreen *screen = gtk_widget_get_screen(widget);
+ if (screen == NULL)
+ screen = gdk_screen_get_default();
+@@ -184,7 +194,7 @@
+ *buffer_size = CFDataGetLength(data);
+
+ CFRelease(data);
+-
++#endif
+ #elif defined G_OS_WIN32
+ (void)widget;
+ HDC hdc = GetDC(NULL);
</ins></span></pre>
</div>
</div>
</body>
</html>