<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/f0e4dfa2a3a9a084dbb0bfbee1de7c85429870ae">https://github.com/macports/macports-ports/commit/f0e4dfa2a3a9a084dbb0bfbee1de7c85429870ae</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 f0e4dfa wine-crossover: Update to 18.0.0
</span>f0e4dfa is described below
<span style='display:block; white-space:pre;color:#808000;'>commit f0e4dfa2a3a9a084dbb0bfbee1de7c85429870ae
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Sun Nov 4 06:06:26 2018 -0600
<span style='display:block; white-space:pre;color:#404040;'> wine-crossover: Update to 18.0.0
</span>---
x11/wine-crossover/Portfile | 41 ++++++++++++++++-----------
x11/wine-crossover/files/QWORD.patch | 13 ---------
x11/wine-crossover/files/libpcap-1.9.patch | 16 -----------
x11/wine-crossover/files/patch-configure.diff | 19 -------------
4 files changed, 25 insertions(+), 64 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 010228c..5c8b027 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;'>@@ -3,7 +3,6 @@
</span> PortSystem 1.0
PortGroup muniversal 1.0
PortGroup compiler_blacklist_versions 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup legacysupport 1.0
</span>
# Please keep the wine, wine-devel and wine-crossover ports as similar as possible.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -17,8 +16,7 @@ PortGroup legacysupport 1.0
</span> name wine-crossover
conflicts wine wine-devel
set my_name wine
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 17.5.1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 18.0.0
</span> license LGPL-2.1+
categories x11
maintainers {ryandesign @ryandesign} {jeremyhu @jeremyhu} openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -30,16 +28,16 @@ set wine_distfile ${distname}${extract.suffix}
</span> set wine_gecko_version 2.47
set wine_gecko_distfile wine_gecko-${wine_gecko_version}-x86.msi
set wine_gecko64_distfile wine_gecko-${wine_gecko_version}-x86_64.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.3
</span> set wine_mono_distfile wine-mono-${wine_mono_version}.msi
worksrcdir sources/wine
use_parallel_build yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-description A Windows API implementation (Wine 2.8 with CodeWeavers modifications for CrossOver)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+description A Windows API implementation (Wine 3.14 with CodeWeavers modifications for CrossOver)
</span>
long_description Wine is a compatibility layer capable of running \
Windows applications. This version contains the \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- Codeweavers patches for CrossOver. Instead of \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CodeWeavers patches for CrossOver. Instead of \
</span> simulating internal Windows logic like a virtual \
machine or emulator, Wine translates Windows API \
calls into POSIX calls on-the-fly, eliminating \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -61,9 +59,9 @@ distfiles ${wine_distfile}:winesource \
</span> ${wine_mono_distfile}:winemono
checksums ${wine_distfile} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 fefe3a30eee6abd058ec52e4982431bd8ea4fbb5 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 26a9998c31daf3a5db0c6eb4f186035f1799f9d77e225ff77c65e923bbba3576 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 71521543 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 4bf96455f8921ce623e034839f5283eac9613641 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 a9906c5658985095548c3acb380d7960cfb109d432c634205e352377914824fa \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 73654474 \
</span> ${wine_gecko_distfile} \
rmd160 abf7cc78b49dd0623bc8fe87ae0e32bb8694e13d \
sha256 3b8a361f5d63952d21caafd74e849a774994822fb96c5922b01d554f1677643a \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -73,9 +71,9 @@ checksums ${wine_distfile} \
</span> sha256 c565ea25e50ea953937d4ab01299e4306da4a556946327d253ea9b28357e4a7d \
size 50806272 \
${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:#ffe0e0;'>- size 64625152
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 1c4aca42bfff33ca7fc485442820c84665a3e581 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 d24a8017371c7e8224a1778bb43a113ed7ed9720efd9d0cda175d42db6106d3a \
</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;background:#e0e0e0;'>@@ -100,12 +98,9 @@ depends_build port:bison \
</span> port:pkgconfig
patchfiles BOOL.patch \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-configure.diff \
</span> cups_headers.patch \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- libpcap-1.9.patch \
</span> mach_machine.patch \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-include-distversion.h.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- QWORD.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-include-distversion.h.diff
</span>
pre-configure {
if {[variant_isset universal]} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -218,6 +213,8 @@ if {${os.platform} ne "darwin" || (${os.major} >= 9 && ${os.major} <= 17)} {
</span>
configure.universal_args
<span style='display:block; white-space:pre;background:#e0ffe0;'>+set merger_build_args(x86_64) "dlldir=\\\\\${libdir}/wine64"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set merger_destroot_args(x86_64) "dlldir=\\\\\${libdir}/wine64"
</span> set merger_configure_args(x86_64) "--enable-win64 --libdir=${prefix}/lib"
set merger_configure_args(i386) --with-wine64=${workpath}/${worksrcdir}-x86_64
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -279,6 +276,18 @@ platform darwin {
</span> configure.args-delete --with-gnutls
configure.args-append --without-gnutls
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Vulkan is supported on macOS through MoltenVK since Wine 3.13, but because
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # it uses Metal it only works on 64-bit, and because it only builds with
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Xcode 9 or later it requires Sierra or later.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${os.major} >= 16 && [variant_exists universal] && [variant_isset universal]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:MoltenVK
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_skip_archcheck-append MoltenVK
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lappend merger_configure_args(x86_64) --with-vulkan
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lappend merger_configure_args(i386) --without-vulkan
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append --without-vulkan
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> if {${os.major} < 10} {
configure.args-delete --with-opencl
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/wine-crossover/files/QWORD.patch b/x11/wine-crossover/files/QWORD.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index f1fa553..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/x11/wine-crossover/files/QWORD.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,13 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Don't redefine QWORD.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://github.com/wine-mirror/wine/commit/0c07a33c4c86fce7923f8e18bd99b75243c9d9b5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- include/wmsdkidl.idl.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ include/wmsdkidl.idl
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -20,8 +20,6 @@ import "oaidl.idl";
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- import "wmsbuffer.idl";
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- import "drmexternals.idl";
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--typedef unsigned __int64 QWORD;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- typedef struct _WMMediaType
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- GUID majortype;
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/wine-crossover/files/libpcap-1.9.patch b/x11/wine-crossover/files/libpcap-1.9.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 010f333..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/x11/wine-crossover/files/libpcap-1.9.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,16 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Fix build with libpcap 1.9+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://github.com/wine-mirror/wine/commit/28173f06932edd85a64a952120d29b9bb1e762ea
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- dlls/wpcap/wpcap.c.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ dlls/wpcap/wpcap.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -19,6 +19,11 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <pcap/pcap.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+/* pcap.h might define those: */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#undef SOCKET
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#undef INVALID_SOCKET
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "winsock2.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "windef.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "winbase.h"
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/wine-crossover/files/patch-configure.diff b/x11/wine-crossover/files/patch-configure.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 6cc1ab2..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/x11/wine-crossover/files/patch-configure.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,19 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Output DLLs to different directories so that we don't have a clash when
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# they're merged back together
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- configure.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ configure
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -7320,7 +7320,12 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--dlldir="\${libdir}/wine"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+if test "x$enable_win64" = "xyes"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ dlldir="\${libdir}/wine64"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ dlldir="\${libdir}/wine"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- DLLFLAGS="-D_REENTRANT"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span></pre><pre style='margin:0'>
</pre>