[90607] trunk/dports/x11/wine

[ryandesign at macports.org]

Revision: 90607
          http://trac.macports.org/changeset/90607
Author:   ryandesign at macports.org
Date:     2012-03-09 13:40:12 -0800 (Fri, 09 Mar 2012)
Log Message:
-----------
wine: bring over changes to BOOL.patch from wine-devel

Modified Paths:
--------------
    trunk/dports/x11/wine/Portfile
    trunk/dports/x11/wine/files/BOOL.patch

Modified: trunk/dports/x11/wine/Portfile
===================================================================
--- trunk/dports/x11/wine/Portfile	2012-03-09 21:21:00 UTC (rev 90606)
+++ trunk/dports/x11/wine/Portfile	2012-03-09 21:40:12 UTC (rev 90607)
@@ -96,7 +96,7 @@
                             port:flex \
                             port:pkgconfig
 
-#patchfiles BOOL.patch
+patchfiles BOOL.patch
 
 configure.ldflags-append    -framework CoreServices \
                             -lz

Modified: trunk/dports/x11/wine/files/BOOL.patch
===================================================================
--- trunk/dports/x11/wine/files/BOOL.patch	2012-03-09 21:21:00 UTC (rev 90606)
+++ trunk/dports/x11/wine/files/BOOL.patch	2012-03-09 21:40:12 UTC (rev 90607)
@@ -16,21 +16,111 @@
  #undef LoadResource
  #undef CompareString
  #undef GetCurrentThread
---- dlls/dinput/joystick_osx.c.orig	2012-02-13 11:57:04.000000000 -0800
-+++ dlls/dinput/joystick_osx.c	2012-02-13 11:57:27.000000000 -0800
-@@ -24,6 +24,7 @@
- #include "wine/port.h"
+--- dlls/windowscodecs/icnsformat.c.orig	2012-02-12 23:54:58.000000000 -0800
++++ dlls/windowscodecs/icnsformat.c	2012-02-12 23:55:20.000000000 -0800
+@@ -22,6 +22,7 @@
+ #include <stdarg.h>
  
- #if defined(HAVE_CARBON_CARBON_H) && defined(HAVE_IOKIT_HID_IOHIDLIB_H)
+ #ifdef HAVE_APPLICATIONSERVICES_APPLICATIONSERVICES_H
++#define BOOL BOOL_Mac
+ #define GetCurrentProcess GetCurrentProcess_Mac
+ #define GetCurrentThread GetCurrentThread_Mac
+ #define LoadResource LoadResource_Mac
+@@ -49,6 +50,7 @@
+ #define ShowCursor ShowCursor_Mac
+ #define UnionRect UnionRect_Mac
+ #include <ApplicationServices/ApplicationServices.h>
++#undef BOOL
+ #undef GetCurrentProcess
+ #undef GetCurrentThread
+ #undef LoadResource
+--- dlls/wineqtdecoder/qtdatahandler.c.orig	2012-02-13 00:04:58.000000000 -0800
++++ dlls/wineqtdecoder/qtdatahandler.c	2012-02-13 00:05:24.000000000 -0800
+@@ -23,6 +23,7 @@
+ #define ULONG CoreFoundation_ULONG
+ #define HRESULT CoreFoundation_HRESULT
+ 
 +#define BOOL __carbon_BOOL
  #define LoadResource __carbon_LoadResource
  #define CompareString __carbon_CompareString
  #define GetCurrentThread __carbon_GetCurrentThread
 @@ -62,6 +63,7 @@
- #define STDMETHODCALLTYPE __carbon_STDMETHODCALLTYPE
- #include <Carbon/Carbon.h>
- #include <IOKit/hid/IOHIDLib.h>
+ 
+ #include <QuickTime/QuickTimeComponents.h>
+ 
 +#undef BOOL
  #undef LoadResource
  #undef CompareString
  #undef GetCurrentThread
+--- dlls/wineqtdecoder/qtsplitter.c.orig	2012-02-13 00:19:05.000000000 -0800
++++ dlls/wineqtdecoder/qtsplitter.c	2012-02-13 00:19:26.000000000 -0800
+@@ -23,6 +23,7 @@
+ #define ULONG CoreFoundation_ULONG
+ #define HRESULT CoreFoundation_HRESULT
+ 
++#define BOOL __carbon_BOOL
+ #define LoadResource __carbon_LoadResource
+ #define CompareString __carbon_CompareString
+ #define GetCurrentThread __carbon_GetCurrentThread
+@@ -63,6 +64,7 @@
+ #include <QuickTime/Movies.h>
+ #include <QuickTime/QuickTimeComponents.h>
+ 
++#undef BOOL
+ #undef LoadResource
+ #undef CompareString
+ #undef GetCurrentThread
+--- dlls/wineqtdecoder/qtutils.c.orig	2012-02-13 00:31:37.000000000 -0800
++++ dlls/wineqtdecoder/qtutils.c	2012-02-13 00:32:14.000000000 -0800
+@@ -23,6 +23,7 @@
+ #define ULONG CoreFoundation_ULONG
+ #define HRESULT CoreFoundation_HRESULT
+ 
++#define BOOL __carbon_BOOL
+ #define LoadResource __carbon_LoadResource
+ #define CompareString __carbon_CompareString
+ #define GetCurrentThread __carbon_GetCurrentThread
+@@ -62,6 +63,7 @@
+ 
+ #include <CoreVideo/CVPixelBuffer.h>
+ 
++#undef BOOL
+ #undef LoadResource
+ #undef CompareString
+ #undef GetCurrentThread
+--- dlls/wineqtdecoder/qtvdecoder.c.orig	2012-02-13 00:31:42.000000000 -0800
++++ dlls/wineqtdecoder/qtvdecoder.c	2012-02-13 00:32:30.000000000 -0800
+@@ -23,6 +23,7 @@
+ #define ULONG CoreFoundation_ULONG
+ #define HRESULT CoreFoundation_HRESULT
+ 
++#define BOOL __carbon_BOOL
+ #define LoadResource __carbon_LoadResource
+ #define CompareString __carbon_CompareString
+ #define GetCurrentThread __carbon_GetCurrentThread
+@@ -63,6 +64,7 @@
+ #include <QuickTime/ImageCompression.h>
+ #include <CoreVideo/CVPixelBuffer.h>
+ 
++#undef BOOL
+ #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)
++#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
+ #include <IOKit/hid/IOHIDLib.h>
++#undef BOOL
+ #undef ULONG
+ #undef E_INVALIDARG
+ #undef E_OUTOFMEMORY
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120309/1acf959b/attachment.html>