<pre style='margin:0'>
Rainer Müller (raimue) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/c62f20f7ee524701f74ccfc48df8f755c9a64bd5">https://github.com/macports/macports-ports/commit/c62f20f7ee524701f74ccfc48df8f755c9a64bd5</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit c62f20f7ee524701f74ccfc48df8f755c9a64bd5
</span>Author: Rainer Müller <raimue@macports.org>
AuthorDate: Mon Mar 19 19:22:02 2018 +0100
<span style='display:block; white-space:pre;color:#404040;'> wine-crossover: Merge 64-bit support from wine
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> See: https://trac.macports.org/ticket/53651
</span>---
x11/wine-crossover/Portfile | 40 +++++++++++++++++++++++----
x11/wine-crossover/files/patch-configure.diff | 19 +++++++++++++
2 files changed, 53 insertions(+), 6 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 b1f5e4b..34cd2b1 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,14 +1,16 @@
</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
PortSystem 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup muniversal 1.0
</span> PortGroup compiler_blacklist_versions 1.0
PortGroup snowleopard_fixes 1.0
# Please keep the wine, wine-devel and wine-crossover ports as similar as possible.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# When updating the version of wine, update wine_gecko to a compatible version
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# per the table at http://wiki.winehq.org/Gecko and update wine-mono as well;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# see http://wiki.winehq.org/Mono and http://sourceforge.net/projects/wine/files/Wine%20Mono/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# When updating the version of wine, update wine_gecko and wine_mono to compatible versions
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# as referenced in the source code. Check here by replacing X.Y with the version:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# https://source.winehq.org/git/wine.git/blob/refs/tags/wine-X.Y:/dlls/appwiz.cpl/addons.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# see also http://wiki.winehq.org/Gecko and http://wiki.winehq.org/Mono
</span>
# Crossover-specific bug reports are accepted at info@codeweavers.com
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -16,6 +18,7 @@ name wine-crossover
</span> conflicts wine wine-devel
set my_name wine
version 17.1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span> license LGPL-2.1+
categories x11
maintainers {ryandesign @ryandesign} {jeremyhu @jeremyhu} openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -26,6 +29,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:#e0ffe0;'>+set wine_gecko64_distfile wine_gecko-${wine_gecko_version}-x86_64.msi
</span> set wine_mono_version 4.7.0
set wine_mono_distfile wine-mono-${wine_mono_version}.msi
worksrcdir sources/wine
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -53,6 +57,7 @@ extract.only ${wine_distfile}
</span>
distfiles ${wine_distfile}:winesource \
${wine_gecko_distfile}:winegecko \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${wine_gecko64_distfile}:winegecko \
</span> ${wine_mono_distfile}:winemono
checksums ${wine_distfile} \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -63,6 +68,10 @@ checksums ${wine_distfile} \
</span> rmd160 abf7cc78b49dd0623bc8fe87ae0e32bb8694e13d \
sha256 3b8a361f5d63952d21caafd74e849a774994822fb96c5922b01d554f1677643a \
size 49266176 \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${wine_gecko64_distfile} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 254da21cb2503f20d065167b385b3e83ea3ab327 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 c565ea25e50ea953937d4ab01299e4306da4a556946327d253ea9b28357e4a7d \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 50806272 \
</span> ${wine_mono_distfile} \
rmd160 6158dce54355c4174ff30544db3a0fd2b9c488b5 \
sha256 7698474dd9cb9eb80796b5812dff37386ba97b78b21ca23b20079ca5ad6ca5a1 \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -91,11 +100,22 @@ depends_build port:bison \
</span> port:pkgconfig
patchfiles BOOL.patch \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-configure.diff \
</span> cups_headers.patch \
mach_machine.patch \
patch-include-distversion.h.diff \
QWORD.patch
<span style='display:block; white-space:pre;background:#e0ffe0;'>+pre-configure {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[variant_isset universal]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach arch ${universal_archs_to_use} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ file mkdir ${worksrcpath}-${arch}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.cmd ${worksrcpath}/configure
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # Wine requires the program specified in INSTALL to create intermediate
# directories; /usr/bin/install doesn't.
# http://bugs.winehq.org/show_bug.cgi?id=35310
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -193,9 +213,14 @@ variant x11 {
</span>
default_variants +x11
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# 64-bit Wine exists for Linux, but does not work on OS X.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# http://www.winehq.org/pipermail/wine-devel/2014-February/103074.html
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-supported_archs i386
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.universal_args
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set merger_configure_args(x86_64) "--enable-win64 --libdir=${prefix}/lib"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set merger_configure_args(i386) --with-wine64=${workpath}/${worksrcdir}-x86_64
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {${build_arch} eq "x86_64"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default_variants +universal
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
# error: Xcode 3.x cannot build 16-bit code correctly
compiler.blacklist-append {gcc-4.2 < 5600}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -265,6 +290,9 @@ post-destroot {
</span> xinstall -d ${destroot}${prefix}/share/wine/gecko
xinstall -m 644 ${distpath}/${wine_gecko_distfile} ${destroot}${prefix}/share/wine/gecko
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -d ${destroot}${prefix}/share/wine/gecko
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 644 ${distpath}/${wine_gecko64_distfile} ${destroot}${prefix}/share/wine/gecko
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> xinstall -d ${destroot}${prefix}/share/wine/mono
xinstall -m 644 ${distpath}/${wine_mono_distfile} ${destroot}${prefix}/share/wine/mono
<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>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..6cc1ab2
</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/patch-configure.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,19 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Output DLLs to different directories so that we don't have a clash when
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# they're merged back together
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- configure.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -7320,7 +7320,12 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-dlldir="\${libdir}/wine"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++if test "x$enable_win64" = "xyes"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ dlldir="\${libdir}/wine64"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ dlldir="\${libdir}/wine"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ DLLFLAGS="-D_REENTRANT"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span></pre><pre style='margin:0'>
</pre>