[gentoo-commits] repo/gentoo:master commit in: dev-cpp/cpp-httplib/, dev-cpp/cpp-httplib/files/

[gentoo-commits] repo/gentoo:master commit in: dev-cpp/cpp-httplib/, dev-cpp/cpp-httplib/files/

[Maciej Barć]

commit:     d94b610dabc0492da60457cd9c8bf781880cf67b
Author:     Violet Purcell <vimproved <AT> inventati <DOT> org>
AuthorDate: Tue Oct 10 00:06:07 2023 +0000
Commit:     Maciej Barć <xgqt <AT> gentoo <DOT> org>
CommitDate: Wed Oct 11 00:19:38 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d94b610d

dev-cpp/cpp-httplib: fix version in header

The 0.14.1 tag doesn't include the "Release v0.14.1" commit, which means
that the version is detected as 0.14.0 and any revdeps that depend on
0.14.1 or higher do not work.

Signed-off-by: Violet Purcell <vimproved <AT> inventati.org>
Closes: https://github.com/gentoo/gentoo/pull/33269
Signed-off-by: Maciej Barć <xgqt <AT> gentoo.org>

 dev-cpp/cpp-httplib/cpp-httplib-0.14.1-r1.ebuild   | 60 ++++++++++++++++++++++
 .../files/cpp-httplib-0.14.1-fix-version.patch     | 16 ++++++
 2 files changed, 76 insertions(+)

diff --git a/dev-cpp/cpp-httplib/cpp-httplib-0.14.1-r1.ebuild b/dev-cpp/cpp-httplib/cpp-httplib-0.14.1-r1.ebuild
new file mode 100644
index 000000000000..3df1116a1b74
--- /dev/null
+++ b/dev-cpp/cpp-httplib/cpp-httplib-0.14.1-r1.ebuild
@@ -0,0 +1,60 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+
+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="~amd64 ~loong ~x86"
+fi
+
+LICENSE="MIT"
+SLOT="0/$(ver_cut 1-2)"  # soversion
+
+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:=[${MULTILIB_USEDEP}] )
+	zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="${PYTHON_DEPS}"
+
+PATCHES=(
+	"${FILESDIR}/${P}-fix-version.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
+
+	GTEST_FILTER='-*.*_Online' emake -C test "CXX=$(tc-getCXX)" CXXFLAGS="${CXXFLAGS} -I."
+}

diff --git a/dev-cpp/cpp-httplib/files/cpp-httplib-0.14.1-fix-version.patch b/dev-cpp/cpp-httplib/files/cpp-httplib-0.14.1-fix-version.patch
new file mode 100644
index 000000000000..1f2c37f56518
--- /dev/null
+++ b/dev-cpp/cpp-httplib/files/cpp-httplib-0.14.1-fix-version.patch
@@ -0,0 +1,16 @@
+From https://github.com/yhirose/cpp-httplib/commit/0a629d739127dcc5d828474a5aedae1f234687d3 Mon Sep 17 00:00:00 2001
+From: yhirose <yuji.hirose.bug@gmail.com>
+Date: Sat, 30 Sep 2023 22:14:02 -0400
+Subject: [PATCH] Release v0.14.1
+
+--- a/httplib.h
++++ b/httplib.h
+@@ -8,7 +8,7 @@
+ #ifndef CPPHTTPLIB_HTTPLIB_H
+ #define CPPHTTPLIB_HTTPLIB_H
+ 
+-#define CPPHTTPLIB_VERSION "0.14.0"
++#define CPPHTTPLIB_VERSION "0.14.1"
+ 
+ /*
+  * Configuration