aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMaki <mxmcube@gmail.com>2020-06-12 06:09:27 +0100
committerGitHub <noreply@github.com>2020-06-11 22:09:27 -0700
commit0f161f9e12f78d701dac14b121179e089e166b1d (patch)
tree6dfa1eec4fcd223c7e949e320fd89ab10c23ba54
parent8c0860c915c7784b0b47e31e3c231a28d00df255 (diff)
downloadvcpkg-0f161f9e12f78d701dac14b121179e089e166b1d.tar.gz
vcpkg-0f161f9e12f78d701dac14b121179e089e166b1d.zip
[discord-game-sdk] Won't compile with certain compilers (#11728)
* [discord-game-sdk] Added required flag for compiling * [discord-game-sdk] Added patch for fixing cstdint issue * [discord-game-sdk] Bumped version for patch * [discord-game-sdk] Formatting Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
-rw-r--r--ports/discord-game-sdk/CONTROL2
-rw-r--r--ports/discord-game-sdk/include-cstdint.patch25
-rw-r--r--ports/discord-game-sdk/portfile.cmake4
3 files changed, 29 insertions, 2 deletions
diff --git a/ports/discord-game-sdk/CONTROL b/ports/discord-game-sdk/CONTROL
index 7110110de..a164d53f0 100644
--- a/ports/discord-game-sdk/CONTROL
+++ b/ports/discord-game-sdk/CONTROL
@@ -1,5 +1,5 @@
Source: discord-game-sdk
-Version: 2.5.6
+Version: 2.5.6-1
Homepage: https://discordapp.com/developers/docs/game-sdk/sdk-starter-guide
Description: The Discord GameSDK is an easy drop-in SDK to help you manage all the hard things that come with making a game.
Supports: ((x64 && (windows || osx || linux)) || (x86 && windows)) && !uwp && !static \ No newline at end of file
diff --git a/ports/discord-game-sdk/include-cstdint.patch b/ports/discord-game-sdk/include-cstdint.patch
new file mode 100644
index 000000000..6e61c4c25
--- /dev/null
+++ b/ports/discord-game-sdk/include-cstdint.patch
@@ -0,0 +1,25 @@
+From 91fab7c4b8f7da3182f07f5392ebe9388f979157 Mon Sep 17 00:00:00 2001
+From: Maki <mxmcube@gmail.com>
+Date: Wed, 3 Jun 2020 01:40:58 +0100
+Subject: [PATCH] Include cstdint
+
+---
+ cpp/types.h | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/cpp/types.h b/cpp/types.h
+index 8c7cc2b..122dc71 100644
+--- a/cpp/types.h
++++ b/cpp/types.h
+@@ -3,6 +3,8 @@
+ #include "ffi.h"
+ #include "event.h"
+
++#include <cstdint>
++
+ namespace discord {
+
+ enum class Result {
+--
+2.26.2
+
diff --git a/ports/discord-game-sdk/portfile.cmake b/ports/discord-game-sdk/portfile.cmake
index fbd82dee0..ab85a7d72 100644
--- a/ports/discord-game-sdk/portfile.cmake
+++ b/ports/discord-game-sdk/portfile.cmake
@@ -15,6 +15,8 @@ vcpkg_extract_source_archive_ex(
OUT_SOURCE_PATH SOURCE_PATH
ARCHIVE ${ARCHIVE}
NO_REMOVE_ONE_LEVEL
+ PATCHES
+ include-cstdint.patch # allows compiling on newer versions of GCC
)
file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION ${SOURCE_PATH})
@@ -48,4 +50,4 @@ vcpkg_install_cmake()
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/copyright" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
-file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") \ No newline at end of file
+file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")