From 34283f5d8a78a814e668c44e10f02bef1c7ab674 Mon Sep 17 00:00:00 2001
From: "Matthias C. M. Troffaes" <matthias.troffaes@gmail.com>
Date: Thu, 5 Nov 2020 20:42:29 +0000
Subject: [PATCH] [xeus] remove openssl static build patch as it is no longer
 needed (#14387)

---
 ports/xeus/CONTROL                |  1 +
 ports/xeus/Fix-static-build.patch | 16 ----------------
 ports/xeus/portfile.cmake         | 19 ++++++-------------
 3 files changed, 7 insertions(+), 29 deletions(-)
 delete mode 100644 ports/xeus/Fix-static-build.patch

diff --git a/ports/xeus/CONTROL b/ports/xeus/CONTROL
index 20ad500f37..67c9c95db4 100644
--- a/ports/xeus/CONTROL
+++ b/ports/xeus/CONTROL
@@ -1,5 +1,6 @@
 Source: xeus
 Version: 0.24.1
+Port-Version: 1
 Homepage: https://github.com/jupyter-xeus/xeus
 Description: C++ implementation of the Jupyter kernel protocol
 Build-Depends: cppzmq, libuuid (linux), nlohmann-json, openssl, xtl, zeromq
diff --git a/ports/xeus/Fix-static-build.patch b/ports/xeus/Fix-static-build.patch
deleted file mode 100644
index 4caf0138f2..0000000000
--- a/ports/xeus/Fix-static-build.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index d02b5d6..6484131 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -244,7 +244,10 @@ macro(xeus_create_target target_name linkage output_name)
-         PUBLIC xtl
-     )
- 
--    target_link_libraries(${target_name} PUBLIC OpenSSL::Crypto)
-+	if (MSVC)
-+	    target_link_libraries(OpenSSL::Crypto INTERFACE crypt32)
-+    endif ()
-+	target_link_libraries(${target_name} PUBLIC OpenSSL::Crypto)
- 
-     if (NOT MSVC)
-         if (APPLE)
diff --git a/ports/xeus/portfile.cmake b/ports/xeus/portfile.cmake
index e68b872d53..4e744a2a4e 100644
--- a/ports/xeus/portfile.cmake
+++ b/ports/xeus/portfile.cmake
@@ -1,12 +1,11 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO QuantStack/xeus
-    REF 424b7cd177886906a59eee535b7de59088461910 # 0.24.1
+    REF 424b7cd177886906a59eee535b7de59088461910 # 0.24.1
     SHA512 877ca45bf649b567a9921d3e8f0adb0299dbe956978bd6e217d0c06617cf3466d08d90d607fd33e129089472e1a96ecec78b1fc21346bc13ba268168a5a6b068
     HEAD_REF master
-    PATCHES
+    PATCHES
 		Fix-Compile-nlohmann-json.patch
-		Fix-static-build.patch
 )
 
 string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" BUILD_STATIC_LIBS)
@@ -28,15 +27,9 @@ vcpkg_copy_pdbs()
 
 vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/${PORT})
 
-file(COPY
-    ${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake
-    DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}
-)
+file(COPY "${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
 
-file(REMOVE_RECURSE
-    ${CURRENT_PACKAGES_DIR}/debug/include
-    ${CURRENT_PACKAGES_DIR}/debug/share
-)
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share")
 
 if(VCPKG_LIBRARY_LINKAGE STREQUAL static)
     vcpkg_replace_string(${CURRENT_PACKAGES_DIR}/include/xeus/xeus.hpp
@@ -47,7 +40,7 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL static)
 endif()
 
 # Handle copyright
-file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
+file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
 
 # Install usage
-file(COPY ${CMAKE_CURRENT_LIST_DIR}/usage DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT})
+file(COPY "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")