From fcc7219a6ff9ca052d20c86afe50abff4724220a Mon Sep 17 00:00:00 2001 From: Samuel Bauer Date: Mon, 13 Feb 2023 16:00:38 +0100 Subject: [PATCH] games-emulation/citra*: use system dev-cpp/cpp-httplib Signed-off-by: Samuel Bauer --- games-emulation/citra-canary/citra-canary-9999.ebuild | 4 ++++ games-emulation/citra/citra-9999.ebuild | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/games-emulation/citra-canary/citra-canary-9999.ebuild b/games-emulation/citra-canary/citra-canary-9999.ebuild index 61b4e81ab3..d008cee0be 100644 --- a/games-emulation/citra-canary/citra-canary-9999.ebuild +++ b/games-emulation/citra-canary/citra-canary-9999.ebuild @@ -44,6 +44,7 @@ RDEPEND=" " DEPEND="${RDEPEND}" BDEPEND=" + dev-cpp/cpp-httplib dev-cpp/cpp-jwt dev-cpp/robin-map" REQUIRED_USE="|| ( qt5 sdl )" @@ -144,6 +145,9 @@ src_prepare() { sed -i -e '$afind_package(cubeb REQUIRED)\n' CMakeLists.txt || die fi + # Unbundle cpp-httplib + sed -i -e '/# httplib/,/target_link_libraries(httplib/d' externals/CMakeLists.txt || die + # Unbundle cpp-jwt sed -i -e '/# cpp-jwt/,/CPP_JWT_USE_VENDORED_NLOHMANN_JSON/d' externals/CMakeLists.txt || die sed -i -e 's/ cpp-jwt//' src/web_service/CMakeLists.txt || die diff --git a/games-emulation/citra/citra-9999.ebuild b/games-emulation/citra/citra-9999.ebuild index 02b932c580..3350fa6989 100644 --- a/games-emulation/citra/citra-9999.ebuild +++ b/games-emulation/citra/citra-9999.ebuild @@ -44,6 +44,7 @@ RDEPEND=" " DEPEND="${RDEPEND}" BDEPEND=" + dev-cpp/cpp-httplib dev-cpp/cpp-jwt dev-cpp/robin-map" REQUIRED_USE="|| ( qt5 sdl )" @@ -126,6 +127,9 @@ src_prepare() { sed -i -e '$afind_package(cubeb REQUIRED)\n' CMakeLists.txt || die fi + # Unbundle cpp-httplib + sed -i -e '/# httplib/,/target_link_libraries(httplib/d' externals/CMakeLists.txt || die + # Unbundle cpp-jwt sed -i -e '/# cpp-jwt/,/CPP_JWT_USE_VENDORED_NLOHMANN_JSON/d' externals/CMakeLists.txt || die sed -i -e 's/ cpp-jwt//' src/web_service/CMakeLists.txt || die