Rebase against 57ca6b90bb7337cb90465b3bf1f147e3d2564f2e.

patches/patchinstall.sh

@@ -52,13 +52,13 @@ usage()
 # Get the upstream commit sha
 upstream_commit()
 {
-	echo "cf5616ffbb39df7ad3ac0a41e55777ab6c1abab9"
+	echo "57ca6b90bb7337cb90465b3bf1f147e3d2564f2e"
 }
 
 # Show version information
 version()
 {
-	echo "Wine Staging 2.19"
+	echo "Wine Staging 2.20 (unreleased)"
 	echo "Copyright (C) 2014-2017 the Wine Staging project authors."
 	echo ""
 	echo "Patchset to be applied on upstream Wine:"
@@ -351,7 +351,6 @@ patch_enable_all ()
 	enable_server_Signal_Thread="$1"
 	enable_server_Stored_ACLs="$1"
 	enable_server_Timestamp_Compat="$1"
-	enable_server_build_shared_mapping="$1"
 	enable_server_device_manager_destroy="$1"
 	enable_server_free_async_queue="$1"
 	enable_server_send_hardware_message="$1"
@@ -1337,9 +1336,6 @@ patch_enable ()
 		server-Timestamp_Compat)
 			enable_server_Timestamp_Compat="$2"
 			;;
-		server-build_shared_mapping)
-			enable_server_build_shared_mapping="$2"
-			;;
 		server-device_manager_destroy)
 			enable_server_device_manager_destroy="$2"
 			;;
@@ -7976,18 +7972,6 @@ if test "$enable_server_Timestamp_Compat" -eq 1; then
 	) >> "$patchlist"
 fi
 
-# Patchset server-build_shared_mapping
-# |
-# | Modified files:
-# |   *	server/mapping.c
-# |
-if test "$enable_server_build_shared_mapping" -eq 1; then
-	patch_apply server-build_shared_mapping/0001-server-Fix-double-free-in-build_shared_mapping.patch
-	(
-		printf '%s\n' '+    { "Sebastian Lackner", "server: Fix double-free in build_shared_mapping.", 1 },';
-	) >> "$patchlist"
-fi
-
 # Patchset server-device_manager_destroy
 # |
 # | Modified files: