From 612e891a90bb75b6c34743e080a005b6cebf91f6 Mon Sep 17 00:00:00 2001 From: Don Olmstead Date: Mon, 24 Mar 2025 11:04:17 -0700 Subject: [PATCH] Update curl to v8.13.0-rc2 --- README.md | 2 +- ports/curl/portfile.cmake | 15 +++++++++++---- ports/curl/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/c-/curl.json | 5 +++++ 5 files changed, 19 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index f8a98f5..c6e0a6c 100644 --- a/README.md +++ b/README.md @@ -13,5 +13,5 @@ of third party libraries used in the Windows port of WebKit. |---|:---:|:---:|---| | [icu](http://site.icu-project.org) | 76.1 | 2024-10-24 | CMake port. Upstream pinned to 74.1 | | [zlib](https://github.com/zlib-ng/zlib-ng) | zlib-ng | N/A | Map zlib to zlib-ng | -| [curl](https://curl.se) | 8.12.1 | 2025-02-12 | Customization of build options | +| [curl](https://curl.se) | 8.13.0-rc2 | 2025-03-17 | Customization of build options, and release candidates | | [cairo](https://gitlab.freedesktop.org/cairo/cairo) | 1.18.2 | 2024-09-01 | CMake port. Will remove when cairo taken out of WebKit | diff --git a/ports/curl/portfile.cmake b/ports/curl/portfile.cmake index 581c171..1df4588 100644 --- a/ports/curl/portfile.cmake +++ b/ports/curl/portfile.cmake @@ -1,14 +1,21 @@ -set(VERSION 8.12.1) +set(VERSION 8.13.0-rc2) string(REPLACE "." "_" TAG ${VERSION}) -set(FILENAME "curl-${VERSION}.zip") -set(URLS "https://github.com/curl/curl/releases/download/curl-${TAG}/${FILENAME}") +set(FILENAME "curl-${VERSION}.tar.xz") +if (VERSION MATCHES "-rc") + set(URLS "https://curl.se/rc/${FILENAME}") +else () + set(URLS + "https://curl.se/download/${FILENAME}" + "https://github.com/curl/curl/releases/download/curl-${TAG}/${FILENAME}" + ) +endif () # Get archive vcpkg_download_distfile(ARCHIVE URLS ${URLS} FILENAME ${FILENAME} - SHA512 c0be503358811b82f360f6bc65389b7b6e45526c1078689df4a6ae5f848c2103babac2f2fcc0bed0c562c22948b990684a420b83aadf028b3912bf2b361c3462 + SHA512 299b41b5bf52b29f5064f68cd7d8d1e95d8b8f8b36fb80fb67ed2b342123f1fc87a543754cbee8c49c83a8e73daca89cb132a76c795d7fa4d9231c6bf281a9e0 ) # Extract archive diff --git a/ports/curl/vcpkg.json b/ports/curl/vcpkg.json index 424bdd5..9f8f0d3 100644 --- a/ports/curl/vcpkg.json +++ b/ports/curl/vcpkg.json @@ -1,6 +1,6 @@ { "name": "curl", - "version": "8.12.1", + "version": "8.13.0-rc2", "description": "A library for transferring data with URLs", "homepage": "https://curl.se/", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index 16ae1ca..9ffb263 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5,7 +5,7 @@ "port-version": 0 }, "curl": { - "baseline": "8.12.1", + "baseline": "8.13.0-rc2", "port-version": 0 }, "icu": { diff --git a/versions/c-/curl.json b/versions/c-/curl.json index 5a593dd..73fca6b 100644 --- a/versions/c-/curl.json +++ b/versions/c-/curl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9eeb80d49e86a49bd154c2eb4db3ed07c3352f40", + "version": "8.13.0-rc2", + "port-version": 0 + }, { "git-tree": "8df7afbdbc341d47543c075fd44c6d6a4ce1f793", "version": "8.12.1",