Ticket #40266: wine-Ports.patch

wine/Portfile

@@ -11 +11 @@
 conflicts                   wine-devel wine-crossover
 set my_name                 wine
 version                     1.6
+revision                    1
 license                     LGPL-2.1+
 categories                  x11
 maintainers                 ryandesign jwa openmaintainer
@@ -149 +150 @@
 
 # clang < 3.1 fails to build wine with "error: invalid operand for instruction lretw"
 # http://bugs.winehq.org/show_bug.cgi?id=32872
-compiler.blacklist-append   {clang < 425} macports-clang-2.9 macports-clang-3.0
+# llvm < 3.2 builds wine, but produces buggy binaries, clang 425 is also affected
+# http://llvm.org/bugs/show_bug.cgi?id=9707
+compiler.blacklist-append   {clang < 426} macports-clang-2.9 macports-clang-3.0 macports-clang-3.1
+
+# winemac.drv won't compile with FSF GCC due to including Cocoa headers making use of
+# the Apple "blocks" Objective C extension
+compiler.blacklist-append   macports-gcc-*
+
+# Prefer clang over old Apple GCC versions. Reorder fallback list.
+compiler.fallback-delete    gcc-4.2 apple-gcc-4.2
+compiler.fallback-append    gcc-4.2 apple-gcc-4.2
 
 platform darwin {
     if {${os.major} <= 9} {
@@ -184 +195 @@
 
     xinstall ${filespath}/wine.in ${destroot}${prefix}/bin/wine
     reinplace s|@PREFIX@|${prefix}|g ${destroot}${prefix}/bin/wine
-    
+
     xinstall -d ${destroot}${prefix}/share/wine/gecko
     xinstall -m 644 ${distpath}/${wine_gecko_distfile} ${destroot}${prefix}/share/wine/gecko
-    
+
     xinstall -d ${destroot}${prefix}/share/doc/${name}
     xinstall -m 644 -W ${worksrcpath} \
         ANNOUNCE \

wine-crossover/Portfile

@@ +1 @@
+# -*- 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
 # $Id: Portfile 109450 2013-08-15 17:03:09Z jeremyhu@macports.org $
 
 PortSystem                  1.0
+PortGroup                   archcheck 1.0
+PortGroup                   compiler_blacklist_versions 1.0
 
 # Please keep the wine, wine-devel and wine-crossover ports as similar as possible.
 
 name                        wine-crossover
 conflicts                   wine wine-devel
-version                     12.2.2
+version                     12.5.0
+revision                    0
 license                     LGPL-2.1+
 categories                  x11
 maintainers                 jeremyhu openmaintainer
@@ -14 +18 @@
 platforms                   darwin
 distname                    crossover-sources-${version}
 dist_subdir                 wine
-set wine_distfile           ${distname}${extract.suffix}
-set wine_gecko_version      1.8
+set wine_distfile           [suffix ${distname}]
+set wine_gecko_version      2.21
 set wine_gecko_distfile     wine_gecko-${wine_gecko_version}-x86.msi
 distfiles                   ${wine_distfile}:winesource ${wine_gecko_distfile}:winegecko
 extract.only                ${wine_distfile}
@@ -23 +27 @@
 build.target                depend all
 use_parallel_build          yes
 
-description                 Wine Is Not an Emulator (1.5.15 with CodeWeavers modifications for CrossOver)
+description                 Wine Is Not an Emulator (1.6 with CodeWeavers modifications for CrossOver)
 
 long_description            Wine is an implementation of the Windows APIs on top of X11. \
                             This version contains the Codeweavers patches for CrossOver
@@ -32 +36 @@
                             http://ftp.codeweavers.com/pub/crossover/source/archive/${version}/:winesource \
                             sourceforge:project/wine/Wine%20Gecko/${wine_gecko_version}:winegecko
 
-checksums                   crossover-sources-12.2.2.tar.gz \
-                            rmd160  5ddd12e9251646a2923a258ea03b9777a6efe4ab \
-                            sha256  110378a4bc8420c84aed96e9e0ba7d5f495934126e3df224863f544708d97b2d \
-                            wine_gecko-1.8-x86.msi \
-                            rmd160  f7b86d2e5ff82bf345b2420c9a8e9cfbc3c9989c \
-                            sha256  28f3b7e497e1f884a64b2d982b61dda3167efac4c843de198654a1c9144ff9dc
+checksums                   crossover-sources-12.5.0.tar.gz \
+                            rmd160  101e3499820d500416ad6f33e4b53fe4f59093bd \
+                            sha256  6e4a6851e484cf7fff37989aed72b82f31d98a964fc3100f09278c46bcce1ca7 \
+                            ${wine_gecko_distfile} \
+                            rmd160  e5aded4dfcde2462d9802478efe5aae1552e842d \
+                            sha256  f01fafa6d7aab995c38add77315c4cbc2f32f52d5d6a9350056f42b62d631fd8
 
 # Note: Most of the X11 libs are dlopen()'d
 depends_lib                 port:expat \
@@ -46 +50 @@
                             port:gstreamer010 \
                             port:gstreamer010-gst-plugins-base \
                             port:jpeg \
-                            port:lcms \
+                            port:lcms2 \
                             port:libiconv \
                             port:libpng \
                             port:libxml2 \
                             port:libxslt \
                             port:ncurses \
-                            port:openssl \
+                            port:gnutls \
                             port:tiff \
                             port:zlib \
                             port:xorg-libsm \
@@ -65 +69 @@
                             port:xrender \
                             port:mesa
 
+archcheck.files             lib/libexpat.dylib \
+                            lib/libfontconfig.dylib \
+                            lib/libfreetype.dylib \
+                            lib/libjpeg.dylib \
+                            lib/liblcms2.dylib \
+                            lib/libiconv.dylib \
+                            lib/libpng.dylib \
+                            lib/libxml2.dylib \
+                            lib/libxslt.dylib \
+                            lib/libncurses.dylib \
+                            lib/libgnutls.dylib \
+                            lib/libtiff.dylib \
+                            lib/libz.dylib \
+                            lib/libSM.dylib \
+                            lib/libXcomposite.dylib \
+                            lib/libXcursor.dylib \
+                            lib/libXi.dylib \
+                            lib/libXinerama.dylib \
+                            lib/libXrandr.dylib \
+                            lib/libXxf86vm.dylib \
+                            lib/libXrender.dylib \
+                            lib/libGL.dylib
+
 depends_build               port:bison \
                             port:flex \
                             port:pkgconfig
@@ -75 +102 @@
 
 patchfiles                  BOOL.patch \
                             mach_machine.patch \
-                            winedbg.patch
+                            winedbg.patch \
+                            tiger-shell.patch
 
 configure.ldflags-append    -framework CoreServices \
-                            -framework Security \
                             -lz
 
 configure.args              --without-alsa \
@@ -91 +118 @@
                             --with-freetype \
                             --without-gphoto \
                             --with-glu \
-                            --without-gnutls \
+                            --with-gnutls \
                             --without-gsm \
                             --without-hal \
                             --with-jpeg \
@@ -99 +126 @@
                             --without-mpg123 \
                             --without-openal \
                             --with-opengl \
-                            --with-openssl \
                             --without-oss \
                             --with-png \
                             --with-pthread \
@@ -123 +149 @@
 # This is not 64-bit friendly yet
 supported_archs             i386
 
-# BUILD FIX TODO: llvm-gcc-4.2, clang
-# llvm-gcc does not respect force_align_arg_pointer
-# clang fails due to CFI-foo (winebuild uses /usr/bin/as to assemble clang-generated assembly)
-compiler.whitelist gcc-4.2 apple-gcc-4.2
+# llvm-gcc-4.2 doesn't respect force_align_arg_pointer; wine builds but fails to run
+# http://bugs.winehq.org/show_bug.cgi?id=28030
+compiler.blacklist-append   llvm-gcc-4.2 macports-llvm-gcc-4.2
+
+# clang < 3.1 fails to build wine with "error: invalid operand for instruction lretw"
+# http://bugs.winehq.org/show_bug.cgi?id=32872
+# llvm < 3.2 builds wine, but produces buggy binaries, clang 425 is also affected
+# http://llvm.org/bugs/show_bug.cgi?id=9707
+compiler.blacklist-append   {clang < 426} macports-clang-2.9 macports-clang-3.0 macports-clang-3.1
+
+# winemac.drv won't compile with FSF GCC due to including Cocoa headers making use of
+# the Apple "blocks" Objective C extension
+compiler.blacklist-append   macports-gcc-*
+
+# Prefer clang over old Apple GCC versions. Reorder fallback list.
+compiler.fallback-delete    gcc-4.2 apple-gcc-4.2
+compiler.fallback-append    gcc-4.2 apple-gcc-4.2
 
 platform darwin {
     if {${os.major} <= 9} {
@@ -157 +196 @@
 post-destroot {
     xinstall -d ${destroot}${prefix}/libexec/wine
     file rename ${destroot}${prefix}/bin/wineloader ${destroot}${prefix}/libexec/wine/wine
-    system "install_name_tool -change @executable_path/../lib/libwine.1.dylib ${prefix}/lib/libwine.1.dylib ${destroot}${prefix}/libexec/wine/wine"
+    system "install_name_tool -change @executable_path/../lib/libwine.1.dylib @executable_path/../../lib/libwine.1.dylib ${destroot}${prefix}/libexec/wine/wine"
 
-    foreach dll [glob ${destroot}${prefix}/lib/wine/*.so] {
-        system "install_name_tool -change @executable_path/../lib/libwine.1.dylib ${prefix}/lib/libwine.1.dylib ${dll}"
-    }
+    # foreach dll [glob ${destroot}${prefix}/lib/wine/*.so] {
+    #     system "install_name_tool -change @executable_path/../lib/libwine.1.dylib ${prefix}/lib/libwine.1.dylib ${dll}"
+    # }
 
     xinstall ${filespath}/wine.in ${destroot}${prefix}/bin/wine
     reinplace s|@PREFIX@|${prefix}|g ${destroot}${prefix}/bin/wine
-    
+
     xinstall -d ${destroot}${prefix}/share/wine/gecko
     xinstall -m 644 ${distpath}/${wine_gecko_distfile} ${destroot}${prefix}/share/wine/gecko
-    
+
     xinstall -d ${destroot}${prefix}/share/doc/${name}
     xinstall -m 644 -W ${worksrcpath} \
         ANNOUNCE \

wine-crossover/files/BOOL.patch

@@ -106 +106 @@
  #undef LoadResource
  #undef CompareString
  #undef GetCurrentThread
---- dlls/dinput/joystick_osx.c.orig     2012-02-13 11:58:52.000000000 -0800
-+++ dlls/dinput/joystick_osx.c  2012-02-13 11:59:09.000000000 -0800
-@@ -24,6 +24,7 @@
- #include "wine/port.h"
- 
- #if defined(HAVE_IOKIT_HID_IOHIDLIB_H)
+--- dlls/dinput/joystick_osx.c.orig     2013-05-25 11:13:00.000000000 +0300
++++ dlls/dinput/joystick_osx.c  2013-05-25 11:13:00.000000000 +0300
+@@ -29,6 +29,7 @@
+ #define LONG SInt32
+ #define LPLONG SInt32*
+ #define E_PENDING __carbon_E_PENDING
 +#define BOOL __carbon_BOOL
  #define ULONG __carbon_ULONG
  #define E_INVALIDARG __carbon_E_INVALIDARG
  #define E_OUTOFMEMORY __carbon_E_OUTOFMEMORY
-@@ -45,6 +46,7 @@
- #define HRESULT __carbon_HRESULT
- #define STDMETHODCALLTYPE __carbon_STDMETHODCALLTYPE
+@@ -52,6 +53,7 @@
+ #include <IOKit/IOKitLib.h>
  #include <IOKit/hid/IOHIDLib.h>
+ #include <ForceFeedback/ForceFeedback.h>
 +#undef BOOL
  #undef ULONG
  #undef E_INVALIDARG

wine-crossover/files/tiger-shell.patch

@@ +1 @@
+--- dlls/shell32/trash.c.orig   2012-04-08 22:35:02.000000000 -0700
++++ dlls/shell32/trash.c        2012-04-08 22:36:59.000000000 -0700
+@@ -60,7 +60,7 @@
+ 
+ WINE_DEFAULT_DEBUG_CHANNEL(trash);
+ 
+-#ifdef HAVE_CORESERVICES_CORESERVICES_H
++#if defined(HAVE_CORESERVICES_CORESERVICES_H) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1050
+ 
+ BOOL TRASH_CanTrashFile(LPCWSTR wszPath)
+ {

wine-devel/Portfile

@@ -11 +11 @@
 conflicts                   wine wine-crossover
 set my_name                 wine
 version                     1.7.0
+revision                    1
 license                     LGPL-2.1+
 categories                  x11
 maintainers                 ryandesign jwa openmaintainer
@@ -149 +150 @@
 
 # clang < 3.1 fails to build wine with "error: invalid operand for instruction lretw"
 # http://bugs.winehq.org/show_bug.cgi?id=32872
-compiler.blacklist-append   {clang < 425} macports-clang-2.9 macports-clang-3.0
+# llvm < 3.2 builds wine, but produces buggy binaries, clang 425 is also affected
+# http://llvm.org/bugs/show_bug.cgi?id=9707
+compiler.blacklist-append   {clang < 426} macports-clang-2.9 macports-clang-3.0 macports-clang-3.1
+
+# winemac.drv won't compile with FSF GCC due to including Cocoa headers making use of
+# the Apple "blocks" Objective C extension
+compiler.blacklist-append   macports-gcc-*
+
+# Prefer clang over old Apple GCC versions. Reorder fallback list.
+compiler.fallback-delete    gcc-4.2 apple-gcc-4.2
+compiler.fallback-append    gcc-4.2 apple-gcc-4.2
 
 platform darwin {
     if {${os.major} <= 9} {
@@ -184 +195 @@
 
     xinstall ${filespath}/wine.in ${destroot}${prefix}/bin/wine
     reinplace s|@PREFIX@|${prefix}|g ${destroot}${prefix}/bin/wine
-    
+
     xinstall -d ${destroot}${prefix}/share/wine/gecko
     xinstall -m 644 ${distpath}/${wine_gecko_distfile} ${destroot}${prefix}/share/wine/gecko
-    
+
     xinstall -d ${destroot}${prefix}/share/doc/${name}
     xinstall -m 644 -W ${worksrcpath} \
         ANNOUNCE \