From ce847dee6756fe085ffe91c3d5979bf6870e2fd4 Mon Sep 17 00:00:00 2001
From: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Date: Wed, 21 Sep 2022 22:03:35 +0200
Subject: [PATCH] debian/patches/: Drop
 1001_keep-symbol-DumpThreadHandles-if-debugging-is-disabled.patch. Applied
 upstream, but only partially. Add
 1001_amend-DumpThreadHandles-inclusion.patch. Amend missing adjustment in
 thread.h.

---
 ...01_amend-DumpThreadHandles-inclusion.patch | 15 ++++++++
 ...readHandles-if-debugging-is-disabled.patch | 38 -------------------
 debian/patches/series                         |  2 +-
 3 files changed, 16 insertions(+), 39 deletions(-)
 create mode 100644 debian/patches/1001_amend-DumpThreadHandles-inclusion.patch
 delete mode 100644 debian/patches/1001_keep-symbol-DumpThreadHandles-if-debugging-is-disabled.patch

diff --git a/debian/patches/1001_amend-DumpThreadHandles-inclusion.patch b/debian/patches/1001_amend-DumpThreadHandles-inclusion.patch
new file mode 100644
index 0000000..e9e1186
--- /dev/null
+++ b/debian/patches/1001_amend-DumpThreadHandles-inclusion.patch
@@ -0,0 +1,15 @@
+Description: Amend missing header changes as found in d337ea9c16edab254f1ce731d475a50a622886f9.
+Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
+
+--- a/winpr/include/winpr/thread.h
++++ b/winpr/include/winpr/thread.h
+@@ -249,9 +249,7 @@
+ 
+ 	WINPR_API LPSTR* CommandLineToArgvA(LPCSTR lpCmdLine, int* pNumArgs);
+ 
+-#if defined(WITH_DEBUG_THREADS)
+ 	WINPR_API VOID DumpThreadHandles(void);
+-#endif
+ 
+ #ifdef __cplusplus
+ }
diff --git a/debian/patches/1001_keep-symbol-DumpThreadHandles-if-debugging-is-disabled.patch b/debian/patches/1001_keep-symbol-DumpThreadHandles-if-debugging-is-disabled.patch
deleted file mode 100644
index 255bdc9..0000000
--- a/debian/patches/1001_keep-symbol-DumpThreadHandles-if-debugging-is-disabled.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-Description: Keep DumpThreadHandles as a symbol even if WITH_DEBUG_THREADS is OFF.
-Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
-Forwarded: https://github.com/FreeRDP/FreeRDP/pull/7708
-
---- a/winpr/libwinpr/thread/thread.c
-+++ b/winpr/libwinpr/thread/thread.c
-@@ -783,9 +783,9 @@
- 	return TRUE;
- }
- 
--#if defined(WITH_DEBUG_THREADS)
- VOID DumpThreadHandles(void)
- {
-+#if defined(WITH_DEBUG_THREADS)
- 	char** msg;
- 	size_t used, i;
- 	void* stack = winpr_backtrace(20);
-@@ -846,6 +846,6 @@
- 	}
- 
- 	WLog_DBG(TAG, "---------------- End Dumping thread handles -------------");
--}
- #endif
-+}
- #endif
---- a/winpr/include/winpr/thread.h
-+++ b/winpr/include/winpr/thread.h
-@@ -248,10 +248,7 @@
- 	/* CommandLineToArgvA is not present in the original Windows API, WinPR always exports it */
- 
- 	WINPR_API LPSTR* CommandLineToArgvA(LPCSTR lpCmdLine, int* pNumArgs);
--
--#if defined(WITH_DEBUG_THREADS)
- 	WINPR_API VOID DumpThreadHandles(void);
--#endif
- 
- #ifdef __cplusplus
- }
diff --git a/debian/patches/series b/debian/patches/series
index 9449325..45b2a9e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1 @@
-1001_keep-symbol-DumpThreadHandles-if-debugging-is-disabled.patch
+1001_amend-DumpThreadHandles-inclusion.patch