Rebase against 2294d3ba456921e83fa5970e0e62855614c9c30c.

patches/configure-Crosscompiling/0001-configure.ac-Do-not-assume-gcc-strength-bug-when-cro.patch

@@ -1,25 +0,0 @@
-From 07bde54374454532f5808b5f1219a6bf2b17d1a9 Mon Sep 17 00:00:00 2001
-From: Sebastian Lackner <sebastian@fds-team.de>
-Date: Tue, 14 Jul 2015 22:32:55 +0200
-Subject: configure.ac: Do not assume gcc strength bug when crosscompiling.
-
----
- configure.ac | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index 3eaec29..9aab130 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -1797,7 +1797,7 @@ then
-   for(i=0; i<4 - 1; i++) L[[i]] = L[[i + 1]];
-   L[[i]] = 4;
-   return (Array[[1]] != -2 || L[[2]] != 3)]])],
--    [ac_cv_c_gcc_strength_bug="no"],[ac_cv_c_gcc_strength_bug="yes"],[ac_cv_c_gcc_strength_bug="yes"]) )
-+    [ac_cv_c_gcc_strength_bug="no"],[ac_cv_c_gcc_strength_bug="yes"],[ac_cv_c_gcc_strength_bug="no"]) )
-   if test "$ac_cv_c_gcc_strength_bug" = "yes"
-   then
-     EXTRACFLAGS="$EXTRACFLAGS -fno-strength-reduce"
--- 
-2.4.5
-

patches/patchinstall.sh

@@ -55,7 +55,7 @@ version()
 	echo "Copyright (C) 2014-2015 the Wine Staging project authors."
 	echo ""
 	echo "Patchset to be applied on upstream Wine:"
-	echo "  commit 22f28d2923811b85024f63ce43e41966a864ecd0"
+	echo "  commit 2294d3ba456921e83fa5970e0e62855614c9c30c"
 	echo ""
 }
 
@@ -84,7 +84,6 @@ patch_enable_all ()
 	enable_combase_String="$1"
 	enable_comctl32_LoadIconMetric="$1"
 	enable_configure_Absolute_RPATH="$1"
-	enable_configure_Crosscompiling="$1"
 	enable_crypt32_CMS_Certificates="$1"
 	enable_d3d9_DesktopWindow="$1"
 	enable_d3d9_Skip_Tests="$1"
@@ -212,7 +211,6 @@ patch_enable_all ()
 	enable_shell32_Icons="$1"
 	enable_shell32_Placeholder_Icons="$1"
 	enable_shell32_Progress_Dialog="$1"
-	enable_shell32_Quoted_ShellExecute="$1"
 	enable_shell32_RunDLL_CallEntry16="$1"
 	enable_shell32_Run_Dialog="$1"
 	enable_shell32_SHCreateSessionKey="$1"
@@ -320,9 +318,6 @@ patch_enable ()
 		configure-Absolute_RPATH)
 			enable_configure_Absolute_RPATH="$2"
 			;;
-		configure-Crosscompiling)
-			enable_configure_Crosscompiling="$2"
-			;;
 		crypt32-CMS_Certificates)
 			enable_crypt32_CMS_Certificates="$2"
 			;;
@@ -704,9 +699,6 @@ patch_enable ()
 		shell32-Progress_Dialog)
 			enable_shell32_Progress_Dialog="$2"
 			;;
-		shell32-Quoted_ShellExecute)
-			enable_shell32_Quoted_ShellExecute="$2"
-			;;
 		shell32-RunDLL_CallEntry16)
 			enable_shell32_RunDLL_CallEntry16="$2"
 			;;
@@ -2059,18 +2051,6 @@ if test "$enable_configure_Absolute_RPATH" -eq 1; then
 	) >> "$patchlist"
 fi
 
-# Patchset configure-Crosscompiling
-# |
-# | Modified files:
-# |   *	configure.ac
-# |
-if test "$enable_configure_Crosscompiling" -eq 1; then
-	patch_apply configure-Crosscompiling/0001-configure.ac-Do-not-assume-gcc-strength-bug-when-cro.patch
-	(
-		echo '+    { "Sebastian Lackner", "configure.ac: Do not assume gcc strength bug when crosscompiling.", 1 },';
-	) >> "$patchlist"
-fi
-
 # Patchset crypt32-CMS_Certificates
 # |
 # | This patchset fixes the following Wine bugs:
@@ -4241,21 +4221,6 @@ if test "$enable_shell32_Progress_Dialog" -eq 1; then
 	) >> "$patchlist"
 fi
 
-# Patchset shell32-Quoted_ShellExecute
-# |
-# | This patchset fixes the following Wine bugs:
-# |   *	[#19666] Multiple applications start wrong executable if whitespace present in name
-# |
-# | Modified files:
-# |   *	dlls/shell32/shlexec.c, dlls/shell32/tests/shlexec.c
-# |
-if test "$enable_shell32_Quoted_ShellExecute" -eq 1; then
-	patch_apply shell32-Quoted_ShellExecute/0001-shell32-Quote-program-name-in-ShellExecuteEx-if-it-c.patch
-	(
-		echo '+    { "Stefan Leichter", "shell32: Quote program name in ShellExecuteEx if it contains spaces.", 1 },';
-	) >> "$patchlist"
-fi
-
 # Patchset shell32-RunDLL_CallEntry16
 # |
 # | This patchset fixes the following Wine bugs:

patches/shell32-Quoted_ShellExecute/definition

@@ -1 +1,2 @@
 Fixes: [19666] Multiple applications start wrong executable if whitespace present in name
+Disabled: true