From 9429391e9fc1f865060cd131c4d8f075eca6540d Mon Sep 17 00:00:00 2001
From: RealTimeChris <40668522+RealTimeChris@users.noreply.github.com>
Date: Mon, 18 Apr 2022 18:43:59 -0400
Subject: [PATCH] [DiscordCoreAPI] Fixing a certificate location issue.
 (#24204)

* Updating version database.

* Updating version database.

* Updating version database.

* Updating version database.

* Updating version database.

* Updating version database.

* Removing patch file.

* Updating version database.

* Updating version database.

* Updating version database.

* Updating version database.

* Updating version database.

* Updating version database.

* Updating version database.

* Updating version database.

* Updating version database.

* Updating version database.

* Updating version database.

* Updating version database.

* Updating version database.

* Updating version database.

* Updating version database.

* Updating version database.

* Updating version database.

* Updating version database.

* Updating version database.

* Updating version database.

* Updating version database.

* Updating version database.

* Updating version database.

* Updating version database.

* Updating version database.

* Updating version database.

* Updated build system.

* Updated build system.

* Updated build system.

* Updated build system.

* Updated build system.

* Updated build system.

* Updating version database.

* Updating version database.

* Updating version database.
---
 .../fix-cert-installation.patch               | 30 -------------------
 ports/discordcoreapi/portfile.cmake           |  7 ++---
 ports/discordcoreapi/vcpkg.json               |  3 +-
 versions/baseline.json                        |  4 +--
 versions/d-/discordcoreapi.json               |  5 ++++
 5 files changed, 11 insertions(+), 38 deletions(-)
 delete mode 100644 ports/discordcoreapi/fix-cert-installation.patch

diff --git a/ports/discordcoreapi/fix-cert-installation.patch b/ports/discordcoreapi/fix-cert-installation.patch
deleted file mode 100644
index 06f0cbe85d..0000000000
--- a/ports/discordcoreapi/fix-cert-installation.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff --git a/Library/CMakeLists.txt b/Library/CMakeLists.txt
-index 10cd8d1..1439aa0 100644
---- a/Library/CMakeLists.txt
-+++ b/Library/CMakeLists.txt
-@@ -27,19 +27,19 @@ file(GLOB HEADERS "${CMAKE_SOURCE_DIR}/Include/discordcoreapi/*.hpp")
- if (UNIX)
- 	add_library(DiscordCoreAPI STATIC "${SOURCES}" "${VersionFilesOutputVariable}")
- 	message(STATUS "Copying a file...")
--	configure_file("${CMAKE_SOURCE_DIR}/Certs/SoundCloudCert.pem" "/home/$ENV{USER}/SSL/Certs/SoundCloudCert.pem" COPYONLY)
-+	install(FILES "${CMAKE_SOURCE_DIR}/Certs/SoundCloudCert.pem" DESTINATION share/discordcoreapi/data)
- 	message(STATUS "Copying a file...")
--	configure_file("${CMAKE_SOURCE_DIR}/Certs/GoogleCert.pem" "/home/$ENV{USER}/SSL/Certs/GoogleCert.pem" COPYONLY)
-+	install(FILES "${CMAKE_SOURCE_DIR}/Certs/GoogleCert.pem" DESTINATION share/discordcoreapi/data)
- 	message(STATUS "Copying a file...")
--	configure_file("${CMAKE_SOURCE_DIR}/Certs/DiscordCert.pem" "/home/$ENV{USER}/SSL/Certs/DiscordCert.pem" COPYONLY)
-+	install(FILES "${CMAKE_SOURCE_DIR}/Certs/DiscordCert.pem" DESTINATION share/discordcoreapi/data)
- elseif (WIN32)
- 	add_library(DiscordCoreAPI SHARED "${SOURCES}" "${VersionFilesOutputVariable}")
- 	message(STATUS "Copying a file...")
--	configure_file("${CMAKE_SOURCE_DIR}/Certs/SoundCloudCert.pem" "C:/SSL/Certs/SoundCloudCert.pem" COPYONLY)
-+	install(FILES "${CMAKE_SOURCE_DIR}/Certs/SoundCloudCert.pem" DESTINATION share/discordcoreapi/data)
- 	message(STATUS "Copying a file...")
--	configure_file("${CMAKE_SOURCE_DIR}/Certs/GoogleCert.pem" "C:/SSL/Certs/GoogleCert.pem" COPYONLY)
-+	install(FILES "${CMAKE_SOURCE_DIR}/Certs/GoogleCert.pem" DESTINATION share/discordcoreapi/data)
- 	message(STATUS "Copying a file...")
--	configure_file("${CMAKE_SOURCE_DIR}/Certs/DiscordCert.pem" "C:/SSL/Certs/DiscordCert.pem" COPYONLY)	
-+	install(FILES "${CMAKE_SOURCE_DIR}/Certs/DiscordCert.pem" DESTINATION share/discordcoreapi/data)	
- endif()
- 
- if (EXISTS ${VCPKG_INSTALLED_DIR})
diff --git a/ports/discordcoreapi/portfile.cmake b/ports/discordcoreapi/portfile.cmake
index 3bb8671ede..73715b3642 100644
--- a/ports/discordcoreapi/portfile.cmake
+++ b/ports/discordcoreapi/portfile.cmake
@@ -5,10 +5,9 @@ endif()
 vcpkg_from_github(
 	OUT_SOURCE_PATH SOURCE_PATH
 	REPO RealTimeChris/DiscordCoreAPI
-	REF 6d7c899f0690513855119aa225259dccf17b10f0
-	SHA512 ff42ed8ae799b8f875158842c47fcb5612a5b8861dbfb442c97ab131d952ed59140b2d2431a0d389aefbecb122263f340ff9c8fb863466d0aa91875f8080616e
+	REF c5e7efee991f4dcff428ca21c2e157949e784a78
+	SHA512 5f42864f8375c87542550ff1f05e761d75a02de5810a4ca1f1b4893894d9be11a21915ff16771e3233103c4fce3ce8734359baacd5f5051d719e387a225343dd
 	HEAD_REF main
-    PATCHES fix-cert-installation.patch
 )
 
 vcpkg_cmake_configure(
@@ -30,7 +29,7 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
 endif()
 
 file(
-	INSTALL "${SOURCE_PATH}/License"
+	INSTALL "${SOURCE_PATH}/License.md"
 	DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}"
 	RENAME copyright
 )
diff --git a/ports/discordcoreapi/vcpkg.json b/ports/discordcoreapi/vcpkg.json
index 767de8aa87..da67d297b3 100644
--- a/ports/discordcoreapi/vcpkg.json
+++ b/ports/discordcoreapi/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "discordcoreapi",
-  "version-date": "2022-03-30",
-  "port-version": 1,
+  "version-date": "2022-04-17",
   "description": "A Discord bot library written in C++ using custom asynchronous coroutines.",
   "homepage": "https://discordcoreapi.com",
   "license": "AGPL-3.0-or-later",
diff --git a/versions/baseline.json b/versions/baseline.json
index 0c7196f127..e4e5174ccb 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -1893,8 +1893,8 @@
       "port-version": 1
     },
     "discordcoreapi": {
-      "baseline": "2022-03-30",
-      "port-version": 1
+      "baseline": "2022-04-17",
+      "port-version": 0
     },
     "discount": {
       "baseline": "2.2.6",
diff --git a/versions/d-/discordcoreapi.json b/versions/d-/discordcoreapi.json
index f3d04577bd..03cef54f20 100644
--- a/versions/d-/discordcoreapi.json
+++ b/versions/d-/discordcoreapi.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "dd790721f9b6d332bbcdae69e83a716720eedc1a",
+      "version-date": "2022-04-17",
+      "port-version": 0
+    },
     {
       "git-tree": "70c609a4d2bc6319e046e08e25842c4559bfc556",
       "version-date": "2022-03-30",