[108318] trunk/dports/x11/wine
jwa at macports.org
jwa at macports.org
Fri Jul 19 04:45:43 PDT 2013
Revision: 108318
https://trac.macports.org/changeset/108318
Author: jwa at macports.org
Date: 2013-07-19 04:45:43 -0700 (Fri, 19 Jul 2013)
Log Message:
-----------
wine: version bump to 1.6, merge changes from wine-devel
Modified Paths:
--------------
trunk/dports/x11/wine/Portfile
trunk/dports/x11/wine/files/BOOL.patch
Added Paths:
-----------
trunk/dports/x11/wine/files/tiger-shell.patch
Modified: trunk/dports/x11/wine/Portfile
===================================================================
--- trunk/dports/x11/wine/Portfile 2013-07-19 11:07:47 UTC (rev 108317)
+++ trunk/dports/x11/wine/Portfile 2013-07-19 11:45:43 UTC (rev 108318)
@@ -3,14 +3,14 @@
PortSystem 1.0
PortGroup archcheck 1.0
+PortGroup compiler_blacklist_versions 1.0
# Please keep the wine, wine-devel and wine-crossover ports as similar as possible.
name wine
conflicts wine-devel wine-crossover
set my_name wine
-version 1.4.1
-revision 4
+version 1.6
license LGPL-2.1+
categories x11
maintainers ryandesign jwa openmaintainer
@@ -20,7 +20,7 @@
distname ${my_name}-${version}
dist_subdir ${my_name}
set wine_distfile [suffix ${distname}]
-set wine_gecko_version 1.4
+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}
@@ -36,11 +36,11 @@
sourceforge:project/wine/Wine%20Gecko/${wine_gecko_version}:winegecko
checksums ${wine_distfile} \
- rmd160 0c5b671c22ad35110080b942549d0e9534ee0bf6 \
- sha256 3c233e3811e42c2f3623413783dbcd0f2288014b5645211f669ffd0ba6ae1856 \
+ rmd160 207ab1bb2b679ffb548599566920aceb365f20a3 \
+ sha256 e1f130efbdcbfa211ca56ee03357ccd17a31443889b4feebdcb88248520b42ae \
${wine_gecko_distfile} \
- rmd160 02363538a77a954f2bf1014b28ec1ed8fe2d1b6e \
- sha256 b30e0ac29a91a6fc40c73b5b760a56360a1d5323282545e32efaa40c75d8986d
+ rmd160 e5aded4dfcde2462d9802478efe5aae1552e842d \
+ sha256 f01fafa6d7aab995c38add77315c4cbc2f32f52d5d6a9350056f42b62d631fd8
# Note: Most of the X11 libs are dlopen()'d
depends_lib port:expat \
@@ -55,7 +55,7 @@
port:libxml2 \
port:libxslt \
port:ncurses \
- port:openssl \
+ port:gnutls \
port:tiff \
port:zlib \
port:xorg-libsm \
@@ -78,7 +78,7 @@
lib/libxml2.dylib \
lib/libxslt.dylib \
lib/libncurses.dylib \
- lib/libssl.dylib \
+ lib/libgnutls.dylib \
lib/libtiff.dylib \
lib/libz.dylib \
lib/libSM.dylib \
@@ -96,7 +96,8 @@
port:pkgconfig
patchfiles BOOL.patch \
- mach_machine.patch
+ mach_machine.patch \
+ tiger-shell.patch
configure.ldflags-append -framework CoreServices \
-lz
@@ -111,7 +112,7 @@
--with-freetype \
--without-gphoto \
--with-glu \
- --without-gnutls \
+ --with-gnutls \
--without-gsm \
--without-hal \
--with-jpeg \
@@ -119,7 +120,6 @@
--without-mpg123 \
--without-openal \
--with-opengl \
- --with-openssl \
--without-oss \
--with-png \
--with-pthread \
@@ -143,11 +143,14 @@
# This is not 64-bit friendly yet
supported_archs i386
-# BUILD FIX TODO: llvm-gcc-4.2, clang
-# llvm-gcc does not respect force_align_arg_pointer
-# clang fails due to CFI-foo (winebuild uses /usr/bin/as to assemble clang-generated assembly)
-compiler.whitelist gcc-4.2 apple-gcc-4.2
+# llvm-gcc-4.2 doesn't respect force_align_arg_pointer; wine builds but fails to run
+# http://bugs.winehq.org/show_bug.cgi?id=28030
+compiler.blacklist-append llvm-gcc-4.2 macports-llvm-gcc-4.2
+# clang < 3.1 fails to build wine with "error: invalid operand for instruction lretw"
+# http://bugs.winehq.org/show_bug.cgi?id=32872
+compiler.blacklist-append {clang < 425} macports-clang-2.9 macports-clang-3.0
+
# TODO: This should be done by base
if {${configure.compiler} eq "apple-gcc-4.2"} {
depends_build-append port:apple-gcc42
Modified: trunk/dports/x11/wine/files/BOOL.patch
===================================================================
--- trunk/dports/x11/wine/files/BOOL.patch 2013-07-19 11:07:47 UTC (rev 108317)
+++ trunk/dports/x11/wine/files/BOOL.patch 2013-07-19 11:45:43 UTC (rev 108318)
@@ -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
Added: trunk/dports/x11/wine/files/tiger-shell.patch
===================================================================
--- trunk/dports/x11/wine/files/tiger-shell.patch (rev 0)
+++ trunk/dports/x11/wine/files/tiger-shell.patch 2013-07-19 11:45:43 UTC (rev 108318)
@@ -0,0 +1,11 @@
+--- dlls/shell32/trash.c.orig 2012-04-08 22:35:02.000000000 -0700
++++ dlls/shell32/trash.c 2012-04-08 22:36:59.000000000 -0700
+@@ -60,7 +60,7 @@
+
+ WINE_DEFAULT_DEBUG_CHANNEL(trash);
+
+-#ifdef HAVE_CORESERVICES_CORESERVICES_H
++#if defined(HAVE_CORESERVICES_CORESERVICES_H) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1050
+
+ BOOL TRASH_CanTrashFile(LPCWSTR wszPath)
+ {
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130719/5367c674/attachment.html>
More information about the macports-changes
mailing list