From caf2e7460bbf983a498c8c8220b715062551ca22 Mon Sep 17 00:00:00 2001 From: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> Date: Sat, 4 Sep 2021 05:14:39 +0800 Subject: [PATCH] [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 --- ports/libosmium/CONTROL | 5 ----- ports/libosmium/portfile.cmake | 21 +++++++++++---------- ports/libosmium/vcpkg.json | 19 +++++++++++++++++++ ports/libxlsxwriter/CONTROL | 5 ----- ports/libxlsxwriter/portfile.cmake | 20 ++++++++++---------- ports/libxlsxwriter/vcpkg.json | 13 +++++++++++++ versions/baseline.json | 4 ++-- versions/l-/libosmium.json | 5 +++++ versions/l-/libxlsxwriter.json | 5 +++++ 9 files changed, 65 insertions(+), 32 deletions(-) delete mode 100644 ports/libosmium/CONTROL create mode 100644 ports/libosmium/vcpkg.json delete mode 100644 ports/libxlsxwriter/CONTROL create mode 100644 ports/libxlsxwriter/vcpkg.json diff --git a/ports/libosmium/CONTROL b/ports/libosmium/CONTROL deleted file mode 100644 index 42b97a70106..00000000000 --- a/ports/libosmium/CONTROL +++ /dev/null @@ -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 diff --git a/ports/libosmium/portfile.cmake b/ports/libosmium/portfile.cmake index 9dd5c09e877..ebc364284db 100644 --- a/ports/libosmium/portfile.cmake +++ b/ports/libosmium/portfile.cmake @@ -2,20 +2,21 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO osmcode/libosmium - REF v2.15.5 - SHA512 a4972901db8ed89302e6ba15fd104543b5e36a41bc83daf8f6f6fb29ce73b0dbd8596de801d099a33df413b26eec1b3a6f4f0d669936ecc6d25f88d783468a59 + REF b263ba5e85c9ac254fa4090c855ec6f0556795e2 #v2.17.0 + SHA512 fd2955af6153ef58d76cca1e5b83cb70cd33cb616a3e221a80df94ee1256eeeaa5f15f4727cd1023f0335e55d7f3f36e3f9f5490bcd78ba9d267b2075480d1ba ) -set(BOOST_ROOT ${CURRENT_INSTALLED_DIR}) +set(BOOST_ROOT "${CURRENT_INSTALLED_DIR}") -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA # Disable this option if project cannot be built with Ninja - OPTIONS -DBUILD_TESTING=OFF -DBUILD_EXAMPLES=OFF +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -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") \ No newline at end of file diff --git a/ports/libosmium/vcpkg.json b/ports/libosmium/vcpkg.json new file mode 100644 index 00000000000..2bd42371b58 --- /dev/null +++ b/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" + ] +} diff --git a/ports/libxlsxwriter/CONTROL b/ports/libxlsxwriter/CONTROL deleted file mode 100644 index 2cd6384ce00..00000000000 --- a/ports/libxlsxwriter/CONTROL +++ /dev/null @@ -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 diff --git a/ports/libxlsxwriter/portfile.cmake b/ports/libxlsxwriter/portfile.cmake index c19db947b8c..20700c76c2e 100644 --- a/ports/libxlsxwriter/portfile.cmake +++ b/ports/libxlsxwriter/portfile.cmake @@ -1,9 +1,9 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO jmcnamara/libxlsxwriter - REF RELEASE_0.9.4 - SHA512 d7bc319e6b9cd2ad6aaa2f3eb6fdce1c5bcc1d5af23ffb3413e29760191f6aed41f836aaa71a322efe7966f3753a6d8a01cb0b403d682b13a6a3734a87cc12ba - HEAD_REF master + REF 576d169463c7f9990045fd9223f5cf688150def0 #RELEASE_1.1.3 + SHA512 376db117df3ab48a6471d7004fc77fb8bd9b5d9dfaff53675f1bd99c8bc9bec7cadcefbd7116b206ef4703b9146cf097ad3b8aadff36b66302f1c82e8e1fa988 + HEAD_REF master ) if (VCPKG_TARGET_IS_UWP) @@ -12,16 +12,16 @@ else() set(USE_WINDOWSSTORE OFF) endif() -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA - OPTIONS -DWINDOWSSTORE=${USE_WINDOWSSTORE} +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -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) \ No newline at end of file diff --git a/ports/libxlsxwriter/vcpkg.json b/ports/libxlsxwriter/vcpkg.json new file mode 100644 index 00000000000..2138d56be6f --- /dev/null +++ b/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" + ] +} diff --git a/versions/baseline.json b/versions/baseline.json index 8bcb5dd4cc2..f19adb3c636 100644 --- a/versions/baseline.json +++ b/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": { diff --git a/versions/l-/libosmium.json b/versions/l-/libosmium.json index 1f8a52d8e6b..7d8e06643ab 100644 --- a/versions/l-/libosmium.json +++ b/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", diff --git a/versions/l-/libxlsxwriter.json b/versions/l-/libxlsxwriter.json index 59b302feabe..6403a027698 100644 --- a/versions/l-/libxlsxwriter.json +++ b/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",