<pre style='margin:0'>
Ryan Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/2ee16ad80f0635feb4725624717935ef14aa169a">https://github.com/macports/macports-ports/commit/2ee16ad80f0635feb4725624717935ef14aa169a</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 2ee16ad wine-crossover: Update to 16.0.0
</span>2ee16ad is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 2ee16ad80f0635feb4725624717935ef14aa169a
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Tue Dec 27 16:46:05 2016 -0600
<span style='display:block; white-space:pre;color:#404040;'> wine-crossover: Update to 16.0.0
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/53149
</span>---
x11/wine-crossover/Portfile | 28 +++++++++++++++-------------
x11/wine-crossover/files/MIN.patch | 29 +++++++++++++++++++++++++++++
x11/wine-crossover/files/cups_headers.patch | 10 ++++++++++
3 files changed, 54 insertions(+), 13 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/wine-crossover/Portfile b/x11/wine-crossover/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 4237932..e45731f 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/x11/wine-crossover/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/x11/wine-crossover/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,5 +1,4 @@
</span> # -*- 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 style='display:block; white-space:pre;background:#ffe0e0;'>-# $Id$
</span>
PortSystem 1.0
PortGroup compiler_blacklist_versions 1.0
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -15,7 +14,7 @@ PortGroup compiler_blacklist_versions 1.0
</span> name wine-crossover
conflicts wine wine-devel
set my_name wine
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 15.3.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 16.0.0
</span> license LGPL-2.1+
categories x11
maintainers jeremyhu openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -24,15 +23,15 @@ platforms darwin
</span> distname crossover-sources-${version}
dist_subdir ${my_name}
set wine_distfile ${distname}${extract.suffix}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set wine_gecko_version 2.40
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set wine_gecko_version 2.47
</span> set wine_gecko_distfile wine_gecko-${wine_gecko_version}-x86.msi
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set wine_mono_version 4.5.6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set wine_mono_version 4.6.3
</span> set wine_mono_distfile wine-mono-${wine_mono_version}.msi
worksrcdir sources/wine
build.target depend all
use_parallel_build yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-description Wine Is Not an Emulator (1.8.4 with CodeWeavers modifications for CrossOver)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+description Wine Is Not an Emulator (1.9.21 with CodeWeavers modifications for CrossOver)
</span>
long_description Wine is an implementation of the Windows APIs on top of X11. \
This version contains the Codeweavers patches for CrossOver
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -51,24 +50,25 @@ distfiles ${wine_distfile}:winesource \
</span> ${wine_mono_distfile}:winemono
checksums ${wine_distfile} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 234b700626c8775eb07a3673330dbd4f87e63fb9 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 aeda0ecc357c879e209c50e339050da86121b684c7acd1bfbea3202938d89336 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 86d50830f012075ff5c993cb0980abdad1ff4f48 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 b0cd0f90b09a8a02f805cccfeed4487fed02456b601ec19a5871dc8fe1d9227d \
</span> ${wine_gecko_distfile} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 2b0e0b6c5cd7579579a27bf179f98b7a76f4f43c \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 1a29d17435a52b7663cea6f30a0771f74097962b07031947719bb7b46057d302 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 abf7cc78b49dd0623bc8fe87ae0e32bb8694e13d \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 3b8a361f5d63952d21caafd74e849a774994822fb96c5922b01d554f1677643a \
</span> ${wine_mono_distfile} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 440a0839e6067eb02b778cbb461606a7d498897b \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 ac681f737f83742d786706529eb85f4bc8d6bdddd8dcdfa9e2e336b71973bc25
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 2dff4296d74c29838219dcd50aaf928f1eb8c8ab \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 f883e88ae78c7ea3d887c24023aa1ed03bb71a83f717c6595abf18b31fef28b9
</span>
# Note: Most of the X11 libs are dlopen()'d
depends_lib port:expat \
port:fontconfig \
port:freetype \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:gstreamer010 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:gstreamer010-gst-plugins-base \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:gstreamer1 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:gstreamer1-gst-plugins-base \
</span> port:jpeg \
port:lcms2 \
port:libiconv \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libpcap \
</span> port:libpng \
port:libxml2 \
port:libxslt \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -92,7 +92,9 @@ depends_build port:bison \
</span> port:pkgconfig
patchfiles BOOL.patch \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ cups_headers.patch \
</span> mach_machine.patch \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ MIN.patch \
</span> patch-include-distversion.h.diff \
tiger-shell.patch
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/wine-crossover/files/MIN.patch b/x11/wine-crossover/files/MIN.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..01fec60
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/x11/wine-crossover/files/MIN.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,29 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From f75addef99736bbb9b1eb80e091b544f045b0d68 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Ken Thomases <ken@codeweavers.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Wed, 26 Oct 2016 10:58:35 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 1/2] winemac: Use min() rather than MIN(), which is not
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reliably defined.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Signed-off-by: Ken Thomases <ken@codeweavers.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Signed-off-by: Alexandre Julliard <julliard@winehq.org>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+(cherry picked from commit 2a09548b5925f09e5709c13c005c6ca9a7d2e86b)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ dlls/winemac.drv/clipboard.c | 2 +-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1 file changed, 1 insertion(+), 1 deletion(-)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/dlls/winemac.drv/clipboard.c b/dlls/winemac.drv/clipboard.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index a7f1ef8..75da1b6 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- dlls/winemac.drv/clipboard.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ dlls/winemac.drv/clipboard.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -445,7 +445,7 @@ static int bitmap_info_size(const BITMAPINFO *info, WORD coloruse)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else /* assume BITMAPINFOHEADER */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- colors = MIN(info->bmiHeader.biClrUsed, 256);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ colors = min(info->bmiHeader.biClrUsed, 256);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (!colors && (info->bmiHeader.biBitCount <= 8))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ colors = 1 << info->bmiHeader.biBitCount;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (info->bmiHeader.biCompression == BI_BITFIELDS) masks = 3;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+2.7.4 (Apple Git-66)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/wine-crossover/files/cups_headers.patch b/x11/wine-crossover/files/cups_headers.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..795af4b
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/x11/wine-crossover/files/cups_headers.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- dlls/winspool.drv/info.c.orig 2016-03-18 06:31:01.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ dlls/winspool.drv/info.c 2016-03-23 00:09:31.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -43,6 +43,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <signal.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifdef HAVE_CUPS_CUPS_H
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # include <cups/cups.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# include <cups/ppd.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifdef HAVE_APPLICATIONSERVICES_APPLICATIONSERVICES_H
</span></pre><pre style='margin:0'>
</pre>