<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/3169afa3b98e79e835a92d230af93b9476202810">https://github.com/macports/macports-ports/commit/3169afa3b98e79e835a92d230af93b9476202810</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 3169afa wine-crossover: Update to 16.1.0
</span>3169afa is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 3169afa3b98e79e835a92d230af93b9476202810
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Thu Feb 23 00:06:04 2017 -0600
<span style='display:block; white-space:pre;color:#404040;'> wine-crossover: Update to 16.1.0
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Also update homepage.
</span>---
x11/wine-crossover/Portfile | 9 ++++-----
x11/wine-crossover/files/MIN.patch | 29 -----------------------------
x11/wine-crossover/files/cups_headers.patch | 8 ++++----
x11/wine-crossover/files/tiger-shell.patch | 10 +++++-----
4 files changed, 13 insertions(+), 43 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 91fc1e8..aec035d 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;'>@@ -14,11 +14,11 @@ 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 16.0.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 16.1.0
</span> license LGPL-2.1+
categories x11
maintainers {jeremyhu @jeremyhu} openmaintainer
<span style='display:block; white-space:pre;background:#ffe0e0;'>-homepage http://www.codeweavers.com/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+homepage https://www.codeweavers.com/products/more-information/source
</span> platforms darwin
distname crossover-sources-${version}
dist_subdir ${my_name}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -50,8 +50,8 @@ distfiles ${wine_distfile}:winesource \
</span> ${wine_mono_distfile}:winemono
checksums ${wine_distfile} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 86d50830f012075ff5c993cb0980abdad1ff4f48 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 b0cd0f90b09a8a02f805cccfeed4487fed02456b601ec19a5871dc8fe1d9227d \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 32e9dea39731239d8acc498c3c6d970ff07eac7f \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 89ba7adc33da74575f44992ae03fc9b2b425ea591efd9a29423768be038e2bb2 \
</span> ${wine_gecko_distfile} \
rmd160 abf7cc78b49dd0623bc8fe87ae0e32bb8694e13d \
sha256 3b8a361f5d63952d21caafd74e849a774994822fb96c5922b01d554f1677643a \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -94,7 +94,6 @@ depends_build port:bison \
</span> patchfiles BOOL.patch \
cups_headers.patch \
mach_machine.patch \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 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>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 01fec60..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/x11/wine-crossover/files/MIN.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,29 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From f75addef99736bbb9b1eb80e091b544f045b0d68 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From: Ken Thomases <ken@codeweavers.com>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Date: Wed, 26 Oct 2016 10:58:35 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH 1/2] winemac: Use min() rather than MIN(), which is not
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reliably defined.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Signed-off-by: Ken Thomases <ken@codeweavers.com>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Signed-off-by: Alexandre Julliard <julliard@winehq.org>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-(cherry picked from commit 2a09548b5925f09e5709c13c005c6ca9a7d2e86b)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>----
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- dlls/winemac.drv/clipboard.c | 2 +-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 1 file changed, 1 insertion(+), 1 deletion(-)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/dlls/winemac.drv/clipboard.c b/dlls/winemac.drv/clipboard.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index a7f1ef8..75da1b6 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- dlls/winemac.drv/clipboard.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ dlls/winemac.drv/clipboard.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -445,7 +445,7 @@ static int bitmap_info_size(const BITMAPINFO *info, WORD coloruse)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else /* assume BITMAPINFOHEADER */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- colors = MIN(info->bmiHeader.biClrUsed, 256);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ colors = min(info->bmiHeader.biClrUsed, 256);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (!colors && (info->bmiHeader.biBitCount <= 8))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- colors = 1 << info->bmiHeader.biBitCount;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (info->bmiHeader.biCompression == BI_BITFIELDS) masks = 3;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-2.7.4 (Apple Git-66)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</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><span style='display:block; white-space:pre;color:#808080;'>index 795af4b..2ddc1bb 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/x11/wine-crossover/files/cups_headers.patch
</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;'>@@ -1,10 +1,10 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- dlls/winspool.drv/info.c.orig 2016-03-18 06:31:01.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ dlls/winspool.drv/info.c 2016-03-23 00:09:31.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- dlls/winspool.drv/info.c.orig 2017-02-03 10:43:29.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ dlls/winspool.drv/info.c 2017-02-22 23:47:49.000000000 -0600
</span> @@ -43,6 +43,7 @@
#include <signal.h>
#ifdef HAVE_CUPS_CUPS_H
# include <cups/cups.h>
+# include <cups/ppd.h>
#endif
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifdef HAVE_APPLICATIONSERVICES_APPLICATIONSERVICES_H
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifdef HAVE_CUPS_PPD_H
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # include <cups/ppd.h>
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/wine-crossover/files/tiger-shell.patch b/x11/wine-crossover/files/tiger-shell.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index abf2ebc..03de81a 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/x11/wine-crossover/files/tiger-shell.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/x11/wine-crossover/files/tiger-shell.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,8 +1,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- dlls/shell32/trash.c.orig 2012-04-08 22:35:02.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ dlls/shell32/trash.c 2012-04-08 22:36:59.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -60,7 +60,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- WINE_DEFAULT_DEBUG_CHANNEL(trash);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- dlls/shell32/trash.c.orig 2017-02-03 10:43:28.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ dlls/shell32/trash.c 2017-02-22 23:47:49.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -109,7 +109,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return S_OK;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span>
-#ifdef HAVE_CORESERVICES_CORESERVICES_H
+#if defined(HAVE_CORESERVICES_CORESERVICES_H) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1050
</pre><pre style='margin:0'>
</pre>