gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-07-25 08:58:27 -07:00
Code Issues Projects Releases Wiki Activity

dev-cpp/cpp-httplib: drop 0.18.3, 0.18.6, 0.20.0-r1

Browse Source 
Signed-off-by: Alexey Sokolov <alexey+gentoo@asokolov.org>
Part-of: https://github.com/gentoo/gentoo/pull/43079
Signed-off-by: Sam James <sam@gentoo.org>
This commit is contained in:
Alexey Sokolov
2025-07-20 09:25:06 +01:00
committed by Sam James
parent 75987921c7
commit 1c003d0419
7 changed files with 0 additions and 364 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
dev-cpp/cpp-httplib/Manifest
View File

@@ -1,6 +1,3 @@
DIST cpp-httplib-0.18.1.tar.gz 1323636 BLAKE2B 8335c9a4d69d7e9b2e7e3c4036b49627536c8d6cffa7a5ae2c3dff693c5458f7fa2f89f3da2c130325069225d3204ec579900d5c5266dff7a9c732c134b39907 SHA512 6dd1054d0171594bf871a918b5540cc67981a48f7dbb82e9029a4877afc6d8c36e2f69411f5eec7b052bf0245554d01f33ef2180f42a15f6b8dd86ebb2427a41
DIST cpp-httplib-0.18.3.tar.gz 1324253 BLAKE2B 995ae8cd63013ec03e86f56e089b4f1374a8913eaf02d8fc07997b986dc8f65b1bda710ed686b6cc111e6203d15bbcb9db08cd810d2167c1658bfa99dc9b61b2 SHA512 d9eb70dfd8ebde658852d1a8cf9f96419ca11cad889b54672aa4812c0b5db0c3f1fddf63f536aec19fc4a849f41ed22461581a18f0733d3f906e45dd096bafd8
DIST cpp-httplib-0.18.6.tar.gz 1326428 BLAKE2B bee65790b8f2a19f80fd8f38799d650ceaef021b6e9f28b2fd0678f4c50b95d210f9764775d67365e65e6f9e03d6999091f28aa553655444c8ff369172cf13f9 SHA512 326c1b3315256c1e1e8b6406b9209215f5c264e1071ab3de400011486713b90cb8f88b48ac979fb024ba91441c2fb00aa40a15b85bfac9895c052f2131773249
DIST cpp-httplib-0.20.0.tar.gz 1408009 BLAKE2B f3888337edd0bf6753b28641a9d7196e59b73648de3e70b7d9e6072a7966c40ead4ef169a6f224b3c31cf4829ab71ffb3e461257f661e613cc806a596c1d6c30 SHA512 a20d306bfc7b3749f67c3f213f410cf61e1d3896cb7b02582299af7a396731594d514680d8af54a48e1462223a30354446c7970dc38f68fb2f647c9d2e018581
DIST cpp-httplib-0.20.1.tar.gz 1408474 BLAKE2B d29bddefc2f103f98fddd19475085bc0e96b487a76ec05142b05bf0255be5c349eb52ba32f32c98eac5b398f3a09c9e750acb33db8146d5ffc1d7ad6c0d4ae58 SHA512 70a6d4572528272766b0d55b382bbe495107646e914193986ed7c336daae26f1c1bf6f63bbf96a278448c7c50982991a04ab7eb83e62f3b34bee560f0ef8172b
DIST cpp-httplib-0.23.1.tar.gz 1300345 BLAKE2B 2fd7cfd0008cdefb2f20e48b608dba684207703fee5755739a1512a1f47bbd63bc1a05cbbe9127b2911be277446b18124be210ba2ac4560080e0c7c339354e28 SHA512 f8037a0d55019931beb4dfd12418c140e6b170ed7d0eb851f2eebefb8a5f48bb83fc3c9030b78a3524190d2d1647a16e14ac64209ce663bbaa717f03b167cb59

92
dev-cpp/cpp-httplib/cpp-httplib-0.18.3.ebuild
View File

@@ -1,92 +0,0 @@
# Copyright 2022-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
PYTHON_COMPAT=( python3_{11..13} )
inherit cmake-multilib python-any-r1 toolchain-funcs
DESCRIPTION="C++ HTTP/HTTPS server and client library"
HOMEPAGE="https://github.com/yhirose/cpp-httplib/"
if [[ "${PV}" == *9999* ]] ; then
inherit git-r3
EGIT_REPO_URI="https://github.com/yhirose/${PN}.git"
else
SRC_URI="https://github.com/yhirose/${PN}/archive/v${PV}.tar.gz
-> ${P}.tar.gz"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
fi
LICENSE="MIT"
SLOT="0/${PV}" # soversion / /usr/include/httplib.h: CPPHTTPLIB_VERSION
IUSE="brotli ssl test zlib"
REQUIRED_USE="test? ( brotli ssl zlib )"
RESTRICT="!test? ( test )"
RDEPEND="
brotli? (
app-arch/brotli:=[${MULTILIB_USEDEP}]
)
ssl? (
>=dev-libs/openssl-3.0.13:=[${MULTILIB_USEDEP}]
)
zlib? (
sys-libs/zlib[${MULTILIB_USEDEP}]
)
"
DEPEND="
${RDEPEND}
"
BDEPEND="
${PYTHON_DEPS}
"
src_configure() {
local -a mycmakeargs=(
-DHTTPLIB_COMPILE=yes
-DBUILD_SHARED_LIBS=yes
-DHTTPLIB_USE_BROTLI_IF_AVAILABLE=no
-DHTTPLIB_USE_OPENSSL_IF_AVAILABLE=no
-DHTTPLIB_USE_ZLIB_IF_AVAILABLE=no
-DHTTPLIB_REQUIRE_BROTLI=$(usex brotli)
-DHTTPLIB_REQUIRE_OPENSSL=$(usex ssl)
-DHTTPLIB_REQUIRE_ZLIB=$(usex zlib)
-DPython3_EXECUTABLE="${PYTHON}"
)
cmake-multilib_src_configure
}
multilib_src_test() {
cp -p -R --reflink=auto "${S}/test" ./test || die
local -a failing_tests=(
# Disable all online tests.
"*.*_Online"
# Fails on musl x86:
ServerTest.GetRangeWithMaxLongLength
ServerTest.GetStreamedWithTooManyRanges
# https://github.com/yhirose/cpp-httplib/issues/1798
# Filed by mgorny's testing, fails on openssl >=3.2:
SSLClientServerTest.ClientCertPresent
SSLClientServerTest.ClientEncryptedCertPresent
SSLClientServerTest.CustomizeServerSSLCtx
SSLClientServerTest.MemoryClientCertPresent
SSLClientServerTest.MemoryClientEncryptedCertPresent
SSLClientServerTest.TrustDirOptional
)
# Little dance to please the GTEST filter (join array using ":").
failing_tests_str="${failing_tests[@]}"
failing_tests_filter="${failing_tests_str// /:}"
# PREFIX is . to avoid calling "brew" and relying on stuff in /opt
GTEST_FILTER="-${failing_tests_filter}" emake -C test \
CXX="$(tc-getCXX)" CXXFLAGS="${CXXFLAGS} -I." PREFIX=.
}

96
dev-cpp/cpp-httplib/cpp-httplib-0.18.6.ebuild
View File

@@ -1,96 +0,0 @@
# Copyright 2022-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
PYTHON_COMPAT=( python3_{11..13} )
inherit cmake-multilib python-any-r1 toolchain-funcs
DESCRIPTION="C++ HTTP/HTTPS server and client library"
HOMEPAGE="https://github.com/yhirose/cpp-httplib/"
if [[ "${PV}" == *9999* ]] ; then
inherit git-r3
EGIT_REPO_URI="https://github.com/yhirose/${PN}.git"
else
SRC_URI="https://github.com/yhirose/${PN}/archive/v${PV}.tar.gz
-> ${P}.tar.gz"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
fi
LICENSE="MIT"
SLOT="0/${PV}" # soversion / /usr/include/httplib.h: CPPHTTPLIB_VERSION
IUSE="brotli ssl test zlib"
REQUIRED_USE="test? ( brotli ssl zlib )"
RESTRICT="!test? ( test )"
RDEPEND="
brotli? (
app-arch/brotli:=[${MULTILIB_USEDEP}]
)
ssl? (
>=dev-libs/openssl-3.0.13:=[${MULTILIB_USEDEP}]
)
zlib? (
sys-libs/zlib[${MULTILIB_USEDEP}]
)
"
DEPEND="
${RDEPEND}
"
BDEPEND="
${PYTHON_DEPS}
"
PATCHES=(
"${FILESDIR}/${P}-onlinetest.patch"
)
src_configure() {
local -a mycmakeargs=(
-DHTTPLIB_COMPILE=yes
-DBUILD_SHARED_LIBS=yes
-DHTTPLIB_USE_BROTLI_IF_AVAILABLE=no
-DHTTPLIB_USE_OPENSSL_IF_AVAILABLE=no
-DHTTPLIB_USE_ZLIB_IF_AVAILABLE=no
-DHTTPLIB_REQUIRE_BROTLI=$(usex brotli)
-DHTTPLIB_REQUIRE_OPENSSL=$(usex ssl)
-DHTTPLIB_REQUIRE_ZLIB=$(usex zlib)
-DPython3_EXECUTABLE="${PYTHON}"
)
cmake-multilib_src_configure
}
multilib_src_test() {
cp -p -R --reflink=auto "${S}/test" ./test || die
local -a failing_tests=(
# Disable all online tests.
"*.*_Online"
# Fails on musl x86:
ServerTest.GetRangeWithMaxLongLength
ServerTest.GetStreamedWithTooManyRanges
# https://github.com/yhirose/cpp-httplib/issues/1798
# Filed by mgorny's testing, fails on openssl >=3.2:
SSLClientServerTest.ClientCertPresent
SSLClientServerTest.ClientEncryptedCertPresent
SSLClientServerTest.CustomizeServerSSLCtx
SSLClientServerTest.MemoryClientCertPresent
SSLClientServerTest.MemoryClientEncryptedCertPresent
SSLClientServerTest.TrustDirOptional
)
# Little dance to please the GTEST filter (join array using ":").
failing_tests_str="${failing_tests[@]}"
failing_tests_filter="${failing_tests_str// /:}"
# PREFIX is . to avoid calling "brew" and relying on stuff in /opt
GTEST_FILTER="-${failing_tests_filter}" emake -C test \
CXX="$(tc-getCXX)" CXXFLAGS="${CXXFLAGS} -I." PREFIX=.
}

106
dev-cpp/cpp-httplib/cpp-httplib-0.20.0-r1.ebuild
View File

@@ -1,106 +0,0 @@
# Copyright 2022-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
PYTHON_COMPAT=( python3_{11..13} )
inherit cmake-multilib python-any-r1 toolchain-funcs
DESCRIPTION="C++ HTTP/HTTPS server and client library"
HOMEPAGE="https://github.com/yhirose/cpp-httplib/"
if [[ "${PV}" == *9999* ]] ; then
inherit git-r3
EGIT_REPO_URI="https://github.com/yhirose/${PN}.git"
else
SRC_URI="https://github.com/yhirose/${PN}/archive/v${PV}.tar.gz
-> ${P}.tar.gz"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
fi
LICENSE="MIT"
SLOT="0/0.20" # soversion / /usr/include/httplib.h: CPPHTTPLIB_VERSION
IUSE="brotli ssl test zlib zstd"
RESTRICT="!test? ( test )"
RDEPEND="
brotli? (
app-arch/brotli:=[${MULTILIB_USEDEP}]
)
ssl? (
>=dev-libs/openssl-3.0.13:=[${MULTILIB_USEDEP}]
)
zlib? (
sys-libs/zlib[${MULTILIB_USEDEP}]
)
zstd? (
app-arch/zstd[${MULTILIB_USEDEP}]
)
"
DEPEND="
${RDEPEND}
"
BDEPEND="
${PYTHON_DEPS}
virtual/pkgconfig
"
PATCHES=(
"${FILESDIR}/${P}-zstd.patch"
"${FILESDIR}/${P}-zstd2.patch"
)
src_configure() {
local -a mycmakeargs=(
-DHTTPLIB_COMPILE=yes
-DBUILD_SHARED_LIBS=yes
-DHTTPLIB_USE_BROTLI_IF_AVAILABLE=no
-DHTTPLIB_USE_OPENSSL_IF_AVAILABLE=no
-DHTTPLIB_USE_ZLIB_IF_AVAILABLE=no
-DHTTPLIB_USE_ZSTD_IF_AVAILABLE=no
-DHTTPLIB_REQUIRE_BROTLI=$(usex brotli)
-DHTTPLIB_REQUIRE_OPENSSL=$(usex ssl)
-DHTTPLIB_REQUIRE_ZLIB=$(usex zlib)
-DHTTPLIB_REQUIRE_ZSTD=$(usex zstd)
-DPython3_EXECUTABLE="${PYTHON}"
)
cmake-multilib_src_configure
}
multilib_src_test() {
cp -p -R --reflink=auto "${S}/test" ./test || die
local -a failing_tests=(
# Disable all online tests.
"*.*_Online"
# Fails on musl x86:
ServerTest.GetRangeWithMaxLongLength
ServerTest.GetStreamedWithTooManyRanges
# https://github.com/yhirose/cpp-httplib/issues/1798
# Filed by mgorny's testing, fails on openssl >=3.2:
SSLClientServerTest.ClientCertPresent
SSLClientServerTest.ClientEncryptedCertPresent
SSLClientServerTest.CustomizeServerSSLCtx
SSLClientServerTest.MemoryClientCertPresent
SSLClientServerTest.MemoryClientEncryptedCertPresent
SSLClientServerTest.TrustDirOptional
# https://github.com/yhirose/cpp-httplib/issues/2113
MaxTimeoutTest.ContentStream
MaxTimeoutTest.ContentStreamSSL
)
# Little dance to please the GTEST filter (join array using ":").
failing_tests_str="${failing_tests[@]}"
failing_tests_filter="${failing_tests_str// /:}"
# PREFIX is . to avoid calling "brew" and relying on stuff in /opt
GTEST_FILTER="-${failing_tests_filter}" emake -C test \
CXX="$(tc-getCXX)" CXXFLAGS="${CXXFLAGS} -I." PREFIX=.
}

13
dev-cpp/cpp-httplib/files/cpp-httplib-0.18.6-onlinetest.patch
View File

@@ -1,13 +0,0 @@
https://github.com/yhirose/cpp-httplib/issues/2042
--- a/test/test.cc
+++ b/test/test.cc
@@ -6189,7 +6189,7 @@ TEST(SSLClientTest, WildcardHostNameMatch_Online) {
ASSERT_EQ(StatusCode::OK_200, res->status);
}
-TEST(SSLClientTest, Issue2004) {
+TEST(SSLClientTest, Issue2004_Online) {
Client client("https://google.com");
client.set_follow_location(true);

22
dev-cpp/cpp-httplib/files/cpp-httplib-0.20.0-zstd.patch
View File

@@ -1,22 +0,0 @@
https://github.com/yhirose/cpp-httplib/pull/2121
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -159,10 +159,16 @@ elseif(HTTPLIB_USE_BROTLI_IF_AVAILABLE)
endif()
if(HTTPLIB_REQUIRE_ZSTD)
- find_package(zstd REQUIRED)
+ find_package(zstd)
+ if(NOT zstd_FOUND)
+ find_package(PkgConfig REQUIRED)
+ pkg_check_modules(zstd REQUIRED IMPORTED_TARGET libzstd)
+ add_library(zstd::libzstd ALIAS PkgConfig::zstd)
+ endif()
set(HTTPLIB_IS_USING_ZSTD TRUE)
elseif(HTTPLIB_USE_ZSTD_IF_AVAILABLE)
find_package(zstd QUIET)
+ # TODO: try to find it via pkg-config
set(HTTPLIB_IS_USING_ZSTD ${zstd_FOUND})
endif()

32
dev-cpp/cpp-httplib/files/cpp-httplib-0.20.0-zstd2.patch
View File

@@ -1,32 +0,0 @@
https://bugs.gentoo.org/953066
https://github.com/yhirose/cpp-httplib/pull/2126
--- a/cmake/httplibConfig.cmake.in
+++ b/cmake/httplibConfig.cmake.in
@@ -39,7 +39,25 @@ if(@HTTPLIB_IS_USING_BROTLI@)
endif()
if(@HTTPLIB_IS_USING_ZSTD@)
- find_dependency(zstd)
+ set(httplib_fd_zstd_quiet_arg)
+ if(${CMAKE_FIND_PACKAGE_NAME}_FIND_QUIETLY)
+ set(httplib_fd_zstd_quiet_arg QUIET)
+ endif()
+ set(httplib_fd_zstd_required_arg)
+ if(${CMAKE_FIND_PACKAGE_NAME}_FIND_REQUIRED)
+ set(httplib_fd_zstd_required_arg REQUIRED)
+ endif()
+ find_package(zstd QUIET)
+ if(NOT zstd_FOUND)
+ find_package(PkgConfig ${httplib_fd_zstd_quiet_arg} ${httplib_fd_zstd_required_arg})
+ if(PKG_CONFIG_FOUND)
+ pkg_check_modules(zstd ${httplib_fd_zstd_quiet_arg} ${httplib_fd_zstd_required_arg} IMPORTED_TARGET libzstd)
+
+ if(TARGET PkgConfig::zstd)
+ add_library(zstd::libzstd ALIAS PkgConfig::zstd)
+ endif()
+ endif()
+ endif()
set(httplib_zstd_FOUND ${zstd_FOUND})
endif()