[98794] trunk/dports/x11/wine-crossover

[jmr at macports.org]

Revision: 98794
          http://trac.macports.org//changeset/98794
Author:   jmr at macports.org
Date:     2012-10-16 03:57:31 -0700 (Tue, 16 Oct 2012)
Log Message:
-----------
wine-crossover: update to 11.2.2, patch a bug in ScreenToClient, remove archcheck portgroup

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

Added Paths:
-----------
    trunk/dports/x11/wine-crossover/files/ScreenToClient.patch

Modified: trunk/dports/x11/wine-crossover/Portfile
===================================================================
--- trunk/dports/x11/wine-crossover/Portfile	2012-10-16 10:22:05 UTC (rev 98793)
+++ trunk/dports/x11/wine-crossover/Portfile	2012-10-16 10:57:31 UTC (rev 98794)
@@ -1,12 +1,10 @@
 # $Id$
 
 PortSystem                  1.0
-PortGroup                   archcheck 1.0
 
 name                        wine-crossover
 conflicts                   wine wine-devel
-version                     11.2.0
-revision                    1
+version                     11.2.2
 license                     LGPL-2.1+
 categories                  x11
 maintainers                 jeremyhu openmaintainer
@@ -14,7 +12,7 @@
 platforms                   darwin
 distname                    crossover-sources-${version}
 dist_subdir                 wine
-set wine_distfile           [suffix ${distname}]
+set wine_distfile           ${distname}${extract.suffix}
 set wine_gecko_version      1.4
 set wine_gecko_distfile     wine_gecko-${wine_gecko_version}-x86.msi
 distfiles                   ${wine_distfile}:winesource ${wine_gecko_distfile}:winegecko
@@ -33,8 +31,8 @@
                             sourceforge:project/wine/Wine%20Gecko/${wine_gecko_version}:winegecko
 
 checksums                   ${wine_distfile} \
-                            rmd160  642b61e20a3724f5d6a71c597e7a5db1db65718f \
-                            sha256  64af63dfaf461f082a6c3297cc96134c9bd2dca3f8a6d5901d18397e8bfd5415 \
+                            rmd160  948a7d76c0cdc5b6bd377511921088207f63df5b \
+                            sha256  58c5adae2f6f2d6f9b2559b7d93aeaadb3ade617f5bd920554eb469eb9649cec \
                             ${wine_gecko_distfile} \
                             rmd160  02363538a77a954f2bf1014b28ec1ed8fe2d1b6e \
                             sha256  b30e0ac29a91a6fc40c73b5b760a56360a1d5323282545e32efaa40c75d8986d
@@ -65,29 +63,6 @@
                             port:xrender \
                             port:mesa
 
-archcheck.files             lib/libexpat.dylib \
-                            lib/libfontconfig.dylib \
-                            lib/libfreetype.dylib \
-                            lib/libjpeg.dylib \
-                            lib/liblcms.dylib \
-                            lib/libiconv.dylib \
-                            lib/libpng.dylib \
-                            lib/libxml2.dylib \
-                            lib/libxslt.dylib \
-                            lib/libncurses.dylib \
-                            lib/libssl.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
@@ -97,7 +72,9 @@
 extract.post_args-append    ${worksrcdir}
 
 patchfiles                  BOOL.patch \
-                            mach_machine.patch
+                            mach_machine.patch \
+                            ScreenToClient.patch
+# ScreenToClient.patch is for http://bugs.winehq.org/show_bug.cgi?id=31979
 
 configure.ldflags-append    -framework CoreServices \
                             -lz

Added: trunk/dports/x11/wine-crossover/files/ScreenToClient.patch
===================================================================
--- trunk/dports/x11/wine-crossover/files/ScreenToClient.patch	                        (rev 0)
+++ trunk/dports/x11/wine-crossover/files/ScreenToClient.patch	2012-10-16 10:57:31 UTC (rev 98794)
@@ -0,0 +1,16 @@
+---
+ dlls/user32/winpos.c |    3 +--
+ 1 files changed, 1 insertions(+), 2 deletions(-)
+--- dlls/user32/winpos.c	
++++ dlls/user32/winpos.c	
+@@ -251,8 +251,7 @@ BOOL WINAPI ClientToScreen( HWND hwnd, LPPOINT lppnt )
+  */
+ BOOL WINAPI ScreenToClient( HWND hwnd, LPPOINT lppnt )
+ {
+-    MapWindowPoints( 0, hwnd, lppnt, 1 );
+-    return TRUE;
++    return MapWindowPoints( 0, hwnd, lppnt, 1 ) != 0;
+ }
+ 
+ 
+-- 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20121016/04d79766/attachment-0001.html>