Merge pull request #25 from gvm/wine-for-upload:rosa2016.1

Update wine to 3.4

.abf.yml

@@ -1,7 +1,10 @@
 removed_sources:
   wine-2.18.tar.xz: f7d7bfd413358ef2473cd28c5fe936a095c92ebf
-  wine-staging-2.18.tar.gz: 461a1d166c33ff9a9078500287ce9326bea044fc
-sources:
   wine-2.21.tar.xz: 8a00efdac4554ac2d3a023cc4098202dd8fdebad
-  wine-2.21.tar.xz.sign: 25d6e2340841339f22460a5a33d00a03dca8c487
+  wine-staging-2.18.tar.gz: 461a1d166c33ff9a9078500287ce9326bea044fc
   wine-staging-2.21.tar.gz: 194c492e7dc942d9477b36cd55f94c86bae0c53d
+sources:
+  wine-2.21.tar.xz.sign: 25d6e2340841339f22460a5a33d00a03dca8c487
+  wine-3.4.tar.xz: 929e452172da42c3bf2608e8d879f68e61695541
+  wine-3.4.tar.xz.sign: 05104b751b74b9fb1c5f9680d2482f2b91bb1bd1
+  wine-staging-3.4.tar.gz: 0782414980dc1c0938e96b1ffe983065e1fb4c28

staging-helper.patch

@@ -1,7 +1,7 @@
-From bdd4da93462b54c97bb8b52a28744776ecb76b6c Mon Sep 17 00:00:00 2001
+From ff5f6994f364f59320ac6fb146238cc6ed6f744d Mon Sep 17 00:00:00 2001
 From: Nick Sarnie <commendsarnex@gmail.com>
-Date: Sat, 25 Nov 2017 17:30:26 -0500
-Subject: [PATCH] Staging helper
+Date: Sat, 17 Mar 2018 19:08:26 -0400
+Subject: [PATCH] Staging Helper
 
 Signed-off-by: Nick Sarnie <commendsarnex@gmail.com>
 ---
@@ -12,10 +12,10 @@ Signed-off-by: Nick Sarnie <commendsarnex@gmail.com>
  4 files changed, 33 insertions(+)
 
 diff --git a/dlls/ntdll/loadorder.c b/dlls/ntdll/loadorder.c
-index 3668d73643..24e8a6f109 100644
+index d05d7b321e..7945d2a599 100644
 --- a/dlls/ntdll/loadorder.c
 +++ b/dlls/ntdll/loadorder.c
-@@ -633,8 +633,10 @@ WCHAR* get_redirect( const WCHAR *app_name, const WCHAR *path, BYTE *buffer, ULO
+@@ -629,8 +629,10 @@ WCHAR* get_redirect( const WCHAR *app_name, const WCHAR *path, BYTE *buffer, ULO
          goto done;
  
      /* then module basename without '*' (only if explicit path) */
@@ -119,5 +119,5 @@ index 314e9858ea..596dc27447 100644
  
  LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
 -- 
-2.15.0
+2.16.2
 

wine-d3d9.patch

@@ -1,6 +1,6 @@
-From 1edb10f8c73c20143f74e84aa13af0169a21af1c Mon Sep 17 00:00:00 2001
+From aa019ab10a175cbbaacf00bd43270b79122685e6 Mon Sep 17 00:00:00 2001
 From: Nick Sarnie <commendsarnex@gmail.com>
-Date: Sat, 25 Nov 2017 17:30:54 -0500
+Date: Sat, 17 Mar 2018 19:14:34 -0400
 Subject: [PATCH] Wine D3D9
 
 Signed-off-by: Nick Sarnie <commendsarnex@gmail.com>
@@ -41,10 +41,10 @@ Signed-off-by: Nick Sarnie <commendsarnex@gmail.com>
  create mode 100644 dlls/d3d9-nine/wndproc.h
 
 diff --git a/configure.ac b/configure.ac
-index 0e1a0a1ee7..90a578a220 100644
+index 04b79d2876..595b17f210 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -67,6 +67,14 @@ AC_ARG_WITH(openal,    AS_HELP_STRING([--without-openal],[do not use OpenAL]),
+@@ -69,6 +69,14 @@ AC_ARG_WITH(openal,    AS_HELP_STRING([--without-openal],[do not use OpenAL]),
  AC_ARG_WITH(opencl,    AS_HELP_STRING([--without-opencl],[do not use OpenCL]),
              [if test "x$withval" = "xno"; then ac_cv_header_CL_cl_h=no; ac_cv_header_OpenCL_opencl_h=no; fi])
  AC_ARG_WITH(opengl,    AS_HELP_STRING([--without-opengl],[do not use OpenGL]))
@@ -59,7 +59,7 @@ index 0e1a0a1ee7..90a578a220 100644
  AC_ARG_WITH(osmesa,     AS_HELP_STRING([--without-osmesa],[do not use the OSMesa library]))
  AC_ARG_WITH(oss,       AS_HELP_STRING([--without-oss],[do not use the OSS sound support]))
  AC_ARG_WITH(pcap,      AS_HELP_STRING([--without-pcap],[do not use the Packet Capture library]),
-@@ -396,6 +404,8 @@ AC_CHECK_LIB(ossaudio,_oss_ioctl)
+@@ -415,6 +423,8 @@ AC_CHECK_LIB(ossaudio,_oss_ioctl)
  
  AC_SUBST(OPENGL_LIBS,"")
  
@@ -68,7 +68,7 @@ index 0e1a0a1ee7..90a578a220 100644
  dnl **** Check for header files ****
  
  AC_SYS_LARGEFILE()
-@@ -1253,6 +1263,183 @@ OpenGL and Direct3D won't be supported.])
+@@ -1261,6 +1271,183 @@ OpenGL and Direct3D won't be supported.])
      WINE_NOTICE_WITH(va,[test "x$ac_cv_lib_soname_va" = "x" -o "x$ac_cv_lib_soname_va_x11" = "x" -o "x$ac_cv_lib_soname_va_drm" = "x"],
                       [libva ${notice_platform}development files not found, GPU video acceleration won't be supported.])
  
@@ -252,14 +252,14 @@ index 0e1a0a1ee7..90a578a220 100644
      CPPFLAGS="$ac_save_CPPFLAGS"
  else
      X_CFLAGS=""
-@@ -3133,6 +3320,7 @@ WINE_CONFIG_DLL(d3d8,,[implib])
- WINE_CONFIG_TEST(dlls/d3d8/tests)
- WINE_CONFIG_DLL(d3d9,,[implib])
- WINE_CONFIG_TEST(dlls/d3d9/tests)
-+WINE_CONFIG_DLL(d3d9-nine,,[implib])
- WINE_CONFIG_DLL(d3dcompiler_33)
- WINE_CONFIG_DLL(d3dcompiler_34)
- WINE_CONFIG_DLL(d3dcompiler_35)
+@@ -3199,6 +3386,7 @@ WINE_CONFIG_MAKEFILE(dlls/d3d8)
+ WINE_CONFIG_MAKEFILE(dlls/d3d8/tests)
+ WINE_CONFIG_MAKEFILE(dlls/d3d9)
+ WINE_CONFIG_MAKEFILE(dlls/d3d9/tests)
++WINE_CONFIG_MAKEFILE(dlls/d3d9-nine)
+ WINE_CONFIG_MAKEFILE(dlls/d3dcompiler_33)
+ WINE_CONFIG_MAKEFILE(dlls/d3dcompiler_34)
+ WINE_CONFIG_MAKEFILE(dlls/d3dcompiler_35)
 diff --git a/dlls/d3d9-nine/Makefile.in b/dlls/d3d9-nine/Makefile.in
 new file mode 100644
 index 0000000000..c6df8d7dbe
@@ -5781,5 +5781,5 @@ index 0000000000..15f26d491a
 +
 +#endif
 -- 
-2.15.0
+2.16.2
 

wine.spec

@@ -19,12 +19,12 @@
 # Switch between systemd-binfmt and sysvinit support
 %bcond_without systemd
 
-%define winetricks_ver 20171018
+%define winetricks_ver 20180217
 
 Summary:	WINE Is Not An Emulator - runs MS Windows programs
 Name:		wine
-Version:	2.21
-Release:	2
+Version:	3.4
+Release:	1
 Epoch:		2
 License:	LGPLv2+
 Group:		Emulators
@@ -133,7 +133,6 @@ Conflicts:	%{wine} < 2:2.21-2
 %description binfmt
 Wine is a program which allows running Microsoft Windows programs
 (including DOS, Windows 3.x and Win32 executables) on Unix.
-
 This package provides support for launching Windows executables directly.
 
 %files binfmt