commit 62bd6e9a463542a3b1e664eebfcbd38a85cf90bb
Author: Jan Rękorajski <[email protected]>
Date: Thu Jun 13 13:11:50 2013 +0200
- fix building with new gnutls
wine-gnutls.patch | 22 ++++++++++++++++++++++
wine.spec | 2 ++
2 files changed, 24 insertions(+)
---
diff --git a/wine.spec b/wine.spec
index 8705786..5a10e78 100644
--- a/wine.spec
+++ b/wine.spec
@@ -50,6 +50,7 @@ Patch4: %{name}-disable-valgrind.patch
Patch5: %{name}-ca_certificates.patch
Patch6: %{name}-manpaths.patch
Patch7: desktop.patch
+Patch8: wine-gnutls.patch
URL: http://www.winehq.org/
BuildRequires: OpenAL-devel >= 1.1
BuildRequires: OpenGL-GLU-devel
@@ -267,6 +268,7 @@ Sterownik ALSA dla implementacji mm.dll (systemu
multimediów) w Wine.
%patch5 -p1
%patch6 -p1
%patch7 -p1
+%patch8 -p1
%build
icotool -x --width=32 --height=32 --bit-depth=32 -o .
dlls/user32/resources/oic_winlogo.ico
diff --git a/wine-gnutls.patch b/wine-gnutls.patch
new file mode 100644
index 0000000..cd09237
--- /dev/null
+++ b/wine-gnutls.patch
@@ -0,0 +1,22 @@
+--- wine-1.4.1/configure.ac~ 2013-06-13 12:53:42.143966172 +0200
++++ wine-1.4.1/configure.ac 2013-06-13 12:57:28.566381773 +0200
+@@ -1267,7 +1267,8 @@
+ CPPFLAGS="$CPPFLAGS $ac_gnutls_cflags"
+ fi
+ AC_CHECK_HEADER(gnutls/gnutls.h,
+- [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <gnutls/gnutls.h>]],
[[static typeof(gnutls_mac_get_key_size) *func; if (func) return 0;]])],
++ [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <gnutls/gnutls.h>
++#include <gnutls/crypto.h>]], [[static typeof(gnutls_mac_get_key_size) *func;
if (func) return 0;]])],
+ [WINE_CHECK_SONAME(gnutls,gnutls_global_init,
+
[AC_SUBST(GNUTLSINCL,"$ac_gnutls_cflags")],,[$ac_gnutls_libs])])])
+ CPPFLAGS="$ac_save_CPPFLAGS"
+--- wine-1.4.1/dlls/secur32/schannel_gnutls.c~ 2012-06-15 21:17:00.000000000
+0200
++++ wine-1.4.1/dlls/secur32/schannel_gnutls.c 2013-06-13 13:11:32.414575193
+0200
+@@ -25,6 +25,7 @@
+ #include <stdarg.h>
+ #ifdef SONAME_LIBGNUTLS
+ #include <gnutls/gnutls.h>
++#include <gnutls/crypto.h>
+ #endif
+
+ #include "windef.h"
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/wine.git/commitdiff/62bd6e9a463542a3b1e664eebfcbd38a85cf90bb
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
