summaryrefslogtreecommitdiff
path: root/dev-cpp
diff options
context:
space:
mode:
Diffstat (limited to 'dev-cpp')
-rw-r--r--dev-cpp/dpp/Manifest3
-rw-r--r--dev-cpp/dpp/dpp-10.0.24.ebuild (renamed from dev-cpp/dpp/dpp-10.0.22-r1.ebuild)15
-rw-r--r--dev-cpp/rapidfuzz-cpp/rapidfuzz-cpp-1.11.3.ebuild2
3 files changed, 9 insertions, 11 deletions
diff --git a/dev-cpp/dpp/Manifest b/dev-cpp/dpp/Manifest
index c2b6eba109e5..9d2026d05c8a 100644
--- a/dev-cpp/dpp/Manifest
+++ b/dev-cpp/dpp/Manifest
@@ -1,3 +1,2 @@
-DIST dpp-10.0.22.tar.gz 13712205 BLAKE2B b935b763f87bfd1058e72f8d297fda136f532a03a5b9f3a6e3471f0ce64988c9615105fb1eb9b19192844cdaab9d332f355dfc22f8bcdbf977eec3eb5f0b8df3 SHA512 6c71673b47d559ef4f04b30cd72a3bd0a31b72ffe6d73dd17470a7e754eba75d21218ebd247702441db45549e5dcea9b200f3d435dd3a9af76fda90740ca4f1a
DIST dpp-10.0.23.tar.gz 13721815 BLAKE2B abbe6849025270554f8462dcbef6adefff412ee06216c19a730f236cd44c7e4da1c6b801f2b10a493df253626a4af9b8132aa155c7f585fe3de35eaa5c5cf4df SHA512 18bbb7d2c1385d179cac9ded31d1b11e8d24f172e7ffe2ba79071203e1e2f277657e21d660b18ee4b849bc093d350f4bc5401702400084b56c3ebd6f03ce28df
-DIST dpp-890014-rework-compiler-flags.patch 6670 BLAKE2B f23ad8f7347841aa924b82b706fbdc5ff5ceac9e90e6c01c28f13117619235a057648e30cdb92d5e3401c228c7497e8804e894d2dfd5d3591e2860746acfcaa2 SHA512 c5777efab36187b59ac8c0d5177752c4f605e584b0f3f2435bf210f792879df0461d64332725e4c47e19f026b3b11eeb2d243425bab9f888cf239dafbedc3890
+DIST dpp-10.0.24.tar.gz 13739463 BLAKE2B 0531d9d14b943302293aac62a3972a4628487332107b77ca6d09ae39ae8a9d1cfeceae1a656790cc8699932af9c5d46a0ae5bc26885a9c29cc970388cdb60f3f SHA512 2f1e5415c121d5f19d2abb1b389512ad22c3cac6779ed897403d430b2c4e62c758ab25d46a3fd02538add711073fadd616a690b4981f3782e46c18ff05d116dc
diff --git a/dev-cpp/dpp/dpp-10.0.22-r1.ebuild b/dev-cpp/dpp/dpp-10.0.24.ebuild
index bf42bca137a1..d5cee490ccde 100644
--- a/dev-cpp/dpp/dpp-10.0.22-r1.ebuild
+++ b/dev-cpp/dpp/dpp-10.0.24.ebuild
@@ -9,7 +9,6 @@ DESCRIPTION="Lightweight C++ Discord bot library"
HOMEPAGE="https://dpp.dev/ https://github.com/brainboxdotcc/DPP"
SRC_URI="
https://github.com/brainboxdotcc/DPP/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
- https://patch-diff.githubusercontent.com/raw/brainboxdotcc/DPP/pull/596.patch -> ${PN}-890014-rework-compiler-flags.patch
"
LICENSE="Apache-2.0"
@@ -28,25 +27,25 @@ RDEPEND="
media-libs/opus
)
"
-DEPEND="${RDEPEND}"
+DEPEND="
+ ${RDEPEND}
+
+ dev-cpp/nlohmann_json
+"
S="${WORKDIR}/DPP-${PV}"
DOCS=( "README.md" "SECURITY.md" )
-PATCHES=(
- # Backport of the compiler flag setting fixes, remove after 10.0.22, https://bugs.gentoo.org/890014
- "${DISTDIR}/${PN}-890014-rework-compiler-flags.patch"
-)
-
src_configure() {
local mycmakeargs=(
-DBUILD_SHARED_LIBS=true
- -DBUILD_VOICE_SUPPORT=$(usex voice)
+ -DBUILD_VOICE_SUPPORT="$(usex voice)"
-DRUN_LDCONFIG=false
# Tests require network access
-DDPP_BUILD_TEST=false
-DDPP_NO_VCPKG=true
+ -DDPP_USE_EXTERNAL_JSON=true
)
cmake_src_configure
diff --git a/dev-cpp/rapidfuzz-cpp/rapidfuzz-cpp-1.11.3.ebuild b/dev-cpp/rapidfuzz-cpp/rapidfuzz-cpp-1.11.3.ebuild
index 315024591a2e..93b379e7f026 100644
--- a/dev-cpp/rapidfuzz-cpp/rapidfuzz-cpp-1.11.3.ebuild
+++ b/dev-cpp/rapidfuzz-cpp/rapidfuzz-cpp-1.11.3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
IUSE="test"
RESTRICT="!test? ( test )"