<!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>[142228] trunk/dports/emulators/qemu</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/142228">142228</a></dd>
<dt>Author</dt> <dd>raimue@macports.org</dd>
<dt>Date</dt> <dd>2015-11-07 06:52:56 -0800 (Sat, 07 Nov 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>emulators/qemu:
Update to 2.4.1
Variants +cocoa and +curses do not conflict with backported patch, closes #48740</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsemulatorsqemuPortfile">trunk/dports/emulators/qemu/Portfile</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkdportsemulatorsqemufilespatchcocoadisplaydiff">trunk/dports/emulators/qemu/files/patch-cocoa-display.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsemulatorsqemuPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/emulators/qemu/Portfile (142227 => 142228)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/emulators/qemu/Portfile 2015-11-07 14:17:59 UTC (rev 142227)
+++ trunk/dports/emulators/qemu/Portfile 2015-11-07 14:52:56 UTC (rev 142228)
</span><span class="lines">@@ -3,7 +3,7 @@
</span><span class="cx"> PortSystem 1.0
</span><span class="cx">
</span><span class="cx"> name qemu
</span><del>-version 2.4.0
</del><ins>+version 2.4.1
</ins><span class="cx"> categories emulators
</span><span class="cx"> license GPL-2+
</span><span class="cx"> platforms darwin
</span><span class="lines">@@ -19,10 +19,11 @@
</span><span class="cx"> master_sites ${homepage}/download
</span><span class="cx"> use_bzip2 yes
</span><span class="cx">
</span><del>-checksums rmd160 f3b5ce602574aec28a5b5e43591248d4358ec5f7 \
- sha256 72b0b991bbcc540663a019e1e8c4f714053b691dda32c9b9ee80b25f367e6620
</del><ins>+checksums rmd160 a6dbab03a5501a55bda12d87c6600e94210bd6f1 \
+ sha256 e3d5cf4c8b1f9129c9c797329a515bfb6b3b1ded0ab8b394c8a316490fe3a177
</ins><span class="cx">
</span><del>-patchfiles patch-configure.diff
</del><ins>+patchfiles patch-configure.diff \
+ patch-cocoa-display.diff
</ins><span class="cx">
</span><span class="cx"> depends_build port:texinfo \
</span><span class="cx"> port:libtool \
</span><span class="lines">@@ -96,11 +97,11 @@
</span><span class="cx"> default_variants-append +cocoa
</span><span class="cx"> }
</span><span class="cx">
</span><del>-variant cocoa description {Use the native Mac OS X graphical user interface} conflicts curses {
</del><ins>+variant cocoa description {Use the native Mac OS X graphical user interface} {
</ins><span class="cx"> configure.args-replace --disable-cocoa --enable-cocoa
</span><span class="cx"> }
</span><span class="cx">
</span><del>-variant curses description {Use the curses text-only user interface} conflicts cocoa {
</del><ins>+variant curses description {Use the curses text-only user interface} {
</ins><span class="cx"> configure.args-replace --disable-curses --enable-curses
</span><span class="cx"> depends_lib-append port:ncurses
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkdportsemulatorsqemufilespatchcocoadisplaydiff"></a>
<div class="addfile"><h4>Added: trunk/dports/emulators/qemu/files/patch-cocoa-display.diff (0 => 142228)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/emulators/qemu/files/patch-cocoa-display.diff (rev 0)
+++ trunk/dports/emulators/qemu/files/patch-cocoa-display.diff 2015-11-07 14:52:56 UTC (rev 142228)
</span><span class="lines">@@ -0,0 +1,35 @@
</span><ins>+From b12a84ce3c27e42c8f51c436aa196938d5cc2c71 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Rainer=20M=C3=BCller?= <raimue@codingfarm.de>
+Date: Wed, 9 Sep 2015 16:08:30 +0200
+Subject: [PATCH] cocoa: Suppress Cocoa window with -display
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Do not open a Cocoa window when another display is selected that will be
+initialized later. The Cocoa display cannot be selected with -display,
+so there is no need to check its argument.
+
+Signed-off-by: Rainer Müller <raimue@codingfarm.de>
+Reviewed-by: Andreas Färber <andreas.faerber@web.de>
+Message-id: 1441807710-25431-1-git-send-email-raimue@codingfarm.de
+Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
+---
+ ui/cocoa.m | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git ui/cocoa.m ui/cocoa.m
+index 334e6f6..c24d9f9 100644
+--- ui/cocoa.m
++++ ui/cocoa.m
+@@ -1148,6 +1148,7 @@ int main (int argc, const char * argv[]) {
+ !strcmp(opt, "-nographic") ||
+ !strcmp(opt, "-version") ||
+ !strcmp(opt, "-curses") ||
++ !strcmp(opt, "-display") ||
+ !strcmp(opt, "-qtest")) {
+ return qemu_main(gArgc, gArgv, *_NSGetEnviron());
+ }
+--
+2.6.2
+
</ins></span></pre>
</div>
</div>
</body>
</html>