From d983633db58f8cb599a95f74b83ac8adabda8060 Mon Sep 17 00:00:00 2001 From: Bo-Ru Ju Date: Thu, 11 Aug 2022 16:08:19 +0800 Subject: [PATCH 1/2] New package: libdpp-10.0.15 --- srcpkgs/libdpp-devel | 1 + srcpkgs/libdpp/patches/fix-headers.patch | 1588 ++++++++++++++++++++++ srcpkgs/libdpp/template | 30 + srcpkgs/libdpp/update | 2 + 4 files changed, 1621 insertions(+) create mode 120000 srcpkgs/libdpp-devel create mode 100644 srcpkgs/libdpp/patches/fix-headers.patch create mode 100644 srcpkgs/libdpp/template create mode 100644 srcpkgs/libdpp/update diff --git a/srcpkgs/libdpp-devel b/srcpkgs/libdpp-devel new file mode 120000 index 000000000000..9176d7a850be --- /dev/null +++ b/srcpkgs/libdpp-devel @@ -0,0 +1 @@ +libdpp \ No newline at end of file diff --git a/srcpkgs/libdpp/patches/fix-headers.patch b/srcpkgs/libdpp/patches/fix-headers.patch new file mode 100644 index 000000000000..edbc0b1ba0e9 --- /dev/null +++ b/srcpkgs/libdpp/patches/fix-headers.patch @@ -0,0 +1,1588 @@ +diff --git a/include/dpp/appcommand.h b/include/dpp/appcommand.h +index 50f2a29..99ae086 100644 +--- a/include/dpp/appcommand.h ++++ b/include/dpp/appcommand.h +@@ -27,7 +27,7 @@ + #include + #include + #include +-#include ++#include + #include + + namespace dpp { +diff --git a/include/dpp/application.h b/include/dpp/application.h +index 7e9d80d..19fad83 100644 +--- a/include/dpp/application.h ++++ b/include/dpp/application.h +@@ -26,7 +26,7 @@ + #include + #include + #include +-#include ++#include + #include + + namespace dpp { +diff --git a/include/dpp/auditlog.h b/include/dpp/auditlog.h +index 946ab41..2de5845 100644 +--- a/include/dpp/auditlog.h ++++ b/include/dpp/auditlog.h +@@ -22,7 +22,7 @@ + #pragma once + #include + #include +-#include ++#include + #include + #include + +diff --git a/include/dpp/automod.h b/include/dpp/automod.h +index a15d52f..922df45 100644 +--- a/include/dpp/automod.h ++++ b/include/dpp/automod.h +@@ -24,7 +24,7 @@ + #include + #include + #include +-#include ++#include + #include + + namespace dpp { +diff --git a/include/dpp/ban.h b/include/dpp/ban.h +index 6bbcdd2..8ad88d6 100644 +--- a/include/dpp/ban.h ++++ b/include/dpp/ban.h +@@ -22,7 +22,7 @@ + #pragma once + #include + #include +-#include ++#include + #include + #include + +diff --git a/include/dpp/channel.h b/include/dpp/channel.h +index 93b6e36..7e6b6e1 100644 +--- a/include/dpp/channel.h ++++ b/include/dpp/channel.h +@@ -25,7 +25,7 @@ + #include + #include + #include +-#include ++#include + #include + #include + #include +diff --git a/include/dpp/cluster.h b/include/dpp/cluster.h +index 59bbd85..f34d179 100644 +--- a/include/dpp/cluster.h ++++ b/include/dpp/cluster.h +@@ -29,7 +29,7 @@ + #include + #include + #include +-#include ++#include + #include + #include + #include +diff --git a/include/dpp/commandhandler.h b/include/dpp/commandhandler.h +index 29da473..0b15417 100644 +--- a/include/dpp/commandhandler.h ++++ b/include/dpp/commandhandler.h +@@ -29,7 +29,7 @@ + #include + #include + #include +-#include ++#include + #include + #include + #include +diff --git a/include/dpp/discordclient.h b/include/dpp/discordclient.h +index 1eb875a..10f010e 100644 +--- a/include/dpp/discordclient.h ++++ b/include/dpp/discordclient.h +@@ -24,7 +24,7 @@ + #include + #include + #include +-#include ++#include + #include + #include + #include +diff --git a/include/dpp/discordevents.h b/include/dpp/discordevents.h +index c6474a4..1a70b18 100644 +--- a/include/dpp/discordevents.h ++++ b/include/dpp/discordevents.h +@@ -21,7 +21,7 @@ + #pragma once + + #include +-#include ++#include + + namespace dpp { + +diff --git a/include/dpp/discordvoiceclient.h b/include/dpp/discordvoiceclient.h +index e11d653..6692e54 100644 +--- a/include/dpp/discordvoiceclient.h ++++ b/include/dpp/discordvoiceclient.h +@@ -32,7 +32,7 @@ + #include + #include + #include +-#include ++#include + #include + #include + #include +diff --git a/include/dpp/dtemplate.h b/include/dpp/dtemplate.h +index 948b25d..5fbe17e 100644 +--- a/include/dpp/dtemplate.h ++++ b/include/dpp/dtemplate.h +@@ -21,7 +21,7 @@ + #pragma once + #include + #include +-#include ++#include + #include + #include + +diff --git a/include/dpp/emoji.h b/include/dpp/emoji.h +index a73e58a..9ab9c1e 100644 +--- a/include/dpp/emoji.h ++++ b/include/dpp/emoji.h +@@ -23,7 +23,7 @@ + #include + #include + #include +-#include ++#include + #include + #include + +diff --git a/include/dpp/etf.h b/include/dpp/etf.h +index 79b18d9..83415cc 100644 +--- a/include/dpp/etf.h ++++ b/include/dpp/etf.h +@@ -34,7 +34,7 @@ + #pragma once + #include + #include +-#include ++#include + + namespace dpp { + +diff --git a/include/dpp/event.h b/include/dpp/event.h +index b82f982..9f86e54 100644 +--- a/include/dpp/event.h ++++ b/include/dpp/event.h +@@ -21,7 +21,7 @@ + #pragma once + #include + #include +-#include ++#include + + #define event_decl(x,wstype) /** @brief Internal event handler for wstype websocket events. Called for each websocket message of this type. @internal */ \ + class x : public event { public: virtual void handle(dpp::discord_client* client, nlohmann::json &j, const std::string &raw); }; +diff --git a/include/dpp/integration.h b/include/dpp/integration.h +index 420c8d8..6815c3c 100644 +--- a/include/dpp/integration.h ++++ b/include/dpp/integration.h +@@ -22,7 +22,7 @@ + #include + #include + #include +-#include ++#include + #include + #include + +diff --git a/include/dpp/invite.h b/include/dpp/invite.h +index eae62a9..e8977a8 100644 +--- a/include/dpp/invite.h ++++ b/include/dpp/invite.h +@@ -21,7 +21,7 @@ + #pragma once + #include + #include +-#include ++#include + #include + #include + #include +diff --git a/include/dpp/json_interface.h b/include/dpp/json_interface.h +index 302642d..e2e467a 100644 +--- a/include/dpp/json_interface.h ++++ b/include/dpp/json_interface.h +@@ -22,7 +22,7 @@ + #pragma once + #include + #include +-#include ++#include + + namespace dpp { + /** +diff --git a/include/dpp/message.h b/include/dpp/message.h +index a5e038f..7e705d0 100644 +--- a/include/dpp/message.h ++++ b/include/dpp/message.h +@@ -27,7 +27,7 @@ + #include + #include + #include +-#include ++#include + #include + + namespace dpp { +diff --git a/include/dpp/permissions.h b/include/dpp/permissions.h +index caf248f..b370e56 100644 +--- a/include/dpp/permissions.h ++++ b/include/dpp/permissions.h +@@ -20,7 +20,7 @@ + ************************************************************************************/ + #pragma once + #include +-#include ++#include + #include + #include + +diff --git a/include/dpp/presence.h b/include/dpp/presence.h +index e018f92..bcf322b 100644 +--- a/include/dpp/presence.h ++++ b/include/dpp/presence.h +@@ -22,7 +22,7 @@ + #include + #include + #include +-#include ++#include + #include + #include + +diff --git a/include/dpp/prune.h b/include/dpp/prune.h +index dd1b19b..7528a37 100644 +--- a/include/dpp/prune.h ++++ b/include/dpp/prune.h +@@ -21,7 +21,7 @@ + #pragma once + #include + #include +-#include ++#include + #include + + namespace dpp { +diff --git a/include/dpp/restrequest.h b/include/dpp/restrequest.h +index 2d1915c..20a4b3d 100644 +--- a/include/dpp/restrequest.h ++++ b/include/dpp/restrequest.h +@@ -23,7 +23,7 @@ + #include + #include + #include +-#include ++#include + + namespace dpp { + +diff --git a/include/dpp/role.h b/include/dpp/role.h +index 4d6d13f..9327aae 100644 +--- a/include/dpp/role.h ++++ b/include/dpp/role.h +@@ -21,7 +21,7 @@ + #pragma once + #include + #include +-#include ++#include + #include + #include + #include +diff --git a/include/dpp/scheduled_event.h b/include/dpp/scheduled_event.h +index 2cddd63..39be997 100644 +--- a/include/dpp/scheduled_event.h ++++ b/include/dpp/scheduled_event.h +@@ -24,7 +24,7 @@ + #include + #include + #include +-#include ++#include + #include + + namespace dpp { +diff --git a/include/dpp/stage_instance.h b/include/dpp/stage_instance.h +index 90a134f..0ab205e 100644 +--- a/include/dpp/stage_instance.h ++++ b/include/dpp/stage_instance.h +@@ -22,7 +22,7 @@ + #include + #include + #include +-#include ++#include + #include + #include + +diff --git a/include/dpp/user.h b/include/dpp/user.h +index 14245e3..a8a6b12 100644 +--- a/include/dpp/user.h ++++ b/include/dpp/user.h +@@ -20,7 +20,7 @@ + ************************************************************************************/ + #pragma once + #include +-#include ++#include + #include + #include + #include +diff --git a/include/dpp/voiceregion.h b/include/dpp/voiceregion.h +index a1def0a..a0a88e5 100644 +--- a/include/dpp/voiceregion.h ++++ b/include/dpp/voiceregion.h +@@ -21,7 +21,7 @@ + #pragma once + #include + #include +-#include ++#include + #include + + namespace dpp { +diff --git a/include/dpp/voicestate.h b/include/dpp/voicestate.h +index 64f1517..c14461e 100644 +--- a/include/dpp/voicestate.h ++++ b/include/dpp/voicestate.h +@@ -21,7 +21,7 @@ + #pragma once + #include + #include +-#include ++#include + #include + #include + +diff --git a/include/dpp/webhook.h b/include/dpp/webhook.h +index 98fa176..95c09dc 100644 +--- a/include/dpp/webhook.h ++++ b/include/dpp/webhook.h +@@ -23,7 +23,7 @@ + #include + #include + #include +-#include ++#include + #include + #include + +diff --git a/library/CMakeLists.txt b/library/CMakeLists.txt +index 139adf8..6c80610 100644 +--- a/library/CMakeLists.txt ++++ b/library/CMakeLists.txt +@@ -196,8 +196,8 @@ foreach (fullmodname ${subdirlist}) + target_precompile_headers( + ${modname} + PRIVATE +- "${CMAKE_CURRENT_SOURCE_DIR}/../include/dpp/nlohmann/json_fwd.hpp" +- "${CMAKE_CURRENT_SOURCE_DIR}/../include/dpp/nlohmann/json.hpp" ++ ++ + ) + + if (WIN32 AND NOT MINGW) +diff --git a/src/dpp/application.cpp b/src/dpp/application.cpp +index a927d45..2799c2f 100644 +--- a/src/dpp/application.cpp ++++ b/src/dpp/application.cpp +@@ -22,7 +22,7 @@ + #include + #include + #include +-#include ++#include + + namespace dpp { + +diff --git a/src/dpp/auditlog.cpp b/src/dpp/auditlog.cpp +index 2d547f3..3dad878 100644 +--- a/src/dpp/auditlog.cpp ++++ b/src/dpp/auditlog.cpp +@@ -20,7 +20,7 @@ + ************************************************************************************/ + #include + #include +-#include ++#include + + namespace dpp { + +diff --git a/src/dpp/automod.cpp b/src/dpp/automod.cpp +index f35a924..3a711c4 100644 +--- a/src/dpp/automod.cpp ++++ b/src/dpp/automod.cpp +@@ -20,7 +20,7 @@ + ************************************************************************************/ + #include + #include +-#include ++#include + + namespace dpp { + +diff --git a/src/dpp/ban.cpp b/src/dpp/ban.cpp +index 2f8744b..fa0a189 100644 +--- a/src/dpp/ban.cpp ++++ b/src/dpp/ban.cpp +@@ -20,7 +20,7 @@ + ************************************************************************************/ + #include + #include +-#include ++#include + + namespace dpp { + +diff --git a/src/dpp/channel.cpp b/src/dpp/channel.cpp +index 364e574..77d4e75 100644 +--- a/src/dpp/channel.cpp ++++ b/src/dpp/channel.cpp +@@ -25,7 +25,7 @@ + #include + #include + #include +-#include ++#include + + using json = nlohmann::json; + +diff --git a/src/dpp/cluster.cpp b/src/dpp/cluster.cpp +index 011bdaf..969e088 100644 +--- a/src/dpp/cluster.cpp ++++ b/src/dpp/cluster.cpp +@@ -29,7 +29,7 @@ + #include + #include + #include +-#include ++#include + #include + #include + +diff --git a/src/dpp/cluster/confirmation.cpp b/src/dpp/cluster/confirmation.cpp +index 36164a6..9ece5d8 100644 +--- a/src/dpp/cluster/confirmation.cpp ++++ b/src/dpp/cluster/confirmation.cpp +@@ -19,7 +19,7 @@ + * + ************************************************************************************/ + #include +-#include ++#include + + namespace dpp { + +diff --git a/src/dpp/cluster/timer.cpp b/src/dpp/cluster/timer.cpp +index af2e67e..1bad535 100644 +--- a/src/dpp/cluster/timer.cpp ++++ b/src/dpp/cluster/timer.cpp +@@ -20,7 +20,7 @@ + ************************************************************************************/ + #include + #include +-#include ++#include + + namespace dpp { + +diff --git a/src/dpp/discordclient.cpp b/src/dpp/discordclient.cpp +index adbf04e..8257167 100644 +--- a/src/dpp/discordclient.cpp ++++ b/src/dpp/discordclient.cpp +@@ -26,7 +26,7 @@ + #include + #include + #include +-#include ++#include + #include + #include + #ifdef _WIN32 +diff --git a/src/dpp/discordevents.cpp b/src/dpp/discordevents.cpp +index 35f811b..c256590 100644 +--- a/src/dpp/discordevents.cpp ++++ b/src/dpp/discordevents.cpp +@@ -30,7 +30,7 @@ + #include + #include + #include +-#include ++#include + #include + #include + #include +diff --git a/src/dpp/discordvoiceclient.cpp b/src/dpp/discordvoiceclient.cpp +index 1981cd4..3aa62c4 100644 +--- a/src/dpp/discordvoiceclient.cpp ++++ b/src/dpp/discordvoiceclient.cpp +@@ -41,7 +41,7 @@ + #include + #include + #include +-#include ++#include + + #ifdef HAVE_VOICE + #include +diff --git a/src/dpp/dtemplate.cpp b/src/dpp/dtemplate.cpp +index 1e981ec..78c51b5 100644 +--- a/src/dpp/dtemplate.cpp ++++ b/src/dpp/dtemplate.cpp +@@ -20,7 +20,7 @@ + ************************************************************************************/ + #include + #include +-#include ++#include + + using json = nlohmann::json; + +diff --git a/src/dpp/emoji.cpp b/src/dpp/emoji.cpp +index 366f49a..bed2358 100644 +--- a/src/dpp/emoji.cpp ++++ b/src/dpp/emoji.cpp +@@ -20,7 +20,7 @@ + ************************************************************************************/ + #include + #include +-#include ++#include + #include + + namespace dpp { +diff --git a/src/dpp/etf.cpp b/src/dpp/etf.cpp +index a97a063..1595c28 100644 +--- a/src/dpp/etf.cpp ++++ b/src/dpp/etf.cpp +@@ -34,7 +34,7 @@ + #include + #include + #include +-#include ++#include + #include + #include + +diff --git a/src/dpp/events/automod_rule_create.cpp b/src/dpp/events/automod_rule_create.cpp +index ae9a662..879472a 100644 +--- a/src/dpp/events/automod_rule_create.cpp ++++ b/src/dpp/events/automod_rule_create.cpp +@@ -21,7 +21,7 @@ + #include + #include + #include +-#include ++#include + + using json = nlohmann::json; + +diff --git a/src/dpp/events/automod_rule_delete.cpp b/src/dpp/events/automod_rule_delete.cpp +index 08449cc..4005d5b 100644 +--- a/src/dpp/events/automod_rule_delete.cpp ++++ b/src/dpp/events/automod_rule_delete.cpp +@@ -21,7 +21,7 @@ + #include + #include + #include +-#include ++#include + + using json = nlohmann::json; + +diff --git a/src/dpp/events/automod_rule_execute.cpp b/src/dpp/events/automod_rule_execute.cpp +index b598260..9ad5bbd 100644 +--- a/src/dpp/events/automod_rule_execute.cpp ++++ b/src/dpp/events/automod_rule_execute.cpp +@@ -21,7 +21,7 @@ + #include + #include + #include +-#include ++#include + + using json = nlohmann::json; + +diff --git a/src/dpp/events/automod_rule_update.cpp b/src/dpp/events/automod_rule_update.cpp +index 24738bb..0310c7b 100644 +--- a/src/dpp/events/automod_rule_update.cpp ++++ b/src/dpp/events/automod_rule_update.cpp +@@ -21,7 +21,7 @@ + #include + #include + #include +-#include ++#include + + using json = nlohmann::json; + +diff --git a/src/dpp/events/channel_create.cpp b/src/dpp/events/channel_create.cpp +index 24307e1..ec533b8 100644 +--- a/src/dpp/events/channel_create.cpp ++++ b/src/dpp/events/channel_create.cpp +@@ -21,7 +21,7 @@ + #include + #include + #include +-#include ++#include + + using json = nlohmann::json; + +diff --git a/src/dpp/events/channel_delete.cpp b/src/dpp/events/channel_delete.cpp +index ef577bc..343d7bb 100644 +--- a/src/dpp/events/channel_delete.cpp ++++ b/src/dpp/events/channel_delete.cpp +@@ -22,7 +22,7 @@ + #include + #include + #include +-#include ++#include + + using json = nlohmann::json; + +diff --git a/src/dpp/events/channel_pins_update.cpp b/src/dpp/events/channel_pins_update.cpp +index 214cf4f..2b50601 100644 +--- a/src/dpp/events/channel_pins_update.cpp ++++ b/src/dpp/events/channel_pins_update.cpp +@@ -22,7 +22,7 @@ + #include + #include + #include +-#include ++#include + + using json = nlohmann::json; + +diff --git a/src/dpp/events/channel_update.cpp b/src/dpp/events/channel_update.cpp +index 24570dc..54ef33b 100644 +--- a/src/dpp/events/channel_update.cpp ++++ b/src/dpp/events/channel_update.cpp +@@ -22,7 +22,7 @@ + #include + #include + #include +-#include ++#include + + using json = nlohmann::json; + +diff --git a/src/dpp/events/guild_ban_add.cpp b/src/dpp/events/guild_ban_add.cpp +index 057ce56..f7e9954 100644 +--- a/src/dpp/events/guild_ban_add.cpp ++++ b/src/dpp/events/guild_ban_add.cpp +@@ -23,7 +23,7 @@ + #include + #include + #include +-#include ++#include + + using json = nlohmann::json; + +diff --git a/src/dpp/events/guild_ban_remove.cpp b/src/dpp/events/guild_ban_remove.cpp +index ad55cd7..1c61471 100644 +--- a/src/dpp/events/guild_ban_remove.cpp ++++ b/src/dpp/events/guild_ban_remove.cpp +@@ -23,7 +23,7 @@ + #include + #include + #include +-#include ++#include + + using json = nlohmann::json; + +diff --git a/src/dpp/events/guild_create.cpp b/src/dpp/events/guild_create.cpp +index f6d8e5a..71accb3 100644 +--- a/src/dpp/events/guild_create.cpp ++++ b/src/dpp/events/guild_create.cpp +@@ -23,7 +23,7 @@ + #include + #include + #include +-#include ++#include + + using json = nlohmann::json; + +diff --git a/src/dpp/events/guild_delete.cpp b/src/dpp/events/guild_delete.cpp +index 4186df4..f99d9db 100644 +--- a/src/dpp/events/guild_delete.cpp ++++ b/src/dpp/events/guild_delete.cpp +@@ -23,7 +23,7 @@ + #include + #include + #include +-#include ++#include + + using json = nlohmann::json; + +diff --git a/src/dpp/events/guild_emojis_update.cpp b/src/dpp/events/guild_emojis_update.cpp +index d15d07b..15f228f 100644 +--- a/src/dpp/events/guild_emojis_update.cpp ++++ b/src/dpp/events/guild_emojis_update.cpp +@@ -24,7 +24,7 @@ + #include + #include + #include +-#include ++#include + + using json = nlohmann::json; + +diff --git a/src/dpp/events/guild_integrations_update.cpp b/src/dpp/events/guild_integrations_update.cpp +index 080a7b8..afd63c8 100644 +--- a/src/dpp/events/guild_integrations_update.cpp ++++ b/src/dpp/events/guild_integrations_update.cpp +@@ -23,7 +23,7 @@ + #include + #include + #include +-#include ++#include + + using json = nlohmann::json; + +diff --git a/src/dpp/events/guild_join_request_delete.cpp b/src/dpp/events/guild_join_request_delete.cpp +index b4bbbcc..cbece67 100644 +--- a/src/dpp/events/guild_join_request_delete.cpp ++++ b/src/dpp/events/guild_join_request_delete.cpp +@@ -21,7 +21,7 @@ + #include + #include + #include +-#include ++#include + + using json = nlohmann::json; + +diff --git a/src/dpp/events/guild_member_add.cpp b/src/dpp/events/guild_member_add.cpp +index ed08758..ff19b16 100644 +--- a/src/dpp/events/guild_member_add.cpp ++++ b/src/dpp/events/guild_member_add.cpp +@@ -22,7 +22,7 @@ + #include + #include + #include +-#include ++#include + + using json = nlohmann::json; + +diff --git a/src/dpp/events/guild_member_remove.cpp b/src/dpp/events/guild_member_remove.cpp +index 3e2be13..cd7a35f 100644 +--- a/src/dpp/events/guild_member_remove.cpp ++++ b/src/dpp/events/guild_member_remove.cpp +@@ -22,7 +22,7 @@ + #include + #include + #include +-#include ++#include + + using json = nlohmann::json; + +diff --git a/src/dpp/events/guild_member_update.cpp b/src/dpp/events/guild_member_update.cpp +index af81395..b6a7ea3 100644 +--- a/src/dpp/events/guild_member_update.cpp ++++ b/src/dpp/events/guild_member_update.cpp +@@ -22,7 +22,7 @@ + #include + #include + #include +-#include ++#include + + using json = nlohmann::json; + +diff --git a/src/dpp/events/guild_members_chunk.cpp b/src/dpp/events/guild_members_chunk.cpp +index beffb96..d14a982 100644 +--- a/src/dpp/events/guild_members_chunk.cpp ++++ b/src/dpp/events/guild_members_chunk.cpp +@@ -23,7 +23,7 @@ + #include + #include + #include +-#include ++#include + + using json = nlohmann::json; + +diff --git a/src/dpp/events/guild_role_create.cpp b/src/dpp/events/guild_role_create.cpp +index 98655a3..67d4faa 100644 +--- a/src/dpp/events/guild_role_create.cpp ++++ b/src/dpp/events/guild_role_create.cpp +@@ -23,7 +23,7 @@ + #include + #include + #include +-#include ++#include + + using json = nlohmann::json; + +diff --git a/src/dpp/events/guild_role_delete.cpp b/src/dpp/events/guild_role_delete.cpp +index 6784db6..6206333 100644 +--- a/src/dpp/events/guild_role_delete.cpp ++++ b/src/dpp/events/guild_role_delete.cpp +@@ -23,7 +23,7 @@ + #include + #include + #include +-#include ++#include + + using json = nlohmann::json; + +diff --git a/src/dpp/events/guild_role_update.cpp b/src/dpp/events/guild_role_update.cpp +index bab481c..1b53ec5 100644 +--- a/src/dpp/events/guild_role_update.cpp ++++ b/src/dpp/events/guild_role_update.cpp +@@ -23,7 +23,7 @@ + #include + #include + #include +-#include ++#include + + using json = nlohmann::json; + +diff --git a/src/dpp/events/guild_scheduled_event_create.cpp b/src/dpp/events/guild_scheduled_event_create.cpp +index f5a6c8a..59902a7 100644 +--- a/src/dpp/events/guild_scheduled_event_create.cpp ++++ b/src/dpp/events/guild_scheduled_event_create.cpp +@@ -22,7 +22,7 @@ + #include + #include + #include +-#include ++#include + + using json = nlohmann::json; + +diff --git a/src/dpp/events/guild_scheduled_event_delete.cpp b/src/dpp/events/guild_scheduled_event_delete.cpp +index 692f271..e01cde9 100644 +--- a/src/dpp/events/guild_scheduled_event_delete.cpp ++++ b/src/dpp/events/guild_scheduled_event_delete.cpp +@@ -22,7 +22,7 @@ + #include + #include + #include +-#include ++#include + + using json = nlohmann::json; + +diff --git a/src/dpp/events/guild_scheduled_event_update.cpp b/src/dpp/events/guild_scheduled_event_update.cpp +index b45d843..8b8465e 100644 +--- a/src/dpp/events/guild_scheduled_event_update.cpp ++++ b/src/dpp/events/guild_scheduled_event_update.cpp +@@ -22,7 +22,7 @@ + #include + #include + #include +-#include ++#include + + using json = nlohmann::json; + +diff --git a/src/dpp/events/guild_scheduled_event_user_add.cpp b/src/dpp/events/guild_scheduled_event_user_add.cpp +index c3084e3..12a95be 100644 +--- a/src/dpp/events/guild_scheduled_event_user_add.cpp ++++ b/src/dpp/events/guild_scheduled_event_user_add.cpp +@@ -21,7 +21,7 @@ + #include + #include + #include +-#include ++#include + + using json = nlohmann::json; + +diff --git a/src/dpp/events/guild_scheduled_event_user_remove.cpp b/src/dpp/events/guild_scheduled_event_user_remove.cpp +index ca521b7..9777836 100644 +--- a/src/dpp/events/guild_scheduled_event_user_remove.cpp ++++ b/src/dpp/events/guild_scheduled_event_user_remove.cpp +@@ -21,7 +21,7 @@ + #include + #include + #include +-#include ++#include + + using json = nlohmann::json; + +diff --git a/src/dpp/events/guild_stickers_update.cpp b/src/dpp/events/guild_stickers_update.cpp +index 7e1fd9b..27ce7eb 100644 +--- a/src/dpp/events/guild_stickers_update.cpp ++++ b/src/dpp/events/guild_stickers_update.cpp +@@ -22,7 +22,7 @@ + #include + #include + #include +-#include ++#include + + using json = nlohmann::json; + +diff --git a/src/dpp/events/guild_update.cpp b/src/dpp/events/guild_update.cpp +index 6133a91..2aeafff 100644 +--- a/src/dpp/events/guild_update.cpp ++++ b/src/dpp/events/guild_update.cpp +@@ -22,7 +22,7 @@ + #include + #include + #include +-#include ++#include + + using json = nlohmann::json; + +diff --git a/src/dpp/events/integration_create.cpp b/src/dpp/events/integration_create.cpp +index 0f24458..8d8824f 100644 +--- a/src/dpp/events/integration_create.cpp ++++ b/src/dpp/events/integration_create.cpp +@@ -22,7 +22,7 @@ + #include + #include + #include +-#include ++#include + + using json = nlohmann::json; + +diff --git a/src/dpp/events/integration_delete.cpp b/src/dpp/events/integration_delete.cpp +index 9eb95fa..b10dfab 100644 +--- a/src/dpp/events/integration_delete.cpp ++++ b/src/dpp/events/integration_delete.cpp +@@ -22,7 +22,7 @@ + #include + #include + #include +-#include ++#include + + using json = nlohmann::json; + +diff --git a/src/dpp/events/integration_update.cpp b/src/dpp/events/integration_update.cpp +index 40741b9..3078e18 100644 +--- a/src/dpp/events/integration_update.cpp ++++ b/src/dpp/events/integration_update.cpp +@@ -22,7 +22,7 @@ + #include + #include + #include +-#include ++#include + + using json = nlohmann::json; + +diff --git a/src/dpp/events/interaction_create.cpp b/src/dpp/events/interaction_create.cpp +index 582e59b..cb4c5eb 100644 +--- a/src/dpp/events/interaction_create.cpp ++++ b/src/dpp/events/interaction_create.cpp +@@ -22,7 +22,7 @@ + #include + #include + #include +-#include ++#include + + using json = nlohmann::json; + +diff --git a/src/dpp/events/invite_create.cpp b/src/dpp/events/invite_create.cpp +index b5c500f..8dfcba6 100644 +--- a/src/dpp/events/invite_create.cpp ++++ b/src/dpp/events/invite_create.cpp +@@ -22,7 +22,7 @@ + #include + #include + #include +-#include ++#include + + using json = nlohmann::json; + +diff --git a/src/dpp/events/invite_delete.cpp b/src/dpp/events/invite_delete.cpp +index af6bc07..815e123 100644 +--- a/src/dpp/events/invite_delete.cpp ++++ b/src/dpp/events/invite_delete.cpp +@@ -22,7 +22,7 @@ + #include + #include + #include +-#include ++#include + + using json = nlohmann::json; + +diff --git a/src/dpp/events/logger.cpp b/src/dpp/events/logger.cpp +index 9614eb7..bc6e831 100644 +--- a/src/dpp/events/logger.cpp ++++ b/src/dpp/events/logger.cpp +@@ -21,7 +21,7 @@ + #include + #include + #include +-#include ++#include + + using json = nlohmann::json; + +diff --git a/src/dpp/events/message_create.cpp b/src/dpp/events/message_create.cpp +index df5aebc..08e99d7 100644 +--- a/src/dpp/events/message_create.cpp ++++ b/src/dpp/events/message_create.cpp +@@ -22,7 +22,7 @@ + #include + #include + #include +-#include ++#include + + using json = nlohmann::json; + +diff --git a/src/dpp/events/message_delete.cpp b/src/dpp/events/message_delete.cpp +index b4678e2..90deefd 100644 +--- a/src/dpp/events/message_delete.cpp ++++ b/src/dpp/events/message_delete.cpp +@@ -22,7 +22,7 @@ + #include + #include + #include +-#include ++#include + + using json = nlohmann::json; + +diff --git a/src/dpp/events/message_delete_bulk.cpp b/src/dpp/events/message_delete_bulk.cpp +index 3636a5b..24c5f79 100644 +--- a/src/dpp/events/message_delete_bulk.cpp ++++ b/src/dpp/events/message_delete_bulk.cpp +@@ -22,7 +22,7 @@ + #include + #include + #include +-#include ++#include + + using json = nlohmann::json; + +diff --git a/src/dpp/events/message_reaction_add.cpp b/src/dpp/events/message_reaction_add.cpp +index 2f95aa3..a85d837 100644 +--- a/src/dpp/events/message_reaction_add.cpp ++++ b/src/dpp/events/message_reaction_add.cpp +@@ -22,7 +22,7 @@ + #include + #include + #include +-#include ++#include + + using json = nlohmann::json; + +diff --git a/src/dpp/events/message_reaction_remove.cpp b/src/dpp/events/message_reaction_remove.cpp +index b8838bb..d703048 100644 +--- a/src/dpp/events/message_reaction_remove.cpp ++++ b/src/dpp/events/message_reaction_remove.cpp +@@ -22,7 +22,7 @@ + #include + #include + #include +-#include ++#include + + using json = nlohmann::json; + +diff --git a/src/dpp/events/message_reaction_remove_all.cpp b/src/dpp/events/message_reaction_remove_all.cpp +index 4952f90..c92dba0 100644 +--- a/src/dpp/events/message_reaction_remove_all.cpp ++++ b/src/dpp/events/message_reaction_remove_all.cpp +@@ -22,7 +22,7 @@ + #include + #include + #include +-#include ++#include + + using json = nlohmann::json; + +diff --git a/src/dpp/events/message_reaction_remove_emoji.cpp b/src/dpp/events/message_reaction_remove_emoji.cpp +index c32391d..047d7b5 100644 +--- a/src/dpp/events/message_reaction_remove_emoji.cpp ++++ b/src/dpp/events/message_reaction_remove_emoji.cpp +@@ -22,7 +22,7 @@ + #include + #include + #include +-#include ++#include + + using json = nlohmann::json; + +diff --git a/src/dpp/events/message_update.cpp b/src/dpp/events/message_update.cpp +index a23b5b9..49e45eb 100644 +--- a/src/dpp/events/message_update.cpp ++++ b/src/dpp/events/message_update.cpp +@@ -22,7 +22,7 @@ + #include + #include + #include +-#include ++#include + + using json = nlohmann::json; + +diff --git a/src/dpp/events/presence_update.cpp b/src/dpp/events/presence_update.cpp +index b324f09..d4ca44f 100644 +--- a/src/dpp/events/presence_update.cpp ++++ b/src/dpp/events/presence_update.cpp +@@ -21,7 +21,7 @@ + #include + #include + #include +-#include ++#include + + using json = nlohmann::json; + +diff --git a/src/dpp/events/ready.cpp b/src/dpp/events/ready.cpp +index b301f18..e5802cb 100644 +--- a/src/dpp/events/ready.cpp ++++ b/src/dpp/events/ready.cpp +@@ -21,7 +21,7 @@ + #include + #include + #include +-#include ++#include + + using json = nlohmann::json; + +diff --git a/src/dpp/events/resumed.cpp b/src/dpp/events/resumed.cpp +index 7d3f771..004c84c 100644 +--- a/src/dpp/events/resumed.cpp ++++ b/src/dpp/events/resumed.cpp +@@ -21,7 +21,7 @@ + #include + #include + #include +-#include ++#include + + using json = nlohmann::json; + +diff --git a/src/dpp/events/stage_instance_create.cpp b/src/dpp/events/stage_instance_create.cpp +index 6540e02..a3d7803 100644 +--- a/src/dpp/events/stage_instance_create.cpp ++++ b/src/dpp/events/stage_instance_create.cpp +@@ -22,7 +22,7 @@ + #include + #include + #include +-#include ++#include + + using json = nlohmann::json; + +diff --git a/src/dpp/events/stage_instance_delete.cpp b/src/dpp/events/stage_instance_delete.cpp +index dc133e5..27e160b 100644 +--- a/src/dpp/events/stage_instance_delete.cpp ++++ b/src/dpp/events/stage_instance_delete.cpp +@@ -22,7 +22,7 @@ + #include + #include + #include +-#include ++#include + + using json = nlohmann::json; + +diff --git a/src/dpp/events/stage_instance_update.cpp b/src/dpp/events/stage_instance_update.cpp +index 1adbc1c..df4b765 100644 +--- a/src/dpp/events/stage_instance_update.cpp ++++ b/src/dpp/events/stage_instance_update.cpp +@@ -22,7 +22,7 @@ + #include + #include + #include +-#include ++#include + + using json = nlohmann::json; + +diff --git a/src/dpp/events/thread_create.cpp b/src/dpp/events/thread_create.cpp +index abc9efb..c70c8a9 100644 +--- a/src/dpp/events/thread_create.cpp ++++ b/src/dpp/events/thread_create.cpp +@@ -22,7 +22,7 @@ + #include + #include + #include +-#include ++#include + + using json = nlohmann::json; + +diff --git a/src/dpp/events/thread_delete.cpp b/src/dpp/events/thread_delete.cpp +index b179f38..08e812c 100644 +--- a/src/dpp/events/thread_delete.cpp ++++ b/src/dpp/events/thread_delete.cpp +@@ -22,7 +22,7 @@ + #include + #include + #include +-#include ++#include + + using json = nlohmann::json; + +diff --git a/src/dpp/events/thread_list_sync.cpp b/src/dpp/events/thread_list_sync.cpp +index 70b5f55..7ad047e 100644 +--- a/src/dpp/events/thread_list_sync.cpp ++++ b/src/dpp/events/thread_list_sync.cpp +@@ -22,7 +22,7 @@ + #include + #include + #include +-#include ++#include + + using json = nlohmann::json; + +diff --git a/src/dpp/events/thread_member_update.cpp b/src/dpp/events/thread_member_update.cpp +index 2eb7a58..b4ee296 100644 +--- a/src/dpp/events/thread_member_update.cpp ++++ b/src/dpp/events/thread_member_update.cpp +@@ -22,7 +22,7 @@ + #include + #include + #include +-#include ++#include + + using json = nlohmann::json; + +diff --git a/src/dpp/events/thread_members_update.cpp b/src/dpp/events/thread_members_update.cpp +index ebd34a5..e02e160 100644 +--- a/src/dpp/events/thread_members_update.cpp ++++ b/src/dpp/events/thread_members_update.cpp +@@ -22,7 +22,7 @@ + #include + #include + #include +-#include ++#include + + using json = nlohmann::json; + +diff --git a/src/dpp/events/thread_update.cpp b/src/dpp/events/thread_update.cpp +index c459ed6..a74832b 100644 +--- a/src/dpp/events/thread_update.cpp ++++ b/src/dpp/events/thread_update.cpp +@@ -22,7 +22,7 @@ + #include + #include + #include +-#include ++#include + + using json = nlohmann::json; + +diff --git a/src/dpp/events/typing_start.cpp b/src/dpp/events/typing_start.cpp +index c7586bb..6e7dd57 100644 +--- a/src/dpp/events/typing_start.cpp ++++ b/src/dpp/events/typing_start.cpp +@@ -21,7 +21,7 @@ + #include + #include + #include +-#include ++#include + + using json = nlohmann::json; + +diff --git a/src/dpp/events/user_update.cpp b/src/dpp/events/user_update.cpp +index 89f1002..5bc1c5e 100644 +--- a/src/dpp/events/user_update.cpp ++++ b/src/dpp/events/user_update.cpp +@@ -23,7 +23,7 @@ + #include + #include + #include +-#include ++#include + + using json = nlohmann::json; + +diff --git a/src/dpp/events/voice_server_update.cpp b/src/dpp/events/voice_server_update.cpp +index 2f9a9b3..a0ff19a 100644 +--- a/src/dpp/events/voice_server_update.cpp ++++ b/src/dpp/events/voice_server_update.cpp +@@ -23,7 +23,7 @@ + #include + #include + #include +-#include ++#include + + using json = nlohmann::json; + +diff --git a/src/dpp/events/voice_state_update.cpp b/src/dpp/events/voice_state_update.cpp +index 71f5780..af6cc73 100644 +--- a/src/dpp/events/voice_state_update.cpp ++++ b/src/dpp/events/voice_state_update.cpp +@@ -24,7 +24,7 @@ + #include + #include + #include +-#include ++#include + + using json = nlohmann::json; + +diff --git a/src/dpp/events/webhooks_update.cpp b/src/dpp/events/webhooks_update.cpp +index 81005c2..191675d 100644 +--- a/src/dpp/events/webhooks_update.cpp ++++ b/src/dpp/events/webhooks_update.cpp +@@ -22,7 +22,7 @@ + #include + #include + #include +-#include ++#include + + using json = nlohmann::json; + +diff --git a/src/dpp/guild.cpp b/src/dpp/guild.cpp +index 4b1b2b9..0ead0cc 100644 +--- a/src/dpp/guild.cpp ++++ b/src/dpp/guild.cpp +@@ -24,7 +24,7 @@ + #include + #include + #include +-#include ++#include + + using json = nlohmann::json; + +diff --git a/src/dpp/integration.cpp b/src/dpp/integration.cpp +index 066f727..f23e52c 100644 +--- a/src/dpp/integration.cpp ++++ b/src/dpp/integration.cpp +@@ -21,7 +21,7 @@ + #include + #include + #include +-#include ++#include + #include + + using json = nlohmann::json; +diff --git a/src/dpp/invite.cpp b/src/dpp/invite.cpp +index d2c3825..c83f5fd 100644 +--- a/src/dpp/invite.cpp ++++ b/src/dpp/invite.cpp +@@ -20,7 +20,7 @@ + ************************************************************************************/ + #include + #include +-#include ++#include + + using json = nlohmann::json; + +diff --git a/src/dpp/message.cpp b/src/dpp/message.cpp +index ddbac35..b0faa08 100644 +--- a/src/dpp/message.cpp ++++ b/src/dpp/message.cpp +@@ -23,7 +23,7 @@ + #include + #include + #include +-#include ++#include + #include + #include + #include +diff --git a/src/dpp/permissions.cpp b/src/dpp/permissions.cpp +index 5985e6e..e7adab6 100644 +--- a/src/dpp/permissions.cpp ++++ b/src/dpp/permissions.cpp +@@ -19,7 +19,7 @@ + * + ************************************************************************************/ + #include +-#include ++#include + + namespace dpp { + +diff --git a/src/dpp/presence.cpp b/src/dpp/presence.cpp +index e58fb74..dc14d8a 100644 +--- a/src/dpp/presence.cpp ++++ b/src/dpp/presence.cpp +@@ -22,7 +22,7 @@ + #include + #include + #include +-#include ++#include + + using json = nlohmann::json; + +diff --git a/src/dpp/prune.cpp b/src/dpp/prune.cpp +index 080a5c5..4f2cbc9 100644 +--- a/src/dpp/prune.cpp ++++ b/src/dpp/prune.cpp +@@ -21,7 +21,7 @@ + #include + #include + #include +-#include ++#include + + namespace dpp { + +diff --git a/src/dpp/role.cpp b/src/dpp/role.cpp +index e952306..fdc6f8f 100644 +--- a/src/dpp/role.cpp ++++ b/src/dpp/role.cpp +@@ -24,7 +24,7 @@ + #include + #include + #include +-#include ++#include + + using json = nlohmann::json; + +diff --git a/src/dpp/scheduled_event.cpp b/src/dpp/scheduled_event.cpp +index dacf4ab..8f2a67a 100644 +--- a/src/dpp/scheduled_event.cpp ++++ b/src/dpp/scheduled_event.cpp +@@ -22,7 +22,7 @@ + #include + #include + #include +-#include ++#include + + namespace dpp { + +diff --git a/src/dpp/slashcommand.cpp b/src/dpp/slashcommand.cpp +index c8fd774..d455fe1 100644 +--- a/src/dpp/slashcommand.cpp ++++ b/src/dpp/slashcommand.cpp +@@ -21,7 +21,7 @@ + #include + #include + #include +-#include ++#include + #include + #include + #include +diff --git a/src/dpp/stage_instance.cpp b/src/dpp/stage_instance.cpp +index 03e6ec4..154f075 100644 +--- a/src/dpp/stage_instance.cpp ++++ b/src/dpp/stage_instance.cpp +@@ -21,7 +21,7 @@ + #include + #include + #include +-#include ++#include + + namespace dpp { + +diff --git a/src/dpp/user.cpp b/src/dpp/user.cpp +index c20eeec..df8f61c 100644 +--- a/src/dpp/user.cpp ++++ b/src/dpp/user.cpp +@@ -20,7 +20,7 @@ + ************************************************************************************/ + #include + #include +-#include ++#include + #include + + using json = nlohmann::json; +diff --git a/src/dpp/voiceregion.cpp b/src/dpp/voiceregion.cpp +index 2dba305..7cf2341 100644 +--- a/src/dpp/voiceregion.cpp ++++ b/src/dpp/voiceregion.cpp +@@ -20,7 +20,7 @@ + ************************************************************************************/ + #include + #include +-#include ++#include + + namespace dpp { + +diff --git a/src/dpp/voicestate.cpp b/src/dpp/voicestate.cpp +index f7d6423..7df6fa8 100644 +--- a/src/dpp/voicestate.cpp ++++ b/src/dpp/voicestate.cpp +@@ -20,7 +20,7 @@ + ************************************************************************************/ + #include + #include +-#include ++#include + + using json = nlohmann::json; + +diff --git a/src/dpp/webhook.cpp b/src/dpp/webhook.cpp +index 65ffd83..b4d26e4 100644 +--- a/src/dpp/webhook.cpp ++++ b/src/dpp/webhook.cpp +@@ -20,7 +20,7 @@ + ************************************************************************************/ + #include + #include +-#include ++#include + #include + + namespace dpp { +diff --git a/src/test.h b/src/test.h +index f9ea580..bf2519e 100644 +--- a/src/test.h ++++ b/src/test.h +@@ -24,7 +24,7 @@ _Pragma("warning( disable : 4251 )"); // 4251 warns when we export classes or st + _Pragma("warning( disable : 5105 )"); // 4251 warns when we export classes or structures with stl member variables + #endif + #include +-#include ++#include + #include + + #ifdef _WIN32 diff --git a/srcpkgs/libdpp/template b/srcpkgs/libdpp/template new file mode 100644 index 000000000000..97ac73d59c64 --- /dev/null +++ b/srcpkgs/libdpp/template @@ -0,0 +1,30 @@ +# Template file for 'libdpp' +pkgname=libdpp +version=10.0.15 +revision=1 +wrksrc=DPP-${version} +build_style=cmake +cmake_builddir=build +hostmakedepends="pkg-config" +makedepends="libsodium-devel opus-devel zlib-devel openssl-devel fmt-devel json-c++" +short_desc="C++ Discord API Library for Bots" +maintainer="Bo-Ru Ju " +license=Apache-2.0 +homepage="https://dpp.dev" +distfiles="https://github.com/brainboxdotcc/DPP/archive/refs/tags/v${version}.tar.gz" +checksum=5370e7fa3e76ed78b87dc4d9c01cc5a5f1a5789ebf1d3d0e8deff05cb665c539 + +post_extract() { + rm -r include/dpp/nlohmann +} + +libdpp-devel_package() { + depends="${makedepends} ${sourcepkg}-${version}_${revision}" + short_desc+=" - development files" + pkg_install() { + rm -r ${DESTDIR}/usr/lib/dpp-${version%.*} + vmove usr/lib/pkgconfig + vmove usr/include + vmove "usr/lib/*.so" + } +} diff --git a/srcpkgs/libdpp/update b/srcpkgs/libdpp/update new file mode 100644 index 000000000000..f88d641f9275 --- /dev/null +++ b/srcpkgs/libdpp/update @@ -0,0 +1,2 @@ +site="https://github.com/brainboxdotcc/DPP/tags" +pattern='/archive/refs/tags/v\K[\d\.]+(?=\.tar\.gz")' From 79850ad8b330d43172201c67cd49d44705a06dc1 Mon Sep 17 00:00:00 2001 From: Bo-Ru Ju Date: Tue, 16 Aug 2022 11:22:02 +0800 Subject: [PATCH 2/2] libdpp: update to 10.0.16. --- srcpkgs/libdpp/patches/fix-headers.patch | 579 ++++++++++++----------- srcpkgs/libdpp/template | 6 +- 2 files changed, 299 insertions(+), 286 deletions(-) diff --git a/srcpkgs/libdpp/patches/fix-headers.patch b/srcpkgs/libdpp/patches/fix-headers.patch index edbc0b1ba0e9..9572aa59b23f 100644 --- a/srcpkgs/libdpp/patches/fix-headers.patch +++ b/srcpkgs/libdpp/patches/fix-headers.patch @@ -1,5 +1,5 @@ diff --git a/include/dpp/appcommand.h b/include/dpp/appcommand.h -index 50f2a29..99ae086 100644 +index baded0e..6731f6d 100644 --- a/include/dpp/appcommand.h +++ b/include/dpp/appcommand.h @@ -27,7 +27,7 @@ @@ -25,7 +25,7 @@ index 7e9d80d..19fad83 100644 namespace dpp { diff --git a/include/dpp/auditlog.h b/include/dpp/auditlog.h -index 946ab41..2de5845 100644 +index de85e68..2b115b2 100644 --- a/include/dpp/auditlog.h +++ b/include/dpp/auditlog.h @@ -22,7 +22,7 @@ @@ -51,7 +51,7 @@ index a15d52f..922df45 100644 namespace dpp { diff --git a/include/dpp/ban.h b/include/dpp/ban.h -index 6bbcdd2..8ad88d6 100644 +index ea35ca4..5c052b7 100644 --- a/include/dpp/ban.h +++ b/include/dpp/ban.h @@ -22,7 +22,7 @@ @@ -77,7 +77,7 @@ index 93b6e36..7e6b6e1 100644 #include #include diff --git a/include/dpp/cluster.h b/include/dpp/cluster.h -index 59bbd85..f34d179 100644 +index ebee15e..7c9686c 100644 --- a/include/dpp/cluster.h +++ b/include/dpp/cluster.h @@ -29,7 +29,7 @@ @@ -87,8 +87,8 @@ index 59bbd85..f34d179 100644 -#include +#include #include + #include #include - #include diff --git a/include/dpp/commandhandler.h b/include/dpp/commandhandler.h index 29da473..0b15417 100644 --- a/include/dpp/commandhandler.h @@ -103,7 +103,7 @@ index 29da473..0b15417 100644 #include #include diff --git a/include/dpp/discordclient.h b/include/dpp/discordclient.h -index 1eb875a..10f010e 100644 +index 38b545e..e02d9e3 100644 --- a/include/dpp/discordclient.h +++ b/include/dpp/discordclient.h @@ -24,7 +24,7 @@ @@ -114,7 +114,7 @@ index 1eb875a..10f010e 100644 +#include #include #include - #include + #include diff --git a/include/dpp/discordevents.h b/include/dpp/discordevents.h index c6474a4..1a70b18 100644 --- a/include/dpp/discordevents.h @@ -142,7 +142,7 @@ index e11d653..6692e54 100644 #include #include diff --git a/include/dpp/dtemplate.h b/include/dpp/dtemplate.h -index 948b25d..5fbe17e 100644 +index f9ecb3a..b1f0594 100644 --- a/include/dpp/dtemplate.h +++ b/include/dpp/dtemplate.h @@ -21,7 +21,7 @@ @@ -207,7 +207,7 @@ index 420c8d8..6815c3c 100644 #include diff --git a/include/dpp/invite.h b/include/dpp/invite.h -index eae62a9..e8977a8 100644 +index fe61b67..704bd01 100644 --- a/include/dpp/invite.h +++ b/include/dpp/invite.h @@ -21,7 +21,7 @@ @@ -233,7 +233,7 @@ index 302642d..e2e467a 100644 namespace dpp { /** diff --git a/include/dpp/message.h b/include/dpp/message.h -index a5e038f..7e705d0 100644 +index 9d865fc..ab482bc 100644 --- a/include/dpp/message.h +++ b/include/dpp/message.h @@ -27,7 +27,7 @@ @@ -272,7 +272,7 @@ index e018f92..bcf322b 100644 #include diff --git a/include/dpp/prune.h b/include/dpp/prune.h -index dd1b19b..7528a37 100644 +index fe3d843..f36f525 100644 --- a/include/dpp/prune.h +++ b/include/dpp/prune.h @@ -21,7 +21,7 @@ @@ -297,6 +297,19 @@ index 2d1915c..20a4b3d 100644 namespace dpp { +diff --git a/include/dpp/restresults.h b/include/dpp/restresults.h +index a4e49a2..60bca06 100644 +--- a/include/dpp/restresults.h ++++ b/include/dpp/restresults.h +@@ -29,7 +29,7 @@ + #include + #include + #include +-#include ++#include + #include + #include + #include diff --git a/include/dpp/role.h b/include/dpp/role.h index 4d6d13f..9327aae 100644 --- a/include/dpp/role.h @@ -350,7 +363,7 @@ index 14245e3..a8a6b12 100644 #include #include diff --git a/include/dpp/voiceregion.h b/include/dpp/voiceregion.h -index a1def0a..a0a88e5 100644 +index 1ca805b..de66301 100644 --- a/include/dpp/voiceregion.h +++ b/include/dpp/voiceregion.h @@ -21,7 +21,7 @@ @@ -363,7 +376,7 @@ index a1def0a..a0a88e5 100644 namespace dpp { diff --git a/include/dpp/voicestate.h b/include/dpp/voicestate.h -index 64f1517..c14461e 100644 +index 5a8b3c5..ad651a0 100644 --- a/include/dpp/voicestate.h +++ b/include/dpp/voicestate.h @@ -21,7 +21,7 @@ @@ -389,10 +402,10 @@ index 98fa176..95c09dc 100644 #include diff --git a/library/CMakeLists.txt b/library/CMakeLists.txt -index 139adf8..6c80610 100644 +index f9ccd5b..2526904 100644 --- a/library/CMakeLists.txt +++ b/library/CMakeLists.txt -@@ -196,8 +196,8 @@ foreach (fullmodname ${subdirlist}) +@@ -215,8 +215,8 @@ foreach (fullmodname ${subdirlist}) target_precompile_headers( ${modname} PRIVATE @@ -404,1029 +417,1029 @@ index 139adf8..6c80610 100644 if (WIN32 AND NOT MINGW) diff --git a/src/dpp/application.cpp b/src/dpp/application.cpp -index a927d45..2799c2f 100644 +index ae6a95f..39e0706 100644 --- a/src/dpp/application.cpp +++ b/src/dpp/application.cpp @@ -22,7 +22,7 @@ #include #include #include --#include -+#include +-#include ++#include namespace dpp { diff --git a/src/dpp/auditlog.cpp b/src/dpp/auditlog.cpp -index 2d547f3..3dad878 100644 +index 0e747a8..45d4df7 100644 --- a/src/dpp/auditlog.cpp +++ b/src/dpp/auditlog.cpp @@ -20,7 +20,7 @@ ************************************************************************************/ #include #include --#include -+#include +-#include ++#include namespace dpp { diff --git a/src/dpp/automod.cpp b/src/dpp/automod.cpp -index f35a924..3a711c4 100644 +index 5f2e330..1563193 100644 --- a/src/dpp/automod.cpp +++ b/src/dpp/automod.cpp @@ -20,7 +20,7 @@ ************************************************************************************/ #include #include --#include -+#include +-#include ++#include namespace dpp { diff --git a/src/dpp/ban.cpp b/src/dpp/ban.cpp -index 2f8744b..fa0a189 100644 +index f1e9c3a..d474230 100644 --- a/src/dpp/ban.cpp +++ b/src/dpp/ban.cpp @@ -20,7 +20,7 @@ ************************************************************************************/ #include #include --#include -+#include +-#include ++#include namespace dpp { diff --git a/src/dpp/channel.cpp b/src/dpp/channel.cpp -index 364e574..77d4e75 100644 +index 68e0595..e3722f0 100644 --- a/src/dpp/channel.cpp +++ b/src/dpp/channel.cpp @@ -25,7 +25,7 @@ #include #include #include --#include -+#include +-#include ++#include using json = nlohmann::json; diff --git a/src/dpp/cluster.cpp b/src/dpp/cluster.cpp -index 011bdaf..969e088 100644 +index 8d284f6..a4dfb6d 100644 --- a/src/dpp/cluster.cpp +++ b/src/dpp/cluster.cpp @@ -29,7 +29,7 @@ #include #include #include --#include -+#include +-#include ++#include #include #include diff --git a/src/dpp/cluster/confirmation.cpp b/src/dpp/cluster/confirmation.cpp -index 36164a6..9ece5d8 100644 +index c7e579b..fcccb4c 100644 --- a/src/dpp/cluster/confirmation.cpp +++ b/src/dpp/cluster/confirmation.cpp @@ -19,7 +19,7 @@ * ************************************************************************************/ #include --#include -+#include +-#include ++#include namespace dpp { diff --git a/src/dpp/cluster/timer.cpp b/src/dpp/cluster/timer.cpp -index af2e67e..1bad535 100644 +index a4b6d83..7159574 100644 --- a/src/dpp/cluster/timer.cpp +++ b/src/dpp/cluster/timer.cpp @@ -20,7 +20,7 @@ ************************************************************************************/ #include #include --#include -+#include +-#include ++#include namespace dpp { diff --git a/src/dpp/discordclient.cpp b/src/dpp/discordclient.cpp -index adbf04e..8257167 100644 +index 80eff80..5be1d09 100644 --- a/src/dpp/discordclient.cpp +++ b/src/dpp/discordclient.cpp @@ -26,7 +26,7 @@ #include #include #include --#include -+#include +-#include ++#include #include #include #ifdef _WIN32 diff --git a/src/dpp/discordevents.cpp b/src/dpp/discordevents.cpp -index 35f811b..c256590 100644 +index aaa8a91..7713a29 100644 --- a/src/dpp/discordevents.cpp +++ b/src/dpp/discordevents.cpp @@ -30,7 +30,7 @@ #include #include #include --#include -+#include +-#include ++#include #include #include #include diff --git a/src/dpp/discordvoiceclient.cpp b/src/dpp/discordvoiceclient.cpp -index 1981cd4..3aa62c4 100644 +index d234ba0..0234950 100644 --- a/src/dpp/discordvoiceclient.cpp +++ b/src/dpp/discordvoiceclient.cpp -@@ -41,7 +41,7 @@ +@@ -42,7 +42,7 @@ #include #include #include --#include -+#include +-#include ++#include #ifdef HAVE_VOICE #include diff --git a/src/dpp/dtemplate.cpp b/src/dpp/dtemplate.cpp -index 1e981ec..78c51b5 100644 +index c1af4d8..73a5853 100644 --- a/src/dpp/dtemplate.cpp +++ b/src/dpp/dtemplate.cpp @@ -20,7 +20,7 @@ ************************************************************************************/ #include #include --#include -+#include +-#include ++#include using json = nlohmann::json; diff --git a/src/dpp/emoji.cpp b/src/dpp/emoji.cpp -index 366f49a..bed2358 100644 +index c0b3613..4f00958 100644 --- a/src/dpp/emoji.cpp +++ b/src/dpp/emoji.cpp @@ -20,7 +20,7 @@ ************************************************************************************/ #include #include --#include -+#include +-#include ++#include #include namespace dpp { diff --git a/src/dpp/etf.cpp b/src/dpp/etf.cpp -index a97a063..1595c28 100644 +index 674b1ed..5dfaed8 100644 --- a/src/dpp/etf.cpp +++ b/src/dpp/etf.cpp @@ -34,7 +34,7 @@ #include #include #include --#include -+#include +-#include ++#include #include #include diff --git a/src/dpp/events/automod_rule_create.cpp b/src/dpp/events/automod_rule_create.cpp -index ae9a662..879472a 100644 +index 4bb9a61..e551699 100644 --- a/src/dpp/events/automod_rule_create.cpp +++ b/src/dpp/events/automod_rule_create.cpp @@ -21,7 +21,7 @@ #include #include #include --#include -+#include +-#include ++#include using json = nlohmann::json; diff --git a/src/dpp/events/automod_rule_delete.cpp b/src/dpp/events/automod_rule_delete.cpp -index 08449cc..4005d5b 100644 +index 7308143..381f975 100644 --- a/src/dpp/events/automod_rule_delete.cpp +++ b/src/dpp/events/automod_rule_delete.cpp @@ -21,7 +21,7 @@ #include #include #include --#include -+#include +-#include ++#include using json = nlohmann::json; diff --git a/src/dpp/events/automod_rule_execute.cpp b/src/dpp/events/automod_rule_execute.cpp -index b598260..9ad5bbd 100644 +index 69a5d84..defb3a2 100644 --- a/src/dpp/events/automod_rule_execute.cpp +++ b/src/dpp/events/automod_rule_execute.cpp @@ -21,7 +21,7 @@ #include #include #include --#include -+#include +-#include ++#include using json = nlohmann::json; diff --git a/src/dpp/events/automod_rule_update.cpp b/src/dpp/events/automod_rule_update.cpp -index 24738bb..0310c7b 100644 +index 1b5fb9b..1bef675 100644 --- a/src/dpp/events/automod_rule_update.cpp +++ b/src/dpp/events/automod_rule_update.cpp @@ -21,7 +21,7 @@ #include #include #include --#include -+#include +-#include ++#include using json = nlohmann::json; diff --git a/src/dpp/events/channel_create.cpp b/src/dpp/events/channel_create.cpp -index 24307e1..ec533b8 100644 +index 07b0c2c..1a0b812 100644 --- a/src/dpp/events/channel_create.cpp +++ b/src/dpp/events/channel_create.cpp @@ -21,7 +21,7 @@ #include #include #include --#include -+#include +-#include ++#include using json = nlohmann::json; diff --git a/src/dpp/events/channel_delete.cpp b/src/dpp/events/channel_delete.cpp -index ef577bc..343d7bb 100644 +index 09d23a4..5e48f96 100644 --- a/src/dpp/events/channel_delete.cpp +++ b/src/dpp/events/channel_delete.cpp @@ -22,7 +22,7 @@ #include #include #include --#include -+#include +-#include ++#include using json = nlohmann::json; diff --git a/src/dpp/events/channel_pins_update.cpp b/src/dpp/events/channel_pins_update.cpp -index 214cf4f..2b50601 100644 +index 3a4244b..cc2f908 100644 --- a/src/dpp/events/channel_pins_update.cpp +++ b/src/dpp/events/channel_pins_update.cpp @@ -22,7 +22,7 @@ #include #include #include --#include -+#include +-#include ++#include using json = nlohmann::json; diff --git a/src/dpp/events/channel_update.cpp b/src/dpp/events/channel_update.cpp -index 24570dc..54ef33b 100644 +index 7e05d8f..fde836a 100644 --- a/src/dpp/events/channel_update.cpp +++ b/src/dpp/events/channel_update.cpp @@ -22,7 +22,7 @@ #include #include #include --#include -+#include +-#include ++#include using json = nlohmann::json; diff --git a/src/dpp/events/guild_ban_add.cpp b/src/dpp/events/guild_ban_add.cpp -index 057ce56..f7e9954 100644 +index 872b875..61dfb5b 100644 --- a/src/dpp/events/guild_ban_add.cpp +++ b/src/dpp/events/guild_ban_add.cpp @@ -23,7 +23,7 @@ #include #include #include --#include -+#include +-#include ++#include using json = nlohmann::json; diff --git a/src/dpp/events/guild_ban_remove.cpp b/src/dpp/events/guild_ban_remove.cpp -index ad55cd7..1c61471 100644 +index e170fde..510a280 100644 --- a/src/dpp/events/guild_ban_remove.cpp +++ b/src/dpp/events/guild_ban_remove.cpp @@ -23,7 +23,7 @@ #include #include #include --#include -+#include +-#include ++#include using json = nlohmann::json; diff --git a/src/dpp/events/guild_create.cpp b/src/dpp/events/guild_create.cpp -index f6d8e5a..71accb3 100644 +index 6f1e369..9de1c39 100644 --- a/src/dpp/events/guild_create.cpp +++ b/src/dpp/events/guild_create.cpp @@ -23,7 +23,7 @@ #include #include #include --#include -+#include +-#include ++#include using json = nlohmann::json; diff --git a/src/dpp/events/guild_delete.cpp b/src/dpp/events/guild_delete.cpp -index 4186df4..f99d9db 100644 +index 82f75d3..e39f4c8 100644 --- a/src/dpp/events/guild_delete.cpp +++ b/src/dpp/events/guild_delete.cpp @@ -23,7 +23,7 @@ #include #include #include --#include -+#include +-#include ++#include using json = nlohmann::json; diff --git a/src/dpp/events/guild_emojis_update.cpp b/src/dpp/events/guild_emojis_update.cpp -index d15d07b..15f228f 100644 +index 62588c0..ec4303d 100644 --- a/src/dpp/events/guild_emojis_update.cpp +++ b/src/dpp/events/guild_emojis_update.cpp @@ -24,7 +24,7 @@ #include #include #include --#include -+#include +-#include ++#include using json = nlohmann::json; diff --git a/src/dpp/events/guild_integrations_update.cpp b/src/dpp/events/guild_integrations_update.cpp -index 080a7b8..afd63c8 100644 +index 58146ae..0d2036f 100644 --- a/src/dpp/events/guild_integrations_update.cpp +++ b/src/dpp/events/guild_integrations_update.cpp @@ -23,7 +23,7 @@ #include #include #include --#include -+#include +-#include ++#include using json = nlohmann::json; diff --git a/src/dpp/events/guild_join_request_delete.cpp b/src/dpp/events/guild_join_request_delete.cpp -index b4bbbcc..cbece67 100644 +index 4b6da22..5642b4c 100644 --- a/src/dpp/events/guild_join_request_delete.cpp +++ b/src/dpp/events/guild_join_request_delete.cpp @@ -21,7 +21,7 @@ #include #include #include --#include -+#include +-#include ++#include using json = nlohmann::json; diff --git a/src/dpp/events/guild_member_add.cpp b/src/dpp/events/guild_member_add.cpp -index ed08758..ff19b16 100644 +index 6c865bb..2b3b8e8 100644 --- a/src/dpp/events/guild_member_add.cpp +++ b/src/dpp/events/guild_member_add.cpp @@ -22,7 +22,7 @@ #include #include #include --#include -+#include +-#include ++#include using json = nlohmann::json; diff --git a/src/dpp/events/guild_member_remove.cpp b/src/dpp/events/guild_member_remove.cpp -index 3e2be13..cd7a35f 100644 +index fa23bed..46646b7 100644 --- a/src/dpp/events/guild_member_remove.cpp +++ b/src/dpp/events/guild_member_remove.cpp @@ -22,7 +22,7 @@ #include #include #include --#include -+#include +-#include ++#include using json = nlohmann::json; diff --git a/src/dpp/events/guild_member_update.cpp b/src/dpp/events/guild_member_update.cpp -index af81395..b6a7ea3 100644 +index 6a9c3b7..689aac4 100644 --- a/src/dpp/events/guild_member_update.cpp +++ b/src/dpp/events/guild_member_update.cpp @@ -22,7 +22,7 @@ #include #include #include --#include -+#include +-#include ++#include using json = nlohmann::json; diff --git a/src/dpp/events/guild_members_chunk.cpp b/src/dpp/events/guild_members_chunk.cpp -index beffb96..d14a982 100644 +index 03e1eb3..0e68089 100644 --- a/src/dpp/events/guild_members_chunk.cpp +++ b/src/dpp/events/guild_members_chunk.cpp @@ -23,7 +23,7 @@ #include #include #include --#include -+#include +-#include ++#include using json = nlohmann::json; diff --git a/src/dpp/events/guild_role_create.cpp b/src/dpp/events/guild_role_create.cpp -index 98655a3..67d4faa 100644 +index b668bb5..ed8bc79 100644 --- a/src/dpp/events/guild_role_create.cpp +++ b/src/dpp/events/guild_role_create.cpp @@ -23,7 +23,7 @@ #include #include #include --#include -+#include +-#include ++#include using json = nlohmann::json; diff --git a/src/dpp/events/guild_role_delete.cpp b/src/dpp/events/guild_role_delete.cpp -index 6784db6..6206333 100644 +index 6c8cedc..336f11b 100644 --- a/src/dpp/events/guild_role_delete.cpp +++ b/src/dpp/events/guild_role_delete.cpp @@ -23,7 +23,7 @@ #include #include #include --#include -+#include +-#include ++#include using json = nlohmann::json; diff --git a/src/dpp/events/guild_role_update.cpp b/src/dpp/events/guild_role_update.cpp -index bab481c..1b53ec5 100644 +index 29130c0..32e3146 100644 --- a/src/dpp/events/guild_role_update.cpp +++ b/src/dpp/events/guild_role_update.cpp @@ -23,7 +23,7 @@ #include #include #include --#include -+#include +-#include ++#include using json = nlohmann::json; diff --git a/src/dpp/events/guild_scheduled_event_create.cpp b/src/dpp/events/guild_scheduled_event_create.cpp -index f5a6c8a..59902a7 100644 +index 02b3ba9..e84c134 100644 --- a/src/dpp/events/guild_scheduled_event_create.cpp +++ b/src/dpp/events/guild_scheduled_event_create.cpp @@ -22,7 +22,7 @@ #include #include #include --#include -+#include +-#include ++#include using json = nlohmann::json; diff --git a/src/dpp/events/guild_scheduled_event_delete.cpp b/src/dpp/events/guild_scheduled_event_delete.cpp -index 692f271..e01cde9 100644 +index ea11ed9..a098a0f 100644 --- a/src/dpp/events/guild_scheduled_event_delete.cpp +++ b/src/dpp/events/guild_scheduled_event_delete.cpp @@ -22,7 +22,7 @@ #include #include #include --#include -+#include +-#include ++#include using json = nlohmann::json; diff --git a/src/dpp/events/guild_scheduled_event_update.cpp b/src/dpp/events/guild_scheduled_event_update.cpp -index b45d843..8b8465e 100644 +index b43f02d..6fd2795 100644 --- a/src/dpp/events/guild_scheduled_event_update.cpp +++ b/src/dpp/events/guild_scheduled_event_update.cpp @@ -22,7 +22,7 @@ #include #include #include --#include -+#include +-#include ++#include using json = nlohmann::json; diff --git a/src/dpp/events/guild_scheduled_event_user_add.cpp b/src/dpp/events/guild_scheduled_event_user_add.cpp -index c3084e3..12a95be 100644 +index 38e07b6..c549c39 100644 --- a/src/dpp/events/guild_scheduled_event_user_add.cpp +++ b/src/dpp/events/guild_scheduled_event_user_add.cpp @@ -21,7 +21,7 @@ #include #include #include --#include -+#include +-#include ++#include using json = nlohmann::json; diff --git a/src/dpp/events/guild_scheduled_event_user_remove.cpp b/src/dpp/events/guild_scheduled_event_user_remove.cpp -index ca521b7..9777836 100644 +index 4d6e8a0..08be1e9 100644 --- a/src/dpp/events/guild_scheduled_event_user_remove.cpp +++ b/src/dpp/events/guild_scheduled_event_user_remove.cpp @@ -21,7 +21,7 @@ #include #include #include --#include -+#include +-#include ++#include using json = nlohmann::json; diff --git a/src/dpp/events/guild_stickers_update.cpp b/src/dpp/events/guild_stickers_update.cpp -index 7e1fd9b..27ce7eb 100644 +index 7f00c23..583d936 100644 --- a/src/dpp/events/guild_stickers_update.cpp +++ b/src/dpp/events/guild_stickers_update.cpp @@ -22,7 +22,7 @@ #include #include #include --#include -+#include +-#include ++#include using json = nlohmann::json; diff --git a/src/dpp/events/guild_update.cpp b/src/dpp/events/guild_update.cpp -index 6133a91..2aeafff 100644 +index d80b40b..e116688 100644 --- a/src/dpp/events/guild_update.cpp +++ b/src/dpp/events/guild_update.cpp @@ -22,7 +22,7 @@ #include #include #include --#include -+#include +-#include ++#include using json = nlohmann::json; diff --git a/src/dpp/events/integration_create.cpp b/src/dpp/events/integration_create.cpp -index 0f24458..8d8824f 100644 +index f72193c..112320b 100644 --- a/src/dpp/events/integration_create.cpp +++ b/src/dpp/events/integration_create.cpp @@ -22,7 +22,7 @@ #include #include #include --#include -+#include +-#include ++#include using json = nlohmann::json; diff --git a/src/dpp/events/integration_delete.cpp b/src/dpp/events/integration_delete.cpp -index 9eb95fa..b10dfab 100644 +index 0438076..e0b2202 100644 --- a/src/dpp/events/integration_delete.cpp +++ b/src/dpp/events/integration_delete.cpp @@ -22,7 +22,7 @@ #include #include #include --#include -+#include +-#include ++#include using json = nlohmann::json; diff --git a/src/dpp/events/integration_update.cpp b/src/dpp/events/integration_update.cpp -index 40741b9..3078e18 100644 +index 8175fab..38b3eda 100644 --- a/src/dpp/events/integration_update.cpp +++ b/src/dpp/events/integration_update.cpp @@ -22,7 +22,7 @@ #include #include #include --#include -+#include +-#include ++#include using json = nlohmann::json; diff --git a/src/dpp/events/interaction_create.cpp b/src/dpp/events/interaction_create.cpp -index 582e59b..cb4c5eb 100644 +index a7bf466..a8aa25b 100644 --- a/src/dpp/events/interaction_create.cpp +++ b/src/dpp/events/interaction_create.cpp @@ -22,7 +22,7 @@ #include #include #include --#include -+#include +-#include ++#include using json = nlohmann::json; diff --git a/src/dpp/events/invite_create.cpp b/src/dpp/events/invite_create.cpp -index b5c500f..8dfcba6 100644 +index 377ba3f..7d03d06 100644 --- a/src/dpp/events/invite_create.cpp +++ b/src/dpp/events/invite_create.cpp @@ -22,7 +22,7 @@ #include #include #include --#include -+#include +-#include ++#include using json = nlohmann::json; diff --git a/src/dpp/events/invite_delete.cpp b/src/dpp/events/invite_delete.cpp -index af6bc07..815e123 100644 +index 5f2f084..c9d81bb 100644 --- a/src/dpp/events/invite_delete.cpp +++ b/src/dpp/events/invite_delete.cpp @@ -22,7 +22,7 @@ #include #include #include --#include -+#include +-#include ++#include using json = nlohmann::json; diff --git a/src/dpp/events/logger.cpp b/src/dpp/events/logger.cpp -index 9614eb7..bc6e831 100644 +index aefc82f..ee9d202 100644 --- a/src/dpp/events/logger.cpp +++ b/src/dpp/events/logger.cpp @@ -21,7 +21,7 @@ #include #include #include --#include -+#include +-#include ++#include using json = nlohmann::json; diff --git a/src/dpp/events/message_create.cpp b/src/dpp/events/message_create.cpp -index df5aebc..08e99d7 100644 +index be56ef8..80481e8 100644 --- a/src/dpp/events/message_create.cpp +++ b/src/dpp/events/message_create.cpp @@ -22,7 +22,7 @@ #include #include #include --#include -+#include +-#include ++#include using json = nlohmann::json; diff --git a/src/dpp/events/message_delete.cpp b/src/dpp/events/message_delete.cpp -index b4678e2..90deefd 100644 +index d7ba0ea..98e7c2c 100644 --- a/src/dpp/events/message_delete.cpp +++ b/src/dpp/events/message_delete.cpp @@ -22,7 +22,7 @@ #include #include #include --#include -+#include +-#include ++#include using json = nlohmann::json; diff --git a/src/dpp/events/message_delete_bulk.cpp b/src/dpp/events/message_delete_bulk.cpp -index 3636a5b..24c5f79 100644 +index a158bf1..cbffcf2 100644 --- a/src/dpp/events/message_delete_bulk.cpp +++ b/src/dpp/events/message_delete_bulk.cpp @@ -22,7 +22,7 @@ #include #include #include --#include -+#include +-#include ++#include using json = nlohmann::json; diff --git a/src/dpp/events/message_reaction_add.cpp b/src/dpp/events/message_reaction_add.cpp -index 2f95aa3..a85d837 100644 +index fac7237..5e61959 100644 --- a/src/dpp/events/message_reaction_add.cpp +++ b/src/dpp/events/message_reaction_add.cpp @@ -22,7 +22,7 @@ #include #include #include --#include -+#include +-#include ++#include using json = nlohmann::json; diff --git a/src/dpp/events/message_reaction_remove.cpp b/src/dpp/events/message_reaction_remove.cpp -index b8838bb..d703048 100644 +index 1036757..1f602b1 100644 --- a/src/dpp/events/message_reaction_remove.cpp +++ b/src/dpp/events/message_reaction_remove.cpp @@ -22,7 +22,7 @@ #include #include #include --#include -+#include +-#include ++#include using json = nlohmann::json; diff --git a/src/dpp/events/message_reaction_remove_all.cpp b/src/dpp/events/message_reaction_remove_all.cpp -index 4952f90..c92dba0 100644 +index 7a63660..a564afb 100644 --- a/src/dpp/events/message_reaction_remove_all.cpp +++ b/src/dpp/events/message_reaction_remove_all.cpp @@ -22,7 +22,7 @@ #include #include #include --#include -+#include +-#include ++#include using json = nlohmann::json; diff --git a/src/dpp/events/message_reaction_remove_emoji.cpp b/src/dpp/events/message_reaction_remove_emoji.cpp -index c32391d..047d7b5 100644 +index c820bbe..93a3f9c 100644 --- a/src/dpp/events/message_reaction_remove_emoji.cpp +++ b/src/dpp/events/message_reaction_remove_emoji.cpp @@ -22,7 +22,7 @@ #include #include #include --#include -+#include +-#include ++#include using json = nlohmann::json; diff --git a/src/dpp/events/message_update.cpp b/src/dpp/events/message_update.cpp -index a23b5b9..49e45eb 100644 +index 3259d88..90b6418 100644 --- a/src/dpp/events/message_update.cpp +++ b/src/dpp/events/message_update.cpp @@ -22,7 +22,7 @@ #include #include #include --#include -+#include +-#include ++#include using json = nlohmann::json; diff --git a/src/dpp/events/presence_update.cpp b/src/dpp/events/presence_update.cpp -index b324f09..d4ca44f 100644 +index af16087..7718019 100644 --- a/src/dpp/events/presence_update.cpp +++ b/src/dpp/events/presence_update.cpp @@ -21,7 +21,7 @@ #include #include #include --#include -+#include +-#include ++#include using json = nlohmann::json; diff --git a/src/dpp/events/ready.cpp b/src/dpp/events/ready.cpp -index b301f18..e5802cb 100644 +index ab0d083..2fd96ba 100644 --- a/src/dpp/events/ready.cpp +++ b/src/dpp/events/ready.cpp -@@ -21,7 +21,7 @@ - #include +@@ -22,7 +22,7 @@ #include #include --#include -+#include + #include +-#include ++#include using json = nlohmann::json; diff --git a/src/dpp/events/resumed.cpp b/src/dpp/events/resumed.cpp -index 7d3f771..004c84c 100644 +index e28c8d8..98e174e 100644 --- a/src/dpp/events/resumed.cpp +++ b/src/dpp/events/resumed.cpp @@ -21,7 +21,7 @@ #include #include #include --#include -+#include +-#include ++#include using json = nlohmann::json; diff --git a/src/dpp/events/stage_instance_create.cpp b/src/dpp/events/stage_instance_create.cpp -index 6540e02..a3d7803 100644 +index bb191df..a53b3bc 100644 --- a/src/dpp/events/stage_instance_create.cpp +++ b/src/dpp/events/stage_instance_create.cpp @@ -22,7 +22,7 @@ #include #include #include --#include -+#include +-#include ++#include using json = nlohmann::json; diff --git a/src/dpp/events/stage_instance_delete.cpp b/src/dpp/events/stage_instance_delete.cpp -index dc133e5..27e160b 100644 +index 639d259..d5bb97c 100644 --- a/src/dpp/events/stage_instance_delete.cpp +++ b/src/dpp/events/stage_instance_delete.cpp @@ -22,7 +22,7 @@ #include #include #include --#include -+#include +-#include ++#include using json = nlohmann::json; diff --git a/src/dpp/events/stage_instance_update.cpp b/src/dpp/events/stage_instance_update.cpp -index 1adbc1c..df4b765 100644 +index 8422ffb..5349aab 100644 --- a/src/dpp/events/stage_instance_update.cpp +++ b/src/dpp/events/stage_instance_update.cpp @@ -22,7 +22,7 @@ #include #include #include --#include -+#include +-#include ++#include using json = nlohmann::json; diff --git a/src/dpp/events/thread_create.cpp b/src/dpp/events/thread_create.cpp -index abc9efb..c70c8a9 100644 +index 896999a..680bc92 100644 --- a/src/dpp/events/thread_create.cpp +++ b/src/dpp/events/thread_create.cpp @@ -22,7 +22,7 @@ #include #include #include --#include -+#include +-#include ++#include using json = nlohmann::json; diff --git a/src/dpp/events/thread_delete.cpp b/src/dpp/events/thread_delete.cpp -index b179f38..08e812c 100644 +index 3969469..d195dac 100644 --- a/src/dpp/events/thread_delete.cpp +++ b/src/dpp/events/thread_delete.cpp @@ -22,7 +22,7 @@ #include #include #include --#include -+#include +-#include ++#include using json = nlohmann::json; diff --git a/src/dpp/events/thread_list_sync.cpp b/src/dpp/events/thread_list_sync.cpp -index 70b5f55..7ad047e 100644 +index ce518f5..19eee46 100644 --- a/src/dpp/events/thread_list_sync.cpp +++ b/src/dpp/events/thread_list_sync.cpp @@ -22,7 +22,7 @@ #include #include #include --#include -+#include +-#include ++#include using json = nlohmann::json; diff --git a/src/dpp/events/thread_member_update.cpp b/src/dpp/events/thread_member_update.cpp -index 2eb7a58..b4ee296 100644 +index 00a5949..5868e8d 100644 --- a/src/dpp/events/thread_member_update.cpp +++ b/src/dpp/events/thread_member_update.cpp @@ -22,7 +22,7 @@ #include #include #include --#include -+#include +-#include ++#include using json = nlohmann::json; diff --git a/src/dpp/events/thread_members_update.cpp b/src/dpp/events/thread_members_update.cpp -index ebd34a5..e02e160 100644 +index c744029..ea702a2 100644 --- a/src/dpp/events/thread_members_update.cpp +++ b/src/dpp/events/thread_members_update.cpp @@ -22,7 +22,7 @@ #include #include #include --#include -+#include +-#include ++#include using json = nlohmann::json; diff --git a/src/dpp/events/thread_update.cpp b/src/dpp/events/thread_update.cpp -index c459ed6..a74832b 100644 +index 6be9cb6..b97e271 100644 --- a/src/dpp/events/thread_update.cpp +++ b/src/dpp/events/thread_update.cpp @@ -22,7 +22,7 @@ #include #include #include --#include -+#include +-#include ++#include using json = nlohmann::json; diff --git a/src/dpp/events/typing_start.cpp b/src/dpp/events/typing_start.cpp -index c7586bb..6e7dd57 100644 +index fc8667b..189129a 100644 --- a/src/dpp/events/typing_start.cpp +++ b/src/dpp/events/typing_start.cpp @@ -21,7 +21,7 @@ #include #include #include --#include -+#include +-#include ++#include using json = nlohmann::json; diff --git a/src/dpp/events/user_update.cpp b/src/dpp/events/user_update.cpp -index 89f1002..5bc1c5e 100644 +index 3236c27..63fde16 100644 --- a/src/dpp/events/user_update.cpp +++ b/src/dpp/events/user_update.cpp @@ -23,7 +23,7 @@ #include #include #include --#include -+#include +-#include ++#include using json = nlohmann::json; diff --git a/src/dpp/events/voice_server_update.cpp b/src/dpp/events/voice_server_update.cpp -index 2f9a9b3..a0ff19a 100644 +index a70c831..fd5d984 100644 --- a/src/dpp/events/voice_server_update.cpp +++ b/src/dpp/events/voice_server_update.cpp @@ -23,7 +23,7 @@ #include #include #include --#include -+#include +-#include ++#include using json = nlohmann::json; diff --git a/src/dpp/events/voice_state_update.cpp b/src/dpp/events/voice_state_update.cpp -index 71f5780..af6cc73 100644 +index 4b316d4..79895e0 100644 --- a/src/dpp/events/voice_state_update.cpp +++ b/src/dpp/events/voice_state_update.cpp @@ -24,7 +24,7 @@ #include #include #include --#include -+#include +-#include ++#include using json = nlohmann::json; diff --git a/src/dpp/events/webhooks_update.cpp b/src/dpp/events/webhooks_update.cpp -index 81005c2..191675d 100644 +index e94e585..d4c49d0 100644 --- a/src/dpp/events/webhooks_update.cpp +++ b/src/dpp/events/webhooks_update.cpp @@ -22,7 +22,7 @@ #include #include #include --#include -+#include +-#include ++#include using json = nlohmann::json; diff --git a/src/dpp/guild.cpp b/src/dpp/guild.cpp -index 4b1b2b9..0ead0cc 100644 +index 2bea4f0..b6de50c 100644 --- a/src/dpp/guild.cpp +++ b/src/dpp/guild.cpp -@@ -24,7 +24,7 @@ +@@ -25,7 +25,7 @@ #include #include #include --#include -+#include +-#include ++#include using json = nlohmann::json; diff --git a/src/dpp/integration.cpp b/src/dpp/integration.cpp -index 066f727..f23e52c 100644 +index 0d7ffba..2057271 100644 --- a/src/dpp/integration.cpp +++ b/src/dpp/integration.cpp @@ -21,7 +21,7 @@ #include #include #include --#include -+#include +-#include ++#include #include using json = nlohmann::json; diff --git a/src/dpp/invite.cpp b/src/dpp/invite.cpp -index d2c3825..c83f5fd 100644 +index b93c738..a6969bf 100644 --- a/src/dpp/invite.cpp +++ b/src/dpp/invite.cpp @@ -20,7 +20,7 @@ ************************************************************************************/ #include #include --#include -+#include +-#include ++#include using json = nlohmann::json; diff --git a/src/dpp/message.cpp b/src/dpp/message.cpp -index ddbac35..b0faa08 100644 +index f57c752..58c8e48 100644 --- a/src/dpp/message.cpp +++ b/src/dpp/message.cpp @@ -23,7 +23,7 @@ #include #include #include --#include -+#include +-#include ++#include #include #include #include @@ -1444,28 +1457,28 @@ index 5985e6e..e7adab6 100644 namespace dpp { diff --git a/src/dpp/presence.cpp b/src/dpp/presence.cpp -index e58fb74..dc14d8a 100644 +index 2571d89..bb9affe 100644 --- a/src/dpp/presence.cpp +++ b/src/dpp/presence.cpp @@ -22,7 +22,7 @@ #include #include #include --#include -+#include +-#include ++#include using json = nlohmann::json; diff --git a/src/dpp/prune.cpp b/src/dpp/prune.cpp -index 080a5c5..4f2cbc9 100644 +index 1d7cd49..50b0315 100644 --- a/src/dpp/prune.cpp +++ b/src/dpp/prune.cpp @@ -21,7 +21,7 @@ #include #include #include --#include -+#include +-#include ++#include namespace dpp { @@ -1483,93 +1496,93 @@ index e952306..fdc6f8f 100644 using json = nlohmann::json; diff --git a/src/dpp/scheduled_event.cpp b/src/dpp/scheduled_event.cpp -index dacf4ab..8f2a67a 100644 +index e049889..3113260 100644 --- a/src/dpp/scheduled_event.cpp +++ b/src/dpp/scheduled_event.cpp @@ -22,7 +22,7 @@ #include #include #include --#include -+#include +-#include ++#include namespace dpp { diff --git a/src/dpp/slashcommand.cpp b/src/dpp/slashcommand.cpp -index c8fd774..d455fe1 100644 +index b902772..d88d182 100644 --- a/src/dpp/slashcommand.cpp +++ b/src/dpp/slashcommand.cpp @@ -21,7 +21,7 @@ #include #include #include --#include -+#include +-#include ++#include #include #include #include diff --git a/src/dpp/stage_instance.cpp b/src/dpp/stage_instance.cpp -index 03e6ec4..154f075 100644 +index 2b10760..34e514d 100644 --- a/src/dpp/stage_instance.cpp +++ b/src/dpp/stage_instance.cpp @@ -21,7 +21,7 @@ #include #include #include --#include -+#include +-#include ++#include namespace dpp { diff --git a/src/dpp/user.cpp b/src/dpp/user.cpp -index c20eeec..df8f61c 100644 +index 25f6c1d..3fc2c86 100644 --- a/src/dpp/user.cpp +++ b/src/dpp/user.cpp @@ -20,7 +20,7 @@ ************************************************************************************/ #include #include --#include -+#include +-#include ++#include #include using json = nlohmann::json; diff --git a/src/dpp/voiceregion.cpp b/src/dpp/voiceregion.cpp -index 2dba305..7cf2341 100644 +index 0f60d20..30f4c01 100644 --- a/src/dpp/voiceregion.cpp +++ b/src/dpp/voiceregion.cpp @@ -20,7 +20,7 @@ ************************************************************************************/ #include #include --#include -+#include +-#include ++#include namespace dpp { diff --git a/src/dpp/voicestate.cpp b/src/dpp/voicestate.cpp -index f7d6423..7df6fa8 100644 +index 601da27..2fd5a15 100644 --- a/src/dpp/voicestate.cpp +++ b/src/dpp/voicestate.cpp @@ -20,7 +20,7 @@ ************************************************************************************/ #include #include --#include -+#include +-#include ++#include using json = nlohmann::json; diff --git a/src/dpp/webhook.cpp b/src/dpp/webhook.cpp -index 65ffd83..b4d26e4 100644 +index 14ec753..37639e4 100644 --- a/src/dpp/webhook.cpp +++ b/src/dpp/webhook.cpp @@ -20,7 +20,7 @@ ************************************************************************************/ #include #include --#include -+#include +-#include ++#include #include namespace dpp { diff --git a/srcpkgs/libdpp/template b/srcpkgs/libdpp/template index 97ac73d59c64..6a563cb5fe90 100644 --- a/srcpkgs/libdpp/template +++ b/srcpkgs/libdpp/template @@ -1,18 +1,18 @@ # Template file for 'libdpp' pkgname=libdpp -version=10.0.15 +version=10.0.16 revision=1 wrksrc=DPP-${version} build_style=cmake cmake_builddir=build hostmakedepends="pkg-config" -makedepends="libsodium-devel opus-devel zlib-devel openssl-devel fmt-devel json-c++" +makedepends="libsodium-devel opus-devel zlib-devel openssl-devel json-c++" short_desc="C++ Discord API Library for Bots" maintainer="Bo-Ru Ju " license=Apache-2.0 homepage="https://dpp.dev" distfiles="https://github.com/brainboxdotcc/DPP/archive/refs/tags/v${version}.tar.gz" -checksum=5370e7fa3e76ed78b87dc4d9c01cc5a5f1a5789ebf1d3d0e8deff05cb665c539 +checksum=dc99af06d9c2fdeefde534d99c00cbda4c96bac7d02ee68bcbbc2b47848bb28e post_extract() { rm -r include/dpp/nlohmann