2025-09-09 20:47:51 +02:00
7 changed files with 4 additions and 177 deletions
--- a/.patch/cpp-jwt/0001-no-install.patch
+++ b/.patch/cpp-jwt/0001-no-install.patch
@ -1,47 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 8c1761f..52c4ca4 100644
--- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -69,42 +69,3 @@ endif()
- if(CPP_JWT_BUILD_EXAMPLES)
-   add_subdirectory(examples)
- endif()
-
-# ##############################################################################
-# INSTALL
-# ##############################################################################
-
-include(GNUInstallDirs)
-include(CMakePackageConfigHelpers)
-set(CPP_JWT_CONFIG_INSTALL_DIR ${CMAKE_INSTALL_DATADIR}/cmake/${PROJECT_NAME})
-
-install(TARGETS ${PROJECT_NAME} EXPORT ${PROJECT_NAME}Targets)
-install(
-  EXPORT ${PROJECT_NAME}Targets
-  DESTINATION ${CPP_JWT_CONFIG_INSTALL_DIR}
-  NAMESPACE ${PROJECT_NAME}::
-  COMPONENT dev)
-configure_package_config_file(cmake/Config.cmake.in ${PROJECT_NAME}Config.cmake
-                              INSTALL_DESTINATION ${CPP_JWT_CONFIG_INSTALL_DIR}
-                              NO_SET_AND_CHECK_MACRO)
-write_basic_package_version_file(${PROJECT_NAME}ConfigVersion.cmake
-                                 COMPATIBILITY SameMajorVersion
-                                 ARCH_INDEPENDENT)
-install(
-  FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}Config.cmake
-        ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake
-  DESTINATION ${CPP_JWT_CONFIG_INSTALL_DIR}
-  COMPONENT dev)
-
-if(NOT CPP_JWT_USE_VENDORED_NLOHMANN_JSON)
-  set(CPP_JWT_VENDORED_NLOHMANN_JSON_INSTALL_PATTERN PATTERN "json" EXCLUDE)
-endif()
-install(
-  DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/include/jwt/
-  DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/jwt
-  COMPONENT dev
-  FILES_MATCHING
-  PATTERN "*.hpp"
-  PATTERN "*.ipp"
-  PATTERN "test" EXCLUDE
-  ${CPP_JWT_VENDORED_NLOHMANN_JSON_INSTALL_PATTERN})
--- a/.patch/cpp-jwt/0002-missing-decl.patch
+++ b/.patch/cpp-jwt/0002-missing-decl.patch
@ -1,13 +0,0 @@
-diff --git a/include/jwt/algorithm.hpp b/include/jwt/algorithm.hpp
-index 0e3b843..1156e6a 100644
--- a/include/jwt/algorithm.hpp
-+++ b/include/jwt/algorithm.hpp
-@@ -64,6 +64,8 @@ using verify_func_t = verify_result_t (*) (const jwt::string_view key,
-                                            const jwt::string_view head,
-                                            const jwt::string_view jwt_sign);
- 
-+verify_result_t is_secret_a_public_key(const jwt::string_view secret);
-+
- namespace algo {
- 
- //Me: TODO: All these can be done using code generaion.
--- a/.patch/discord-rpc/0001-cmake-version.patch
+++ b/.patch/discord-rpc/0001-cmake-version.patch
@ -1,10 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 5dad9e9..760a1b2 100644
--- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 3.2.0)
-+cmake_minimum_required (VERSION 3.10)
- project (DiscordRPC)
- 
- include(GNUInstallDirs)
--- a/.patch/discord-rpc/0002-no-clang-format.patch
+++ b/.patch/discord-rpc/0002-no-clang-format.patch
@ -1,40 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 760a1b2..540d643 100644
--- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -12,20 +12,6 @@ file(GLOB_RECURSE ALL_SOURCE_FILES
-     src/*.cpp src/*.h src/*.c
- )
- 
-# Set CLANG_FORMAT_SUFFIX if you are using custom clang-format, e.g. clang-format-5.0
-find_program(CLANG_FORMAT_CMD clang-format${CLANG_FORMAT_SUFFIX})
-
-if (CLANG_FORMAT_CMD)
-    add_custom_target(
-        clangformat
-        COMMAND ${CLANG_FORMAT_CMD}
-        -i -style=file -fallback-style=none
-        ${ALL_SOURCE_FILES}
-        DEPENDS
-        ${ALL_SOURCE_FILES}
-    )
-endif(CLANG_FORMAT_CMD)
-
- # thirdparty stuff
- execute_process(
-     COMMAND mkdir ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 290d761..cd2cc92 100644
--- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -120,10 +120,6 @@ if (${BUILD_SHARED_LIBS})
-     target_compile_definitions(discord-rpc PRIVATE -DDISCORD_BUILDING_SDK)
- endif(${BUILD_SHARED_LIBS})
- 
-if (CLANG_FORMAT_CMD)
-    add_dependencies(discord-rpc clangformat)
-endif(CLANG_FORMAT_CMD)
-
- # install
- 
- install(
--- a/.patch/discord-rpc/0003-fix-cpp17.patch
+++ b/.patch/discord-rpc/0003-fix-cpp17.patch
@ -1,31 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 540d643..5d12f3d 100644
--- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -17,12 +17,14 @@ execute_process(
-     COMMAND mkdir ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty
-     ERROR_QUIET
- )
-+# new commit that fixes c++17
-+set(RAPIDJSON_SHA 3b2441b87f99ab65f37b141a7b548ebadb607b96)
- 
-find_file(RAPIDJSONTEST NAMES rapidjson rapidjson-1.1.0 PATHS ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty CMAKE_FIND_ROOT_PATH_BOTH)
-+find_file(RAPIDJSONTEST NAMES rapidjson rapidjson-${RAPIDJSON_SHA} PATHS ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty CMAKE_FIND_ROOT_PATH_BOTH)
- if (NOT RAPIDJSONTEST)
-     message("no rapidjson, download")
-    set(RJ_TAR_FILE ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/v1.1.0.tar.gz)
-    file(DOWNLOAD https://github.com/miloyip/rapidjson/archive/v1.1.0.tar.gz ${RJ_TAR_FILE})
-+    set(RJ_TAR_FILE ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/${RAPIDJSON_SHA}.tar.gz)
-+    file(DOWNLOAD https://github.com/miloyip/rapidjson/archive/${RAPIDJSON_SHA}.tar.gz ${RJ_TAR_FILE})
-     execute_process(
-         COMMAND ${CMAKE_COMMAND} -E tar xzf ${RJ_TAR_FILE}
-         WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty
-@@ -30,7 +32,7 @@ if (NOT RAPIDJSONTEST)
-     file(REMOVE ${RJ_TAR_FILE})
- endif(NOT RAPIDJSONTEST)
- 
-find_file(RAPIDJSON NAMES rapidjson rapidjson-1.1.0 PATHS ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty CMAKE_FIND_ROOT_PATH_BOTH)
-+find_file(RAPIDJSON NAMES rapidjson rapidjson-${RAPIDJSON_SHA} PATHS ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty CMAKE_FIND_ROOT_PATH_BOTH)
- 
- add_library(rapidjson STATIC IMPORTED ${RAPIDJSON})
- 
--- a/.patch/unordered-dense/0001-cmake.patch
+++ b/.patch/unordered-dense/0001-cmake.patch
@ -1,22 +0,0 @@
-From e59d30b7b12e1d04cc2fc9c6219e35bda447c17e Mon Sep 17 00:00:00 2001
-From: Lizzie <159065448+Lizzie841@users.noreply.github.com>
-Date: Fri, 16 May 2025 04:12:13 +0100
-Subject: [PATCH] Update CMakeLists.txt
-
---
- CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index b5f4c4f..c5c6f31 100644
--- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -24,7 +24,7 @@ target_include_directories(
- 
- target_compile_features(unordered_dense INTERFACE cxx_std_17)
- 
-if(_unordered_dense_is_toplevel_project)
-+if(_unordered_dense_is_toplevel_project OR UNORDERED_DENSE_INSTALL)
-     # locations are provided by GNUInstallDirs
-     install(
-         TARGETS unordered_dense
--- a/externals/cpmfile.json
+++ b/externals/cpmfile.json
@ -29,18 +29,14 @@
    },
    "cpp-jwt": {
        "version": "1.4",
-        "repo": "arun11299/cpp-jwt",
-        "sha": "a54fa08a3b",
-        "hash": "a90f7e594ada0c7e49d5ff9211c71097534e7742a8e44bf0851b0362642a7271d53f5d83d04eeaae2bad17ef3f35e09e6818434d8eaefa038f3d1f7359d0969a",
+        "repo": "crueter/cpp-jwt",
+        "sha": "ce992811fe",
+        "hash": "d86f1495dc42189636cde959fcbd06334113aa81af0abb5b096a9ef29c51ad391cc56e2f1b5d627bf8805efd838d28f39cc1687caa4db6a3d49934232762742c",
        "find_args": "CONFIG",
        "options": [
            "CPP_JWT_BUILD_EXAMPLES OFF",
            "CPP_JWT_BUILD_TESTS OFF",
            "CPP_JWT_USE_VENDORED_NLOHMANN_JSON OFF"
-        ],
-        "patches": [
-            "0001-no-install.patch",
-            "0002-missing-decl.patch"
        ]
    },
    "vulkan-utility-headers": {
@ -107,12 +103,6 @@
        "repo": "martinus/unordered_dense",
        "sha": "73f3cbb237",
        "hash": "c08c03063938339d61392b687562909c1a92615b6ef39ec8df19ea472aa6b6478e70d7d5e33d4a27b5d23f7806daf57fe1bacb8124c8a945c918c7663a9e8532",
-        "find_args": "CONFIG",
-        "options": [
-            "UNORDERED_DENSE_INSTALL OFF"
-        ],
-        "patches": [
-            "0001-cmake.patch"
-        ]
+        "find_args": "CONFIG"
    }
 }