From 3ebfb3e473b4cafca3a4c7d7c50588dcc8d4f0f1 Mon Sep 17 00:00:00 2001
From: Hongxu Xu <xuhongxu96@hotmail.com>
Date: Tue, 18 Aug 2020 16:00:21 +0800
Subject: [PATCH 1/2] [xlnt] Upgrade xlnt to 1.5.0

---
 ports/xlnt/CONTROL                     |  2 +-
 ports/xlnt/fix-not-found-include.patch | 12 ++++++++++++
 ports/xlnt/portfile.cmake              |  5 +++--
 3 files changed, 16 insertions(+), 3 deletions(-)
 create mode 100644 ports/xlnt/fix-not-found-include.patch

diff --git a/ports/xlnt/CONTROL b/ports/xlnt/CONTROL
index 2c2736e8e237e6..baa96ec4cb1f96 100644
--- a/ports/xlnt/CONTROL
+++ b/ports/xlnt/CONTROL
@@ -1,4 +1,4 @@
 Source: xlnt
-Version: 1.4.0-1
+Version: 1.5.0-0
 Homepage: https://github.com/tfussell/xlnt
 Description: Cross-platform user-friendly xlsx library for C++14
diff --git a/ports/xlnt/fix-not-found-include.patch b/ports/xlnt/fix-not-found-include.patch
new file mode 100644
index 00000000000000..a3068b14ce8c7c
--- /dev/null
+++ b/ports/xlnt/fix-not-found-include.patch
@@ -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)
diff --git a/ports/xlnt/portfile.cmake b/ports/xlnt/portfile.cmake
index 0da394c9ab6b75..eb4147f8edfbfa 100644
--- a/ports/xlnt/portfile.cmake
+++ b/ports/xlnt/portfile.cmake
@@ -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}
 )
 

From ca45de5d2b169576925a7fae64908aff504b6c51 Mon Sep 17 00:00:00 2001
From: Hongxu Xu <xuhongxu96@hotmail.com>
Date: Tue, 18 Aug 2020 16:49:23 +0800
Subject: [PATCH 2/2] Change version to 1.5.0

---
 ports/xlnt/CONTROL | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/xlnt/CONTROL b/ports/xlnt/CONTROL
index baa96ec4cb1f96..3e03a5a4ffae17 100644
--- a/ports/xlnt/CONTROL
+++ b/ports/xlnt/CONTROL
@@ -1,4 +1,4 @@
 Source: xlnt
-Version: 1.5.0-0
+Version: 1.5.0
 Homepage: https://github.com/tfussell/xlnt
 Description: Cross-platform user-friendly xlsx library for C++14