[qhull] update version 8.0.0 (#12015)

* [qhull] Update the library version to 8.0.0 (2020.1)

* [qhull] Update the patches:
* uwp.patch has been removed
* mac-fix.patch is updated. Now C++11 is required to compile the library

4 files changed, 17 insertions, 68 deletions

diff --git a/ports/qhull/CONTROL b/ports/qhull/CONTROL
index e27ef1af2..4fd05103a 100644
--- a/ports/qhull/CONTROL
+++ b/ports/qhull/CONTROL
@@ -1,4 +1,4 @@
 Source: qhull
-Version: 7.3.2-2
+Version: 8.0.0
 Homepage: https://github.com/qhull/qhull
 Description: computes the convex hull, Delaunay triangulation, Voronoi diagram
diff --git a/ports/qhull/mac-fix.patch b/ports/qhull/mac-fix.patch
index 9af0a1c7e..96f16df07 100644
--- a/ports/qhull/mac-fix.patch
+++ b/ports/qhull/mac-fix.patch
@@ -1,37 +1,13 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 07d3da2..14df8e9 100644
+index bf7a259..b527e23 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -626,18 +626,18 @@ install(TARGETS ${qhull_TARGETS_INSTALL} EXPORT QhullTargets
- include(CMakePackageConfigHelpers)
- 
- write_basic_package_version_file(
--    "${CMAKE_CURRENT_BINARY_DIR}/Qhull/QhullConfigVersion.cmake"
-+    "${CMAKE_CURRENT_BINARY_DIR}/QhullExport/QhullConfigVersion.cmake"
-     VERSION ${qhull_VERSION}
-     COMPATIBILITY AnyNewerVersion
- )
- 
- export(EXPORT QhullTargets
--  FILE "${CMAKE_CURRENT_BINARY_DIR}/Qhull/QhullTargets.cmake"
-+  FILE "${CMAKE_CURRENT_BINARY_DIR}/QhullExport/QhullTargets.cmake"
-   NAMESPACE Qhull::
- )
- 
- configure_file(${PROJECT_SOURCE_DIR}/build/config.cmake.in
--  "${CMAKE_CURRENT_BINARY_DIR}/Qhull/QhullConfig.cmake"
-+  "${CMAKE_CURRENT_BINARY_DIR}/QhullExport/QhullConfig.cmake"
-   @ONLY
- )
- 
-@@ -652,8 +652,8 @@ install(EXPORT QhullTargets
- )
- install(
-   FILES
--    "${CMAKE_CURRENT_BINARY_DIR}/Qhull/QhullConfig.cmake"
--    "${CMAKE_CURRENT_BINARY_DIR}/Qhull/QhullConfigVersion.cmake"
-+    "${CMAKE_CURRENT_BINARY_DIR}/QhullExport/QhullConfig.cmake"
-+    "${CMAKE_CURRENT_BINARY_DIR}/QhullExport/QhullConfigVersion.cmake"
-   DESTINATION
-     ${ConfigPackageLocation}
-   COMPONENT
+@@ -67,6 +67,8 @@
+ project(qhull)
+ cmake_minimum_required(VERSION 3.0)
+ 
++set(CMAKE_CXX_STANDARD 11)
++
+ # Define qhull_VERSION in README.txt, Announce.txt, qh-get.htm, CMakeLists.txt
+ #   qhull-zip.sh (twice), qhull-wiki.md, qhull-news.htm, File_id.diz, index.htm
+ #   Makefile (SO), qhull-warn.pri (VERSION), qhull-exports.def (VERSION 8.0), qhull_p-exports.def, qhull_r-exports.def
diff --git a/ports/qhull/portfile.cmake b/ports/qhull/portfile.cmake
index 779206415..d67114dd6 100644
--- a/ports/qhull/portfile.cmake
+++ b/ports/qhull/portfile.cmake
@@ -3,18 +3,17 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO qhull/qhull
-    REF v7.3.2 # Qhull 2019.1
-    SHA512 aea2c70179de10f648aba960129a3b9a3fe309a0eb085bdb86f697e3d4b214570c241e88d4f0b4d2974137759ee7086452d0a3957c4b2a256708402fb3c9eb3d
+    REF v8.0.0 # Qhull 2020.1
+    SHA512 b6ac17193b7c8a4ffb5f5a64cc057d1d5123f155f1c4fcd290fe1768356fef5c58d511707bba8c4814ca754bc6cdf5c370af23953d00c24a5ec28b8a1e489d31
     HEAD_REF master
     PATCHES
-        uwp.patch
         mac-fix.patch
 )
-if(${TARGET_TRIPLET} STREQUAL "x64-windows-static") 
+if(${TARGET_TRIPLET} STREQUAL "x64-windows-static")
 # workaround for visual studio toolset regression LNK1201 (remove if solved)
 vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}
-    OPTIONS 
+    OPTIONS
         -DINCLUDE_INSTALL_DIR=${CURRENT_PACKAGES_DIR}/include
         -DMAN_INSTALL_DIR=${CURRENT_PACKAGES_DIR}/doc/qhull
         -DDOC_INSTALL_DIR=${CURRENT_PACKAGES_DIR}/doc/qhull
@@ -27,7 +26,7 @@ else()
 vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}
     PREFER_NINJA
-    OPTIONS 
+    OPTIONS
         -DINCLUDE_INSTALL_DIR=${CURRENT_PACKAGES_DIR}/include
         -DMAN_INSTALL_DIR=${CURRENT_PACKAGES_DIR}/doc/qhull
         -DDOC_INSTALL_DIR=${CURRENT_PACKAGES_DIR}/doc/qhull
@@ -40,7 +39,7 @@ endif()
 
 vcpkg_install_cmake()
 
-vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/Qhull) 
+vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/Qhull)
 
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
 file(GLOB_RECURSE HTMFILES ${CURRENT_PACKAGES_DIR}/include/*.htm)
diff --git a/ports/qhull/uwp.patch b/ports/qhull/uwp.patch
deleted file mode 100644
index 98c74564e..000000000
--- a/ports/qhull/uwp.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff --git a/src/libqhull/global.c b/src/libqhull/global.c
-index e7de8e6..81be9df 100644
---- a/src/libqhull/global.c
-+++ b/src/libqhull/global.c
-@@ -636,7 +636,7 @@ void qh_init_qhull_command(int argc, char *argv[]) {
- */
- void qh_initflags(char *command) {
-   int k, i, lastproject;
--  char *s= command, *t, *prev_s, *start, key, *lastwarning= NULL;
-+  char *s= command, *t = NULL, *prev_s, *start, key, *lastwarning= NULL;
-   boolT isgeom= False, wasproject;
-   realT r;
- 
-diff --git a/src/libqhull_r/global_r.c b/src/libqhull_r/global_r.c
-index 3e6919f..8d13e47 100644
---- a/src/libqhull_r/global_r.c
-+++ b/src/libqhull_r/global_r.c
-@@ -610,7 +610,7 @@ void qh_init_qhull_command(qhT *qh, int argc, char *argv[]) {
- */
- void qh_initflags(qhT *qh, char *command) {
-   int k, i, lastproject;
--  char *s= command, *t, *prev_s, *start, key, *lastwarning= NULL;
-+  char *s= command, *t = NULL, *prev_s, *start, key, *lastwarning= NULL;
-   boolT isgeom= False, wasproject;
-   realT r;
-