commit: c4cb96a5c8847ac96f6c3f4b351895bd76bd4739 Author: Maciej Barć <xgqt <AT> gentoo <DOT> org> AuthorDate: Thu Feb 6 22:35:02 2025 +0000 Commit: Maciej Barć <xgqt <AT> gentoo <DOT> org> CommitDate: Thu Feb 6 22:36:21 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c4cb96a5
dev-cpp/curlpp: fix curloption Closes: https://bugs.gentoo.org/939581 Signed-off-by: Maciej Barć <xgqt <AT> gentoo.org> .../{curlpp-0.8.1.ebuild => curlpp-0.8.1-r1.ebuild} | 20 ++++++++++++++------ .../curlpp/files/curlpp-0.8.1-fix-curloption.patch | 12 ++++++++++++ 2 files changed, 26 insertions(+), 6 deletions(-) diff --git a/dev-cpp/curlpp/curlpp-0.8.1.ebuild b/dev-cpp/curlpp/curlpp-0.8.1-r1.ebuild similarity index 70% rename from dev-cpp/curlpp/curlpp-0.8.1.ebuild rename to dev-cpp/curlpp/curlpp-0.8.1-r1.ebuild index 92293f3924f5..7842b9134be6 100644 --- a/dev-cpp/curlpp/curlpp-0.8.1.ebuild +++ b/dev-cpp/curlpp/curlpp-0.8.1-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 2018-2023 Gentoo Authors +# Copyright 2018-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -7,19 +7,27 @@ inherit cmake DESCRIPTION="C++ wrapper for libcURL" HOMEPAGE="https://www.curlpp.org/"; -SRC_URI="https://github.com/jpbarrette/curlpp/archive/v${PV}.tar.gz -> ${P}.tar.gz" +SRC_URI="https://github.com/jpbarrette/curlpp/archive/v${PV}.tar.gz + -> ${P}.tar.gz" LICENSE="MIT" SLOT="0" KEYWORDS="amd64 ~x86" IUSE="doc examples" -RDEPEND="net-misc/curl" -DEPEND="${RDEPEND}" +RDEPEND=" + net-misc/curl +" +DEPEND=" + ${RDEPEND} +" -DOCS=( Readme.md doc/AUTHORS doc/TODO ) +PATCHES=( + "${FILESDIR}/curlpp-0.8.1-fix-curloption.patch" + "${FILESDIR}/curlpp-0.8.1-fix-pkgconfig.patch" +) -PATCHES=( "${FILESDIR}"/${P}-fix-pkgconfig.patch ) +DOCS=( Readme.md doc/AUTHORS doc/TODO ) src_install() { use doc && DOCS+=( doc/guide.pdf ) diff --git a/dev-cpp/curlpp/files/curlpp-0.8.1-fix-curloption.patch b/dev-cpp/curlpp/files/curlpp-0.8.1-fix-curloption.patch new file mode 100644 index 000000000000..c82526025578 --- /dev/null +++ b/dev-cpp/curlpp/files/curlpp-0.8.1-fix-curloption.patch @@ -0,0 +1,12 @@ +https://git.openembedded.org/meta-openembedded/commit/?id=56010090ef75da2a3d564e16ee046a709da4a650 +--- a/include/curlpp/Options.hpp ++++ b/include/curlpp/Options.hpp +@@ -278,7 +278,7 @@ + typedef curlpp::OptionTrait<long, CURLOPT_LOW_SPEED_LIMIT> LowSpeedLimit; + typedef curlpp::OptionTrait<long, CURLOPT_LOW_SPEED_TIME> LowSpeedTime; + typedef curlpp::OptionTrait<long, CURLOPT_MAXCONNECTS> MaxConnects; +- typedef curlpp::OptionTrait<curl_closepolicy, CURLOPT_CLOSEPOLICY> ClosePolicy; ++ typedef curlpp::OptionTrait<curl_closepolicy, (CURLoption)CURLOPT_CLOSEPOLICY> ClosePolicy; + typedef curlpp::OptionTrait<bool, CURLOPT_FRESH_CONNECT> FreshConnect; + typedef curlpp::OptionTrait<bool, CURLOPT_FORBID_REUSE> ForbidReuse; + typedef curlpp::OptionTrait<long, CURLOPT_CONNECTTIMEOUT> ConnectTimeout;
