From 4d5f020d4437fe56e3033abbfa8608a4a0084422 Mon Sep 17 00:00:00 2001
From: Sebastian Lackner <sebastian@fds-team.de>
Date: Tue, 13 Jan 2015 07:54:16 +0100
Subject: [PATCH] Add support for patchinstall.sh parameters '--no-patchlist'
 and '--no-autoconf'.

---
 debian/changelog                |  1 +
 debian/tools/patchinstall.sh.in | 31 ++++++++++++++++++++-----------
 patches/patchinstall.sh         | 31 ++++++++++++++++++++-----------
 3 files changed, 41 insertions(+), 22 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a3063351..42c353a4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,5 @@
 wine-staging (1.7.35) UNRELEASED; urgency=low
+  * Add support for patchinstall.sh parameters '--no-patchlist' and '--no-autoconf'.
   * Add support for Gentoo epatch backend to patchinstall.sh.
   * Added patch to implement support for DDS file format in D3DXSaveTextureToFileInMemory.
   * Added patch to avoid appending duplicate NULL character when importing keys with regedit.
diff --git a/debian/tools/patchinstall.sh.in b/debian/tools/patchinstall.sh.in
index cc710a4c..a5a580c7 100644
--- a/debian/tools/patchinstall.sh.in
+++ b/debian/tools/patchinstall.sh.in
@@ -31,10 +31,11 @@ usage()
 	echo ""
 	echo "Configuration:"
 	echo "  DESTDIR=path         Specify the path to the wine source tree"
-	echo "  --all          		 Select all patches"
-	echo "  --help    	     	 Display this help and exit"
-	echo "  --no-autoupdate  	 Do not apply patchlist and don't auto-update files"
-	echo "  -W patchset        	 Exclude a specific patchset"
+	echo "  --all                Select all patches"
+	echo "  --help               Display this help and exit"
+	echo "  --no-patchlist       Do not apply patchlist (needed for 'wine --patches')"
+	echo "  --no-autoconf        Do not run autoreconf and tools/make_requests"
+	echo "  -W patchset          Exclude a specific patchset"
 	echo ""
 	echo "Backends:"
 	echo "  --backend=patch      Use regular 'patch' utility to apply patches (default)"
@@ -56,7 +57,8 @@ abort()
 
 # Default settings
 patch_enable_all 0
-enable_autoupdate=1
+enable_patchlist=1
+enable_autoconf=1
 patchlist="/dev/null"
 backend="patch"
 enable=1
@@ -97,8 +99,13 @@ while test "$#" -gt 0; do
 			exit 0
 			;;
 
-		--no-autoupdate)
-			enable_autoupdate=0
+		--no-patchlist)
+			enable_patchlist=0
+			shift
+			;;
+
+		--no-autoconf)
+			enable_autoconf=0
 			shift
 			;;
 
@@ -172,7 +179,8 @@ elif test "$backend" = "stg"; then
 
 	# Only import the regular patches, no autogenerated ones -
 	# moreover, don't run autoreconf or ./tools/make_requests.
-	enable_autoupdate=0
+	enable_patchlist=0
+	enable_autoconf=0
 
 	patch_apply ()
 	{{
@@ -209,7 +217,7 @@ elif test ! -f ./patchinstall.sh; then
 fi
 
 # If autoupdate is enabled then create a tempfile to keep track of all patches
-if test "$enable_autoupdate" -eq 1; then
+if test "$enable_patchlist" -eq 1; then
 	patchlist=$(mktemp)
 	if test ! -f "$patchlist"; then
 		abort "Unable to create temporary file for patchlist."
@@ -220,7 +228,7 @@ fi
 {patch_apply}
 
 
-if test "$enable_autoupdate" -eq 1; then
+if test "$enable_patchlist" -eq 1; then
 
 	# Generate a temporary patch containing the patchlist and apply it
 	patch_data=$(cat "$patchlist" | sort)
@@ -299,8 +307,9 @@ EOF
 		patch_apply "$patchlist"
 	fi
 	rm "$patchlist"
+fi
 
-	# Other autogenerated changes
+if test "$enable_autoconf" -eq 1; then
 	if ! (cd "$DESTDIR" && autoreconf -f); then
 		abort "'autoreconf -f' failed."
 	fi
diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh
index 6c433d1b..d86804dd 100755
--- a/patches/patchinstall.sh
+++ b/patches/patchinstall.sh
@@ -31,10 +31,11 @@ usage()
 	echo ""
 	echo "Configuration:"
 	echo "  DESTDIR=path         Specify the path to the wine source tree"
-	echo "  --all          		 Select all patches"
-	echo "  --help    	     	 Display this help and exit"
-	echo "  --no-autoupdate  	 Do not apply patchlist and don't auto-update files"
-	echo "  -W patchset        	 Exclude a specific patchset"
+	echo "  --all                Select all patches"
+	echo "  --help               Display this help and exit"
+	echo "  --no-patchlist       Do not apply patchlist (needed for 'wine --patches')"
+	echo "  --no-autoconf        Do not run autoreconf and tools/make_requests"
+	echo "  -W patchset          Exclude a specific patchset"
 	echo ""
 	echo "Backends:"
 	echo "  --backend=patch      Use regular 'patch' utility to apply patches (default)"
@@ -606,7 +607,8 @@ patch_enable ()
 
 # Default settings
 patch_enable_all 0
-enable_autoupdate=1
+enable_patchlist=1
+enable_autoconf=1
 patchlist="/dev/null"
 backend="patch"
 enable=1
@@ -647,8 +649,13 @@ while test "$#" -gt 0; do
 			exit 0
 			;;
 
-		--no-autoupdate)
-			enable_autoupdate=0
+		--no-patchlist)
+			enable_patchlist=0
+			shift
+			;;
+
+		--no-autoconf)
+			enable_autoconf=0
 			shift
 			;;
 
@@ -722,7 +729,8 @@ elif test "$backend" = "stg"; then
 
 	# Only import the regular patches, no autogenerated ones -
 	# moreover, don't run autoreconf or ./tools/make_requests.
-	enable_autoupdate=0
+	enable_patchlist=0
+	enable_autoconf=0
 
 	patch_apply ()
 	{
@@ -860,7 +868,7 @@ elif test ! -f ./patchinstall.sh; then
 fi
 
 # If autoupdate is enabled then create a tempfile to keep track of all patches
-if test "$enable_autoupdate" -eq 1; then
+if test "$enable_patchlist" -eq 1; then
 	patchlist=$(mktemp)
 	if test ! -f "$patchlist"; then
 		abort "Unable to create temporary file for patchlist."
@@ -3546,7 +3554,7 @@ if test "$enable_wtsapi32_EnumerateProcesses" -eq 1; then
 fi
 
 
-if test "$enable_autoupdate" -eq 1; then
+if test "$enable_patchlist" -eq 1; then
 
 	# Generate a temporary patch containing the patchlist and apply it
 	patch_data=$(cat "$patchlist" | sort)
@@ -3625,8 +3633,9 @@ EOF
 		patch_apply "$patchlist"
 	fi
 	rm "$patchlist"
+fi
 
-	# Other autogenerated changes
+if test "$enable_autoconf" -eq 1; then
 	if ! (cd "$DESTDIR" && autoreconf -f); then
 		abort "'autoreconf -f' failed."
 	fi