Ticket #33618: wine-crossover-11.0.0.diff

File wine-crossover-11.0.0.diff, 10.0 KB (added by ryandesign (Ryan Carsten Schmidt), 13 years ago)

incomplete patch

  • files/BOOL.patch

     
    1616 #undef LoadResource
    1717 #undef CompareString
    1818 #undef GetCurrentThread
    19 --- dlls/dinput/joystick_osx.c.orig     2012-02-13 11:57:04.000000000 -0800
    20 +++ dlls/dinput/joystick_osx.c  2012-02-13 11:57:27.000000000 -0800
    21 @@ -24,6 +24,7 @@
    22  #include "wine/port.h"
    23  
    24  #if defined(HAVE_CARBON_CARBON_H) && defined(HAVE_IOKIT_HID_IOHIDLIB_H)
    25 +#define BOOL __carbon_BOOL
    26  #define LoadResource __carbon_LoadResource
    27  #define CompareString __carbon_CompareString
    28  #define GetCurrentThread __carbon_GetCurrentThread
    29 @@ -62,6 +63,7 @@
    30  #define STDMETHODCALLTYPE __carbon_STDMETHODCALLTYPE
    31  #include <Carbon/Carbon.h>
    32  #include <IOKit/hid/IOHIDLib.h>
    33 +#undef BOOL
    34  #undef LoadResource
    35  #undef CompareString
    36  #undef GetCurrentThread
    37 --- dlls/windowscodecs/icnsformat.c.orig        2012-02-13 12:58:07.000000000 -0800
    38 +++ dlls/windowscodecs/icnsformat.c     2012-02-13 12:58:31.000000000 -0800
     19--- dlls/windowscodecs/icnsformat.c.orig        2012-02-12 23:54:58.000000000 -0800
     20+++ dlls/windowscodecs/icnsformat.c     2012-02-12 23:55:20.000000000 -0800
    3921@@ -22,6 +22,7 @@
    4022 #include <stdarg.h>
    4123 
    … …  
    4426 #define GetCurrentProcess GetCurrentProcess_Mac
    4527 #define GetCurrentThread GetCurrentThread_Mac
    4628 #define LoadResource LoadResource_Mac
    47 @@ -37,6 +38,7 @@
     29@@ -49,6 +50,7 @@
    4830 #define ShowCursor ShowCursor_Mac
    4931 #define UnionRect UnionRect_Mac
    5032 #include <ApplicationServices/ApplicationServices.h>
    … …  
    5234 #undef GetCurrentProcess
    5335 #undef GetCurrentThread
    5436 #undef LoadResource
    55 --- dlls/wineosxime.drv/mactext.c.orig  2012-02-13 14:31:06.000000000 -0800
    56 +++ dlls/wineosxime.drv/mactext.c       2012-02-13 14:31:58.000000000 -0800
    57 @@ -50,7 +50,9 @@
    58  #ifdef __APPLE__
     37--- dlls/wineqtdecoder/qtdatahandler.c.orig     2012-02-13 00:04:58.000000000 -0800
     38+++ dlls/wineqtdecoder/qtdatahandler.c  2012-02-13 00:05:24.000000000 -0800
     39@@ -23,6 +23,7 @@
     40 #define ULONG CoreFoundation_ULONG
     41 #define HRESULT CoreFoundation_HRESULT
    5942 
    60  #include "wine/debug.h"
    6143+#define BOOL __carbon_BOOL
    62  #include <Carbon/Carbon.h>
     44 #define LoadResource __carbon_LoadResource
     45 #define CompareString __carbon_CompareString
     46 #define GetCurrentThread __carbon_GetCurrentThread
     47@@ -62,6 +63,7 @@
     48 
     49 #include <QuickTime/QuickTimeComponents.h>
     50 
    6351+#undef BOOL
    64  #include <dlfcn.h>
    65  #include "IMKClient.h"
     52 #undef LoadResource
     53 #undef CompareString
     54 #undef GetCurrentThread
     55--- dlls/wineqtdecoder/qtsplitter.c.orig        2012-02-13 00:19:05.000000000 -0800
     56+++ dlls/wineqtdecoder/qtsplitter.c     2012-02-13 00:19:26.000000000 -0800
     57@@ -23,6 +23,7 @@
     58 #define ULONG CoreFoundation_ULONG
     59 #define HRESULT CoreFoundation_HRESULT
    6660 
    67 --- dlls/wineqtdecoder/qtvdecoder.c.orig        2012-02-13 14:36:12.000000000 -0800
    68 +++ dlls/wineqtdecoder/qtvdecoder.c     2012-02-13 14:36:46.000000000 -0800
    69 @@ -22,6 +22,7 @@
     61+#define BOOL __carbon_BOOL
     62 #define LoadResource __carbon_LoadResource
     63 #define CompareString __carbon_CompareString
     64 #define GetCurrentThread __carbon_GetCurrentThread
     65@@ -63,6 +64,7 @@
     66 #include <QuickTime/Movies.h>
     67 #include <QuickTime/QuickTimeComponents.h>
    7068 
     69+#undef BOOL
     70 #undef LoadResource
     71 #undef CompareString
     72 #undef GetCurrentThread
     73--- dlls/wineqtdecoder/qtutils.c.orig   2012-02-13 00:31:37.000000000 -0800
     74+++ dlls/wineqtdecoder/qtutils.c        2012-02-13 00:32:14.000000000 -0800
     75@@ -23,6 +23,7 @@
    7176 #define ULONG CoreFoundation_ULONG
    7277 #define HRESULT CoreFoundation_HRESULT
    73 +#define BOOL CoreFoundation_BOOL
    7478 
     79+#define BOOL __carbon_BOOL
    7580 #define LoadResource __carbon_LoadResource
    7681 #define CompareString __carbon_CompareString
    77 @@ -103,6 +104,8 @@
     82 #define GetCurrentThread __carbon_GetCurrentThread
     83@@ -62,6 +63,7 @@
    7884 
    79  #undef ULONG
    80  #undef HRESULT
     85 #include <CoreVideo/CVPixelBuffer.h>
     86 
    8187+#undef BOOL
    82 +
    83  #undef DPRINTF
    84  #undef STDMETHODCALLTYPE
     88 #undef LoadResource
     89 #undef CompareString
     90 #undef GetCurrentThread
     91--- dlls/wineqtdecoder/qtvdecoder.c.orig        2012-02-13 00:31:42.000000000 -0800
     92+++ dlls/wineqtdecoder/qtvdecoder.c     2012-02-13 00:32:30.000000000 -0800
     93@@ -23,6 +23,7 @@
     94 #define ULONG CoreFoundation_ULONG
     95 #define HRESULT CoreFoundation_HRESULT
    8596 
     97+#define BOOL __carbon_BOOL
     98 #define LoadResource __carbon_LoadResource
     99 #define CompareString __carbon_CompareString
     100 #define GetCurrentThread __carbon_GetCurrentThread
     101@@ -63,6 +64,7 @@
     102 #include <QuickTime/ImageCompression.h>
     103 #include <CoreVideo/CVPixelBuffer.h>
     104 
     105+#undef BOOL
     106 #undef LoadResource
     107 #undef CompareString
     108 #undef GetCurrentThread
     109--- dlls/dinput/joystick_osx.c.orig     2012-02-13 11:58:52.000000000 -0800
     110+++ dlls/dinput/joystick_osx.c  2012-02-13 11:59:09.000000000 -0800
     111@@ -24,6 +24,7 @@
     112 #include "wine/port.h"
     113 
     114 #if defined(HAVE_IOKIT_HID_IOHIDLIB_H)
     115+#define BOOL __carbon_BOOL
     116 #define ULONG __carbon_ULONG
     117 #define E_INVALIDARG __carbon_E_INVALIDARG
     118 #define E_OUTOFMEMORY __carbon_E_OUTOFMEMORY
     119@@ -45,6 +46,7 @@
     120 #define HRESULT __carbon_HRESULT
     121 #define STDMETHODCALLTYPE __carbon_STDMETHODCALLTYPE
     122 #include <IOKit/hid/IOHIDLib.h>
     123+#undef BOOL
     124 #undef ULONG
     125 #undef E_INVALIDARG
     126 #undef E_OUTOFMEMORY

  • files/sl-audio.patch

     
    1 --- dlls/winecoreaudio.drv/audio.c.orig 2010-07-27 14:56:49.000000000 -0500
    2 +++ dlls/winecoreaudio.drv/audio.c      2010-09-16 12:33:09.000000000 -0500
    3 @@ -56,7 +56,6 @@
    4  #include "wine/unicode.h"
    5  #include "wine/library.h"
    6  #include "wine/debug.h"
    7 -#include "wine/list.h"
    8  
    9  WINE_DEFAULT_DEBUG_CHANNEL(wave);
    10  
    11 @@ -64,6 +63,12 @@
    12  
    13  WINE_DECLARE_DEBUG_CHANNEL(coreaudio);
    14  
    15 +/* This needs to be after CoreAudio/CoreAudio.h because
    16 + * CoreAudio includes sys/queue.h which has namespace conflicts
    17 + * with wine/list.h
    18 + */
    19 +#include "wine/list.h"
    20 +
    21  /*
    22      Due to AudioUnit headers conflict define some needed types.
    23  */

  • 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
    12# $Id$
    23
    34PortSystem                  1.0
    … …  
    67
    78name                        wine-crossover
    89conflicts                   wine wine-devel wine-crossover-games
    9 version                     10.1.0
     10version                     11.0.0
    1011license                     LGPL-2.1+
    1112categories                  x11
    1213maintainers                 jeremyhu openmaintainer
    … …  
    1516distname                    crossover-sources-${version}
    1617dist_subdir                 wine
    1718set wine_distfile           [suffix ${distname}]
    18 set wine_gecko_distfile     wine_gecko-1.2.0-x86.msi
    19 distfiles                   ${wine_distfile} ${wine_gecko_distfile}
     19set wine_gecko_version      1.4
     20set wine_gecko_distfile     wine_gecko-${wine_gecko_version}-x86.msi
     21distfiles                   ${wine_distfile}:winesource ${wine_gecko_distfile}:winegecko
    2022extract.only                ${wine_distfile}
    2123worksrcdir                  wine
    2224build.target                depend all
    … …  
    2426
    2527minimum_xcodeversions       {8 2.5}
    2628
    27 description                 Wine Is Not an Emulator (1.3.9 with CodeWeavers modifications for CrossOver)
     29description                 Wine Is Not an Emulator (1.4-rc5 with CodeWeavers modifications for CrossOver)
    2830
    2931long_description            Wine is an implementation of the Windows APIs on top of X11. \
    3032                            This version contains the Codeweavers patches for CrossOver
    3133
    32 master_sites                http://media.codeweavers.com/pub/crossover/source/ \
    33                             http://media.codeweavers.com/pub/crossover/source/archive/${version}/
     34master_sites                http://media.codeweavers.com/pub/crossover/source/:winesource \
     35                            http://media.codeweavers.com/pub/crossover/source/archive/${version}/:winesource \
     36                            sourceforge:project/wine/Wine%20Gecko/${wine_gecko_version}:winegecko
    3437
    3538checksums                   ${wine_distfile} \
    36                             rmd160  ff68078e199337c063f7a306d4af9cb710fee39e \
    37                             sha256  b61721ffd06a649846f5afc45b5a2e0e4f533bbb19250539cdeef4035ab52067 \
     39                            rmd160  38e4db61b6f3270f429a049d0d21502709265f98 \
     40                            sha256  3a068f9b46feb0bbc0e87a59d294021c494da62f601375a53582f33c95129d57 \
    3841                            ${wine_gecko_distfile} \
    39                             rmd160  089447eb59eea81c7b1b3d1896a20fe68586cd96 \
    40                             sha256  d6ccdb32b5867df207c7cd89513297ceb89cfa93696bece470467845c6c4d3ee
     42                            rmd160  02363538a77a954f2bf1014b28ec1ed8fe2d1b6e \
     43                            sha256  b30e0ac29a91a6fc40c73b5b760a56360a1d5323282545e32efaa40c75d8986d
    4144
    4245# Note: Most of the X11 libs are dlopen()'d
    4346depends_lib                 port:expat \
    4447                            port:fontconfig \
    4548                            port:freetype \
     49                            port:gstreamer \
     50                            port:gst-plugins-base \
    4651                            port:jpeg \
    4752                            port:lcms \
    4853                            port:libiconv \
    … …  
    8691                            lib/libXrender.dylib \
    8792                            lib/libGL.dylib
    8893
    89 depends_build               port:flex \
     94depends_build               port:bison \
     95                            port:flex \
    9096                            port:pkgconfig
    9197
    9298# Extract only the wine directory. We don't need the others, and their presence
    9399# interferes with the wine build (which uses parts of them if present).
    94100extract.post_args-append    wine
    95101
    96 patchfiles                  sl-audio.patch no-quartz-wm-workaround.patch BOOL.patch
     102patchfiles                  no-quartz-wm-workaround.patch BOOL.patch
    97103
    98104configure.ldflags-append    -framework CoreServices \
    99105                            -lz