[106410] trunk/dports/x11/wine-devel

[jwa at macports.org]

Revision: 106410
          https://trac.macports.org/changeset/106410
Author:   jwa at macports.org
Date:     2013-05-25 06:26:26 -0700 (Sat, 25 May 2013)
Log Message:
-----------
wine-devel: version bump to 1.5.31, new gecko version, remove unnecessary patch file as the change done upstream

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

Modified: trunk/dports/x11/wine-devel/Portfile
===================================================================
--- trunk/dports/x11/wine-devel/Portfile	2013-05-25 11:41:10 UTC (rev 106409)
+++ trunk/dports/x11/wine-devel/Portfile	2013-05-25 13:26:26 UTC (rev 106410)
@@ -8,8 +8,8 @@
 name                        wine-devel
 conflicts                   wine wine-crossover
 set my_name                 wine
-version                     1.5.30
-revision                    1
+version                     1.5.31
+
 license                     LGPL-2.1+
 categories                  x11
 maintainers                 ryandesign jwa openmaintainer
@@ -19,7 +19,7 @@
 distname                    ${my_name}-${version}
 dist_subdir                 ${my_name}
 set wine_distfile           [suffix ${distname}]
-set wine_gecko_version      1.9
+set wine_gecko_version      2.21
 set wine_gecko_distfile     wine_gecko-${wine_gecko_version}-x86.msi
 distfiles                   ${wine_distfile}:winesource ${wine_gecko_distfile}:winegecko
 extract.only                ${wine_distfile}
@@ -35,11 +35,11 @@
                             sourceforge:project/wine/Wine%20Gecko/${wine_gecko_version}:winegecko
 
 checksums                   ${wine_distfile} \
-                            rmd160  7378f18dc6c7d288e8002493fa342b942e652b30 \
-                            sha256  0f6f92a5730037b85b75089af6817ae2ceffb335caa5077e2ab1b41944c452c3 \
+                            rmd160  c0b6ca9859f8fdd1b5297e69dd248290442e5b56 \
+                            sha256  462547451e17a3d2a287b2881731282da3b537bc2cf338e9c2ab86d8470e92c2 \
                             ${wine_gecko_distfile} \
-                            rmd160  1a547f03772c22ad2330d0a369dfe8be995f86bc \
-                            sha256  2f1df59287a4f21ec0f1322ae10520c8e6a95de10f8ef7339ab217e4b46ce782
+                            rmd160  e5aded4dfcde2462d9802478efe5aae1552e842d \
+                            sha256  f01fafa6d7aab995c38add77315c4cbc2f32f52d5d6a9350056f42b62d631fd8
 
 # Note: Most of the X11 libs are dlopen()'d
 depends_lib                 port:expat \
@@ -95,7 +95,6 @@
                             port:pkgconfig
 
 patchfiles                  BOOL.patch \
-                            libwine.patch \
                             mach_machine.patch \
                             tiger-shell.patch
 

Modified: trunk/dports/x11/wine-devel/files/BOOL.patch
===================================================================
--- trunk/dports/x11/wine-devel/files/BOOL.patch	2013-05-25 11:41:10 UTC (rev 106409)
+++ trunk/dports/x11/wine-devel/files/BOOL.patch	2013-05-25 13:26:26 UTC (rev 106410)
@@ -106,20 +106,20 @@
  #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)
+--- dlls/dinput/joystick_osx.c.orig	2013-05-25 11:13:00.000000000 +0300
++++ dlls/dinput/joystick_osx.c	2013-05-25 11:13:00.000000000 +0300
+@@ -29,6 +29,7 @@
+ #define LONG SInt32
+ #define LPLONG SInt32*
+ #define E_PENDING __carbon_E_PENDING
 +#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
+@@ -52,6 +53,7 @@
+ #include <IOKit/IOKitLib.h>
  #include <IOKit/hid/IOHIDLib.h>
+ #include <ForceFeedback/ForceFeedback.h>
 +#undef BOOL
  #undef ULONG
  #undef E_INVALIDARG
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130525/cb982fe2/attachment.html>