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

[jmr at macports.org]

Revision: 100116
          https://trac.macports.org/changeset/100116
Author:   jmr at macports.org
Date:     2012-11-28 20:30:31 -0800 (Wed, 28 Nov 2012)
Log Message:
-----------
wine-crossover: update to 11.3.0 and use ScreenToClient fix that was integrated upstream

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

Added Paths:
-----------
    trunk/dports/x11/wine-crossover/files/dlls-user32-winpos.c.patch

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

Modified: trunk/dports/x11/wine-crossover/Portfile
===================================================================
--- trunk/dports/x11/wine-crossover/Portfile	2012-11-29 03:58:50 UTC (rev 100115)
+++ trunk/dports/x11/wine-crossover/Portfile	2012-11-29 04:30:31 UTC (rev 100116)
@@ -4,7 +4,7 @@
 
 name                        wine-crossover
 conflicts                   wine wine-devel
-version                     11.2.2
+version                     11.3.0
 license                     LGPL-2.1+
 categories                  x11
 maintainers                 jeremyhu openmaintainer
@@ -31,8 +31,8 @@
                             sourceforge:project/wine/Wine%20Gecko/${wine_gecko_version}:winegecko
 
 checksums                   ${wine_distfile} \
-                            rmd160  948a7d76c0cdc5b6bd377511921088207f63df5b \
-                            sha256  58c5adae2f6f2d6f9b2559b7d93aeaadb3ade617f5bd920554eb469eb9649cec \
+                            rmd160  002356a69d81e672504075759df578355dc370be \
+                            sha256  a7649f2fbf6f2af196123a4276f70e3bd0c5640d48ca6b7e5341fe5086e24799 \
                             ${wine_gecko_distfile} \
                             rmd160  02363538a77a954f2bf1014b28ec1ed8fe2d1b6e \
                             sha256  b30e0ac29a91a6fc40c73b5b760a56360a1d5323282545e32efaa40c75d8986d
@@ -73,8 +73,8 @@
 
 patchfiles                  BOOL.patch \
                             mach_machine.patch \
-                            ScreenToClient.patch
-# ScreenToClient.patch is for http://bugs.winehq.org/show_bug.cgi?id=31979
+                            dlls-user32-winpos.c.patch
+# dlls-user32-winpos.c.patch is for http://bugs.winehq.org/show_bug.cgi?id=31979
 
 configure.ldflags-append    -framework CoreServices \
                             -lz

Deleted: trunk/dports/x11/wine-crossover/files/ScreenToClient.patch
===================================================================
--- trunk/dports/x11/wine-crossover/files/ScreenToClient.patch	2012-11-29 03:58:50 UTC (rev 100115)
+++ trunk/dports/x11/wine-crossover/files/ScreenToClient.patch	2012-11-29 04:30:31 UTC (rev 100116)
@@ -1,16 +0,0 @@
----
- 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;
- }
- 
- 
--- 

Added: trunk/dports/x11/wine-crossover/files/dlls-user32-winpos.c.patch
===================================================================
--- trunk/dports/x11/wine-crossover/files/dlls-user32-winpos.c.patch	                        (rev 0)
+++ trunk/dports/x11/wine-crossover/files/dlls-user32-winpos.c.patch	2012-11-29 04:30:31 UTC (rev 100116)
@@ -0,0 +1,82 @@
+X-Git-Url: http://source.winehq.org/git
+
+diff --git dlls/user32/winpos.c.orig dlls/user32/winpos.c
+index c620df9..0ce3ddd 100644
+--- dlls/user32/winpos.c.orig
++++ dlls/user32/winpos.c
+@@ -235,26 +235,6 @@ BOOL WINAPI GetClientRect( HWND hwnd, LPRECT rect )
+ }
+ 
+ 
+-/*******************************************************************
+- *		ClientToScreen (USER32.@)
+- */
+-BOOL WINAPI ClientToScreen( HWND hwnd, LPPOINT lppnt )
+-{
+-    MapWindowPoints( hwnd, 0, lppnt, 1 );
+-    return TRUE;
+-}
+-
+-
+-/*******************************************************************
+- *		ScreenToClient (USER32.@)
+- */
+-BOOL WINAPI ScreenToClient( HWND hwnd, LPPOINT lppnt )
+-{
+-    MapWindowPoints( 0, hwnd, lppnt, 1 );
+-    return TRUE;
+-}
+-
+-
+ /***********************************************************************
+  *           list_children_from_point
+  *
+@@ -588,6 +568,48 @@ INT WINAPI MapWindowPoints( HWND hwndFrom, HWND hwndTo, LPPOINT lppt, UINT count
+ }
+ 
+ 
++/*******************************************************************
++ *		ClientToScreen (USER32.@)
++ */
++BOOL WINAPI ClientToScreen( HWND hwnd, LPPOINT lppnt )
++{
++    POINT offset;
++    BOOL mirrored;
++
++    if (!hwnd)
++    {
++        SetLastError( ERROR_INVALID_WINDOW_HANDLE );
++        return FALSE;
++    }
++    if (!WINPOS_GetWinOffset( hwnd, 0, &mirrored, &offset )) return FALSE;
++    lppnt->x += offset.x;
++    lppnt->y += offset.y;
++    if (mirrored) lppnt->x = -lppnt->x;
++    return TRUE;
++}
++
++
++/*******************************************************************
++ *		ScreenToClient (USER32.@)
++ */
++BOOL WINAPI ScreenToClient( HWND hwnd, LPPOINT lppnt )
++{
++    POINT offset;
++    BOOL mirrored;
++
++    if (!hwnd)
++    {
++        SetLastError( ERROR_INVALID_WINDOW_HANDLE );
++        return FALSE;
++    }
++    if (!WINPOS_GetWinOffset( 0, hwnd, &mirrored, &offset )) return FALSE;
++    lppnt->x += offset.x;
++    lppnt->y += offset.y;
++    if (mirrored) lppnt->x = -lppnt->x;
++    return TRUE;
++}
++
++
+ /***********************************************************************
+  *		IsIconic (USER32.@)
+  */
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20121128/3261819e/attachment.html>