[dpp] fix error hash (#30035)

* fix error hash * fix wrong header
microsoft · Mar 9, 2023 · 571bffa · 571bffa
1 parent a01d0a9
commit 571bffa
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 7 deletions.
diff --git a/ports/dpp/portfile.cmake b/ports/dpp/portfile.cmake
@@ -2,8 +2,10 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO brainboxdotcc/DPP
     REF "v${VERSION}"
-    SHA512  09666b3e05c379aa2da794aed0a59ff5f6b2dae06c6e700b2bd45486aa20003b4e6d28bd9436d1e28bf7dd1b5ca80d55e5a107fe9589587b88719caa2cecb243
+    SHA512 18bbb7d2c1385d179cac9ded31d1b11e8d24f172e7ffe2ba79071203e1e2f277657e21d660b18ee4b849bc093d350f4bc5401702400084b56c3ebd6f03ce28df
     HEAD_REF master
+    PATCHES
+        remove-wrong-header.patch
 )
 
 vcpkg_cmake_configure(
@@ -22,11 +24,7 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
     file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin")
 endif()
 
-file(
-    INSTALL "${SOURCE_PATH}/LICENSE"
-    DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}"
-    RENAME copyright
-)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
 
 file(COPY "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
 
diff --git a/ports/dpp/remove-wrong-header.patch b/ports/dpp/remove-wrong-header.patch
@@ -0,0 +1,13 @@
+diff --git a/src/dpp/user.cpp b/src/dpp/user.cpp
+index 0f5bce1..cdd7903 100644
+--- a/src/dpp/user.cpp
++++ b/src/dpp/user.cpp
+@@ -22,7 +22,7 @@
+ #include <dpp/discordevents.h>
+ #include <dpp/json.h>
+ #include <dpp/stringops.h>
+-#include "user.h"
++// #include "user.h"
+
+ using json = nlohmann::json;
+
diff --git a/ports/dpp/vcpkg.json b/ports/dpp/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "dpp",
   "version": "10.0.23",
+  "port-version": 1,
   "description": "D++ Extremely Lightweight C++ Discord Library.",
   "homepage": "https://dpp.dev/",
   "license": "Apache-2.0",

diff --git a/versions/baseline.json b/versions/baseline.json
@@ -2114,7 +2114,7 @@
     },
     "dpp": {
       "baseline": "10.0.23",
-      "port-version": 0
+      "port-version": 1
     },
     "draco": {
       "baseline": "1.5.3",

diff --git a/versions/d-/dpp.json b/versions/d-/dpp.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "f5258ce203526b7be2ba77c9ab6deb7a197273af",
+      "version": "10.0.23",
+      "port-version": 1
+    },
     {
       "git-tree": "1701fdce3e1e8a3557382fcc806d87abf06fd452",
       "version": "10.0.23",