From 87cb1e2a4178f5d327bb38ceb3cfd0456b05a9c4 Mon Sep 17 00:00:00 2001 From: chausner <15180557+chausner@users.noreply.github.com> Date: Mon, 15 Nov 2021 23:54:04 +0100 Subject: [PATCH] [libxlsxwriter] Update to 1.1.4 (#21387) * Update libxlsxwriter to 1.1.4 * Update CI baseline Co-authored-by: chausner --- ports/libxlsxwriter/portfile.cmake | 10 +++++----- ports/libxlsxwriter/vcpkg.json | 3 +-- versions/baseline.json | 4 ++-- versions/l-/libxlsxwriter.json | 5 +++++ 4 files changed, 13 insertions(+), 9 deletions(-) diff --git a/ports/libxlsxwriter/portfile.cmake b/ports/libxlsxwriter/portfile.cmake index f2bf4f7e04..b95032196f 100644 --- a/ports/libxlsxwriter/portfile.cmake +++ b/ports/libxlsxwriter/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO jmcnamara/libxlsxwriter - REF 576d169463c7f9990045fd9223f5cf688150def0 #RELEASE_1.1.3 - SHA512 376db117df3ab48a6471d7004fc77fb8bd9b5d9dfaff53675f1bd99c8bc9bec7cadcefbd7116b206ef4703b9146cf097ad3b8aadff36b66302f1c82e8e1fa988 + REF RELEASE_1.1.4 + SHA512 fad36f7882fcb21b87e13cf603022cfad3f14e6f955a06e2771712facd0fe12f83f4d1655dc1a744724bda1ac83af7e7bf1393457c5507d8983f63002ab294b5 HEAD_REF master ) @@ -19,10 +19,10 @@ vcpkg_cmake_configure( ) vcpkg_cmake_install() +vcpkg_fixup_pkgconfig() +vcpkg_copy_pdbs() 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) -vcpkg_fixup_pkgconfig() diff --git a/ports/libxlsxwriter/vcpkg.json b/ports/libxlsxwriter/vcpkg.json index d54a1f0361..f72992f787 100644 --- a/ports/libxlsxwriter/vcpkg.json +++ b/ports/libxlsxwriter/vcpkg.json @@ -1,7 +1,6 @@ { "name": "libxlsxwriter", - "version-semver": "1.1.3", - "port-version": 1, + "version-semver": "1.1.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", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index d09bf11820..711e37f46e 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4041,8 +4041,8 @@ "port-version": 1 }, "libxlsxwriter": { - "baseline": "1.1.3", - "port-version": 1 + "baseline": "1.1.4", + "port-version": 0 }, "libxml2": { "baseline": "2.9.12", diff --git a/versions/l-/libxlsxwriter.json b/versions/l-/libxlsxwriter.json index c68eb249ae..53b304b03b 100644 --- a/versions/l-/libxlsxwriter.json +++ b/versions/l-/libxlsxwriter.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9e7e4072f13a2839135caf76e0b0ef31ee13bc48", + "version-semver": "1.1.4", + "port-version": 0 + }, { "git-tree": "13265cc8f10d1cd14a723dfda351ac6ad6625e60", "version-semver": "1.1.3",