aboutsummaryrefslogtreecommitdiffstats
path: root/main/wine
diff options
context:
space:
mode:
authorTimo Teräs <timo.teras@iki.fi>2013-12-18 18:26:52 +0000
committerTimo Teräs <timo.teras@iki.fi>2013-12-18 18:26:52 +0000
commit865e677dba13fb6458fa658c349349384a06c125 (patch)
tree7fa8ed234cc99466fc9cafcf9ebcef51b5f51f32 /main/wine
parent46f1e5db6ce295c6842dbcec50c75f2552c5a463 (diff)
downloadaports-865e677dba13fb6458fa658c349349384a06c125.tar.bz2
aports-865e677dba13fb6458fa658c349349384a06c125.tar.xz
main/wine: fix musl build
Diffstat (limited to 'main/wine')
-rw-r--r--main/wine/APKBUILD10
-rw-r--r--main/wine/musl-fix.patch43
2 files changed, 50 insertions, 3 deletions
diff --git a/main/wine/APKBUILD b/main/wine/APKBUILD
index b8da01d85a..b654095768 100644
--- a/main/wine/APKBUILD
+++ b/main/wine/APKBUILD
@@ -17,6 +17,7 @@ makedepends="fontconfig-dev openldap-dev libxslt-dev libxxf86dga-dev
tiff-dev v4l-utils-dev udisks2-dev
autoconf automake"
source="http://downloads.sourceforge.net/project/wine/Source/wine-$_ver.tar.bz2
+ musl-fix.patch
"
_builddir="$srcdir"/$pkgname-$_ver
@@ -53,6 +54,9 @@ package() {
"$pkgdir"/usr/bin/wine
}
-md5sums="e66a9d73e224c099b617a1f5d718d604 wine-1.7.8.tar.bz2"
-sha256sums="30e17f5f863a09416f3d229666566b318dbb40f683d4ca6630012c60bb511804 wine-1.7.8.tar.bz2"
-sha512sums="1fdaddb7909f818050854bf351d20f445cf6a5906b1bcc789c96ee8d5058c90815a91bbbc6444f3e4527748764f03ab5297585c174b433093a3354a827402fea wine-1.7.8.tar.bz2"
+md5sums="e66a9d73e224c099b617a1f5d718d604 wine-1.7.8.tar.bz2
+00e663cb263cc8cf1e93704ce5019cb7 musl-fix.patch"
+sha256sums="30e17f5f863a09416f3d229666566b318dbb40f683d4ca6630012c60bb511804 wine-1.7.8.tar.bz2
+0d8da319944de067f716b3f7d09239682c917e51b4864bc1bbb27075afb0e4b7 musl-fix.patch"
+sha512sums="1fdaddb7909f818050854bf351d20f445cf6a5906b1bcc789c96ee8d5058c90815a91bbbc6444f3e4527748764f03ab5297585c174b433093a3354a827402fea wine-1.7.8.tar.bz2
+3df740201ea8105546e56b9e79843d12cc678aa89ad2a84283210dabab0b8b8357baa96266773bcfa1b5434c11b8fec014c51778278daad45ccffcede3f4e9c4 musl-fix.patch"
diff --git a/main/wine/musl-fix.patch b/main/wine/musl-fix.patch
new file mode 100644
index 0000000000..35aded54e5
--- /dev/null
+++ b/main/wine/musl-fix.patch
@@ -0,0 +1,43 @@
+--- wine-1.7.8.orig/dlls/dnsapi/query.c
++++ wine-1.7.8/dlls/dnsapi/query.c
+@@ -146,7 +146,9 @@
+ case HOST_NOT_FOUND: return DNS_ERROR_RCODE_NAME_ERROR;
+ case TRY_AGAIN: return DNS_ERROR_RCODE_SERVER_FAILURE;
+ case NO_RECOVERY: return DNS_ERROR_RCODE_REFUSED;
++#ifdef NETDB_INTERNAL
+ case NETDB_INTERNAL: return DNS_ERROR_RCODE;
++#endif
+ default:
+ FIXME( "unmapped error code: %d\n", error );
+ return DNS_ERROR_RCODE_NOT_IMPLEMENTED;
+--- wine-1.7.8.orig/dlls/ntdll/directory.c
++++ wine-1.7.8/dlls/ntdll/directory.c
+@@ -119,6 +119,7 @@
+ char d_name[256];
+ } KERNEL_DIRENT64;
+
++#undef getdents64
+ static inline int getdents64( int fd, char *de, unsigned int size )
+ {
+ return syscall( __NR_getdents64, fd, de, size );
+--- wine-1.7.8.orig/dlls/ws2_32/socket.c
++++ wine-1.7.8/dlls/ws2_32/socket.c
+@@ -101,7 +101,7 @@
+ #ifdef HAVE_NETIPX_IPX_H
+ # include <netipx/ipx.h>
+ # define HAS_IPX
+-#elif defined(HAVE_LINUX_IPX_H)
++#elif defined(HAVE_LINUX_IPX_H) && defined(__GLIBC__)
+ # ifdef HAVE_ASM_TYPES_H
+ # include <asm/types.h>
+ # endif
+--- wine-1.7.8.orig/server/file.h
++++ wine-1.7.8/server/file.h
+@@ -21,6 +21,7 @@
+ #ifndef __WINE_SERVER_FILE_H
+ #define __WINE_SERVER_FILE_H
+
++#include <fcntl.h>
+ #include "object.h"
+
+ struct fd;