From 5644fcadc9b5476ced6e291a187a46f449384f41 Mon Sep 17 00:00:00 2001
From: Craig Edwards <craigedwards@brainbox.cc>
Date: Mon, 22 May 2023 17:01:45 +0000
Subject: [PATCH 1/6] [bot] Update DPP to v10.0.24
---
ports/dpp/portfile.cmake | 13 +++++++------
ports/dpp/vcpkg.json | 3 +--
versions/baseline.json | 4 ++--
versions/d-/dpp.json | 5 +++++
4 files changed, 15 insertions(+), 10 deletions(-)
diff --git a/ports/dpp/portfile.cmake b/ports/dpp/portfile.cmake
index baa1c840c8fbcb..f7f8c312d64513 100644
--- a/ports/dpp/portfile.cmake
+++ b/ports/dpp/portfile.cmake
@@ -2,10 +2,8 @@ vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO brainboxdotcc/DPP
REF "v${VERSION}"
- SHA512 18bbb7d2c1385d179cac9ded31d1b11e8d24f172e7ffe2ba79071203e1e2f277657e21d660b18ee4b849bc093d350f4bc5401702400084b56c3ebd6f03ce28df
- HEAD_REF master
- PATCHES
- remove-wrong-header.patch
+ # Auto-generated by release CI action at brainboxdotcc/DPP
+ SHA512 2f1e5415c121d5f19d2abb1b389512ad22c3cac6779ed897403d430b2c4e62c758ab25d46a3fd02538add711073fadd616a690b4981f3782e46c18ff05d116dc
)
vcpkg_cmake_configure(
@@ -24,7 +22,10 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin")
endif()
-vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
+file(
+ INSTALL "${SOURCE_PATH}/LICENSE"
+ DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}"
+ RENAME copyright
+)
file(COPY "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
-
diff --git a/ports/dpp/vcpkg.json b/ports/dpp/vcpkg.json
index 74348aaaf50e09..016e2b4faadea1 100644
--- a/ports/dpp/vcpkg.json
+++ b/ports/dpp/vcpkg.json
@@ -1,7 +1,6 @@
{
"name": "dpp",
- "version": "10.0.23",
- "port-version": 1,
+ "version": "10.0.24",
"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
index 192ca2d1a3d375..c27866ba0e8387 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -2153,8 +2153,8 @@
"port-version": 1
},
"dpp": {
- "baseline": "10.0.23",
- "port-version": 1
+ "baseline": "10.0.24",
+ "port-version": 0
},
"draco": {
"baseline": "1.5.6",
diff --git a/versions/d-/dpp.json b/versions/d-/dpp.json
index a05124cc09d4f9..770d2b8fd9d697 100644
--- a/versions/d-/dpp.json
+++ b/versions/d-/dpp.json
@@ -1,5 +1,10 @@
{
"versions": [
+ {
+ "git-tree": "8d605903b75a46d8a4a2278261c81fd2c68e6281",
+ "version": "10.0.24",
+ "port-version": 0
+ },
{
"git-tree": "f5258ce203526b7be2ba77c9ab6deb7a197273af",
"version": "10.0.23",
From acb447f90eff00ebb5d60c86ca8ec94ed4327fb8 Mon Sep 17 00:00:00 2001
From: Brain <braindigitalis@users.noreply.github.com>
Date: Wed, 24 May 2023 08:58:36 +0100
Subject: [PATCH 2/6] Update portfile.cmake
---
ports/dpp/portfile.cmake | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/ports/dpp/portfile.cmake b/ports/dpp/portfile.cmake
index f7f8c312d64513..2a2f0dc72372fb 100644
--- a/ports/dpp/portfile.cmake
+++ b/ports/dpp/portfile.cmake
@@ -22,10 +22,6 @@ 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}")
From fd135dbf804ce172587360aae710cdb56ece8408 Mon Sep 17 00:00:00 2001
From: Brain <braindigitalis@users.noreply.github.com>
Date: Wed, 24 May 2023 08:58:53 +0100
Subject: [PATCH 3/6] Update ports/dpp/portfile.cmake
Co-authored-by: Cheney Wang <38240633+Cheney-W@users.noreply.github.com>
---
ports/dpp/portfile.cmake | 1 -
1 file changed, 1 deletion(-)
diff --git a/ports/dpp/portfile.cmake b/ports/dpp/portfile.cmake
index 2a2f0dc72372fb..99c8e6052736be 100644
--- a/ports/dpp/portfile.cmake
+++ b/ports/dpp/portfile.cmake
@@ -2,7 +2,6 @@ vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO brainboxdotcc/DPP
REF "v${VERSION}"
- # Auto-generated by release CI action at brainboxdotcc/DPP
SHA512 2f1e5415c121d5f19d2abb1b389512ad22c3cac6779ed897403d430b2c4e62c758ab25d46a3fd02538add711073fadd616a690b4981f3782e46c18ff05d116dc
)
From a1af076f8b3bf9cbcabd2ed3b79041299ac08143 Mon Sep 17 00:00:00 2001
From: Brain <braindigitalis@users.noreply.github.com>
Date: Wed, 24 May 2023 09:01:51 +0100
Subject: [PATCH 4/6] Update dpp.json
---
versions/d-/dpp.json | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/versions/d-/dpp.json b/versions/d-/dpp.json
index 770d2b8fd9d697..df9eb0313b9ea5 100644
--- a/versions/d-/dpp.json
+++ b/versions/d-/dpp.json
@@ -1,7 +1,7 @@
{
"versions": [
{
- "git-tree": "8d605903b75a46d8a4a2278261c81fd2c68e6281",
+ "git-tree": "aa6c5a950fd9417562f788b27a61c2d3c5e4f4d8",
"version": "10.0.24",
"port-version": 0
},
From 290eb3ec8495b86fe4f085c67423d14a5589be98 Mon Sep 17 00:00:00 2001
From: Craig Edwards <craigedwards@brainbox.cc>
Date: Wed, 24 May 2023 21:02:30 +0000
Subject: [PATCH 5/6] remove unused
---
ports/dpp/remove-wrong-header.patch | 13 -------------
1 file changed, 13 deletions(-)
delete mode 100644 ports/dpp/remove-wrong-header.patch
diff --git a/ports/dpp/remove-wrong-header.patch b/ports/dpp/remove-wrong-header.patch
deleted file mode 100644
index a1ae8fb5044298..00000000000000
--- a/ports/dpp/remove-wrong-header.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-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;
-
From 2ab94670117d4ca90e94f6dc0bf98213c05a021d Mon Sep 17 00:00:00 2001
From: Brain <braindigitalis@users.noreply.github.com>
Date: Wed, 24 May 2023 22:04:04 +0100
Subject: [PATCH 6/6] Update dpp.json
---
versions/d-/dpp.json | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/versions/d-/dpp.json b/versions/d-/dpp.json
index df9eb0313b9ea5..58f1cc79fdc057 100644
--- a/versions/d-/dpp.json
+++ b/versions/d-/dpp.json
@@ -1,7 +1,7 @@
{
"versions": [
{
- "git-tree": "aa6c5a950fd9417562f788b27a61c2d3c5e4f4d8",
+ "git-tree": "8c631e7b3f93d40c4aea0d65e722e1ff1ac028ac",
"version": "10.0.24",
"port-version": 0
},