[libosmium/libxlsxwriter] Update to the latest version (#19935)

* [libosmium/libxlsxwriter] Update to the latest version

* Update version files

* Update versions/l-/libosmium.json

* Attempt to fix version database again.

Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>

ports/libosmium/CONTROL

@@ -1,5 +0,0 @@
-Source: libosmium
-Version: 2.15.5
-Homepage: https://osmcode.org/libosmium/
-Description: A fast and flexible C++ library for working with OpenStreetMap data
-Build-Depends: utfcpp, expat, zlib, proj4, bzip2, protozero, boost

ports/libosmium/portfile.cmake

@@ -2,20 +2,21 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO osmcode/libosmium
-    REF v2.15.5
+    REF b263ba5e85c9ac254fa4090c855ec6f0556795e2 #v2.17.0
-    SHA512 a4972901db8ed89302e6ba15fd104543b5e36a41bc83daf8f6f6fb29ce73b0dbd8596de801d099a33df413b26eec1b3a6f4f0d669936ecc6d25f88d783468a59
+    SHA512 fd2955af6153ef58d76cca1e5b83cb70cd33cb616a3e221a80df94ee1256eeeaa5f15f4727cd1023f0335e55d7f3f36e3f9f5490bcd78ba9d267b2075480d1ba
 )
-set(BOOST_ROOT ${CURRENT_INSTALLED_DIR})
+set(BOOST_ROOT "${CURRENT_INSTALLED_DIR}")
 
-vcpkg_configure_cmake(
+vcpkg_cmake_configure(
-    SOURCE_PATH ${SOURCE_PATH}
+    SOURCE_PATH "${SOURCE_PATH}"
-    PREFER_NINJA # Disable this option if project cannot be built with Ninja
+    OPTIONS
-    OPTIONS -DBUILD_TESTING=OFF -DBUILD_EXAMPLES=OFF
+        -DBUILD_TESTING=OFF
+        -DBUILD_EXAMPLES=OFF
 )
 
-vcpkg_install_cmake()
+vcpkg_cmake_install()
 
 # Handle copyright
-file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
+file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
 
-file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug")
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug")

ports/libosmium/vcpkg.json

@@ -0,0 +1,19 @@
+{
+  "name": "libosmium",
+  "version-semver": "2.17.0",
+  "description": "A fast and flexible C++ library for working with OpenStreetMap data",
+  "homepage": "https://osmcode.org/libosmium/",
+  "dependencies": [
+    "boost",
+    "bzip2",
+    "expat",
+    "proj4",
+    "protozero",
+    "utfcpp",
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    "zlib"
+  ]
+}

ports/libxlsxwriter/CONTROL

@@ -1,5 +0,0 @@
-Source: libxlsxwriter
-Version: 0.9.4
-Description: Libxlsxwriter is a C library that can be used to write text, numbers, formulas and hyperlinks to multiple worksheets in an Excel 2007+ XLSX file.
-Homepage: https://github.com/jmcnamara/libxlsxwriter
-Build-Depends: zlib

ports/libxlsxwriter/portfile.cmake

@@ -1,9 +1,9 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO jmcnamara/libxlsxwriter
-    REF RELEASE_0.9.4
+    REF 576d169463c7f9990045fd9223f5cf688150def0 #RELEASE_1.1.3
-    SHA512 d7bc319e6b9cd2ad6aaa2f3eb6fdce1c5bcc1d5af23ffb3413e29760191f6aed41f836aaa71a322efe7966f3753a6d8a01cb0b403d682b13a6a3734a87cc12ba
+    SHA512 376db117df3ab48a6471d7004fc77fb8bd9b5d9dfaff53675f1bd99c8bc9bec7cadcefbd7116b206ef4703b9146cf097ad3b8aadff36b66302f1c82e8e1fa988
-	HEAD_REF master
+    HEAD_REF master
 )
 
 if (VCPKG_TARGET_IS_UWP)
@@ -12,16 +12,16 @@ else()
   set(USE_WINDOWSSTORE OFF)
 endif()
 
-vcpkg_configure_cmake(
+vcpkg_cmake_configure(
-    SOURCE_PATH ${SOURCE_PATH}
+    SOURCE_PATH "${SOURCE_PATH}"
-	PREFER_NINJA
+    OPTIONS 
-	OPTIONS -DWINDOWSSTORE=${USE_WINDOWSSTORE}
+        -DWINDOWSSTORE=${USE_WINDOWSSTORE}
 )
 
-vcpkg_install_cmake()
+vcpkg_cmake_install()
 
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 
 vcpkg_copy_pdbs()
 
-file(INSTALL ${SOURCE_PATH}/License.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
+file(INSTALL "${SOURCE_PATH}/License.txt" DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)

ports/libxlsxwriter/vcpkg.json

@@ -0,0 +1,13 @@
+{
+  "name": "libxlsxwriter",
+  "version-semver": "1.1.3",
+  "description": "Libxlsxwriter is a C library that can be used to write text, numbers, formulas and hyperlinks to multiple worksheets in an Excel 2007+ XLSX file.",
+  "homepage": "https://github.com/jmcnamara/libxlsxwriter",
+  "dependencies": [
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    "zlib"
+  ]
+}

versions/baseline.json

@@ -3505,7 +3505,7 @@
       "port-version": 0
     },
     "libosmium": {
-      "baseline": "2.15.5",
+      "baseline": "2.17.0",
       "port-version": 0
     },
     "libosmscout": {
@@ -3813,7 +3813,7 @@
       "port-version": 0
     },
     "libxlsxwriter": {
-      "baseline": "0.9.4",
+      "baseline": "1.1.3",
       "port-version": 0
     },
     "libxml2": {

versions/l-/libosmium.json

@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "3cfda0b067f25efdb3d3f35421c5eb898cba74c3",
+      "version-semver": "2.17.0",
+      "port-version": 0
+    },
     {
       "git-tree": "2ee36f73249f1102786deb5e2fea00ef8480de54",
       "version-string": "2.15.5",

versions/l-/libxlsxwriter.json

@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "6355a7b3fb476841c51ccde98e671ca3b181b000",
+      "version-semver": "1.1.3",
+      "port-version": 0
+    },
     {
       "git-tree": "f4f03a0a0d45dc562ef63a482b4307a3f2c858b9",
       "version-string": "0.9.4",