diff options
| author | Xisco Fauli <xiscofauli@libreoffice.org> | 2025-02-05 15:07:33 +0100 |
|---|---|---|
| committer | Xisco Fauli <xiscofauli@libreoffice.org> | 2025-02-05 18:11:26 +0100 |
| commit | 0843e1df9be6451d3462d0c907de945df30bbf68 (patch) | |
| tree | d6da6ec26e098443b1b6cf35b4d8144167aaca0b | |
| parent | fe8ef5ec0777e2edcddbaf1ed03280fbac05f67d (diff) | |
curl: upgrade to 8.12.0
Downloaded from https://curl.se/download/curl-8.12.0.tar.xz
Windows build fails now with
WARNING:
The winbuild build system is deprecated and will be removed in
September 2025 in favor of the CMake build system.
Please see docs/INSTALL-CMAKE.md : "Migrating from winbuild builds"
To use the winbuild build system you must acknowledge this warning by
setting command line option WINBUILD_ACKNOWLEDGE_DEPRECATED=yes
Makefile.vc(37) : fatal error U1050: The user must acknowledge the deprecation warning to continue.
Stop.
so building with WINBUILD_ACKNOWLEDGE_DEPRECATED=yes for now until
the migration from winbuild is done
Change-Id: I5d357b20a93863c81f7637f43abbf7d3167f6dd2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/181173
Tested-by: Jenkins
Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
| -rw-r--r-- | download.lst | 4 | ||||
| -rw-r--r-- | external/curl/ExternalProject_curl.mk | 1 | ||||
| -rw-r--r-- | external/curl/curl-msvc-disable-protocols.patch.1 | 10 |
3 files changed, 9 insertions, 6 deletions
diff --git a/download.lst b/download.lst index 98f1c20de9db..fff30e13a34c 100644 --- a/download.lst +++ b/download.lst @@ -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 := c7ca7db48b0909743eaef34250da02c19bc61d4f1dcedd6603f109409536ab56 -CURL_TARBALL := curl-8.11.1.tar.xz +CURL_SHA256SUM := 9a4628c764be6b1a9909567c13e8e771041609df43b2158fcac4e05ea7097e5d +CURL_TARBALL := curl-8.12.0.tar.xz # three static lines # so that git cherry-pick # will not run into conflicts diff --git a/external/curl/ExternalProject_curl.mk b/external/curl/ExternalProject_curl.mk index 45aa6d561389..df2ee9e78ce5 100644 --- a/external/curl/ExternalProject_curl.mk +++ b/external/curl/ExternalProject_curl.mk @@ -93,6 +93,7 @@ $(call gb_ExternalProject_get_state_target,curl,build): ENABLE_IPV6=yes \ ENABLE_SSPI=yes \ ENABLE_WINSSL=yes \ + WINBUILD_ACKNOWLEDGE_DEPRECATED=yes \ WITH_ZLIB=static \ ,winbuild) $(call gb_Trace_EndRange,curl,EXTERNAL) diff --git a/external/curl/curl-msvc-disable-protocols.patch.1 b/external/curl/curl-msvc-disable-protocols.patch.1 index 1c74fa63381b..fcf90b0ab2f8 100644 --- a/external/curl/curl-msvc-disable-protocols.patch.1 +++ b/external/curl/curl-msvc-disable-protocols.patch.1 @@ -2,9 +2,9 @@ disable protocols nobody needs in MSVC build --- curl/lib/config-win32.h.orig 2017-08-09 16:43:29.464000000 +0200 +++ curl/lib/config-win32.h 2017-08-09 16:47:38.549200000 +0200 -@@ -509,4 +509,20 @@ - /* If you want to build curl with the built-in manual */ - #define USE_MANUAL 1 +@@ -500,6 +500,22 @@ + # endif /* UNDER_CE */ + #endif /* !CURL_OS */ +#define CURL_DISABLE_DICT 1 +#define CURL_DISABLE_FILE 1 @@ -22,7 +22,9 @@ disable protocols nobody needs in MSVC build +#define CURL_DISABLE_TELNET 1 +#define CURL_DISABLE_TFTP 1 + - #endif /* HEADER_CURL_CONFIG_WIN32_H */ + /* ---------------------------------------------------------------- */ + /* Windows CE */ + /* ---------------------------------------------------------------- */ --- curl/winbuild/MakefileBuild.vc.orig 2017-10-23 23:41:21.393200000 +0200 +++ curl/winbuild/MakefileBuild.vc 2017-10-23 23:34:16.028000000 +0200 @@ -562,7 +562,7 @@ |