From 2de02e53344f208910b5380ebfed7e23cf6872a9 Mon Sep 17 00:00:00 2001
From: JackBoosY <47264268+JackBoosY@users.noreply.github.com>
Date: Mon, 22 Jul 2019 14:12:29 +0800
Subject: [PATCH] [cutelyst2]Upgrade version to 2.8.0 (#7327)

---
 ports/cutelyst2/CONTROL                |  2 +-
 ports/cutelyst2/fix-static-build.patch | 38 ++++++++++++++++++++++++++
 ports/cutelyst2/portfile.cmake         | 11 ++++++--
 3 files changed, 48 insertions(+), 3 deletions(-)
 create mode 100644 ports/cutelyst2/fix-static-build.patch

diff --git a/ports/cutelyst2/CONTROL b/ports/cutelyst2/CONTROL
index 499e039ce4..8d5ce89a0f 100644
--- a/ports/cutelyst2/CONTROL
+++ b/ports/cutelyst2/CONTROL
@@ -1,4 +1,4 @@
 Source: cutelyst2
-Version: 2.7.0
+Version: 2.8.0
 Description: A C++ Web Framework built on top of Qt, using the simple approach of Catalyst (Perl) framework
 Build-Depends: qt5-base
diff --git a/ports/cutelyst2/fix-static-build.patch b/ports/cutelyst2/fix-static-build.patch
new file mode 100644
index 0000000000..e40cd1dab8
--- /dev/null
+++ b/ports/cutelyst2/fix-static-build.patch
@@ -0,0 +1,38 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 9a695fd..0667668 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -129,6 +129,33 @@ add_definitions(
+     -DQT_DISABLE_DEPRECATED_BEFORE=0x050c00
+ )
+ 
++if (BUILD_WIN_STATIC)
++    add_definitions(
++        -DCutelyst2Qt5_EXPORTS
++        -DActionRenderView_EXPORTS
++        -DActionREST_EXPORTS
++        -DActionRoleACL_EXPORTS
++        -DCutelyst2Qt5Authentication_EXPORTS
++        -DCutelyst2Qt5Session_EXPORTS
++        -DCutelyst2Qt5StaticSimple_EXPORTS
++        -DCutelyst2Qt5StaticCompressed_EXPORTS
++        -DCutelyst2Qt5UtilsPagination_EXPORTS
++        -DCutelyst2Qt5StatusMessage_EXPORTS
++        -DCutelyst2Qt5Memcached_EXPORTS
++        -DCutelyst2Qt5MemcachedSessionStore_EXPORTS
++        -DCutelyst2Qt5CSRFProtection_EXPORTS
++        -DCutelyst2Qt5UtilsSql_EXPORTS
++        -DCutelyst2Qt5UtilsValidator_EXPORTS
++        -DCutelyst2Qt5UtilsLangSelect_EXPORTS
++        -DCutelyst2Qt5ViewClearSilver_EXPORTS
++        -DCutelyst2Qt5ViewEmail_EXPORTS
++        -DCutelyst2Qt5ViewGrantlee_EXPORTS
++        -DCutelyst2Qt5ViewJson_EXPORTS
++        -DCutelyst2Qt5Wsgi_EXPORTS
++        -DCutelyst2Qt5UserAgent_EXPORTS
++    )
++endif()
++
+ set(CMAKE_CXX_STANDARD 11)
+ set(CMAKE_CXX_STANDARD_REQUIRED ON)
+ set(CMAKE_CXX_EXTENSIONS OFF)
diff --git a/ports/cutelyst2/portfile.cmake b/ports/cutelyst2/portfile.cmake
index 755cc3ed54..320059cd9c 100644
--- a/ports/cutelyst2/portfile.cmake
+++ b/ports/cutelyst2/portfile.cmake
@@ -3,16 +3,23 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO cutelyst/cutelyst
-    REF v2.7.0
-    SHA512 78848d6d4e79149d9e9ae07211875dd212eb046bcdde7cde0bd781ed89d006247b21bc7a37c4e028d0982bb0f69654d469eb37b857dc0d585e9adc79ecd6291d
+    REF c020f115b392bb8e22bed1e1669724102a31ab0c #v2.8.0
+    SHA512 79b440f6dc0a78bc6b3ea83b496a4a9fd7bb016ea2492393c53d82af2c304291ac62a11af96bb05b1fc6422bf2012bec501bb8eb4bd770c54ad166d119891bc1
     HEAD_REF master
+    PATCHES fix-static-build.patch
 )
 
+set(BUILD_WIN_STATIC OFF)
+if (VCPKG_TARGET_IS_WINDOWS AND VCPKG_LIBRARY_LINKAGE STREQUAL static)
+    set(BUILD_WIN_STATIC ON)
+endif()
+
 vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}
     PREFER_NINJA
     OPTIONS
         -DBUILD_TESTS:BOOL=OFF
+        -DBUILD_WIN_STATIC=${BUILD_WIN_STATIC}
 )
 
 vcpkg_install_cmake()