[packages/wine] - update patches

[cactus]

commit f67e874d49e231e8c602a7208b1ab9fdec1e9ee7
Author: Bartlomiej Zimon <uzi18 at o2.pl>
Date:   Thu Mar 3 18:19:38 2022 +0000

    - update patches

 wine-ca_certificates.patch  |  9 ++++-----
 wine-disable-valgrind.patch | 19 ++++++++++---------
 wine-makedep.patch          | 18 +++++++++---------
 wine.spec                   |  3 +--
 4 files changed, 24 insertions(+), 25 deletions(-)
---
diff --git a/wine.spec b/wine.spec
index 3a84138..fa339e5 100644
--- a/wine.spec
+++ b/wine.spec
@@ -265,9 +265,8 @@ Sterownik ALSA dla implementacji mm.dll (systemu multimediów) w Wine.
 
 %prep
 %setup -q
-%patch0 -p1
+#%patch0 -p1
 %patch1 -p1
-%patch2 -p1
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
diff --git a/wine-ca_certificates.patch b/wine-ca_certificates.patch
index 19b70c9..e59ba55 100644
--- a/wine-ca_certificates.patch
+++ b/wine-ca_certificates.patch
@@ -1,11 +1,10 @@
-diff -dur wine-1.8.orig/dlls/crypt32/rootstore.c wine-1.8/dlls/crypt32/rootstore.c
---- wine-1.8.orig/dlls/crypt32/rootstore.c	2015-12-19 16:57:44.000000000 +0100
-+++ wine-1.8/dlls/crypt32/rootstore.c	2016-01-09 18:19:17.673921302 +0100
-@@ -490,6 +490,7 @@
+--- wine-6.0.2/dlls/crypt32/unixlib.c.orig	2021-10-26 16:38:44.000000000 +0200
++++ wine-6.0.2/dlls/crypt32/unixlib.c	2022-01-09 21:45:16.898023272 +0100
+@@ -573,6 +573,7 @@
   "/usr/local/share/certs/",
   "/etc/sfw/openssl/certs",
   "/etc/security/cacerts",  /* Android */
 + "/etc/certs/ca-certificates.crt",
  };
  
- static const BYTE authenticode[] = {
+ static void load_root_certs(void)
diff --git a/wine-disable-valgrind.patch b/wine-disable-valgrind.patch
index d291a26..d9e5ff9 100644
--- a/wine-disable-valgrind.patch
+++ b/wine-disable-valgrind.patch
@@ -1,12 +1,13 @@
-diff -ruN wine-0.9.51./configure.ac wine-0.9.51/configure.ac
---- wine-0.9.51./configure.ac	2007-12-16 20:15:52.000000000 +0100
-+++ wine-0.9.51/configure.ac	2007-12-16 20:31:42.099007759 +0100
-@@ -377,8 +377,6 @@
- 	termios.h \
- 	unistd.h \
- 	utime.h \
+--- wine-7.0/configure.ac.orig	2022-01-09 21:37:56.595170351 +0100
++++ wine-7.0/configure.ac	2022-01-09 21:39:13.939184716 +0100
+@@ -502,9 +502,7 @@
+ 	sys/utsname.h \
+ 	sys/vnode.h \
+ 	syscall.h \
+-	utime.h \
 -	valgrind/memcheck.h \
--	valgrind/valgrind.h \
- 	zlib.h
+-	valgrind/valgrind.h
++	utime.h
  )
+ WINE_HEADER_MAJOR()
  AC_HEADER_STAT()
diff --git a/wine-makedep.patch b/wine-makedep.patch
index 6b8f86b..c5575d2 100644
--- a/wine-makedep.patch
+++ b/wine-makedep.patch
@@ -1,11 +1,11 @@
---- wine-20030709/tools/makedep.c.wiget	2003-07-11 10:48:42.000000000 +0200
-+++ wine-20030709/tools/makedep.c	2003-07-11 10:49:43.000000000 +0200
-@@ -511,6 +511,8 @@
-         if (opt[2]) Separator = opt + 2;
-         else Separator = NULL;
+--- wine-6.0.2/tools/makedep.c.orig	2022-01-09 21:05:19.110310244 +0100
++++ wine-6.0.2/tools/makedep.c	2022-01-09 21:13:06.377871601 +0100
+@@ -4355,6 +4355,8 @@
+     case 'S':
+         silent_rules = 1;
          break;
-+	case 'p': /* ignore -pthread */
-+		break;
++    case 'p': /* ignore -pthread */
++	break;
      default:
-         fprintf( stderr, "Unknown option '%s'\n", opt );
-         fprintf( stderr, Usage, ProgramName );
+         fprintf( stderr, "Unknown option '%s'\n%s", opt, Usage );
+         exit(1);
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/wine.git/commitdiff/3092e49ca17582a4bb46d104f045c9d062624f1b