[tinyxml2] Update to 9.0.0 (#20607)

* Update tinyxml2 to 9.0.0

* Update CI baseline

Co-authored-by: chausner <chausner@users.noreply.github.com>

6 files changed, 27 insertions, 97 deletions

diff --git a/ports/tinyxml2/fix-debug-postfix.patch b/ports/tinyxml2/fix-debug-postfix.patch
deleted file mode 100644
index 8021e0f63..000000000
--- a/ports/tinyxml2/fix-debug-postfix.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 1e384d50313a08dd36a43df1925588741dc33301 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Wolfgang=20St=C3=B6ggl?= <c72578@yahoo.de>
-Date: Wed, 17 Jun 2020 06:17:06 +0200
-Subject: [PATCH] Fix debug postfix in pkgconfig file
-
-CMakeLists.txt uses set(CMAKE_DEBUG_POSTFIX "d") to distinguish
-between debug and release lib. Use this postfix also in the
-generated tinyxml2.pc file in case of a CMake Debug build.
-This results in the following contents of tinyxml2.pc
-- Release:
-  Libs: -L${libdir} -ltinyxml2
-- Debug:
-  Libs: -L${libdir} -ltinyxml2d
----
- CMakeLists.txt | 3 +++
- tinyxml2.pc.in | 2 +-
- 2 files changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 9f9ab07..7085276 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -106,6 +106,9 @@ endif()
- 

- install(FILES tinyxml2.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} COMPONENT tinyxml2_headers)

- 

-+if(CMAKE_BUILD_TYPE MATCHES Debug)

-+  set(LIB_POSTFIX ${CMAKE_DEBUG_POSTFIX})

-+endif()

- configure_file(tinyxml2.pc.in tinyxml2.pc @ONLY)

- install(FILES ${CMAKE_CURRENT_BINARY_DIR}/tinyxml2.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig COMPONENT tinyxml2_config)

- 

-diff --git a/tinyxml2.pc.in b/tinyxml2.pc.in
-index b040b0e..b100f60 100644
---- a/tinyxml2.pc.in
-+++ b/tinyxml2.pc.in
-@@ -6,5 +6,5 @@ includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@
- Name: TinyXML2
- Description: simple, small, C++ XML parser
- Version: @GENERIC_LIB_VERSION@
--Libs: -L${libdir} -ltinyxml2
-+Libs: -L${libdir} -ltinyxml2@LIB_POSTFIX@
- Cflags: -I${includedir}
diff --git a/ports/tinyxml2/fix-symbol-exports.patch b/ports/tinyxml2/fix-symbol-exports.patch
deleted file mode 100644
index 7108d0540..000000000
--- a/ports/tinyxml2/fix-symbol-exports.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From f8b048656b9937252ce5fb4ebea9e5df5b203bdb Mon Sep 17 00:00:00 2001
-From: Owen Rudge <owen@owenrudge.net>
-Date: Wed, 27 May 2020 09:40:59 +0100
-Subject: [PATCH] cmake: Don't export symbols if building static library
-
----
- CMakeLists.txt | 12 +++++++++---
- 1 file changed, 9 insertions(+), 3 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 9f9ab07..67b4f33 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -50,10 +50,16 @@ set(CMAKE_DEBUG_POSTFIX "d")
- 

- add_library(tinyxml2 tinyxml2.cpp tinyxml2.h)

- 

--set_target_properties(tinyxml2 PROPERTIES

-+if(BUILD_SHARED_LIBS)

-+    set_target_properties(tinyxml2 PROPERTIES

-         COMPILE_DEFINITIONS "TINYXML2_EXPORT"

--	VERSION "${GENERIC_LIB_VERSION}"

--	SOVERSION "${GENERIC_LIB_SOVERSION}")

-+        VERSION "${GENERIC_LIB_VERSION}"

-+        SOVERSION "${GENERIC_LIB_SOVERSION}")

-+else()

-+    set_target_properties(tinyxml2 PROPERTIES

-+        VERSION "${GENERIC_LIB_VERSION}"

-+        SOVERSION "${GENERIC_LIB_SOVERSION}")

-+endif()

- 

- target_compile_definitions(tinyxml2 PUBLIC $<$<CONFIG:Debug>:TINYXML2_DEBUG>)

- 

--- 
-2.25.1.windows.1
-
diff --git a/ports/tinyxml2/portfile.cmake b/ports/tinyxml2/portfile.cmake
index d4fb1c3f9..3c4d0e7d7 100644
--- a/ports/tinyxml2/portfile.cmake
+++ b/ports/tinyxml2/portfile.cmake
@@ -1,27 +1,22 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO leethomason/tinyxml2
-    REF 8.0.0
-    SHA512 bcbb065c2af34ea681ec556377fd22e720b6f5d4caa73f432b1e34e08603a96f2233763f0ec5ae86b9ee71ddbe3062f58d3794cd3a162ce6903435530de0bba6
+    REF 9.0.0
+    SHA512 9C5CE8131984690DF302CA3E32314573B137180ED522C92FD631692979C942372A28F697FDB3D5E56BCF2D3DC596262B724D088153F3E1D721C9536F2A883367
     HEAD_REF master
-    PATCHES
-        fix-symbol-exports.patch
-        fix-debug-postfix.patch
 )
 
-vcpkg_configure_cmake(
-    SOURCE_PATH ${SOURCE_PATH}
-    PREFER_NINJA
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
 )
 
-vcpkg_install_cmake()
+vcpkg_cmake_install()
 
-vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/tinyxml2)
+vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/tinyxml2)
 vcpkg_fixup_pkgconfig()
 
 vcpkg_copy_pdbs()
 
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 
-file(INSTALL ${SOURCE_PATH}/readme.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
+file(INSTALL "${SOURCE_PATH}/readme.md" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
diff --git a/ports/tinyxml2/vcpkg.json b/ports/tinyxml2/vcpkg.json
index 83d8b3fc3..c059fc809 100644
--- a/ports/tinyxml2/vcpkg.json
+++ b/ports/tinyxml2/vcpkg.json
@@ -1,7 +1,16 @@
 {
   "name": "tinyxml2",
-  "version-string": "8.0.0",
-  "port-version": 2,
+  "version-semver": "9.0.0",
   "description": "A simple, small, efficient, C++ XML parser",
-  "homepage": "https://github.com/leethomason/tinyxml2"
+  "homepage": "https://github.com/leethomason/tinyxml2",
+  "dependencies": [
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    }
+  ]
 }
diff --git a/versions/baseline.json b/versions/baseline.json
index d61319332..b575bf12c 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -6665,8 +6665,8 @@
       "port-version": 8
     },
     "tinyxml2": {
-      "baseline": "8.0.0",
-      "port-version": 2
+      "baseline": "9.0.0",
+      "port-version": 0
     },
     "tl-expected": {
       "baseline": "1.0.0",
diff --git a/versions/t-/tinyxml2.json b/versions/t-/tinyxml2.json
index 0d16235d0..aebfd80f0 100644
--- a/versions/t-/tinyxml2.json
+++ b/versions/t-/tinyxml2.json
@@ -1,6 +1,11 @@
 {
   "versions": [
     {
+      "git-tree": "a8b086bdb3eaa94fea466bf8565d7c98b00c9f94",
+      "version-semver": "9.0.0",
+      "port-version": 0
+    },
+    {
       "git-tree": "6c434072d7cd45db70c50b5553673f174b981eee",
       "version-string": "8.0.0",
       "port-version": 2