[expat] Update the version to 2.2.9 (add support for uwp) (#9146)

* [expat] Update the version to 2.2.9(support uwp)

* [readosm] Fix expat.lib cannot be found

* Remove expat:arm-uwp and expat:x64-uwp from fail list in ci.baseline.txt

* [apr-util,io2d,skia] Fix expat cannot be found and also update expat

* [many ports] Add supports and fix the regressions

* Fix new regressions

* Fix typo

* [io2d] Update expat patch

* [io2d,libkml,skia] Fix expat cannot find and also fix typo

* [expat] Remove usage

* [libkml,vtk] Update expat patch and fix static build

* [wxwidgets] Fix static build caused by expat cannot found

* Update as review suggestion

* Add Port-Version

* Remove evpp:x64-osx=fail from ci.baseline.txt

* [wxwidgest] Remove unnecessary spaces

* [itk] Fix expat cannot be found

* fix cmake test port

* [wxwidgets] Update Port-Version

Co-authored-by: Nicole Mazzuca <mazzucan@outlook.com>

3 files changed, 22 insertions, 8 deletions

diff --git a/ports/poco/CONTROL b/ports/poco/CONTROL
index be032c6de..17c74d0aa 100644
--- a/ports/poco/CONTROL
+++ b/ports/poco/CONTROL
@@ -1,5 +1,6 @@
 Source: poco
-Version: 1.9.2-2
+Version: 1.9.2
+Port-Version: 3
 Build-Depends: expat, libpq, pcre, sqlite3, zlib, libpng
 Description: Modern, powerful open source C++ class libraries for building network and internet-based applications that run on desktop, server, mobile and embedded systems.
 Homepage: https://github.com/pocoproject/poco
diff --git a/ports/poco/portfile.cmake b/ports/poco/portfile.cmake
index 27eddc982..18418e864 100644
--- a/ports/poco/portfile.cmake
+++ b/ports/poco/portfile.cmake
@@ -1,5 +1,3 @@
-include(vcpkg_common_functions)
-
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO pocoproject/poco
@@ -18,6 +16,7 @@ vcpkg_from_github(
         # Add the support of arm64-windows
         arm64_pcre.patch
         fix_foundation_link.patch
+        use-vcpkg-expat.patch
 )
 
 # define Poco linkage type
@@ -119,8 +118,6 @@ else()
     file(RENAME ${CURRENT_PACKAGES_DIR}/bin/tec ${CURRENT_PACKAGES_DIR}/tools/tec)
 endif()
 
-
-#
 if (VCPKG_LIBRARY_LINKAGE STREQUAL static OR VCPKG_TARGET_IS_LINUX OR VCPKG_TARGET_IS_OSX)
     file(REMOVE_RECURSE
         ${CURRENT_PACKAGES_DIR}/bin
@@ -141,7 +138,6 @@ else()
         ${CURRENT_PACKAGES_DIR}/debug/bin/tec.pdb)
 endif()
 
-#
 if(EXISTS "${CURRENT_PACKAGES_DIR}/cmake")
   vcpkg_fixup_cmake_targets(CONFIG_PATH cmake)
 elseif(EXISTS "${CURRENT_PACKAGES_DIR}/lib/cmake/Poco")
@@ -152,7 +148,6 @@ endif()
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
 
 # copy license
-file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT})
-file(RENAME ${CURRENT_PACKAGES_DIR}/share/${PORT}/LICENSE ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright)
+file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
 
 vcpkg_copy_pdbs()
diff --git a/ports/poco/use-vcpkg-expat.patch b/ports/poco/use-vcpkg-expat.patch
new file mode 100644
index 000000000..ee1990b9e
--- /dev/null
+++ b/ports/poco/use-vcpkg-expat.patch
@@ -0,0 +1,18 @@
+diff --git a/XML/CMakeLists.txt b/XML/CMakeLists.txt

+index d4a502a..780f5d0 100644

+--- a/XML/CMakeLists.txt

++++ b/XML/CMakeLists.txt

+@@ -23,7 +23,12 @@ endif()

+ # If POCO_UNBUNDLED is enabled we try to find the required packages

+ # The configuration will fail if the packages are not found

+ if (POCO_UNBUNDLED)

+-    find_package(EXPAT REQUIRED)

++    find_package(expat CONFIG REQUIRED)

++    if(WIN32 AND NOT MINGW)

++        set(EXPAT_LIBRARIES expat::libexpat)

++    else()

++        set(EXPAT_LIBRARIES expat::expat)   

++    endif()

+     set(SYSLIBS ${SYSLIBS} ${EXPAT_LIBRARIES})

+     include_directories(${EXPAT_INCLUDE_DIRS})

+ else()