From 3df4c1e6fcf3b0a56d666a0427357771c07c8551 Mon Sep 17 00:00:00 2001 From: Sergii Baitala Date: Thu, 22 Jul 2021 14:47:42 +0300 Subject: [PATCH 01/16] Update vcpkg_from_github.cmake --- scripts/cmake/vcpkg_from_github.cmake | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/cmake/vcpkg_from_github.cmake b/scripts/cmake/vcpkg_from_github.cmake index a9373baf592591..68c4e23700cef5 100644 --- a/scripts/cmake/vcpkg_from_github.cmake +++ b/scripts/cmake/vcpkg_from_github.cmake @@ -153,6 +153,7 @@ function(vcpkg_from_github) vcpkg_download_distfile(archive_version URLS "${github_api_url}/repos/${org_name}/${repo_name}/git/refs/heads/${arg_HEAD_REF}" FILENAME "${downloaded_file_name}.version" + ${headers_param} SKIP_SHA512 ALWAYS_REDOWNLOAD ) From dcde4134195cbb941998973a04651ac0c97bd372 Mon Sep 17 00:00:00 2001 From: Sergii Baitala Date: Wed, 4 Aug 2021 12:13:47 +0300 Subject: [PATCH 02/16] Update abseil to 20210324.2 --- ports/abseil/portfile.cmake | 4 ++-- ports/abseil/vcpkg.json | 2 +- versions/a-/abseil.json | 5 +++++ versions/baseline.json | 2 +- 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ports/abseil/portfile.cmake b/ports/abseil/portfile.cmake index bcb93b928a9185..b8e71ada0f9cf3 100644 --- a/ports/abseil/portfile.cmake +++ b/ports/abseil/portfile.cmake @@ -5,8 +5,8 @@ endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO abseil/abseil-cpp - REF 997aaf3a28308eba1b9156aa35ab7bca9688e9f6 #LTS 20210324 - SHA512 bdd80a2278eef121e8837791fdebca06e87bfff4adc438c123e0ce11efc42a8bd461edcbbe18c0eee05be2cd6100f9acf8eab3db58ac73322b5852e6ffe7c85b + REF 278e0a071885a22dcd2fd1b5576cc44757299343 #LTS 20210324, Patch 2 + SHA512 a9e8e9169ebcfb8bc2eca28152ad2f655f48e6281ea932eb712333f3d0aa0b6fa1a9b184f3e2ddd75d932a54b501cc5c7bb29a1c9de5d2146f82fc5754653895 HEAD_REF master PATCHES # in C++17 mode, use std::any, std::optional, std::string_view, std::variant diff --git a/ports/abseil/vcpkg.json b/ports/abseil/vcpkg.json index 8000413e75df73..1dc8fa01c55093 100644 --- a/ports/abseil/vcpkg.json +++ b/ports/abseil/vcpkg.json @@ -1,7 +1,7 @@ { "name": "abseil", "version-date": "2021-03-24", - "port-version": 1, + "port-version": 2, "description": [ "an open-source collection designed to augment the C++ standard library.", "Abseil is an open-source collection of C++ library code designed to augment the C++ standard library. The Abseil library code is collected from Google's own C++ code base, has been extensively tested and used in production, and is the same code we depend on in our daily coding lives.", diff --git a/versions/a-/abseil.json b/versions/a-/abseil.json index 20e992ddde430d..1048c202a84665 100644 --- a/versions/a-/abseil.json +++ b/versions/a-/abseil.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7afb928a59ae165fb87f21a8b3345fb93547a09c", + "version-string": "2021-03-24", + "port-version": 2 + }, { "git-tree": "bae9c59114a4a2dc396452fb9e988a9da881b4f4", "version-date": "2021-03-24", diff --git a/versions/baseline.json b/versions/baseline.json index 8cadbc5a6cc5ee..c6cd9c611130ff 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -10,7 +10,7 @@ }, "abseil": { "baseline": "2021-03-24", - "port-version": 1 + "port-version": 2 }, "absent": { "baseline": "0.3.1", From 337d59def1ac3000ba9085341505243955a87833 Mon Sep 17 00:00:00 2001 From: Sergii Baitala Date: Wed, 4 Aug 2021 12:43:53 +0300 Subject: [PATCH 03/16] Use version-date instead of version-string --- versions/a-/abseil.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/a-/abseil.json b/versions/a-/abseil.json index 1048c202a84665..32b771ea5cebef 100644 --- a/versions/a-/abseil.json +++ b/versions/a-/abseil.json @@ -2,7 +2,7 @@ "versions": [ { "git-tree": "7afb928a59ae165fb87f21a8b3345fb93547a09c", - "version-string": "2021-03-24", + "version-date": "2021-03-24.2", "port-version": 2 }, { From 030bdafe38f8448c5649501c646786c4bc5e5670 Mon Sep 17 00:00:00 2001 From: Sergii Baitala Date: Wed, 4 Aug 2021 12:44:56 +0300 Subject: [PATCH 04/16] Update abseil.json --- versions/a-/abseil.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/a-/abseil.json b/versions/a-/abseil.json index 32b771ea5cebef..3118536a9b00ed 100644 --- a/versions/a-/abseil.json +++ b/versions/a-/abseil.json @@ -2,7 +2,7 @@ "versions": [ { "git-tree": "7afb928a59ae165fb87f21a8b3345fb93547a09c", - "version-date": "2021-03-24.2", + "version-date": "2021-03-24", "port-version": 2 }, { From 29d8cf11a6d3efcfb707d88d10795b4208b63ce8 Mon Sep 17 00:00:00 2001 From: Sergii Baitala Date: Wed, 4 Aug 2021 12:46:31 +0300 Subject: [PATCH 05/16] Remove port-version from ports/abseil/vcpkg.json Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> --- ports/abseil/vcpkg.json | 1 - 1 file changed, 1 deletion(-) diff --git a/ports/abseil/vcpkg.json b/ports/abseil/vcpkg.json index 1dc8fa01c55093..aaf8773c47c00b 100644 --- a/ports/abseil/vcpkg.json +++ b/ports/abseil/vcpkg.json @@ -1,7 +1,6 @@ { "name": "abseil", "version-date": "2021-03-24", - "port-version": 2, "description": [ "an open-source collection designed to augment the C++ standard library.", "Abseil is an open-source collection of C++ library code designed to augment the C++ standard library. The Abseil library code is collected from Google's own C++ code base, has been extensively tested and used in production, and is the same code we depend on in our daily coding lives.", From fcfcb05d6ce07300d5c88ae03614ad0557bba106 Mon Sep 17 00:00:00 2001 From: Sergii Baitala Date: Wed, 4 Aug 2021 13:12:22 +0300 Subject: [PATCH 06/16] update version-date --- ports/abseil/vcpkg.json | 3 ++- versions/a-/abseil.json | 4 ++-- versions/baseline.json | 4 ++-- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/ports/abseil/vcpkg.json b/ports/abseil/vcpkg.json index aaf8773c47c00b..620deb5f5e8af6 100644 --- a/ports/abseil/vcpkg.json +++ b/ports/abseil/vcpkg.json @@ -1,6 +1,7 @@ { "name": "abseil", - "version-date": "2021-03-24", + "version-date": "2021-03-24.2", + "port-version": 0, "description": [ "an open-source collection designed to augment the C++ standard library.", "Abseil is an open-source collection of C++ library code designed to augment the C++ standard library. The Abseil library code is collected from Google's own C++ code base, has been extensively tested and used in production, and is the same code we depend on in our daily coding lives.", diff --git a/versions/a-/abseil.json b/versions/a-/abseil.json index 3118536a9b00ed..3286d6149a847a 100644 --- a/versions/a-/abseil.json +++ b/versions/a-/abseil.json @@ -2,8 +2,8 @@ "versions": [ { "git-tree": "7afb928a59ae165fb87f21a8b3345fb93547a09c", - "version-date": "2021-03-24", - "port-version": 2 + "version-date": "2021-03-24.2", + "port-version": 0 }, { "git-tree": "bae9c59114a4a2dc396452fb9e988a9da881b4f4", diff --git a/versions/baseline.json b/versions/baseline.json index c6cd9c611130ff..b4cdaa4fdbcb6b 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -9,8 +9,8 @@ "port-version": 2 }, "abseil": { - "baseline": "2021-03-24", - "port-version": 2 + "baseline": "2021-03-24.2", + "port-version": 0 }, "absent": { "baseline": "0.3.1", From f811ecec2f4bc387a91086c3829a3b9205d89106 Mon Sep 17 00:00:00 2001 From: Sergii Baitala Date: Wed, 4 Aug 2021 13:13:37 +0300 Subject: [PATCH 07/16] Update abseil.json --- versions/a-/abseil.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/a-/abseil.json b/versions/a-/abseil.json index 3286d6149a847a..125e46b3332282 100644 --- a/versions/a-/abseil.json +++ b/versions/a-/abseil.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "7afb928a59ae165fb87f21a8b3345fb93547a09c", + "git-tree": "628a8266bc65edd927ceea767b340361eae4ff96", "version-date": "2021-03-24.2", "port-version": 0 }, From eb9c71c10a55e214a2cbc08042454d2f27f2d4fa Mon Sep 17 00:00:00 2001 From: Sergii Baitala Date: Wed, 4 Aug 2021 13:17:14 +0300 Subject: [PATCH 08/16] Update vcpkg.json --- ports/abseil/vcpkg.json | 1 - 1 file changed, 1 deletion(-) diff --git a/ports/abseil/vcpkg.json b/ports/abseil/vcpkg.json index 620deb5f5e8af6..f8b9059462a540 100644 --- a/ports/abseil/vcpkg.json +++ b/ports/abseil/vcpkg.json @@ -1,7 +1,6 @@ { "name": "abseil", "version-date": "2021-03-24.2", - "port-version": 0, "description": [ "an open-source collection designed to augment the C++ standard library.", "Abseil is an open-source collection of C++ library code designed to augment the C++ standard library. The Abseil library code is collected from Google's own C++ code base, has been extensively tested and used in production, and is the same code we depend on in our daily coding lives.", From ac5e4d20694f55dc856ee4d5ef1a058ed5302a30 Mon Sep 17 00:00:00 2001 From: Sergii Baitala Date: Wed, 4 Aug 2021 13:36:55 +0300 Subject: [PATCH 09/16] Update version --- ports/abseil/vcpkg.json | 2 +- versions/a-/abseil.json | 2 +- versions/baseline.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ports/abseil/vcpkg.json b/ports/abseil/vcpkg.json index f8b9059462a540..aaf8773c47c00b 100644 --- a/ports/abseil/vcpkg.json +++ b/ports/abseil/vcpkg.json @@ -1,6 +1,6 @@ { "name": "abseil", - "version-date": "2021-03-24.2", + "version-date": "2021-03-24", "description": [ "an open-source collection designed to augment the C++ standard library.", "Abseil is an open-source collection of C++ library code designed to augment the C++ standard library. The Abseil library code is collected from Google's own C++ code base, has been extensively tested and used in production, and is the same code we depend on in our daily coding lives.", diff --git a/versions/a-/abseil.json b/versions/a-/abseil.json index 125e46b3332282..0ab66527d38e63 100644 --- a/versions/a-/abseil.json +++ b/versions/a-/abseil.json @@ -2,7 +2,7 @@ "versions": [ { "git-tree": "628a8266bc65edd927ceea767b340361eae4ff96", - "version-date": "2021-03-24.2", + "version-date": "2021-03-24", "port-version": 0 }, { diff --git a/versions/baseline.json b/versions/baseline.json index b4cdaa4fdbcb6b..5dd702d6106b8b 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -9,7 +9,7 @@ "port-version": 2 }, "abseil": { - "baseline": "2021-03-24.2", + "baseline": "2021-03-24", "port-version": 0 }, "absent": { From 523c64275be170bf72b0402cc780cecafe460f70 Mon Sep 17 00:00:00 2001 From: Sergii Baitala Date: Wed, 4 Aug 2021 13:39:41 +0300 Subject: [PATCH 10/16] Update abseil.json --- versions/a-/abseil.json | 5 ----- 1 file changed, 5 deletions(-) diff --git a/versions/a-/abseil.json b/versions/a-/abseil.json index 0ab66527d38e63..20e992ddde430d 100644 --- a/versions/a-/abseil.json +++ b/versions/a-/abseil.json @@ -1,10 +1,5 @@ { "versions": [ - { - "git-tree": "628a8266bc65edd927ceea767b340361eae4ff96", - "version-date": "2021-03-24", - "port-version": 0 - }, { "git-tree": "bae9c59114a4a2dc396452fb9e988a9da881b4f4", "version-date": "2021-03-24", From 690a3ae8206de3077426d79b90d0f8e5068cab11 Mon Sep 17 00:00:00 2001 From: Sergii Baitala Date: Wed, 4 Aug 2021 14:17:13 +0300 Subject: [PATCH 11/16] Add port-version back --- ports/abseil/vcpkg.json | 1 + versions/a-/abseil.json | 5 +++++ versions/baseline.json | 2 +- 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/ports/abseil/vcpkg.json b/ports/abseil/vcpkg.json index aaf8773c47c00b..1dc8fa01c55093 100644 --- a/ports/abseil/vcpkg.json +++ b/ports/abseil/vcpkg.json @@ -1,6 +1,7 @@ { "name": "abseil", "version-date": "2021-03-24", + "port-version": 2, "description": [ "an open-source collection designed to augment the C++ standard library.", "Abseil is an open-source collection of C++ library code designed to augment the C++ standard library. The Abseil library code is collected from Google's own C++ code base, has been extensively tested and used in production, and is the same code we depend on in our daily coding lives.", diff --git a/versions/a-/abseil.json b/versions/a-/abseil.json index 20e992ddde430d..3118536a9b00ed 100644 --- a/versions/a-/abseil.json +++ b/versions/a-/abseil.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7afb928a59ae165fb87f21a8b3345fb93547a09c", + "version-date": "2021-03-24", + "port-version": 2 + }, { "git-tree": "bae9c59114a4a2dc396452fb9e988a9da881b4f4", "version-date": "2021-03-24", diff --git a/versions/baseline.json b/versions/baseline.json index 5dd702d6106b8b..c6cd9c611130ff 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -10,7 +10,7 @@ }, "abseil": { "baseline": "2021-03-24", - "port-version": 0 + "port-version": 2 }, "absent": { "baseline": "0.3.1", From 1e44a6cab3204af1d467dab9eadb00620ba1e6f2 Mon Sep 17 00:00:00 2001 From: Sergii Baitala Date: Fri, 6 Aug 2021 12:49:02 +0300 Subject: [PATCH 12/16] Update ports/abseil/vcpkg.json Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> --- ports/abseil/vcpkg.json | 1 - 1 file changed, 1 deletion(-) diff --git a/ports/abseil/vcpkg.json b/ports/abseil/vcpkg.json index 1dc8fa01c55093..aaf8773c47c00b 100644 --- a/ports/abseil/vcpkg.json +++ b/ports/abseil/vcpkg.json @@ -1,7 +1,6 @@ { "name": "abseil", "version-date": "2021-03-24", - "port-version": 2, "description": [ "an open-source collection designed to augment the C++ standard library.", "Abseil is an open-source collection of C++ library code designed to augment the C++ standard library. The Abseil library code is collected from Google's own C++ code base, has been extensively tested and used in production, and is the same code we depend on in our daily coding lives.", From 228245cb08ac081716507716deff8b18f6ac4c71 Mon Sep 17 00:00:00 2001 From: Jonliu1993 <13720414433@163.com> Date: Mon, 9 Aug 2021 13:59:41 +0800 Subject: [PATCH 13/16] [abseil] Upgrade to 20210324.2 --- ports/abseil/vcpkg.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/abseil/vcpkg.json b/ports/abseil/vcpkg.json index aaf8773c47c00b..af75c4992fb59e 100644 --- a/ports/abseil/vcpkg.json +++ b/ports/abseil/vcpkg.json @@ -1,6 +1,6 @@ { "name": "abseil", - "version-date": "2021-03-24", + "version-string": "20210324", "description": [ "an open-source collection designed to augment the C++ standard library.", "Abseil is an open-source collection of C++ library code designed to augment the C++ standard library. The Abseil library code is collected from Google's own C++ code base, has been extensively tested and used in production, and is the same code we depend on in our daily coding lives.", From 056ae0e0cc076d7db9217a63c2c6de17c67c7db1 Mon Sep 17 00:00:00 2001 From: Jonliu1993 <13720414433@163.com> Date: Mon, 9 Aug 2021 14:02:48 +0800 Subject: [PATCH 14/16] update version --- versions/a-/abseil.json | 6 +++--- versions/baseline.json | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/versions/a-/abseil.json b/versions/a-/abseil.json index 3118536a9b00ed..016aefc061349d 100644 --- a/versions/a-/abseil.json +++ b/versions/a-/abseil.json @@ -1,9 +1,9 @@ { "versions": [ { - "git-tree": "7afb928a59ae165fb87f21a8b3345fb93547a09c", - "version-date": "2021-03-24", - "port-version": 2 + "git-tree": "d9a67a6766b80775ba83fb17a2cfdf8979464dc3", + "version-string": "20210324", + "port-version": 0 }, { "git-tree": "bae9c59114a4a2dc396452fb9e988a9da881b4f4", diff --git a/versions/baseline.json b/versions/baseline.json index c6cd9c611130ff..7f4e869b2e469a 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -9,8 +9,8 @@ "port-version": 2 }, "abseil": { - "baseline": "2021-03-24", - "port-version": 2 + "baseline": "20210324", + "port-version": 0 }, "absent": { "baseline": "0.3.1", From f39f004dd64c39d01606bbfc053139d49f55c5e0 Mon Sep 17 00:00:00 2001 From: Jonliu1993 <13720414433@163.com> Date: Mon, 9 Aug 2021 16:18:43 +0800 Subject: [PATCH 15/16] update vcpkg.json --- ports/abseil/vcpkg.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/abseil/vcpkg.json b/ports/abseil/vcpkg.json index af75c4992fb59e..83f27d1d9f7896 100644 --- a/ports/abseil/vcpkg.json +++ b/ports/abseil/vcpkg.json @@ -1,6 +1,6 @@ { "name": "abseil", - "version-string": "20210324", + "version-string": "20210324.2", "description": [ "an open-source collection designed to augment the C++ standard library.", "Abseil is an open-source collection of C++ library code designed to augment the C++ standard library. The Abseil library code is collected from Google's own C++ code base, has been extensively tested and used in production, and is the same code we depend on in our daily coding lives.", From 4e3d555a3e70bd0ac27034bb90e937bdb60fb0d0 Mon Sep 17 00:00:00 2001 From: Jonliu1993 <13720414433@163.com> Date: Mon, 9 Aug 2021 16:20:26 +0800 Subject: [PATCH 16/16] update version --- versions/a-/abseil.json | 4 ++-- versions/baseline.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/versions/a-/abseil.json b/versions/a-/abseil.json index 016aefc061349d..7dcb532c3c69da 100644 --- a/versions/a-/abseil.json +++ b/versions/a-/abseil.json @@ -1,8 +1,8 @@ { "versions": [ { - "git-tree": "d9a67a6766b80775ba83fb17a2cfdf8979464dc3", - "version-string": "20210324", + "git-tree": "231cc80bbfb1e54466799ddb6a94dc6d15e7d39b", + "version-string": "20210324.2", "port-version": 0 }, { diff --git a/versions/baseline.json b/versions/baseline.json index 7f4e869b2e469a..4281e9b1b1f831 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -9,7 +9,7 @@ "port-version": 2 }, "abseil": { - "baseline": "20210324", + "baseline": "20210324.2", "port-version": 0 }, "absent": {