diff options
| author | Andras Timar <andras.timar@collabora.com> | 2023-03-10 12:09:59 +0100 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2023-03-11 08:47:27 +0000 |
| commit | ac8f98ffc2daa644bc46858e4093beb9856b78fb (patch) | |
| tree | f5c606155eac074b5f77df4c625dd9bc3b5abe32 /external/curl/zlib.patch.0 | |
| parent | Always push a result, even if it's only an error (diff) | |
| download | core-ac8f98ffc2daa644bc46858e4093beb9856b78fb.tar.gz core-ac8f98ffc2daa644bc46858e4093beb9856b78fb.zip | |
update 3rd party libs
* curl 7.88.1
* expat 2.5.0
* libjpeg-turbo 2.1.2
* libxml2 2.10.3
* nss 3.88.1
* openssl 1.1.1t
* libpng 1.6.39
* zlib 1.2.13
Change-Id: I3ece36a221af44612519f964d580affa9004a0f9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/148612
Tested-by: Andras Timar <andras.timar@collabora.com>
Reviewed-by: Andras Timar <andras.timar@collabora.com>
Diffstat (limited to 'external/curl/zlib.patch.0')
| -rw-r--r-- | external/curl/zlib.patch.0 | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/external/curl/zlib.patch.0 b/external/curl/zlib.patch.0 index e0f579f8675a..b4442ba262d1 100644 --- a/external/curl/zlib.patch.0 +++ b/external/curl/zlib.patch.0 @@ -1,6 +1,6 @@ --- configure +++ configure -@@ -22699,7 +22699,6 @@ +@@ -23035,7 +23035,6 @@ clean_CPPFLAGS=$CPPFLAGS clean_LDFLAGS=$LDFLAGS clean_LIBS=$LIBS @@ -8,7 +8,7 @@ # Check whether --with-zlib was given. if test ${with_zlib+y} -@@ -22709,6 +22708,7 @@ +@@ -23045,6 +23044,7 @@ if test "$OPT_ZLIB" = "no" ; then @@ -16,7 +16,7 @@ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: zlib disabled" >&5 printf "%s\n" "$as_me: WARNING: zlib disabled" >&2;} else -@@ -22716,6 +22716,21 @@ +@@ -23052,6 +23052,21 @@ OPT_ZLIB="" fi @@ -38,7 +38,7 @@ if test -z "$OPT_ZLIB" ; then if test -n "$PKG_CONFIG"; then -@@ -23011,6 +23026,7 @@ +@@ -23344,6 +23359,7 @@ printf "%s\n" "$as_me: found both libz and libz.h header" >&6;} curl_zlib_msg="enabled" fi @@ -48,7 +48,7 @@ if test x"$AMFIXLIB" = x1; then --- configure.ac +++ configure.ac -@@ -880,19 +880,30 @@ +@@ -1243,19 +1243,30 @@ clean_CPPFLAGS=$CPPFLAGS clean_LDFLAGS=$LDFLAGS clean_LIBS=$LIBS @@ -80,7 +80,7 @@ if test -z "$OPT_ZLIB" ; then CURL_CHECK_PKGCONFIG(zlib) -@@ -975,6 +986,7 @@ +@@ -1336,6 +1347,7 @@ AC_MSG_NOTICE([found both libz and libz.h header]) curl_zlib_msg="enabled" fi |