commit 06edb407f1194d95d6925cf1c99010768ef09ddc Author: Antti Nykanen <aon@iki.fi> Date: Tue Jun 3 04:38:52 2008 +0300 wine: updated to 1.0-rc3 Thanks to tilman for providing the patch. diff --git a/wine/.footprint b/wine/.footprint index 8bd14e6..6dc140d 100644 --- a/wine/.footprint +++ b/wine/.footprint @@ -29,7 +29,6 @@ lrwxrwxrwx root/root usr/bin/wineg++ -> winegcc -rwxr-xr-x root/root usr/bin/wineprefixcreate -rwxr-xr-x root/root usr/bin/wineserver -rwxr-xr-x root/root usr/bin/wineshelllink --rwxr-xr-x root/root usr/bin/winhelp -rwxr-xr-x root/root usr/bin/wmc -rwxr-xr-x root/root usr/bin/wrc drwxr-xr-x root/root usr/include/ @@ -1011,7 +1010,8 @@ drwxr-xr-x root/root usr/lib/wine/ -rwxr-xr-x root/root usr/lib/wine/winex11.drv.so -rw-r--r-- root/root usr/lib/wine/wing.dll16 -rwxr-xr-x root/root usr/lib/wine/wing32.dll.so --rwxr-xr-x root/root usr/lib/wine/winhelp.exe.so +-rw-r--r-- root/root usr/lib/wine/winhelp.exe16 +-rwxr-xr-x root/root usr/lib/wine/winhlp32.exe.so -rwxr-xr-x root/root usr/lib/wine/winhttp.dll.so -rwxr-xr-x root/root usr/lib/wine/wininet.dll.so -rwxr-xr-x root/root usr/lib/wine/winmm.dll.so diff --git a/wine/.md5sum b/wine/.md5sum index b693f55..6e3ddd2 100644 --- a/wine/.md5sum +++ b/wine/.md5sum @@ -1 +1,2 @@ -2aa76ed20a327aa10e3ef07301c733fa wine-1.0-rc1.tar.bz2 +07f4db15902c6e558c60146beca22516 wine-1.0-rc3-openssl.diff +bcef2a24ed6ffaa4bb14a491e3daff31 wine-1.0-rc3.tar.bz2 diff --git a/wine/Pkgfile b/wine/Pkgfile index 16c6cdc..2526fb3 100644 --- a/wine/Pkgfile +++ b/wine/Pkgfile @@ -5,13 +5,15 @@ # Depends on: fontforge name=wine -version=1.0-rc1 +version=1.0-rc3 release=1 source=(http://ibiblio.org/pub/linux/system/emulators/wine/wine-$version.tar.bz2 + $name-$version-openssl.diff ) build() { cd $name-$version + patch -p1 -i $SRC/$name-$version-openssl.diff ./configure \ --prefix=/usr \ --mandir=$PKG/usr/man \ diff --git a/wine/wine-1.0-rc3-openssl.diff b/wine/wine-1.0-rc3-openssl.diff new file mode 100644 index 0000000..d733507 --- /dev/null +++ b/wine/wine-1.0-rc3-openssl.diff @@ -0,0 +1,78 @@ +commit 7c616799894faa48ee3277bc276a39bed55780e0 +Author: Alexandre Julliard <julliard@winehq.org> +Date: Mon Jun 2 12:14:37 2008 +0200 + + wininet: Include openssl/ssl.h before Windows headers. + +diff --git a/dlls/wininet/internet.h b/dlls/wininet/internet.h +index 2645686..43b8d8e 100644 +--- a/dlls/wininet/internet.h ++++ b/dlls/wininet/internet.h +@@ -38,18 +38,6 @@ + # include <sys/types.h> + # include <netinet/in.h> + #endif +-#ifdef HAVE_OPENSSL_SSL_H +-#define DSA __ssl_DSA /* avoid conflict with commctrl.h */ +-#undef FAR +-/* avoid conflict with wincrypt.h */ +-#undef PKCS7_SIGNER_INFO +-#undef X509_NAME +-#undef X509_CERT_PAIR +-# include <openssl/ssl.h> +-#undef FAR +-#define FAR do_not_use_this_in_wine +-#undef DSA +-#endif + #ifdef HAVE_SYS_SOCKET_H + # include <sys/socket.h> + #endif +@@ -69,12 +57,10 @@ typedef struct + { + BOOL useSSL; + int socketFD; +-#ifdef HAVE_OPENSSL_SSL_H +- SSL *ssl_s; ++ void *ssl_s; + char *peek_msg; + char *peek_msg_mem; + size_t peek_len; +-#endif + } WININET_NETCONNECTION; + + static inline LPWSTR WININET_strdupW( LPCWSTR str ) +diff --git a/dlls/wininet/netconnection.c b/dlls/wininet/netconnection.c +index 9cd7917..f55fbf2 100644 +--- a/dlls/wininet/netconnection.c ++++ b/dlls/wininet/netconnection.c +@@ -23,6 +23,7 @@ + #include "config.h" + #include "wine/port.h" + ++#include <sys/types.h> + #ifdef HAVE_POLL_H + #include <poll.h> + #endif +@@ -42,6 +43,22 @@ + #ifdef HAVE_SYS_IOCTL_H + # include <sys/ioctl.h> + #endif ++#include <time.h> ++#ifdef HAVE_NETDB_H ++# include <netdb.h> ++#endif ++#ifdef HAVE_NETINET_IN_H ++# include <netinet/in.h> ++#endif ++#ifdef HAVE_OPENSSL_SSL_H ++# include <openssl/ssl.h> ++#undef FAR ++#undef DSA ++#endif ++#ifdef HAVE_SYS_SOCKET_H ++# include <sys/socket.h> ++#endif ++ + #include <stdarg.h> + #include <stdlib.h> + #include <string.h>