From b787d44a468a4be633696bef6449371e91d6443b Mon Sep 17 00:00:00 2001
From: cnbatch <cnbatch@gmail.com>
Date: Fri, 10 Jan 2020 02:27:47 +0800
Subject: [PATCH 1/2] Upgrade to v1.4.0

---
 ports/xlnt/CONTROL                          |  2 +-
 ports/xlnt/portfile.cmake                   | 71 ++++++++++++---------
 ports/xlnt/static-linking-for-windows.patch | 13 ++++
 3 files changed, 55 insertions(+), 31 deletions(-)
 create mode 100644 ports/xlnt/static-linking-for-windows.patch

diff --git a/ports/xlnt/CONTROL b/ports/xlnt/CONTROL
index b3fbc8422526bc..3e2cc3d517172a 100644
--- a/ports/xlnt/CONTROL
+++ b/ports/xlnt/CONTROL
@@ -1,4 +1,4 @@
 Source: xlnt
-Version: 1.3.0-2
+Version: 1.4.0
 Homepage: https://github.com/tfussell/xlnt
 Description: Cross-platform user-friendly xlsx library for C++14
diff --git a/ports/xlnt/portfile.cmake b/ports/xlnt/portfile.cmake
index 1e1a9cb435a5a5..cf5fa416646618 100644
--- a/ports/xlnt/portfile.cmake
+++ b/ports/xlnt/portfile.cmake
@@ -1,30 +1,41 @@
-include(vcpkg_common_functions)
-
-vcpkg_from_github(
-    OUT_SOURCE_PATH SOURCE_PATH
-    REPO tfussell/xlnt
-    REF v1.3.0
-    SHA512 716b93a6138daf1e293980a3c26801bfd00aa713afdd9cbe9be672ccff8c86b69b26eb0f3e8259bd0844e04d0e6148b64467d7db6815c76ecf412715d506786f
-    HEAD_REF master
-)
-
-if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
-    set(STATIC OFF)
-else()
-    set(STATIC ON)
-endif()
-
-vcpkg_configure_cmake(
-    SOURCE_PATH ${SOURCE_PATH}
-    PREFER_NINJA
-    OPTIONS -DTESTS=OFF -DSAMPLES=OFF -DBENCHMARKS=OFF -DSTATIC=${STATIC}
-)
-
-vcpkg_install_cmake()
-
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/share/man)
-file(INSTALL ${SOURCE_PATH}/LICENSE.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/xlnt RENAME copyright)
-
-vcpkg_copy_pdbs()
+include(vcpkg_common_functions)
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO tfussell/xlnt
+    REF v1.4.0
+    SHA512 74abbee97994098fb7d8fd0839929db74fe01b8428f8bdb8edd28340d3b3ed04d4c7d6dd5d886ae766054ff1b0fe9a8275098a1462e7a5146ff09f1cdb063360
+    HEAD_REF master
+)
+
+if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
+    set(STATIC OFF)
+else()
+    set(STATIC ON)
+endif()
+
+vcpkg_configure_cmake(
+    SOURCE_PATH ${SOURCE_PATH}
+    PREFER_NINJA
+    OPTIONS -DTESTS=OFF -DSAMPLES=OFF -DBENCHMARKS=OFF -DSTATIC=${STATIC}
+)
+
+vcpkg_install_cmake()
+
+if(CMAKE_SYSTEM_NAME STREQUAL "Windows" OR (NOT CMAKE_SYSTEM_NAME AND CMAKE_HOST_SYSTEM_NAME STREQUAL "Windows"))
+    if(VCPKG_LIBRARY_LINKAGE STREQUAL static)
+        vcpkg_apply_patches(
+            SOURCE_PATH ${CURRENT_PACKAGES_DIR}
+            PATCHES ${CMAKE_CURRENT_LIST_DIR}/static-linking-for-windows.patch
+        )
+    endif()
+endif()
+
+vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/xlnt)
+
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/share/man)
+file(INSTALL ${SOURCE_PATH}/LICENSE.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/xlnt RENAME copyright)
+
+vcpkg_copy_pdbs()
diff --git a/ports/xlnt/static-linking-for-windows.patch b/ports/xlnt/static-linking-for-windows.patch
new file mode 100644
index 00000000000000..9f27197242d95f
--- /dev/null
+++ b/ports/xlnt/static-linking-for-windows.patch
@@ -0,0 +1,13 @@
+diff --git a/include/xlnt/xlnt.hpp b/include/xlnt/xlnt.hpp
+index 01fe4981..9cefa6e0 100644
+--- a/include/xlnt/xlnt.hpp
++++ b/include/xlnt/xlnt.hpp
+@@ -22,7 +22,7 @@
+ // @author: see AUTHORS file
+ 
+ #pragma once
+-
++#define XLNT_STATIC
+ #include <xlnt/xlnt_config.hpp>
+ 
+ // cell

From 68a89f25d9593ac0d48da061c637056c2dbe775e Mon Sep 17 00:00:00 2001
From: cnbatch <cnbatch@gmail.com>
Date: Fri, 10 Jan 2020 16:35:00 +0800
Subject: [PATCH 2/2] Upgrade to 1.4.0

---
 ports/xlnt/portfile.cmake | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

diff --git a/ports/xlnt/portfile.cmake b/ports/xlnt/portfile.cmake
index cf5fa416646618..42e1883350bf33 100644
--- a/ports/xlnt/portfile.cmake
+++ b/ports/xlnt/portfile.cmake
@@ -1,4 +1,8 @@
-include(vcpkg_common_functions)
+if(VCPKG_TARGET_IS_WINDOWS) 
+    if(VCPKG_LIBRARY_LINKAGE STREQUAL static)
+       set(win_patch "static-linking-for-windows.patch")
+    endif()
+endif()
 
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
@@ -6,6 +10,8 @@ vcpkg_from_github(
     REF v1.4.0
     SHA512 74abbee97994098fb7d8fd0839929db74fe01b8428f8bdb8edd28340d3b3ed04d4c7d6dd5d886ae766054ff1b0fe9a8275098a1462e7a5146ff09f1cdb063360
     HEAD_REF master
+    PATCHES
+        ${win_patch}
 )
 
 if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
@@ -22,20 +28,11 @@ vcpkg_configure_cmake(
 
 vcpkg_install_cmake()
 
-if(CMAKE_SYSTEM_NAME STREQUAL "Windows" OR (NOT CMAKE_SYSTEM_NAME AND CMAKE_HOST_SYSTEM_NAME STREQUAL "Windows"))
-    if(VCPKG_LIBRARY_LINKAGE STREQUAL static)
-        vcpkg_apply_patches(
-            SOURCE_PATH ${CURRENT_PACKAGES_DIR}
-            PATCHES ${CMAKE_CURRENT_LIST_DIR}/static-linking-for-windows.patch
-        )
-    endif()
-endif()
-
 vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/xlnt)
 
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/share/man)
-file(INSTALL ${SOURCE_PATH}/LICENSE.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/xlnt RENAME copyright)
+file(INSTALL ${SOURCE_PATH}/LICENSE.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
 
 vcpkg_copy_pdbs()