public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: dev-cpp/curlpp/, dev-cpp/curlpp/files/
@ 2023-02-17 23:39 Maciej Barć
  0 siblings, 0 replies; 2+ messages in thread
From: Maciej Barć @ 2023-02-17 23:39 UTC (permalink / raw
  To: gentoo-commits

commit:     83a088ef3b1f8c5714e9b77adcb1b00a07790724
Author:     Ronny (tastytea) Gutbrod <gentoo <AT> tastytea <DOT> de>
AuthorDate: Fri Feb 17 16:34:47 2023 +0000
Commit:     Maciej Barć <xgqt <AT> gentoo <DOT> org>
CommitDate: Fri Feb 17 23:39:45 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=83a088ef

dev-cpp/curlpp: new package, add 0.8.1

Signed-off-by: Ronny (tastytea) Gutbrod <gentoo <AT> tastytea.de>
Closes: https://github.com/gentoo/gentoo/pull/29638
Signed-off-by: Maciej Barć <xgqt <AT> gentoo.org>

 dev-cpp/curlpp/Manifest                            |  1 +
 dev-cpp/curlpp/curlpp-0.8.1.ebuild                 | 34 +++++++++++++++++++
 .../curlpp/files/curlpp-0.8.1-fix-pkgconfig.patch  | 39 ++++++++++++++++++++++
 dev-cpp/curlpp/metadata.xml                        | 24 +++++++++++++
 4 files changed, 98 insertions(+)

diff --git a/dev-cpp/curlpp/Manifest b/dev-cpp/curlpp/Manifest
new file mode 100644
index 000000000000..54731842449c
--- /dev/null
+++ b/dev-cpp/curlpp/Manifest
@@ -0,0 +1 @@
+DIST curlpp-0.8.1.tar.gz 143017 BLAKE2B 7f3911499b42077c9f108b0355005744300383836a1c82dcba80207482b231527482fb17dcd78a7f288903e996afaf49a4478c7cb5c821bf597b26f4450a430b SHA512 a46b47150c0f0f1f0056e08966ce2fefa5e86fc729406e0220fbcf400da5409f05c87b636b13da3c4d4460c1177aedb494b9569bbcd9012326d4d5f59376397e

diff --git a/dev-cpp/curlpp/curlpp-0.8.1.ebuild b/dev-cpp/curlpp/curlpp-0.8.1.ebuild
new file mode 100644
index 000000000000..8f19bb669879
--- /dev/null
+++ b/dev-cpp/curlpp/curlpp-0.8.1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 2018-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc examples"
+
+RDEPEND="net-misc/curl"
+DEPEND="${RDEPEND}"
+
+DOCS=( Readme.md doc/AUTHORS doc/TODO )
+
+PATCHES=( "${FILESDIR}"/${P}-fix-pkgconfig.patch )
+
+src_install() {
+	use doc && DOCS+=( doc/guide.pdf )
+
+	cmake_src_install
+
+	rm "${ED}"/usr/$(get_libdir)/libcurlpp.a || die
+
+	if use examples ; then
+		dodoc -r examples/
+	fi
+}

diff --git a/dev-cpp/curlpp/files/curlpp-0.8.1-fix-pkgconfig.patch b/dev-cpp/curlpp/files/curlpp-0.8.1-fix-pkgconfig.patch
new file mode 100644
index 000000000000..701c81e9c43e
--- /dev/null
+++ b/dev-cpp/curlpp/files/curlpp-0.8.1-fix-pkgconfig.patch
@@ -0,0 +1,39 @@
+# upstream commit: <https://github.com/jpbarrette/curlpp/commit/5cdb4eb>
+
+From 5cdb4eb7ae898bc9b81cd1a7f87986827848456a Mon Sep 17 00:00:00 2001
+From: Dale Mellor <black-hole@rdmp.org>
+Date: Thu, 6 Jan 2022 18:57:23 +0000
+Subject: [PATCH] Put full paths in pkg-config specification.
+
+Currently, 'pkg-config --cflags curlpp' gives '-Iinclude', which is not good
+enough for outside projects to link to this package.
+
+* extras/curlpp.pc.in: use internal variables to make the generated
+  specifications more precise.
+---
+ extras/curlpp.pc.in | 10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/extras/curlpp.pc.in b/extras/curlpp.pc.in
+index b040ee0..e19c5b2 100644
+--- a/extras/curlpp.pc.in
++++ b/extras/curlpp.pc.in
+@@ -1,13 +1,13 @@
+ # This is a comment
+ prefix=@prefix@
+-exec_prefix=@prefix@
+-includedir=@includedir@
++exec_prefix=${prefix}
++includedir=${prefix}/@includedir@
++libdir=${exec_prefix}/@libdir@
+ 
+ Name: curlpp
+ Description: cURLpp is a libcurl C++ wrapper
+ Version: @VERSION@                           
+-Libs: -L@libdir@ -lcurlpp @LDFLAGS@ @LIBS@
+-Cflags: -I@includedir@ @CURLPP_CXXFLAGS@
++Libs: -L${libdir} -lcurlpp @LDFLAGS@ @LIBS@
++Cflags: -I${includedir} @CURLPP_CXXFLAGS@
+ # libcurl is required as non-private because CurlHandle.inl uses curl_easy_setopt.
+ Requires: libcurl
+- 

diff --git a/dev-cpp/curlpp/metadata.xml b/dev-cpp/curlpp/metadata.xml
new file mode 100644
index 000000000000..045b624e941f
--- /dev/null
+++ b/dev-cpp/curlpp/metadata.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>xgqt@gentoo.org</email>
+		<name>Maciej Barć</name>
+	</maintainer>
+	<maintainer type="person" proxied="yes">
+		<email>gentoo@tastytea.de</email>
+		<name>tastytea</name>
+	</maintainer>
+	<maintainer type="project" proxied="proxy">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<upstream>
+		<maintainer>
+			<name>Jean-Philippe Barrette-LaPierre</name>
+		</maintainer>
+		<doc>https://github.com/jpbarrette/curlpp/blob/master/doc/guide.pdf</doc>
+		<bugs-to>https://github.com/jpbarrette/curlpp/issues</bugs-to>
+		<remote-id type="github">jpbarrette/curlpp</remote-id>
+	</upstream>
+</pkgmetadata>


^ permalink raw reply related	[flat|nested] 2+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-cpp/curlpp/, dev-cpp/curlpp/files/
@ 2025-02-06 22:36 Maciej Barć
  0 siblings, 0 replies; 2+ messages in thread
From: Maciej Barć @ 2025-02-06 22:36 UTC (permalink / raw
  To: gentoo-commits

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;


^ permalink raw reply related	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2025-02-06 22:36 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-02-06 22:36 [gentoo-commits] repo/gentoo:master commit in: dev-cpp/curlpp/, dev-cpp/curlpp/files/ Maciej Barć
  -- strict thread matches above, loose matches on Subject: below --
2023-02-17 23:39 Maciej Barć

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox