strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

curl: upgrade to 8.10.0

Browse source 
Downloaded from https://curl.se/download/curl-8.10.0.tar.xz

Change-Id: I1eb9506a73162ce2e2adf1fe1e02267c34bc78ac
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/173194
Tested-by: Jenkins
Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
This commit is contained in:
Xisco Fauli 2024-09-11 11:04:56 +02:00
parent ca8c59c7e6
commit c95229bf8e
2 changed files with 18 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
download.lst
View file

@ -80,8 +80,8 @@ CPPUNIT_TARBALL := cppunit-1.15.1.tar.gz
# three static lines
# so that git cherry-pick
# will not run into conflicts
CURL_SHA256SUM := f292f6cc051d5bbabf725ef85d432dfeacc8711dd717ea97612ae590643801e5
CURL_TARBALL := curl-8.9.1.tar.xz
CURL_SHA256SUM := e6b142f0e85e954759d37e26a3627e2278137595be80e3a860c4353e4335e5a0
CURL_TARBALL := curl-8.10.0.tar.xz
# three static lines
# so that git cherry-pick
# will not run into conflicts

32
external/curl/zlib.patch.0 vendored
View file

@ -8,18 +8,18 @@
# Check whether --with-zlib was given.
if test ${with_zlib+y}
@@ -23045,6 +23044,7 @@
@@ -23609,12 +23609,28 @@
if test "$OPT_ZLIB" = "no" ; then
+ ZLIB_LIBS=""
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: zlib disabled" >&5
if test "$OPT_ZLIB" = "no"; then
+ ZLIB_LIBS=""
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: zlib disabled" >&5
printf "%s\n" "$as_me: WARNING: zlib disabled" >&2;}
else
@@ -23052,6 +23052,21 @@
if test "$OPT_ZLIB" = "yes"; then
OPT_ZLIB=""
fi
+
+ if test -n "$ZLIB_CFLAGS$ZLIB_LIBS"; then
+ CPPFLAGS="$CPPFLAGS $ZLIB_CFLAGS"
+ LIBS="$ZLIB_LIBS $LIBS"
@ -34,10 +34,9 @@
+ AMFIXLIB="1"
+ else
+ ZLIB_LIBS=""
+
if test -z "$OPT_ZLIB" ; then
if test -n "$PKG_CONFIG"; then
if test -z "$OPT_ZLIB"; then
@@ -23903,6 +23903,7 @@
LIBCURL_PC_REQUIRES_PRIVATE="$LIBCURL_PC_REQUIRES_PRIVATE zlib"
curl_zlib_msg="enabled"
@ -48,21 +47,22 @@
if test x"$AMFIXLIB" = x1; then
--- configure.ac
+++ configure.ac
@@ -1243,19 +1243,30 @@
@@ -1302,19 +1302,31 @@
clean_CPPFLAGS=$CPPFLAGS
clean_LDFLAGS=$LDFLAGS
clean_LIBS=$LIBS
-ZLIB_LIBS=""
+
AC_ARG_WITH(zlib,
AS_HELP_STRING([--with-zlib=PATH],[search for zlib in PATH])
AS_HELP_STRING([--without-zlib],[disable use of zlib]),
[OPT_ZLIB="$withval"])
[OPT_ZLIB="$withval"])
if test "$OPT_ZLIB" = "no" ; then
+ ZLIB_LIBS=""
AC_MSG_WARN([zlib disabled])
if test "$OPT_ZLIB" = "no"; then
+ ZLIB_LIBS=""
AC_MSG_WARN([zlib disabled])
else
if test "$OPT_ZLIB" = "yes" ; then
if test "$OPT_ZLIB" = "yes"; then
OPT_ZLIB=""
fi
@ -77,7 +77,7 @@
+ else
+ ZLIB_LIBS=""
+
if test -z "$OPT_ZLIB" ; then
if test -z "$OPT_ZLIB"; then
CURL_CHECK_PKGCONFIG(zlib)
@@ -1395,6 +1395,7 @@