[101884] trunk/dports/x11/wine-crossover
jeremyhu at macports.org
jeremyhu at macports.org
Sun Jan 20 14:50:42 PST 2013
Revision: 101884
https://trac.macports.org/changeset/101884
Author: jeremyhu at macports.org
Date: 2013-01-20 14:50:42 -0800 (Sun, 20 Jan 2013)
Log Message:
-----------
wine-crossover: Bump to 12.0.0 and update winegecko to 1.9
Modified Paths:
--------------
trunk/dports/x11/wine-crossover/Portfile
Removed Paths:
-------------
trunk/dports/x11/wine-crossover/files/dlls-user32-winpos.c.patch
Modified: trunk/dports/x11/wine-crossover/Portfile
===================================================================
--- trunk/dports/x11/wine-crossover/Portfile 2013-01-20 22:13:39 UTC (rev 101883)
+++ trunk/dports/x11/wine-crossover/Portfile 2013-01-20 22:50:42 UTC (rev 101884)
@@ -4,7 +4,7 @@
name wine-crossover
conflicts wine wine-devel
-version 11.3.0
+version 12.0.0
license LGPL-2.1+
categories x11
maintainers jeremyhu openmaintainer
@@ -13,7 +13,7 @@
distname crossover-sources-${version}
dist_subdir wine
set wine_distfile ${distname}${extract.suffix}
-set wine_gecko_version 1.4
+set wine_gecko_version 1.9
set wine_gecko_distfile wine_gecko-${wine_gecko_version}-x86.msi
distfiles ${wine_distfile}:winesource ${wine_gecko_distfile}:winegecko
extract.only ${wine_distfile}
@@ -30,12 +30,12 @@
http://ftp.codeweavers.com/pub/crossover/source/archive/${version}/:winesource \
sourceforge:project/wine/Wine%20Gecko/${wine_gecko_version}:winegecko
-checksums ${wine_distfile} \
- rmd160 002356a69d81e672504075759df578355dc370be \
- sha256 a7649f2fbf6f2af196123a4276f70e3bd0c5640d48ca6b7e5341fe5086e24799 \
- ${wine_gecko_distfile} \
- rmd160 02363538a77a954f2bf1014b28ec1ed8fe2d1b6e \
- sha256 b30e0ac29a91a6fc40c73b5b760a56360a1d5323282545e32efaa40c75d8986d
+checksums crossover-sources-12.0.0.tar.gz \
+ rmd160 125f0a7f2d7cbc517440f3aa1e802d5903607de3 \
+ sha256 b8650963791ab3109fae3e7dfb705a89cfbbc77ef9234b7fb4b7c3b4c6979e35 \
+ wine_gecko-1.9-x86.msi \
+ rmd160 1a547f03772c22ad2330d0a369dfe8be995f86bc \
+ sha256 2f1df59287a4f21ec0f1322ae10520c8e6a95de10f8ef7339ab217e4b46ce782
# Note: Most of the X11 libs are dlopen()'d
depends_lib port:expat \
@@ -72,9 +72,7 @@
extract.post_args-append ${worksrcdir}
patchfiles BOOL.patch \
- mach_machine.patch \
- dlls-user32-winpos.c.patch
-# dlls-user32-winpos.c.patch is for http://bugs.winehq.org/show_bug.cgi?id=31979
+ mach_machine.patch
configure.ldflags-append -framework CoreServices \
-lz
Deleted: trunk/dports/x11/wine-crossover/files/dlls-user32-winpos.c.patch
===================================================================
--- trunk/dports/x11/wine-crossover/files/dlls-user32-winpos.c.patch 2013-01-20 22:13:39 UTC (rev 101883)
+++ trunk/dports/x11/wine-crossover/files/dlls-user32-winpos.c.patch 2013-01-20 22:50:42 UTC (rev 101884)
@@ -1,193 +0,0 @@
-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.@)
- */
-From: Alexandre Julliard <julliard at winehq.org>
-Date: Wed, 14 Nov 2012 15:26:13 +0000 (+0100)
-Subject: user32: Properly set last error in MapWindowPoints.
-X-Git-Tag: wine-1.5.18~240
-X-Git-Url: http://source.winehq.org/git
-
-user32: Properly set last error in MapWindowPoints.
----
-
-diff --git dlls/user32/winpos.c.orig dlls/user32/winpos.c
-index eda5b78..c620df9 100644
---- dlls/user32/winpos.c
-+++ dlls/user32/winpos.c
-@@ -422,11 +422,11 @@ HWND WINAPI ChildWindowFromPointEx( HWND hwndParent, POINT pt, UINT uFlags)
- * Calculate the offset between the origin of the two windows. Used
- * to implement MapWindowPoints.
- */
--static POINT WINPOS_GetWinOffset( HWND hwndFrom, HWND hwndTo, BOOL *mirrored )
-+static BOOL WINPOS_GetWinOffset( HWND hwndFrom, HWND hwndTo, BOOL *mirrored, POINT *ret_offset )
- {
- WND * wndPtr;
- POINT offset;
-- BOOL mirror_from, mirror_to;
-+ BOOL mirror_from, mirror_to, ret;
- HWND hwnd;
-
- offset.x = offset.y = 0;
-@@ -435,7 +435,11 @@ static POINT WINPOS_GetWinOffset( HWND hwndFrom, HWND hwndTo, BOOL *mirrored )
- /* Translate source window origin to screen coords */
- if (hwndFrom)
- {
-- if (!(wndPtr = WIN_GetPtr( hwndFrom ))) return offset;
-+ if (!(wndPtr = WIN_GetPtr( hwndFrom )))
-+ {
-+ SetLastError( ERROR_INVALID_WINDOW_HANDLE );
-+ return FALSE;
-+ }
- if (wndPtr == WND_OTHER_PROCESS) goto other_process;
- if (wndPtr != WND_DESKTOP)
- {
-@@ -466,7 +470,11 @@ static POINT WINPOS_GetWinOffset( HWND hwndFrom, HWND hwndTo, BOOL *mirrored )
- /* Translate origin to destination window coords */
- if (hwndTo)
- {
-- if (!(wndPtr = WIN_GetPtr( hwndTo ))) return offset;
-+ if (!(wndPtr = WIN_GetPtr( hwndTo )))
-+ {
-+ SetLastError( ERROR_INVALID_WINDOW_HANDLE );
-+ return FALSE;
-+ }
- if (wndPtr == WND_OTHER_PROCESS) goto other_process;
- if (wndPtr != WND_DESKTOP)
- {
-@@ -496,35 +504,37 @@ static POINT WINPOS_GetWinOffset( HWND hwndFrom, HWND hwndTo, BOOL *mirrored )
-
- *mirrored = mirror_from ^ mirror_to;
- if (mirror_from) offset.x = -offset.x;
-- return offset;
-+ *ret_offset = offset;
-+ return TRUE;
-
- other_process: /* one of the parents may belong to another process, do it the hard way */
-- offset.x = offset.y = 0;
- SERVER_START_REQ( get_windows_offset )
- {
- req->from = wine_server_user_handle( hwndFrom );
- req->to = wine_server_user_handle( hwndTo );
-- if (!wine_server_call( req ))
-+ if ((ret = !wine_server_call_err( req )))
- {
-- offset.x = reply->x;
-- offset.y = reply->y;
-+ ret_offset->x = reply->x;
-+ ret_offset->y = reply->y;
- *mirrored = reply->mirror;
- }
- }
- SERVER_END_REQ;
-- return offset;
-+ return ret;
- }
-
- /* map coordinates of a window region */
- void map_window_region( HWND from, HWND to, HRGN hrgn )
- {
- BOOL mirrored;
-- POINT offset = WINPOS_GetWinOffset( from, to, &mirrored );
-+ POINT offset;
- UINT i, size;
- RGNDATA *data;
- HRGN new_rgn;
- RECT *rect;
-
-+ if (!WINPOS_GetWinOffset( from, to, &mirrored, &offset )) return;
-+
- if (!mirrored)
- {
- OffsetRgn( hrgn, offset.x, offset.y );
-@@ -557,9 +567,11 @@ void map_window_region( HWND from, HWND to, HRGN hrgn )
- INT WINAPI MapWindowPoints( HWND hwndFrom, HWND hwndTo, LPPOINT lppt, UINT count )
- {
- BOOL mirrored;
-- POINT offset = WINPOS_GetWinOffset( hwndFrom, hwndTo, &mirrored );
-+ POINT offset;
- UINT i;
-
-+ if (!WINPOS_GetWinOffset( hwndFrom, hwndTo, &mirrored, &offset )) return 0;
-+
- for (i = 0; i < count; i++)
- {
- lppt[i].x += offset.x;
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130120/ddaba39d/attachment-0001.html>
More information about the macports-changes
mailing list