[pthread] update to v3 (#6473)

* [pthread] update to v3

* [flint, mosquitto, usbmuxd] bump CONTROL files and add final touches for PThreads4W v3

* [arb] add compatibility with PThreads4W

4 files changed, 7 insertions, 26 deletions

diff --git a/ports/mosquitto/CONTROL b/ports/mosquitto/CONTROL
index a623c89d7..a80d0da7a 100644
--- a/ports/mosquitto/CONTROL
+++ b/ports/mosquitto/CONTROL
@@ -1,6 +1,6 @@
 Source: mosquitto

-Version: 1.5.0-2

+Version: 1.5.0-3

 Build-Depends: c-ares, libwebsockets, openssl, pthreads

-Description: Mosquitto is an open source message broker that implements the MQ Telemetry Transport protocol versions 3.1 and 3.1.1. 

-  MQTT provides a lightweight method of carrying out messaging using a publish/subscribe model. This makes it suitable for "machine to machine" messaging such as with low power sensors or mobile devices such as phones, embedded computers or microcontrollers like the Arduino. 

+Description: Mosquitto is an open source message broker that implements the MQ Telemetry Transport protocol versions 3.1 and 3.1.1.

+  MQTT provides a lightweight method of carrying out messaging using a publish/subscribe model. This makes it suitable for "machine to machine" messaging such as with low power sensors or mobile devices such as phones, embedded computers or microcontrollers like the Arduino.

   You can see more information from this url https://mosquitto.org/download/

diff --git a/ports/mosquitto/fix-dependence-pthreads.patch b/ports/mosquitto/fix-dependence-pthreads.patch
deleted file mode 100644
index d21786646..000000000
--- a/ports/mosquitto/fix-dependence-pthreads.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt

-index 6355eaa..490df32 100644

---- a/lib/CMakeLists.txt

-+++ b/lib/CMakeLists.txt

-@@ -6,7 +6,7 @@ option(WITH_THREADING "Include client library threading support?" ON)

- if (${WITH_THREADING} STREQUAL ON)

- 	add_definitions("-DWITH_THREADING")

- 	if (WIN32)

--		find_library(PTHREAD_LIBRARIES NAMES pthreadsVC2)

-+		find_library(PTHREAD_LIBRARIES NAMES pthreadVC2)

- 		find_path(PTHREAD_INCLUDE_DIR pthread.h)

- 	else (WIN32)

- 		find_library(LIBPTHREAD pthread)

diff --git a/ports/mosquitto/portfile.cmake b/ports/mosquitto/portfile.cmake
index 061593969..92a8988d4 100644
--- a/ports/mosquitto/portfile.cmake
+++ b/ports/mosquitto/portfile.cmake
@@ -8,14 +8,9 @@ vcpkg_from_github(
     REF v1.5
     SHA512 f6a5c8e71d642ef931176fe428fb79353933facc2db226d9e55b87d4ff9bd6610a1bd05d71159e30c8afb1fda542d233630ae164770e652baa7ea51117211489
     HEAD_REF master
-)
-
-vcpkg_apply_patches(
-    SOURCE_PATH ${SOURCE_PATH}
     PATCHES
-        "${CMAKE_CURRENT_LIST_DIR}/win64-cmake.patch"
-        "${CMAKE_CURRENT_LIST_DIR}/output_folders-cmake.patch"
-        "${CMAKE_CURRENT_LIST_DIR}/fix-dependence-pthreads.patch"
+        win64-cmake.patch
+        output_folders-cmake.patch
 )
 
 vcpkg_configure_cmake(
diff --git a/ports/mosquitto/win64-cmake.patch b/ports/mosquitto/win64-cmake.patch
index a7ac936e0..360bf006b 100644
--- a/ports/mosquitto/win64-cmake.patch
+++ b/ports/mosquitto/win64-cmake.patch
@@ -15,7 +15,7 @@ diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
 index d537e77..272b60a 100644
 --- a/lib/CMakeLists.txt
 +++ b/lib/CMakeLists.txt
-@@ -6,12 +6,8 @@ option(WITH_THREADING "Include client library threading support?" ON)
+@@ -6,12 +6,7 @@ option(WITH_THREADING "Include client library threading support?" ON)
  if (${WITH_THREADING} STREQUAL ON)
  	add_definitions("-DWITH_THREADING")
  	if (WIN32)
@@ -25,8 +25,7 @@ index d537e77..272b60a 100644
 -			set (PTHREAD_LIBRARIES C:\\pthreads\\Pre-built.2\\lib\\x86\\pthreadVC2.lib)
 -		endif (CMAKE_CL_64)
 -		set (PTHREAD_INCLUDE_DIR C:\\pthreads\\Pre-built.2\\include)
-+		find_library(PTHREAD_LIBRARIES NAMES pthreadsVC2)
-+		find_path(PTHREAD_INCLUDE_DIR pthread.h)
++		find_package(pthread REQUIRED)
  	else (WIN32)
  		find_library(LIBPTHREAD pthread)
  		if (LIBPTHREAD)