[85517] trunk/dports/x11

[ryandesign at macports.org]

Revision: 85517
          http://trac.macports.org/changeset/85517
Author:   ryandesign at macports.org
Date:     2011-10-13 21:49:18 -0700 (Thu, 13 Oct 2011)
Log Message:
-----------
wine-crossover, wine-crossover-games: fix "'kIconServices16PixelDataARGB' undeclared" on Tiger by packporting a fix from upstream wine; see #31500

Modified Paths:
--------------
    trunk/dports/x11/wine-crossover/Portfile
    trunk/dports/x11/wine-crossover-games/Portfile

Added Paths:
-----------
    trunk/dports/x11/wine-crossover/files/patch-dlls-windowscodecs-icnsformat.c.diff
    trunk/dports/x11/wine-crossover-games/files/patch-dlls-windowscodecs-icnsformat.c.diff

Modified: trunk/dports/x11/wine-crossover/Portfile
===================================================================
--- trunk/dports/x11/wine-crossover/Portfile	2011-10-14 04:47:57 UTC (rev 85516)
+++ trunk/dports/x11/wine-crossover/Portfile	2011-10-14 04:49:18 UTC (rev 85517)
@@ -158,7 +158,8 @@
 }
 
 # darwin 8
-patchfiles-append           patch-SSLCopyPeerCertificates.diff
+patchfiles-append           patch-SSLCopyPeerCertificates.diff \
+                            patch-dlls-windowscodecs-icnsformat.c.diff
 
 platform darwin 9 {
     # Fix "Xcode 3.x cannot build 16-bit code correctly. Use --disable-win16 if you don't need 16-bit support."

Added: trunk/dports/x11/wine-crossover/files/patch-dlls-windowscodecs-icnsformat.c.diff
===================================================================
--- trunk/dports/x11/wine-crossover/files/patch-dlls-windowscodecs-icnsformat.c.diff	                        (rev 0)
+++ trunk/dports/x11/wine-crossover/files/patch-dlls-windowscodecs-icnsformat.c.diff	2011-10-14 04:49:18 UTC (rev 85517)
@@ -0,0 +1,31 @@
+From: Ken Thomases <ken at codeweavers.com>
+Date: Fri, 21 Jan 2011 00:58:57 +0000 (-0600)
+Subject: windowscodecs: Disable ICNS support when building for Mac OS X 10.4 Tiger.
+X-Git-Tag: wine-1.3.12~27
+X-Git-Url: http://source.winehq.org/git?hp=9c66f68f55beca6fc92315d40a73b41f12865353
+
+windowscodecs: Disable ICNS support when building for Mac OS X 10.4 Tiger.
+---
+
+--- dlls/windowscodecs/icnsformat.c.orig
++++ dlls/windowscodecs/icnsformat.c
+@@ -68,7 +68,8 @@
+ 
+ WINE_DEFAULT_DEBUG_CHANNEL(wincodecs);
+ 
+-#ifdef HAVE_APPLICATIONSERVICES_APPLICATIONSERVICES_H
++#if defined(HAVE_APPLICATIONSERVICES_APPLICATIONSERVICES_H) && \
++    MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_4
+ 
+ typedef struct IcnsEncoder {
+     IWICBitmapEncoder IWICBitmapEncoder_iface;
+@@ -752,7 +753,8 @@ HRESULT IcnsEncoder_CreateInstance(IUnknown *pUnkOuter, REFIID iid, void** ppv)
+     return ret;
+ }
+ 
+-#else /* !defined(HAVE_APPLICATIONSERVICES_APPLICATIONSERVICES_H) */
++#else /* !defined(HAVE_APPLICATIONSERVICES_APPLICATIONSERVICES_H) ||
++         MAC_OS_X_VERSION_MAX_ALLOWED <= MAC_OS_X_VERSION_10_4 */
+ 
+ HRESULT IcnsEncoder_CreateInstance(IUnknown *pUnkOuter, REFIID iid, void** ppv)
+ {

Modified: trunk/dports/x11/wine-crossover-games/Portfile
===================================================================
--- trunk/dports/x11/wine-crossover-games/Portfile	2011-10-14 04:47:57 UTC (rev 85516)
+++ trunk/dports/x11/wine-crossover-games/Portfile	2011-10-14 04:49:18 UTC (rev 85517)
@@ -160,7 +160,8 @@
 }
 
 # darwin 8
-patchfiles-append           patch-SSLCopyPeerCertificates.diff
+patchfiles-append           patch-SSLCopyPeerCertificates.diff \
+                            patch-dlls-windowscodecs-icnsformat.c.diff
 
 platform darwin 9 {
     # Fix "Xcode 3.x cannot build 16-bit code correctly. Use --disable-win16 if you don't need 16-bit support."

Added: trunk/dports/x11/wine-crossover-games/files/patch-dlls-windowscodecs-icnsformat.c.diff
===================================================================
--- trunk/dports/x11/wine-crossover-games/files/patch-dlls-windowscodecs-icnsformat.c.diff	                        (rev 0)
+++ trunk/dports/x11/wine-crossover-games/files/patch-dlls-windowscodecs-icnsformat.c.diff	2011-10-14 04:49:18 UTC (rev 85517)
@@ -0,0 +1,31 @@
+From: Ken Thomases <ken at codeweavers.com>
+Date: Fri, 21 Jan 2011 00:58:57 +0000 (-0600)
+Subject: windowscodecs: Disable ICNS support when building for Mac OS X 10.4 Tiger.
+X-Git-Tag: wine-1.3.12~27
+X-Git-Url: http://source.winehq.org/git?hp=9c66f68f55beca6fc92315d40a73b41f12865353
+
+windowscodecs: Disable ICNS support when building for Mac OS X 10.4 Tiger.
+---
+
+--- dlls/windowscodecs/icnsformat.c.orig
++++ dlls/windowscodecs/icnsformat.c
+@@ -68,7 +68,8 @@
+ 
+ WINE_DEFAULT_DEBUG_CHANNEL(wincodecs);
+ 
+-#ifdef HAVE_APPLICATIONSERVICES_APPLICATIONSERVICES_H
++#if defined(HAVE_APPLICATIONSERVICES_APPLICATIONSERVICES_H) && \
++    MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_4
+ 
+ typedef struct IcnsEncoder {
+     IWICBitmapEncoder IWICBitmapEncoder_iface;
+@@ -752,7 +753,8 @@ HRESULT IcnsEncoder_CreateInstance(IUnknown *pUnkOuter, REFIID iid, void** ppv)
+     return ret;
+ }
+ 
+-#else /* !defined(HAVE_APPLICATIONSERVICES_APPLICATIONSERVICES_H) */
++#else /* !defined(HAVE_APPLICATIONSERVICES_APPLICATIONSERVICES_H) ||
++         MAC_OS_X_VERSION_MAX_ALLOWED <= MAC_OS_X_VERSION_10_4 */
+ 
+ HRESULT IcnsEncoder_CreateInstance(IUnknown *pUnkOuter, REFIID iid, void** ppv)
+ {
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20111013/ad05972e/attachment-0001.html>