[142228] trunk/dports/emulators/qemu

[raimue at macports.org]

Revision: 142228
          https://trac.macports.org/changeset/142228
Author:   raimue at macports.org
Date:     2015-11-07 06:52:56 -0800 (Sat, 07 Nov 2015)
Log Message:
-----------
emulators/qemu:
Update to 2.4.1
Variants +cocoa and +curses do not conflict with backported patch, closes #48740

Modified Paths:
--------------
    trunk/dports/emulators/qemu/Portfile

Added Paths:
-----------
    trunk/dports/emulators/qemu/files/patch-cocoa-display.diff

Modified: trunk/dports/emulators/qemu/Portfile
===================================================================
--- 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)
@@ -3,7 +3,7 @@
 PortSystem 1.0
 
 name                    qemu
-version                 2.4.0
+version                 2.4.1
 categories              emulators
 license                 GPL-2+
 platforms               darwin
@@ -19,10 +19,11 @@
 master_sites            ${homepage}/download
 use_bzip2 yes
 
-checksums               rmd160  f3b5ce602574aec28a5b5e43591248d4358ec5f7 \
-                        sha256  72b0b991bbcc540663a019e1e8c4f714053b691dda32c9b9ee80b25f367e6620
+checksums               rmd160  a6dbab03a5501a55bda12d87c6600e94210bd6f1 \
+                        sha256  e3d5cf4c8b1f9129c9c797329a515bfb6b3b1ded0ab8b394c8a316490fe3a177
 
-patchfiles              patch-configure.diff
+patchfiles              patch-configure.diff \
+                        patch-cocoa-display.diff
 
 depends_build           port:texinfo \
                         port:libtool \
@@ -96,11 +97,11 @@
     default_variants-append +cocoa
 }
 
-variant cocoa description {Use the native Mac OS X graphical user interface} conflicts curses {
+variant cocoa description {Use the native Mac OS X graphical user interface} {
     configure.args-replace  --disable-cocoa --enable-cocoa
 }
 
-variant curses description {Use the curses text-only user interface} conflicts cocoa {
+variant curses description {Use the curses text-only user interface} {
     configure.args-replace --disable-curses --enable-curses
     depends_lib-append      port:ncurses
 }

Added: trunk/dports/emulators/qemu/files/patch-cocoa-display.diff
===================================================================
--- 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)
@@ -0,0 +1,35 @@
+From b12a84ce3c27e42c8f51c436aa196938d5cc2c71 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Rainer=20M=C3=BCller?= <raimue at 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 at codingfarm.de>
+Reviewed-by: Andreas Färber <andreas.faerber at web.de>
+Message-id: 1441807710-25431-1-git-send-email-raimue at codingfarm.de
+Signed-off-by: Peter Maydell <peter.maydell at 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
+
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20151212/6779a3cf/attachment.html>