<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/a1af4f5c9b0d02d822928639a8a5a46b975459dc">https://github.com/macports/macports-ports/commit/a1af4f5c9b0d02d822928639a8a5a46b975459dc</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 a1af4f5 wine: Update to 2.0.3
</span>a1af4f5 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit a1af4f5c9b0d02d822928639a8a5a46b975459dc
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Sat Oct 21 02:26:12 2017 -0500
<span style='display:block; white-space:pre;color:#404040;'> wine: Update to 2.0.3
</span>---
x11/wine/Portfile | 15 +++++++++------
x11/wine/files/cups_headers.patch | 8 ++++----
x11/wine/files/fix-flicker.patch | 15 +++++++--------
3 files changed, 20 insertions(+), 18 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/wine/Portfile b/x11/wine/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index cd90e12..7dab2fb 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/x11/wine/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/x11/wine/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -13,7 +13,7 @@ PortGroup snowleopard_fixes 1.0
</span> name wine
conflicts wine-devel wine-crossover
set my_name wine
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 2.0.2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 2.0.3
</span> set branch [lindex [split ${version} .] 0].0
license LGPL-2.1+
categories x11
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -26,7 +26,7 @@ dist_subdir ${my_name}
</span> set wine_distfile ${distname}${extract.suffix}
set wine_gecko_version 2.47
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.7.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set wine_mono_version 4.7.1
</span> set wine_mono_distfile wine-mono-${wine_mono_version}.msi
use_parallel_build yes
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -56,14 +56,17 @@ distfiles ${wine_distfile}:winesource \
</span> ${wine_mono_distfile}:winemono
checksums ${wine_distfile} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 76e5aae6cc213743a7b5cacef8c4c5b0402ceca3 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 f71884f539928877f4b415309f582825d3d3c9976104e43d566944c710713c9a \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 8fe84fcc9313fca0736cf3008476621aa5ce65b9 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 a811c664f870a3a01449443a93a6fcee41aea2e912e58f72742eb7924962be56 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 18864648 \
</span> ${wine_gecko_distfile} \
rmd160 abf7cc78b49dd0623bc8fe87ae0e32bb8694e13d \
sha256 3b8a361f5d63952d21caafd74e849a774994822fb96c5922b01d554f1677643a \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 49266176 \
</span> ${wine_mono_distfile} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 6158dce54355c4174ff30544db3a0fd2b9c488b5 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 7698474dd9cb9eb80796b5812dff37386ba97b78b21ca23b20079ca5ad6ca5a1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 3e2932960dabff8283f02b32dc573b0dda6adfac \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 2c8d5db7f833c3413b2519991f5af1f433d59a927564ec6f38a3f1f8b2c629aa \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 56470528
</span>
# Note: Most of the X11 libs are dlopen()'d
depends_lib port:fontconfig \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/wine/files/cups_headers.patch b/x11/wine/files/cups_headers.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index 795af4b..15dd958 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/x11/wine/files/cups_headers.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/x11/wine/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-10-20 07:17:32.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ dlls/winspool.drv/info.c 2017-10-21 02:10:21.000000000 -0500
</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/files/fix-flicker.patch b/x11/wine/files/fix-flicker.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index 1389206..9636098 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/x11/wine/files/fix-flicker.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/x11/wine/files/fix-flicker.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,9 +1,8 @@
</span> # Patch to fix flickering in full screen. Patch 57066 below.
# https://bugs.winehq.org/show_bug.cgi?id=34166
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- dlls/wined3d/context.c.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ dlls/wined3d/context.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1417,19 +1417,23 @@ void context_invalidate_state(struct wined3d_context *context, DWORD state)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- dlls/wined3d/context.c.orig 2017-10-20 07:17:32.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ dlls/wined3d/context.c 2017-10-21 02:10:21.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1420,19 +1420,23 @@
</span> }
/* This function takes care of wined3d pixel format selection. */
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -29,7 +28,7 @@
</span> current_value = 0;
for (i = 0; i < cfg_count; ++i)
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1441,7 +1445,7 @@ static int context_choose_pixel_format(const struct wined3d_device *device, HDC
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1444,7 +1448,7 @@
</span> if (cfg->iPixelType != WGL_TYPE_RGBA_ARB)
continue;
/* In window mode we need a window drawable format and double buffering. */
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -38,7 +37,7 @@
</span> continue;
if (cfg->redSize < color_format->red_size)
continue;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1464,17 +1468,19 @@ static int context_choose_pixel_format(const struct wined3d_device *device, HDC
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1467,17 +1471,19 @@
</span> * depth it is no problem to emulate 16-bit using e.g. 24-bit, so accept that. */
if (cfg->depthSize == ds_format->depth_size)
value += 1;
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -62,7 +61,7 @@
</span>
if (value > current_value)
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1495,7 +1501,9 @@ static int context_choose_pixel_format(const struct wined3d_device *device, HDC
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1498,7 +1504,9 @@
</span> ZeroMemory(&pfd, sizeof(pfd));
pfd.nSize = sizeof(pfd);
pfd.nVersion = 1;
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -73,7 +72,7 @@
</span> pfd.iPixelType = PFD_TYPE_RGBA;
pfd.cAlphaBits = color_format->alpha_size;
pfd.cColorBits = color_format->red_size + color_format->green_size
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1762,13 +1770,13 @@ struct wined3d_context *context_create(struct wined3d_swapchain *swapchain,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1771,13 +1779,13 @@
</span> }
/* Try to find a pixel format which matches our requirements. */
</pre><pre style='margin:0'>
</pre>