[gentoo-commits] repo/gentoo:master commit in: net-misc/curl/files/, net-misc/curl/

[Matt Jolly]

commit:     3bc90070bc8616a42baa883665aa1eb77fa61757
Author:     Matt Jolly <kangie <AT> gentoo <DOT> org>
AuthorDate: Wed Feb  5 07:57:45 2025 +0000
Commit:     Matt Jolly <kangie <AT> gentoo <DOT> org>
CommitDate: Wed Feb  5 08:39:42 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3bc90070

net-misc/curl: update live for 8.12.0

Signed-off-by: Matt Jolly <kangie <AT> gentoo.org>

 net-misc/curl/curl-9999.ebuild          | 17 ++++++++++------
 net-misc/curl/files/curl-prefix-4.patch | 35 +++++++++++++++++++++++++++++++++
 2 files changed, 46 insertions(+), 6 deletions(-)

diff --git a/net-misc/curl/curl-9999.ebuild b/net-misc/curl/curl-9999.ebuild
index 5a37525caae2..f8c605501860 100644
--- a/net-misc/curl/curl-9999.ebuild
+++ b/net-misc/curl/curl-9999.ebuild
@@ -156,7 +156,7 @@ QA_CONFIG_IMPL_DECL_SKIP=(
 )
 
 PATCHES=(
-       "${FILESDIR}/${PN}-prefix-3.patch"
+       "${FILESDIR}/${PN}-prefix-4.patch"
        "${FILESDIR}/${PN}-respect-cflags-3.patch"
 )
 
@@ -270,15 +270,12 @@ multilib_src_configure() {
                --enable-socketpair
                --disable-sspi
                $(use_enable static-libs static)
-               --enable-pthreads
-               --enable-threaded-resolver
                --disable-versioned-symbols
                --without-amissl
                --without-bearssl
                $(use_with brotli)
                
--with-fish-functions-dir="${EPREFIX}"/usr/share/fish/vendor_completions.d
                $(use_with http2 nghttp2)
-               --without-hyper
                $(use_with idn libidn2)
                $(use_with kerberos gssapi "${EPREFIX}"/usr)
                --without-libgsasl
@@ -314,9 +311,17 @@ multilib_src_configure() {
                )
        fi
 
-       if [[ ${CHOST} == *mingw* ]] ; then
+       # Since 8.12.0 adns/c-ares and the threaded resolver are mutually 
exclusive
+       # This is in support of some work to enable `httpsrr` to use adns and 
the rest
+       # of curl to use the threaded resolver; we'll just make `httpsrr` 
conditional on adns
+       # when the time comes.
+       if use adns; then
                myconf+=(
-                       --disable-pthreads
+                       --disable-threaded-resolver
+               )
+       else
+               myconf+=(
+                       --enable-threaded-resolver
                )
        fi
 

diff --git a/net-misc/curl/files/curl-prefix-4.patch 
b/net-misc/curl/files/curl-prefix-4.patch
new file mode 100644
index 000000000000..796b67fd927f
--- /dev/null
+++ b/net-misc/curl/files/curl-prefix-4.patch
@@ -0,0 +1,35 @@
+From f18f4362d7ca60fb12248a559dab26aea330771c Mon Sep 17 00:00:00 2001
+From: Matt Jolly <kan...@gentoo.org>
+Date: Wed, 5 Feb 2025 17:27:11 +1000
+Subject: [PATCH] Update prefix patch for 8.12.0
+
+Signed-off-by: Matt Jolly <kan...@gentoo.org>
+---
+ curl-config.in | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/curl-config.in b/curl-config.in
+index 55184167b..df31fdb46 100644
+--- a/curl-config.in
++++ b/curl-config.in
+@@ -141,7 +141,7 @@ while test "$#" -gt 0; do
+     ;;
+ 
+   --cflags)
+-    if test "X@includedir@" = 'X/usr/include'; then
++    if test "X@includedir@" = "X@GENTOO_PORTAGE_EPREFIX@/usr/include"; then
+       echo '@LIBCURL_PC_CFLAGS@'
+     else
+       echo "@LIBCURL_PC_CFLAGS@ -I@includedir@"
+@@ -149,7 +149,7 @@ while test "$#" -gt 0; do
+     ;;
+ 
+   --libs)
+-    if test "X@libdir@" != 'X/usr/lib' -a "X@libdir@" != 'X/usr/lib64'; then
++    if test "X@libdir@" != "X@GENTOO_PORTAGE_EPREFIX@/usr/lib" -a "X@libdir@" 
!= "X@GENTOO_PORTAGE_EPREFIX@/usr/lib64"; then
+       curllibdir="-L@libdir@ "
+     else
+       curllibdir=''
+-- 
+2.48.0
+