diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2014-08-11 12:35:12 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2014-08-11 12:35:55 +0000 |
| commit | 433cbcf0bbc5d2f04d674e6bf67fabbec733c9a9 (patch) | |
| tree | 164977695b4395d843585e1489e663ef7a0b9822 /main/wine | |
| parent | 5a3102461f9d40667358c4ae4c28d57597859b16 (diff) | |
| download | aports-433cbcf0bbc5d2f04d674e6bf67fabbec733c9a9.tar.bz2 aports-433cbcf0bbc5d2f04d674e6bf67fabbec733c9a9.tar.xz | |
main/wine: upgrade to 1.7.24
Diffstat (limited to 'main/wine')
| -rw-r--r-- | main/wine/APKBUILD | 14 | ||||
| -rw-r--r-- | main/wine/musl-fix.patch | 34 |
2 files changed, 18 insertions, 30 deletions
diff --git a/main/wine/APKBUILD b/main/wine/APKBUILD index 7a868c79d8..b141cf47e4 100644 --- a/main/wine/APKBUILD +++ b/main/wine/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=wine -pkgver=1.7.18 +pkgver=1.7.24 _ver=${pkgver/_/-} pkgrel=0 pkgdesc="A compatibility layer for running Windows programs" @@ -54,9 +54,9 @@ package() { "$pkgdir"/usr/bin/wine } -md5sums="b13c19ef69a99f2aa6c0b3fd08ae8d90 wine-1.7.18.tar.bz2 -00e663cb263cc8cf1e93704ce5019cb7 musl-fix.patch" -sha256sums="dab6d12e620e2097a6838a3f6928f3b2ca3aab0b70521b53107ee1998303d378 wine-1.7.18.tar.bz2 -0d8da319944de067f716b3f7d09239682c917e51b4864bc1bbb27075afb0e4b7 musl-fix.patch" -sha512sums="059f60318508f158cceef029c111c2b11bdf334def95aa96361163358ad7632f87fe0d1d9a05060a5b76ddcb367d8490fd31a1b512ecf7cd01f7be82a8ff8677 wine-1.7.18.tar.bz2 -3df740201ea8105546e56b9e79843d12cc678aa89ad2a84283210dabab0b8b8357baa96266773bcfa1b5434c11b8fec014c51778278daad45ccffcede3f4e9c4 musl-fix.patch" +md5sums="e66e0e8839dcfb562ae52e6a62e923e6 wine-1.7.24.tar.bz2 +4622990a436f3264baf8cf3fc6e809aa musl-fix.patch" +sha256sums="5e9a9f250b6eb703cdc13c6dcfe025958dadddfdd3f8e683f46c2d642b5ec749 wine-1.7.24.tar.bz2 +940a2fd5cf9e0de06e82a6a1b92043b4dc26afa593da1483fd3b56a0406893a2 musl-fix.patch" +sha512sums="ce080325f4406954f67d78612eb6d1eb23b2e72f137ba2b5e6c300660f9b91711e8f5573109b5292d6bed9484448fd7282c7cf9e87e6753ab37c184e5b1e8b17 wine-1.7.24.tar.bz2 +9b8ebfbc21132ed61ef6a410a0d4c1e0b75f8cfbf81ea70d44c5aed30ca6a5215b6ed7953d684feffe9fc6e26615056aa40e952de4ab485b48f3d19921db3e1e musl-fix.patch" diff --git a/main/wine/musl-fix.patch b/main/wine/musl-fix.patch index 35aded54e5..95de951683 100644 --- a/main/wine/musl-fix.patch +++ b/main/wine/musl-fix.patch @@ -1,15 +1,3 @@ ---- 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 @@ @@ -20,17 +8,6 @@ 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 @@ @@ -41,3 +18,14 @@ #include "object.h" struct fd; +--- ./dlls/ws2_32/socket.c.orig ++++ ./dlls/ws2_32/socket.c +@@ -100,7 +100,7 @@ + + #ifdef HAVE_NETIPX_IPX_H + # include <netipx/ipx.h> +-#elif defined(HAVE_LINUX_IPX_H) ++#elif defined(HAVE_LINUX_IPX_H) && defined(__GLIBC__) + # ifdef HAVE_ASM_TYPES_H + # include <asm/types.h> + # endif |