Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[xlnt] Upgrade xlnt to 1.5.0 #12972

Merged
merged 2 commits into from
Aug 18, 2020
Merged

[xlnt] Upgrade xlnt to 1.5.0 #12972

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3ebfb3e
[xlnt] Upgrade xlnt to 1.5.0
xuhongxu96 Aug 18, 2020
ca45de5
Change version to 1.5.0
xuhongxu96 Aug 18, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ports/xlnt/CONTROL
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Source: xlnt
Version: 1.4.0-1
Version: 1.5.0
Homepage: https:/tfussell/xlnt
Description: Cross-platform user-friendly xlsx library for C++14
12 changes: 12 additions & 0 deletions ports/xlnt/fix-not-found-include.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
diff --git a/cmake/XlntConfig.cmake.in b/cmake/XlntConfig.cmake.in
index 01fe4981..9cefa6e0 100644
--- a/cmake/XlntConfig.cmake.in
+++ b/cmake/XlntConfig.cmake.in
@@ -7,7 +7,6 @@
get_filename_component(XLNT_CMAKE_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH)

-set_and_check(XLNT_INCLUDE_DIR "@XLNT_INCLUDE_INSTALL_DIR@")

check_required_components(xlnt)

if(NOT TARGET xlnt::xlnt)
5 changes: 3 additions & 2 deletions ports/xlnt/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,11 @@ endif()
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO tfussell/xlnt
REF 85e6878cc41d4c5ad002e961dc1fe35e41f936b6 # v1.4.0
SHA512 335198fbcc1b3028e38bced4ee26047047b02372b6c52727a64c0cab6db19cc31be8ac6c08e96f415875a181d6f717082220b0f63f08ef6ac194927e2184a9df
REF 568ac85346bc37757b0cd16464e7e1ea7656df91 # v1.5.0
SHA512 414d691b372934326dc0da134eb7752c27c3223b6e92b433494d0758ca657f43b66894ad54ac97a8410387a2531a573c81572daa6a0434fa023e8e29ca74331c
HEAD_REF master
PATCHES
"fix-not-found-include.patch"
${win_patch}
)

Expand Down