Skip to content
Permalink
Browse files

wine-crossover: Merge 64-bit support from wine

  • Loading branch information
raimue committed Mar 19, 2018
1 parent 6641a52 commit c62f20f7ee524701f74ccfc48df8f755c9a64bd5
Showing with 53 additions and 6 deletions.
  1. +34 −6 x11/wine-crossover/Portfile
  2. +19 −0 x11/wine-crossover/files/patch-configure.diff
@@ -1,21 +1,24 @@
# -*- 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
PortGroup muniversal 1.0
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.

# When updating the version of wine, update wine_gecko to a compatible version
# per the table at http://wiki.winehq.org/Gecko and update wine-mono as well;
# see http://wiki.winehq.org/Mono and http://sourceforge.net/projects/wine/files/Wine%20Mono/
# When updating the version of wine, update wine_gecko and wine_mono to compatible versions
# as referenced in the source code. Check here by replacing X.Y with the version:
# https://source.winehq.org/git/wine.git/blob/refs/tags/wine-X.Y:/dlls/appwiz.cpl/addons.c
# see also http://wiki.winehq.org/Gecko and http://wiki.winehq.org/Mono

# Crossover-specific bug reports are accepted at info@codeweavers.com

name wine-crossover
conflicts wine wine-devel
set my_name wine
version 17.1.0
revision 1
license LGPL-2.1+
categories x11
maintainers {ryandesign @ryandesign} {jeremyhu @jeremyhu} openmaintainer
@@ -26,6 +29,7 @@ dist_subdir ${my_name}
set wine_distfile ${distname}${extract.suffix}
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
set wine_mono_version 4.7.0
set wine_mono_distfile wine-mono-${wine_mono_version}.msi
worksrcdir sources/wine
@@ -53,6 +57,7 @@ extract.only ${wine_distfile}

distfiles ${wine_distfile}:winesource \
${wine_gecko_distfile}:winegecko \
${wine_gecko64_distfile}:winegecko \
${wine_mono_distfile}:winemono

checksums ${wine_distfile} \
@@ -63,6 +68,10 @@ checksums ${wine_distfile} \
rmd160 abf7cc78b49dd0623bc8fe87ae0e32bb8694e13d \
sha256 3b8a361f5d63952d21caafd74e849a774994822fb96c5922b01d554f1677643a \
size 49266176 \
${wine_gecko64_distfile} \
rmd160 254da21cb2503f20d065167b385b3e83ea3ab327 \
sha256 c565ea25e50ea953937d4ab01299e4306da4a556946327d253ea9b28357e4a7d \
size 50806272 \
${wine_mono_distfile} \
rmd160 6158dce54355c4174ff30544db3a0fd2b9c488b5 \
sha256 7698474dd9cb9eb80796b5812dff37386ba97b78b21ca23b20079ca5ad6ca5a1 \
@@ -91,11 +100,22 @@ depends_build port:bison \
port:pkgconfig

patchfiles BOOL.patch \
patch-configure.diff \
cups_headers.patch \
mach_machine.patch \
patch-include-distversion.h.diff \
QWORD.patch

pre-configure {
if {[variant_isset universal]} {
foreach arch ${universal_archs_to_use} {
file mkdir ${worksrcpath}-${arch}
}

configure.cmd ${worksrcpath}/configure
}
}

# 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
@@ -193,9 +213,14 @@ variant x11 {

default_variants +x11

# 64-bit Wine exists for Linux, but does not work on OS X.
# http://www.winehq.org/pipermail/wine-devel/2014-February/103074.html
supported_archs i386
configure.universal_args

set merger_configure_args(x86_64) "--enable-win64 --libdir=${prefix}/lib"
set merger_configure_args(i386) --with-wine64=${workpath}/${worksrcdir}-x86_64

if {${build_arch} eq "x86_64"} {
default_variants +universal
}

# error: Xcode 3.x cannot build 16-bit code correctly
compiler.blacklist-append {gcc-4.2 < 5600}
@@ -265,6 +290,9 @@ post-destroot {
xinstall -d ${destroot}${prefix}/share/wine/gecko
xinstall -m 644 ${distpath}/${wine_gecko_distfile} ${destroot}${prefix}/share/wine/gecko

xinstall -d ${destroot}${prefix}/share/wine/gecko
xinstall -m 644 ${distpath}/${wine_gecko64_distfile} ${destroot}${prefix}/share/wine/gecko

xinstall -d ${destroot}${prefix}/share/wine/mono
xinstall -m 644 ${distpath}/${wine_mono_distfile} ${destroot}${prefix}/share/wine/mono

@@ -0,0 +1,19 @@
# Output DLLs to different directories so that we don't have a clash when
# they're merged back together

--- configure.orig
+++ configure
@@ -7320,7 +7320,12 @@



-dlldir="\${libdir}/wine"
+if test "x$enable_win64" = "xyes"
+then
+ dlldir="\${libdir}/wine64"
+else
+ dlldir="\${libdir}/wine"
+fi

DLLFLAGS="-D_REENTRANT"

0 comments on commit c62f20f

Please sign in to comment.
You can’t perform that action at this time.