From 32bcc81772acb184d092fd0b70ab78f602e19365 Mon Sep 17 00:00:00 2001 From: Vitaly Zaitsev Date: Sat, 30 Oct 2021 13:33:01 +0200 Subject: [PATCH 01/69] Reverted due to missing dependencies on F33. This reverts commit 78f36754a1ec4420172a57279a3f82a27badb781. --- .gitignore | 1 - sources | 2 +- vcpkg.spec | 7 ++----- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index 74f4f83..511bada 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,3 @@ /vcpkg-2021.08.03.tar.gz /vcpkg-2021.08.12.tar.gz /vcpkg-2021.09.10.tar.gz -/vcpkg-2021.10.25.tar.gz diff --git a/sources b/sources index cb5e3b7..5d4d471 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vcpkg-2021.10.25.tar.gz) = b12cc1229c93f8745864ac67a76213ecb052fb06a233bad2d6ce7743f40e0e2a72d654660d4dadeae95b9d6dd663a8b6cd83ae723cd90d63e3c795a1f12692bb +SHA512 (vcpkg-2021.09.10.tar.gz) = 0bea4c7bdd91933d44a0214e2202eb5ef988826d32ae7a00a8868e510710e7de0b336b1cc6aa1ea20af2f6e24d92f2ab665046089bb4ec43bc2add94a901d5fc diff --git a/vcpkg.spec b/vcpkg.spec index 90f5741..9360816 100644 --- a/vcpkg.spec +++ b/vcpkg.spec @@ -1,8 +1,8 @@ %undefine __cmake_in_source_build %global version_year 2021 -%global version_month 10 -%global version_day 25 +%global version_month 09 +%global version_day 10 %global repo_name vcpkg-tool %global repo_tag %{version_year}-%{version_month}-%{version_day} @@ -68,9 +68,6 @@ install -D -m 0644 -p "%{SOURCE1}" "%{buildroot}%{_sysconfdir}/profile.d/%{name} %config(noreplace) %{_sysconfdir}/profile.d/%{name}.sh %changelog -* Sat Oct 30 2021 Vitaly Zaitsev - 2021.10.25-1 -- Updated to version 2021.10.25. - * Sun Sep 12 2021 Vitaly Zaitsev - 2021.09.10-1 - Updated to version 2021.09.10. From e78e0b3d9f299ac94966929d2d1f86fce403544c Mon Sep 17 00:00:00 2001 From: Vitaly Zaitsev Date: Sat, 30 Oct 2021 13:36:04 +0200 Subject: [PATCH 02/69] Build with packaged fmt. --- vcpkg.spec | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/vcpkg.spec b/vcpkg.spec index 90f5741..4208b6e 100644 --- a/vcpkg.spec +++ b/vcpkg.spec @@ -17,8 +17,9 @@ URL: https://github.com/microsoft/%{repo_name} Source0: %{url}/archive/%{repo_tag}/%{name}-%{version}.tar.gz Source1: %{name}.sh -BuildRequires: catch-devel +BuildRequires: catch-devel >= 2.13.0 BuildRequires: cmake +BuildRequires: fmt-devel >= 8.0.1 BuildRequires: gcc-c++ BuildRequires: ninja-build @@ -48,6 +49,7 @@ ln -svf %{_includedir}/catch2/ include/ -DBUILD_TESTING:BOOL=OFF \ -DVCPKG_DEVELOPMENT_WARNINGS:BOOL=OFF \ -DVCPKG_WARNINGS_AS_ERRORS:BOOL=OFF \ + -DVCPKG_DEPENDENCY_EXTERNAL_FMT:BOOL=ON \ -DVCPKG_BUILD_TLS12_DOWNLOADER:BOOL=OFF \ -DVCPKG_BUILD_FUZZING:BOOL=OFF \ -DVCPKG_EMBED_GIT_SHA:BOOL=OFF \ From 3d1f22c830d438e0ed8b5f270a3012f7a575ee2b Mon Sep 17 00:00:00 2001 From: Vitaly Zaitsev Date: Tue, 9 Nov 2021 15:51:22 +0100 Subject: [PATCH 03/69] Updated to version 2021.11.02. --- .gitignore | 1 + sources | 2 +- vcpkg.spec | 14 ++++++++++++-- 3 files changed, 14 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 74f4f83..2771a05 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /vcpkg-2021.08.12.tar.gz /vcpkg-2021.09.10.tar.gz /vcpkg-2021.10.25.tar.gz +/vcpkg-2021.11.02.tar.gz diff --git a/sources b/sources index cb5e3b7..9026a83 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vcpkg-2021.10.25.tar.gz) = b12cc1229c93f8745864ac67a76213ecb052fb06a233bad2d6ce7743f40e0e2a72d654660d4dadeae95b9d6dd663a8b6cd83ae723cd90d63e3c795a1f12692bb +SHA512 (vcpkg-2021.11.02.tar.gz) = 2c50a5a360ca34eeaf00def29c9092c38225d9c70f1b3ad4b8f81e5a4bab027e215e8a65d28d38422229129959bb7d1c1d709e1f2d8b7c3efed024d67d8c3307 diff --git a/vcpkg.spec b/vcpkg.spec index 4208b6e..456e15b 100644 --- a/vcpkg.spec +++ b/vcpkg.spec @@ -1,8 +1,8 @@ %undefine __cmake_in_source_build %global version_year 2021 -%global version_month 10 -%global version_day 25 +%global version_month 11 +%global version_day 02 %global repo_name vcpkg-tool %global repo_tag %{version_year}-%{version_month}-%{version_day} @@ -23,6 +23,13 @@ BuildRequires: fmt-devel >= 8.0.1 BuildRequires: gcc-c++ BuildRequires: ninja-build +Requires: cmake%{?_isa} +Requires: gcc-c++%{?_isa} +Requires: git-core%{?_isa} +Requires: ninja-build%{?_isa} + +Recommends: aria2%{?_isa} + %description Vcpkg is a package manager for the different C and C++ libraries. @@ -70,6 +77,9 @@ install -D -m 0644 -p "%{SOURCE1}" "%{buildroot}%{_sysconfdir}/profile.d/%{name} %config(noreplace) %{_sysconfdir}/profile.d/%{name}.sh %changelog +* Tue Nov 09 2021 Vitaly Zaitsev - 2021.11.02-1 +- Updated to version 2021.11.02. + * Sat Oct 30 2021 Vitaly Zaitsev - 2021.10.25-1 - Updated to version 2021.10.25. From adf300abebbd21edfcdfbb522ee5cf0cfc86bd02 Mon Sep 17 00:00:00 2001 From: Vitaly Zaitsev Date: Thu, 9 Dec 2021 14:18:08 +0100 Subject: [PATCH 04/69] Updated to version 2021.12.09. --- .gitignore | 1 + sources | 2 +- vcpkg.spec | 9 +++++++-- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 2771a05..e23c166 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ /vcpkg-2021.09.10.tar.gz /vcpkg-2021.10.25.tar.gz /vcpkg-2021.11.02.tar.gz +/vcpkg-2021.12.09.tar.gz diff --git a/sources b/sources index 9026a83..2f7e01f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vcpkg-2021.11.02.tar.gz) = 2c50a5a360ca34eeaf00def29c9092c38225d9c70f1b3ad4b8f81e5a4bab027e215e8a65d28d38422229129959bb7d1c1d709e1f2d8b7c3efed024d67d8c3307 +SHA512 (vcpkg-2021.12.09.tar.gz) = efed2448008b74067c5a13129f1fc99b91e7c848b6d95f5be280524ccb585239f464c96a79b6cfa977ed12c92694fe0e353c67df6cfd90f7d29d124f595bc8fb diff --git a/vcpkg.spec b/vcpkg.spec index 456e15b..8bcc44f 100644 --- a/vcpkg.spec +++ b/vcpkg.spec @@ -1,8 +1,8 @@ %undefine __cmake_in_source_build %global version_year 2021 -%global version_month 11 -%global version_day 02 +%global version_month 12 +%global version_day 09 %global repo_name vcpkg-tool %global repo_tag %{version_year}-%{version_month}-%{version_day} @@ -54,6 +54,8 @@ ln -svf %{_includedir}/catch2/ include/ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_SKIP_INSTALL_RPATH:BOOL=ON \ -DBUILD_TESTING:BOOL=OFF \ + -DVCPKG_BASE_VERSION:STRING=%{repo_tag} \ + -DVCPKG_VERSION:STRING=%{repo_tag} \ -DVCPKG_DEVELOPMENT_WARNINGS:BOOL=OFF \ -DVCPKG_WARNINGS_AS_ERRORS:BOOL=OFF \ -DVCPKG_DEPENDENCY_EXTERNAL_FMT:BOOL=ON \ @@ -77,6 +79,9 @@ install -D -m 0644 -p "%{SOURCE1}" "%{buildroot}%{_sysconfdir}/profile.d/%{name} %config(noreplace) %{_sysconfdir}/profile.d/%{name}.sh %changelog +* Thu Dec 09 2021 Vitaly Zaitsev - 2021.12.09-1 +- Updated to version 2021.12.09. + * Tue Nov 09 2021 Vitaly Zaitsev - 2021.11.02-1 - Updated to version 2021.11.02. From af13a7ecf10ce9b14a2e37a50c17ba1bfa64e157 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jan 2022 03:49:36 +0000 Subject: [PATCH 05/69] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- vcpkg.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vcpkg.spec b/vcpkg.spec index 8bcc44f..5fe6f01 100644 --- a/vcpkg.spec +++ b/vcpkg.spec @@ -9,7 +9,7 @@ Name: vcpkg Version: %{version_year}.%{version_month}.%{version_day} -Release: 1%{?dist} +Release: 2%{?dist} License: MIT Summary: C++ Library Manager @@ -79,6 +79,9 @@ install -D -m 0644 -p "%{SOURCE1}" "%{buildroot}%{_sysconfdir}/profile.d/%{name} %config(noreplace) %{_sysconfdir}/profile.d/%{name}.sh %changelog +* Sat Jan 22 2022 Fedora Release Engineering - 2021.12.09-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Thu Dec 09 2021 Vitaly Zaitsev - 2021.12.09-1 - Updated to version 2021.12.09. From 371febf7d3abb8bba6cf5414c1494e3b07b48ab3 Mon Sep 17 00:00:00 2001 From: Vitaly Zaitsev Date: Tue, 25 Jan 2022 17:34:27 +0100 Subject: [PATCH 06/69] Updated to version 2022.01.19. --- .gitignore | 1 + sources | 2 +- vcpkg.spec | 11 +++++++---- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index e23c166..e0203fb 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ /vcpkg-2021.10.25.tar.gz /vcpkg-2021.11.02.tar.gz /vcpkg-2021.12.09.tar.gz +/vcpkg-2022.01.19.tar.gz diff --git a/sources b/sources index 2f7e01f..159bb92 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vcpkg-2021.12.09.tar.gz) = efed2448008b74067c5a13129f1fc99b91e7c848b6d95f5be280524ccb585239f464c96a79b6cfa977ed12c92694fe0e353c67df6cfd90f7d29d124f595bc8fb +SHA512 (vcpkg-2022.01.19.tar.gz) = 1d91248b63f5d5824ef1b6c40944a0e31628f4f34ecb3e09d8cb8e164d321a94086ae5507af6049e9c7cd27631d65676cf03df8728f96990885661838ed2e0e2 diff --git a/vcpkg.spec b/vcpkg.spec index 5fe6f01..6b78efb 100644 --- a/vcpkg.spec +++ b/vcpkg.spec @@ -1,15 +1,15 @@ %undefine __cmake_in_source_build -%global version_year 2021 -%global version_month 12 -%global version_day 09 +%global version_year 2022 +%global version_month 01 +%global version_day 19 %global repo_name vcpkg-tool %global repo_tag %{version_year}-%{version_month}-%{version_day} Name: vcpkg Version: %{version_year}.%{version_month}.%{version_day} -Release: 2%{?dist} +Release: 1%{?dist} License: MIT Summary: C++ Library Manager @@ -79,6 +79,9 @@ install -D -m 0644 -p "%{SOURCE1}" "%{buildroot}%{_sysconfdir}/profile.d/%{name} %config(noreplace) %{_sysconfdir}/profile.d/%{name}.sh %changelog +* Tue Jan 25 2022 Vitaly Zaitsev - 2022.01.19-1 +- Updated to version 2022.01.19. + * Sat Jan 22 2022 Fedora Release Engineering - 2021.12.09-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From 57ab6e944d4916015138dc0d3e7105b42f2e4d99 Mon Sep 17 00:00:00 2001 From: Vitaly Zaitsev Date: Fri, 4 Feb 2022 18:13:00 +0100 Subject: [PATCH 07/69] Updated to version 2022.02.01. --- .gitignore | 1 + sources | 2 +- vcpkg.spec | 7 +++++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index e0203fb..d7f6c56 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ /vcpkg-2021.11.02.tar.gz /vcpkg-2021.12.09.tar.gz /vcpkg-2022.01.19.tar.gz +/vcpkg-2022.02.01.tar.gz diff --git a/sources b/sources index 159bb92..b1ecb63 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vcpkg-2022.01.19.tar.gz) = 1d91248b63f5d5824ef1b6c40944a0e31628f4f34ecb3e09d8cb8e164d321a94086ae5507af6049e9c7cd27631d65676cf03df8728f96990885661838ed2e0e2 +SHA512 (vcpkg-2022.02.01.tar.gz) = f8f6646a1b063f078aa278ebb301dc96289d8008a51e1203248e65014085d7d47ec1dc76c61385dc822bb8607ac256d8009e180b2a4081c8a127eb15be4f9b0a diff --git a/vcpkg.spec b/vcpkg.spec index 6b78efb..c41f1db 100644 --- a/vcpkg.spec +++ b/vcpkg.spec @@ -1,8 +1,8 @@ %undefine __cmake_in_source_build %global version_year 2022 -%global version_month 01 -%global version_day 19 +%global version_month 02 +%global version_day 01 %global repo_name vcpkg-tool %global repo_tag %{version_year}-%{version_month}-%{version_day} @@ -79,6 +79,9 @@ install -D -m 0644 -p "%{SOURCE1}" "%{buildroot}%{_sysconfdir}/profile.d/%{name} %config(noreplace) %{_sysconfdir}/profile.d/%{name}.sh %changelog +* Fri Feb 04 2022 Vitaly Zaitsev - 2022.02.01-1 +- Updated to version 2022.02.01. + * Tue Jan 25 2022 Vitaly Zaitsev - 2022.01.19-1 - Updated to version 2022.01.19. From bfef80c5ddb0b3c5e535c8bf2a53ee8fc9f30062 Mon Sep 17 00:00:00 2001 From: Vitaly Zaitsev Date: Tue, 15 Feb 2022 14:59:01 +0100 Subject: [PATCH 08/69] Updated to version 2022.02.11. --- .gitignore | 1 + sources | 2 +- vcpkg.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index d7f6c56..536c1d8 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ /vcpkg-2021.12.09.tar.gz /vcpkg-2022.01.19.tar.gz /vcpkg-2022.02.01.tar.gz +/vcpkg-2022.02.11.tar.gz diff --git a/sources b/sources index b1ecb63..5a9ef44 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vcpkg-2022.02.01.tar.gz) = f8f6646a1b063f078aa278ebb301dc96289d8008a51e1203248e65014085d7d47ec1dc76c61385dc822bb8607ac256d8009e180b2a4081c8a127eb15be4f9b0a +SHA512 (vcpkg-2022.02.11.tar.gz) = c7c31852b0657716aaee1ad322cc79954d9b64068594420dd9d8cdea8ed7717e099ba6b1c771a43fdb9584be639da4704e920b15c4410a17998ab2d1e10d73d6 diff --git a/vcpkg.spec b/vcpkg.spec index c41f1db..a26bef8 100644 --- a/vcpkg.spec +++ b/vcpkg.spec @@ -2,7 +2,7 @@ %global version_year 2022 %global version_month 02 -%global version_day 01 +%global version_day 11 %global repo_name vcpkg-tool %global repo_tag %{version_year}-%{version_month}-%{version_day} @@ -79,6 +79,9 @@ install -D -m 0644 -p "%{SOURCE1}" "%{buildroot}%{_sysconfdir}/profile.d/%{name} %config(noreplace) %{_sysconfdir}/profile.d/%{name}.sh %changelog +* Tue Feb 15 2022 Vitaly Zaitsev - 2022.02.11-1 +- Updated to version 2022.02.11. + * Fri Feb 04 2022 Vitaly Zaitsev - 2022.02.01-1 - Updated to version 2022.02.01. From 07cdef2a22c8836fdc7712a5b2d5efeaca475387 Mon Sep 17 00:00:00 2001 From: Vitaly Zaitsev Date: Tue, 15 Feb 2022 20:40:39 +0100 Subject: [PATCH 09/69] Added upstream patch with fmt build fixes. --- vcpkg-fmt-fixes.patch | 36 ++++++++++++++++++++++++++++++++++++ vcpkg.spec | 3 +++ 2 files changed, 39 insertions(+) create mode 100644 vcpkg-fmt-fixes.patch diff --git a/vcpkg-fmt-fixes.patch b/vcpkg-fmt-fixes.patch new file mode 100644 index 0000000..11bc1e6 --- /dev/null +++ b/vcpkg-fmt-fixes.patch @@ -0,0 +1,36 @@ +From f49213972ad17988ce208053be6de187d089bf6c Mon Sep 17 00:00:00 2001 +From: Leander Schulten +Date: Tue, 15 Feb 2022 20:33:14 +0100 +Subject: [PATCH] update fmt to 8.1.1 and fix build + +--- + cmake/Findfmt.cmake | 2 +- + src/vcpkg/sourceparagraph.cpp | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/cmake/Findfmt.cmake b/cmake/Findfmt.cmake +index 72abca8a5..5af5ed571 100644 +--- a/cmake/Findfmt.cmake ++++ b/cmake/Findfmt.cmake +@@ -4,7 +4,7 @@ include(FetchContent) + FetchContent_Declare( + fmt + GIT_REPOSITORY https://github.com/fmtlib/fmt +- GIT_TAG d141cdbeb0fb422a3fb7173b285fd38e0d1772dc # 8.0.1 ++ GIT_TAG b6f4ceaed0a0a24ccf575fab6c56dd50ccf6f1a9 # 8.1.1 + ) + + if(NOT fmt_FIND_REQUIRED) +diff --git a/src/vcpkg/sourceparagraph.cpp b/src/vcpkg/sourceparagraph.cpp +index a5e14805f..ab2651526 100644 +--- a/src/vcpkg/sourceparagraph.cpp ++++ b/src/vcpkg/sourceparagraph.cpp +@@ -974,7 +974,7 @@ namespace vcpkg + next(); + auto last = it().pointer_to_current(); + add_error(msg::format(msgLicenseExpressionContainsUnicode, +- msg::value = ch, ++ msg::value = static_cast(ch), + msg::pretty_value = StringView{first, last})); + break; + } diff --git a/vcpkg.spec b/vcpkg.spec index a26bef8..f6813c1 100644 --- a/vcpkg.spec +++ b/vcpkg.spec @@ -17,6 +17,9 @@ URL: https://github.com/microsoft/%{repo_name} Source0: %{url}/archive/%{repo_tag}/%{name}-%{version}.tar.gz Source1: %{name}.sh +# https://github.com/microsoft/vcpkg-tool/pull/356 +Patch100: %{name}-fmt-fixes.patch + BuildRequires: catch-devel >= 2.13.0 BuildRequires: cmake BuildRequires: fmt-devel >= 8.0.1 From e1835b171af9e79333eea3702befb79b1ff0f24c Mon Sep 17 00:00:00 2001 From: Vitaly Zaitsev Date: Sat, 19 Feb 2022 14:30:45 +0100 Subject: [PATCH 10/69] Updated to version 2022.02.18. --- .gitignore | 1 + sources | 2 +- vcpkg-fmt-fixes.patch | 36 ------------------------------------ vcpkg.spec | 10 +++++----- 4 files changed, 7 insertions(+), 42 deletions(-) delete mode 100644 vcpkg-fmt-fixes.patch diff --git a/.gitignore b/.gitignore index 536c1d8..fcfd316 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ /vcpkg-2022.01.19.tar.gz /vcpkg-2022.02.01.tar.gz /vcpkg-2022.02.11.tar.gz +/vcpkg-2022.02.18.tar.gz diff --git a/sources b/sources index 5a9ef44..74fbf03 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vcpkg-2022.02.11.tar.gz) = c7c31852b0657716aaee1ad322cc79954d9b64068594420dd9d8cdea8ed7717e099ba6b1c771a43fdb9584be639da4704e920b15c4410a17998ab2d1e10d73d6 +SHA512 (vcpkg-2022.02.18.tar.gz) = 1ceec11e7ba7c684dc2af706351c0cda267cf719a29cd2c27c2fb3557280a8b79091fd8bf3f2a7142fb4f1e5a390fcb8743b513551627a01f3f433bbcdc23645 diff --git a/vcpkg-fmt-fixes.patch b/vcpkg-fmt-fixes.patch deleted file mode 100644 index 11bc1e6..0000000 --- a/vcpkg-fmt-fixes.patch +++ /dev/null @@ -1,36 +0,0 @@ -From f49213972ad17988ce208053be6de187d089bf6c Mon Sep 17 00:00:00 2001 -From: Leander Schulten -Date: Tue, 15 Feb 2022 20:33:14 +0100 -Subject: [PATCH] update fmt to 8.1.1 and fix build - ---- - cmake/Findfmt.cmake | 2 +- - src/vcpkg/sourceparagraph.cpp | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/cmake/Findfmt.cmake b/cmake/Findfmt.cmake -index 72abca8a5..5af5ed571 100644 ---- a/cmake/Findfmt.cmake -+++ b/cmake/Findfmt.cmake -@@ -4,7 +4,7 @@ include(FetchContent) - FetchContent_Declare( - fmt - GIT_REPOSITORY https://github.com/fmtlib/fmt -- GIT_TAG d141cdbeb0fb422a3fb7173b285fd38e0d1772dc # 8.0.1 -+ GIT_TAG b6f4ceaed0a0a24ccf575fab6c56dd50ccf6f1a9 # 8.1.1 - ) - - if(NOT fmt_FIND_REQUIRED) -diff --git a/src/vcpkg/sourceparagraph.cpp b/src/vcpkg/sourceparagraph.cpp -index a5e14805f..ab2651526 100644 ---- a/src/vcpkg/sourceparagraph.cpp -+++ b/src/vcpkg/sourceparagraph.cpp -@@ -974,7 +974,7 @@ namespace vcpkg - next(); - auto last = it().pointer_to_current(); - add_error(msg::format(msgLicenseExpressionContainsUnicode, -- msg::value = ch, -+ msg::value = static_cast(ch), - msg::pretty_value = StringView{first, last})); - break; - } diff --git a/vcpkg.spec b/vcpkg.spec index f6813c1..3de99c5 100644 --- a/vcpkg.spec +++ b/vcpkg.spec @@ -2,7 +2,7 @@ %global version_year 2022 %global version_month 02 -%global version_day 11 +%global version_day 18 %global repo_name vcpkg-tool %global repo_tag %{version_year}-%{version_month}-%{version_day} @@ -17,12 +17,9 @@ URL: https://github.com/microsoft/%{repo_name} Source0: %{url}/archive/%{repo_tag}/%{name}-%{version}.tar.gz Source1: %{name}.sh -# https://github.com/microsoft/vcpkg-tool/pull/356 -Patch100: %{name}-fmt-fixes.patch - BuildRequires: catch-devel >= 2.13.0 BuildRequires: cmake -BuildRequires: fmt-devel >= 8.0.1 +BuildRequires: fmt-devel >= 8.1.1 BuildRequires: gcc-c++ BuildRequires: ninja-build @@ -82,6 +79,9 @@ install -D -m 0644 -p "%{SOURCE1}" "%{buildroot}%{_sysconfdir}/profile.d/%{name} %config(noreplace) %{_sysconfdir}/profile.d/%{name}.sh %changelog +* Sat Feb 19 2022 Vitaly Zaitsev - 2022.02.18-1 +- Updated to version 2022.02.18. + * Tue Feb 15 2022 Vitaly Zaitsev - 2022.02.11-1 - Updated to version 2022.02.11. From 6869034b0cb2027f9a8d22d416776ba3e5cc592f Mon Sep 17 00:00:00 2001 From: Vitaly Zaitsev Date: Sat, 5 Mar 2022 17:04:09 +0100 Subject: [PATCH 11/69] Updated to version 2022.03.03. --- .gitignore | 1 + sources | 2 +- vcpkg.spec | 7 +++++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index fcfd316..7b95f8c 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ /vcpkg-2022.02.01.tar.gz /vcpkg-2022.02.11.tar.gz /vcpkg-2022.02.18.tar.gz +/vcpkg-2022.03.03.tar.gz diff --git a/sources b/sources index 74fbf03..ed4f5bf 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vcpkg-2022.02.18.tar.gz) = 1ceec11e7ba7c684dc2af706351c0cda267cf719a29cd2c27c2fb3557280a8b79091fd8bf3f2a7142fb4f1e5a390fcb8743b513551627a01f3f433bbcdc23645 +SHA512 (vcpkg-2022.03.03.tar.gz) = 47a6e60237f2fdd63f4f4551caa358fc212f33f5f8ec9495ad39885ce52ccbf3330759265ee2596b560215736b0418d782a7b9edd7a289772c9d4e2cd48ddd7f diff --git a/vcpkg.spec b/vcpkg.spec index 3de99c5..c318161 100644 --- a/vcpkg.spec +++ b/vcpkg.spec @@ -1,8 +1,8 @@ %undefine __cmake_in_source_build %global version_year 2022 -%global version_month 02 -%global version_day 18 +%global version_month 03 +%global version_day 03 %global repo_name vcpkg-tool %global repo_tag %{version_year}-%{version_month}-%{version_day} @@ -79,6 +79,9 @@ install -D -m 0644 -p "%{SOURCE1}" "%{buildroot}%{_sysconfdir}/profile.d/%{name} %config(noreplace) %{_sysconfdir}/profile.d/%{name}.sh %changelog +* Sat Mar 05 2022 Vitaly Zaitsev - 2022.03.03-1 +- Updated to version 2022.03.03. + * Sat Feb 19 2022 Vitaly Zaitsev - 2022.02.18-1 - Updated to version 2022.02.18. From d8a7f71c889b0f1e0b0076a8aacf86fdb55fb8fa Mon Sep 17 00:00:00 2001 From: Vitaly Zaitsev Date: Tue, 29 Mar 2022 11:03:00 +0200 Subject: [PATCH 12/69] Updated to version 2022.03.25. --- .gitignore | 1 + sources | 2 +- vcpkg-cmake-build-fix.patch | 22 ++++++++++++++++++++++ vcpkg.spec | 8 +++++++- 4 files changed, 31 insertions(+), 2 deletions(-) create mode 100644 vcpkg-cmake-build-fix.patch diff --git a/.gitignore b/.gitignore index 7b95f8c..64993d0 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ /vcpkg-2022.02.11.tar.gz /vcpkg-2022.02.18.tar.gz /vcpkg-2022.03.03.tar.gz +/vcpkg-2022.03.25.tar.gz diff --git a/sources b/sources index ed4f5bf..be94c2c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vcpkg-2022.03.03.tar.gz) = 47a6e60237f2fdd63f4f4551caa358fc212f33f5f8ec9495ad39885ce52ccbf3330759265ee2596b560215736b0418d782a7b9edd7a289772c9d4e2cd48ddd7f +SHA512 (vcpkg-2022.03.25.tar.gz) = 15188f9c7370b308d54df3a47bba56d7cbcf437252c3c4545b8aaa7e459e06c47cbdf3d3a8d98bd1ef0d39ccbf2e70b4c0a6d99ce0a58db866b95606d46f92d6 diff --git a/vcpkg-cmake-build-fix.patch b/vcpkg-cmake-build-fix.patch new file mode 100644 index 0000000..0ea73db --- /dev/null +++ b/vcpkg-cmake-build-fix.patch @@ -0,0 +1,22 @@ +From 87236936e5228126cc93713688472fdae467610c Mon Sep 17 00:00:00 2001 +From: Vitaly Zaitsev +Date: Tue, 29 Mar 2022 10:54:12 +0200 +Subject: [PATCH] Added missing CheckCXXSourceCompiles include. + +Signed-off-by: Vitaly Zaitsev +--- + CMakeLists.txt | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 945ba2f74..49c0e7721 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -177,6 +177,7 @@ else() + endif() + + set(CPP_ATOMIC_LIBRARY "") ++include(CheckCXXSourceCompiles) + if(NOT MSVC) + # Some platforms require a explicit linkage against libatomic to operate on 64-bit numbers + set(TEST_SOURCE " diff --git a/vcpkg.spec b/vcpkg.spec index c318161..a87a78b 100644 --- a/vcpkg.spec +++ b/vcpkg.spec @@ -2,7 +2,7 @@ %global version_year 2022 %global version_month 03 -%global version_day 03 +%global version_day 25 %global repo_name vcpkg-tool %global repo_tag %{version_year}-%{version_month}-%{version_day} @@ -17,6 +17,9 @@ URL: https://github.com/microsoft/%{repo_name} Source0: %{url}/archive/%{repo_tag}/%{name}-%{version}.tar.gz Source1: %{name}.sh +# https://github.com/microsoft/vcpkg-tool/pull/464 +Patch100: %{name}-cmake-build-fix.patch + BuildRequires: catch-devel >= 2.13.0 BuildRequires: cmake BuildRequires: fmt-devel >= 8.1.1 @@ -79,6 +82,9 @@ install -D -m 0644 -p "%{SOURCE1}" "%{buildroot}%{_sysconfdir}/profile.d/%{name} %config(noreplace) %{_sysconfdir}/profile.d/%{name}.sh %changelog +* Tue Mar 29 2022 Vitaly Zaitsev - 2022.03.25-1 +- Updated to version 2022.03.25. + * Sat Mar 05 2022 Vitaly Zaitsev - 2022.03.03-1 - Updated to version 2022.03.03. From f49a22a639ddff0a888995e750cf7160e1d8bbe7 Mon Sep 17 00:00:00 2001 From: Vitaly Zaitsev Date: Sat, 2 Apr 2022 14:57:55 +0200 Subject: [PATCH 13/69] Updated to version 2022.03.30. --- .gitignore | 1 + sources | 2 +- vcpkg-cmake-build-fix.patch | 22 ---------------------- vcpkg.spec | 8 ++++---- 4 files changed, 6 insertions(+), 27 deletions(-) delete mode 100644 vcpkg-cmake-build-fix.patch diff --git a/.gitignore b/.gitignore index 64993d0..19582a8 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ /vcpkg-2022.02.18.tar.gz /vcpkg-2022.03.03.tar.gz /vcpkg-2022.03.25.tar.gz +/vcpkg-2022.03.30.tar.gz diff --git a/sources b/sources index be94c2c..2a25f1a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vcpkg-2022.03.25.tar.gz) = 15188f9c7370b308d54df3a47bba56d7cbcf437252c3c4545b8aaa7e459e06c47cbdf3d3a8d98bd1ef0d39ccbf2e70b4c0a6d99ce0a58db866b95606d46f92d6 +SHA512 (vcpkg-2022.03.30.tar.gz) = d1fba2655e04dbf599129e688b40be6b61cc23c41943b5d0d4ac23a7cb5df195fadfe252a8c9ea619d4730352eb40e424ef50919ecfad6e52a76b2b4627dbb16 diff --git a/vcpkg-cmake-build-fix.patch b/vcpkg-cmake-build-fix.patch deleted file mode 100644 index 0ea73db..0000000 --- a/vcpkg-cmake-build-fix.patch +++ /dev/null @@ -1,22 +0,0 @@ -From 87236936e5228126cc93713688472fdae467610c Mon Sep 17 00:00:00 2001 -From: Vitaly Zaitsev -Date: Tue, 29 Mar 2022 10:54:12 +0200 -Subject: [PATCH] Added missing CheckCXXSourceCompiles include. - -Signed-off-by: Vitaly Zaitsev ---- - CMakeLists.txt | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 945ba2f74..49c0e7721 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -177,6 +177,7 @@ else() - endif() - - set(CPP_ATOMIC_LIBRARY "") -+include(CheckCXXSourceCompiles) - if(NOT MSVC) - # Some platforms require a explicit linkage against libatomic to operate on 64-bit numbers - set(TEST_SOURCE " diff --git a/vcpkg.spec b/vcpkg.spec index a87a78b..802a609 100644 --- a/vcpkg.spec +++ b/vcpkg.spec @@ -2,7 +2,7 @@ %global version_year 2022 %global version_month 03 -%global version_day 25 +%global version_day 30 %global repo_name vcpkg-tool %global repo_tag %{version_year}-%{version_month}-%{version_day} @@ -17,9 +17,6 @@ URL: https://github.com/microsoft/%{repo_name} Source0: %{url}/archive/%{repo_tag}/%{name}-%{version}.tar.gz Source1: %{name}.sh -# https://github.com/microsoft/vcpkg-tool/pull/464 -Patch100: %{name}-cmake-build-fix.patch - BuildRequires: catch-devel >= 2.13.0 BuildRequires: cmake BuildRequires: fmt-devel >= 8.1.1 @@ -82,6 +79,9 @@ install -D -m 0644 -p "%{SOURCE1}" "%{buildroot}%{_sysconfdir}/profile.d/%{name} %config(noreplace) %{_sysconfdir}/profile.d/%{name}.sh %changelog +* Sat Apr 02 2022 Vitaly Zaitsev - 2022.03.30-1 +- Updated to version 2022.03.30. + * Tue Mar 29 2022 Vitaly Zaitsev - 2022.03.25-1 - Updated to version 2022.03.25. From 2d76349fa307df9b033cf5a8a65e50c966887d28 Mon Sep 17 00:00:00 2001 From: Vitaly Zaitsev Date: Sat, 14 May 2022 11:57:05 +0200 Subject: [PATCH 14/69] Updated to version 2022.05.05. --- .gitignore | 1 + sources | 2 +- vcpkg.spec | 7 +++++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 19582a8..c5544f2 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ /vcpkg-2022.03.03.tar.gz /vcpkg-2022.03.25.tar.gz /vcpkg-2022.03.30.tar.gz +/vcpkg-2022.05.05.tar.gz diff --git a/sources b/sources index 2a25f1a..13f3781 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vcpkg-2022.03.30.tar.gz) = d1fba2655e04dbf599129e688b40be6b61cc23c41943b5d0d4ac23a7cb5df195fadfe252a8c9ea619d4730352eb40e424ef50919ecfad6e52a76b2b4627dbb16 +SHA512 (vcpkg-2022.05.05.tar.gz) = 9968b2420c19ac88fd912aa0d3d230a4712d51c411a7f5023c4a5d96c5fcc963ce8fbb286594220b5dfc63e23bdbcf3439326b90262dd89ea5b63afa143ca699 diff --git a/vcpkg.spec b/vcpkg.spec index 802a609..f76d3f6 100644 --- a/vcpkg.spec +++ b/vcpkg.spec @@ -1,8 +1,8 @@ %undefine __cmake_in_source_build %global version_year 2022 -%global version_month 03 -%global version_day 30 +%global version_month 05 +%global version_day 05 %global repo_name vcpkg-tool %global repo_tag %{version_year}-%{version_month}-%{version_day} @@ -79,6 +79,9 @@ install -D -m 0644 -p "%{SOURCE1}" "%{buildroot}%{_sysconfdir}/profile.d/%{name} %config(noreplace) %{_sysconfdir}/profile.d/%{name}.sh %changelog +* Sat May 14 2022 Vitaly Zaitsev - 2022.05.05-1 +- Updated to version 2022.05.05. + * Sat Apr 02 2022 Vitaly Zaitsev - 2022.03.30-1 - Updated to version 2022.03.30. From 60561e05a3458ab455e8a741634f7ac33d9e9b3c Mon Sep 17 00:00:00 2001 From: Vitaly Zaitsev Date: Mon, 23 May 2022 13:18:13 +0200 Subject: [PATCH 15/69] Removed obsolete __cmake_in_source_build definition. --- vcpkg.spec | 2 -- 1 file changed, 2 deletions(-) diff --git a/vcpkg.spec b/vcpkg.spec index f76d3f6..30a5ef4 100644 --- a/vcpkg.spec +++ b/vcpkg.spec @@ -1,5 +1,3 @@ -%undefine __cmake_in_source_build - %global version_year 2022 %global version_month 05 %global version_day 05 From f9d36f2a96a347cfb98c09dd2fa6705d23e3cae2 Mon Sep 17 00:00:00 2001 From: Vitaly Zaitsev Date: Fri, 17 Jun 2022 15:22:26 +0200 Subject: [PATCH 16/69] Updated to version 2022.06.15. --- .gitignore | 1 + sources | 2 +- vcpkg.spec | 7 +++++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index c5544f2..07b42a0 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,4 @@ /vcpkg-2022.03.25.tar.gz /vcpkg-2022.03.30.tar.gz /vcpkg-2022.05.05.tar.gz +/vcpkg-2022.06.15.tar.gz diff --git a/sources b/sources index 13f3781..561a609 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vcpkg-2022.05.05.tar.gz) = 9968b2420c19ac88fd912aa0d3d230a4712d51c411a7f5023c4a5d96c5fcc963ce8fbb286594220b5dfc63e23bdbcf3439326b90262dd89ea5b63afa143ca699 +SHA512 (vcpkg-2022.06.15.tar.gz) = cb0ec26f8aab601588b4505f9eeb3076562e22f3f955ef7b21396cd7b2a93940ef89c3f945a5816db6f73d42724a00a69588819b0421d79a122bcd3d63f81b2e diff --git a/vcpkg.spec b/vcpkg.spec index 30a5ef4..11eeeb7 100644 --- a/vcpkg.spec +++ b/vcpkg.spec @@ -1,6 +1,6 @@ %global version_year 2022 -%global version_month 05 -%global version_day 05 +%global version_month 06 +%global version_day 15 %global repo_name vcpkg-tool %global repo_tag %{version_year}-%{version_month}-%{version_day} @@ -77,6 +77,9 @@ install -D -m 0644 -p "%{SOURCE1}" "%{buildroot}%{_sysconfdir}/profile.d/%{name} %config(noreplace) %{_sysconfdir}/profile.d/%{name}.sh %changelog +* Fri Jun 17 2022 Vitaly Zaitsev - 2022.06.15-1 +- Updated to version 2022.06.15. + * Sat May 14 2022 Vitaly Zaitsev - 2022.05.05-1 - Updated to version 2022.05.05. From 4e52ebdcb9cca0041dbdf4f424e93736508ae3a5 Mon Sep 17 00:00:00 2001 From: Vitaly Zaitsev Date: Sun, 10 Jul 2022 20:10:32 +0200 Subject: [PATCH 17/69] Rebuilt due to fmt library update. --- vcpkg.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vcpkg.spec b/vcpkg.spec index 11eeeb7..cae36ca 100644 --- a/vcpkg.spec +++ b/vcpkg.spec @@ -7,7 +7,7 @@ Name: vcpkg Version: %{version_year}.%{version_month}.%{version_day} -Release: 1%{?dist} +Release: 2%{?dist} License: MIT Summary: C++ Library Manager @@ -77,6 +77,9 @@ install -D -m 0644 -p "%{SOURCE1}" "%{buildroot}%{_sysconfdir}/profile.d/%{name} %config(noreplace) %{_sysconfdir}/profile.d/%{name}.sh %changelog +* Sun Jul 10 2022 Vitaly Zaitsev - 2022.06.15-2 +- Rebuilt due to fmt library update. + * Fri Jun 17 2022 Vitaly Zaitsev - 2022.06.15-1 - Updated to version 2022.06.15. From d339cc970b4206fd3dfcfbc22b699f21b6cec7c7 Mon Sep 17 00:00:00 2001 From: Vitaly Zaitsev Date: Sat, 16 Jul 2022 13:05:08 +0200 Subject: [PATCH 18/69] Fixed FTBFS against fmt 9.0.0. --- vcpkg.spec | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/vcpkg.spec b/vcpkg.spec index cae36ca..a2456da 100644 --- a/vcpkg.spec +++ b/vcpkg.spec @@ -43,6 +43,11 @@ or unset the VCPKG_DISABLE_METRICS environment variable. # Fixing line endings... sed -e "s,\r,," -i README.md +# https://github.com/microsoft/vcpkg/issues/25673 +%if 0%{?fedora} && 0%{?fedora} >= 37 +sed -e "s/v8/v9/" -i include/vcpkg/base/fwd/format.h +%endif + # Unbundling catch... rm -rf include/catch2 ln -svf %{_includedir}/catch2/ include/ From d05878ab7823a575434220d2ac73046b48258381 Mon Sep 17 00:00:00 2001 From: Vitaly Zaitsev Date: Sat, 16 Jul 2022 13:07:50 +0200 Subject: [PATCH 19/69] Updated to version 2022.07.14. --- .gitignore | 1 + sources | 2 +- vcpkg.spec | 9 ++++++--- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 07b42a0..b0eede5 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,4 @@ /vcpkg-2022.03.30.tar.gz /vcpkg-2022.05.05.tar.gz /vcpkg-2022.06.15.tar.gz +/vcpkg-2022.07.14.tar.gz diff --git a/sources b/sources index 561a609..0e829ac 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vcpkg-2022.06.15.tar.gz) = cb0ec26f8aab601588b4505f9eeb3076562e22f3f955ef7b21396cd7b2a93940ef89c3f945a5816db6f73d42724a00a69588819b0421d79a122bcd3d63f81b2e +SHA512 (vcpkg-2022.07.14.tar.gz) = eebdedb2743476342ea578c360cdc35c869680139c7e0a841a453dd856b2f8b50f951b6c807d4b783e3c46c94f36d66fb498316d3039d6c9b79613553c564612 diff --git a/vcpkg.spec b/vcpkg.spec index a2456da..e97749b 100644 --- a/vcpkg.spec +++ b/vcpkg.spec @@ -1,13 +1,13 @@ %global version_year 2022 -%global version_month 06 -%global version_day 15 +%global version_month 07 +%global version_day 14 %global repo_name vcpkg-tool %global repo_tag %{version_year}-%{version_month}-%{version_day} Name: vcpkg Version: %{version_year}.%{version_month}.%{version_day} -Release: 2%{?dist} +Release: 1%{?dist} License: MIT Summary: C++ Library Manager @@ -82,6 +82,9 @@ install -D -m 0644 -p "%{SOURCE1}" "%{buildroot}%{_sysconfdir}/profile.d/%{name} %config(noreplace) %{_sysconfdir}/profile.d/%{name}.sh %changelog +* Sat Jul 16 2022 Vitaly Zaitsev - 2022.07.14-1 +- Updated to version 2022.07.14. + * Sun Jul 10 2022 Vitaly Zaitsev - 2022.06.15-2 - Rebuilt due to fmt library update. From bc58165cb905a7e857897c650444500d7638f500 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 23 Jul 2022 11:43:22 +0000 Subject: [PATCH 20/69] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- vcpkg.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vcpkg.spec b/vcpkg.spec index e97749b..75c578f 100644 --- a/vcpkg.spec +++ b/vcpkg.spec @@ -7,7 +7,7 @@ Name: vcpkg Version: %{version_year}.%{version_month}.%{version_day} -Release: 1%{?dist} +Release: 2%{?dist} License: MIT Summary: C++ Library Manager @@ -82,6 +82,9 @@ install -D -m 0644 -p "%{SOURCE1}" "%{buildroot}%{_sysconfdir}/profile.d/%{name} %config(noreplace) %{_sysconfdir}/profile.d/%{name}.sh %changelog +* Sat Jul 23 2022 Fedora Release Engineering - 2022.07.14-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Sat Jul 16 2022 Vitaly Zaitsev - 2022.07.14-1 - Updated to version 2022.07.14. From 0df86daa4b1bc42d8e0f63180e599fd1ef04da46 Mon Sep 17 00:00:00 2001 From: Vitaly Zaitsev Date: Fri, 2 Sep 2022 20:00:29 +0200 Subject: [PATCH 21/69] Updated to version 2022.09.01. --- .gitignore | 1 + sources | 2 +- vcpkg.spec | 16 +++++++--------- 3 files changed, 9 insertions(+), 10 deletions(-) diff --git a/.gitignore b/.gitignore index b0eede5..b391245 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,4 @@ /vcpkg-2022.05.05.tar.gz /vcpkg-2022.06.15.tar.gz /vcpkg-2022.07.14.tar.gz +/vcpkg-2022.09.01.tar.gz diff --git a/sources b/sources index 0e829ac..2536fa7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vcpkg-2022.07.14.tar.gz) = eebdedb2743476342ea578c360cdc35c869680139c7e0a841a453dd856b2f8b50f951b6c807d4b783e3c46c94f36d66fb498316d3039d6c9b79613553c564612 +SHA512 (vcpkg-2022.09.01.tar.gz) = 6546ecaa26191c005737a3c2c254dbad945b99334cc80ab81247e970214bc546a6ae002d5cb68eeffe8df009b6f6ce8459a0e658b12f4614aafaf852863ad298 diff --git a/vcpkg.spec b/vcpkg.spec index 75c578f..b9c3fa8 100644 --- a/vcpkg.spec +++ b/vcpkg.spec @@ -1,13 +1,13 @@ %global version_year 2022 -%global version_month 07 -%global version_day 14 +%global version_month 09 +%global version_day 01 %global repo_name vcpkg-tool %global repo_tag %{version_year}-%{version_month}-%{version_day} Name: vcpkg Version: %{version_year}.%{version_month}.%{version_day} -Release: 2%{?dist} +Release: 1%{?dist} License: MIT Summary: C++ Library Manager @@ -17,7 +17,7 @@ Source1: %{name}.sh BuildRequires: catch-devel >= 2.13.0 BuildRequires: cmake -BuildRequires: fmt-devel >= 8.1.1 +BuildRequires: fmt-devel >= 9.1.0 BuildRequires: gcc-c++ BuildRequires: ninja-build @@ -43,11 +43,6 @@ or unset the VCPKG_DISABLE_METRICS environment variable. # Fixing line endings... sed -e "s,\r,," -i README.md -# https://github.com/microsoft/vcpkg/issues/25673 -%if 0%{?fedora} && 0%{?fedora} >= 37 -sed -e "s/v8/v9/" -i include/vcpkg/base/fwd/format.h -%endif - # Unbundling catch... rm -rf include/catch2 ln -svf %{_includedir}/catch2/ include/ @@ -82,6 +77,9 @@ install -D -m 0644 -p "%{SOURCE1}" "%{buildroot}%{_sysconfdir}/profile.d/%{name} %config(noreplace) %{_sysconfdir}/profile.d/%{name}.sh %changelog +* Fri Sep 02 2022 Vitaly Zaitsev - 2022.09.01-1 +- Updated to version 2022.09.01. + * Sat Jul 23 2022 Fedora Release Engineering - 2022.07.14-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From 296899d041871b8bdb62b0d0ad287836fca8fe79 Mon Sep 17 00:00:00 2001 From: Vitaly Zaitsev Date: Fri, 14 Oct 2022 15:45:02 +0200 Subject: [PATCH 22/69] Updated to version 2022.10.12. --- .gitignore | 1 + sources | 2 +- vcpkg.spec | 7 +++++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index b391245..e7c90b3 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,4 @@ /vcpkg-2022.06.15.tar.gz /vcpkg-2022.07.14.tar.gz /vcpkg-2022.09.01.tar.gz +/vcpkg-2022.10.12.tar.gz diff --git a/sources b/sources index 2536fa7..c68a006 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vcpkg-2022.09.01.tar.gz) = 6546ecaa26191c005737a3c2c254dbad945b99334cc80ab81247e970214bc546a6ae002d5cb68eeffe8df009b6f6ce8459a0e658b12f4614aafaf852863ad298 +SHA512 (vcpkg-2022.10.12.tar.gz) = 02034b38a9bdd491ccd0832539fb4aa1bdd4812531d861ba336ea61c70d6926bfb08a3a40de958b0e66d24a3ff1e44f383c0d15258df04a18d683ac29d5dd28e diff --git a/vcpkg.spec b/vcpkg.spec index b9c3fa8..18e282c 100644 --- a/vcpkg.spec +++ b/vcpkg.spec @@ -1,6 +1,6 @@ %global version_year 2022 -%global version_month 09 -%global version_day 01 +%global version_month 10 +%global version_day 12 %global repo_name vcpkg-tool %global repo_tag %{version_year}-%{version_month}-%{version_day} @@ -77,6 +77,9 @@ install -D -m 0644 -p "%{SOURCE1}" "%{buildroot}%{_sysconfdir}/profile.d/%{name} %config(noreplace) %{_sysconfdir}/profile.d/%{name}.sh %changelog +* Fri Oct 14 2022 Vitaly Zaitsev - 2022.10.12-1 +- Updated to version 2022.10.12. + * Fri Sep 02 2022 Vitaly Zaitsev - 2022.09.01-1 - Updated to version 2022.09.01. From 9a445eaaf552870f9257cb5e651872f55ce6c97b Mon Sep 17 00:00:00 2001 From: Vitaly Zaitsev Date: Sat, 22 Oct 2022 10:49:57 +0200 Subject: [PATCH 23/69] Updated to version 2022.10.17. --- .gitignore | 1 + sources | 2 +- vcpkg.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index e7c90b3..f4bc8f6 100644 --- a/.gitignore +++ b/.gitignore @@ -16,3 +16,4 @@ /vcpkg-2022.07.14.tar.gz /vcpkg-2022.09.01.tar.gz /vcpkg-2022.10.12.tar.gz +/vcpkg-2022.10.17.tar.gz diff --git a/sources b/sources index c68a006..eb3c15a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vcpkg-2022.10.12.tar.gz) = 02034b38a9bdd491ccd0832539fb4aa1bdd4812531d861ba336ea61c70d6926bfb08a3a40de958b0e66d24a3ff1e44f383c0d15258df04a18d683ac29d5dd28e +SHA512 (vcpkg-2022.10.17.tar.gz) = b12493472403d0fe9fe5df0b1c7387f55ac6f7830117098f17b084a2aca5db3a11c8f862e9fdf158c6514d7f84fdb0b1ceb4a7397865299e6826129fd2eb6b65 diff --git a/vcpkg.spec b/vcpkg.spec index 18e282c..ac59a07 100644 --- a/vcpkg.spec +++ b/vcpkg.spec @@ -1,6 +1,6 @@ %global version_year 2022 %global version_month 10 -%global version_day 12 +%global version_day 17 %global repo_name vcpkg-tool %global repo_tag %{version_year}-%{version_month}-%{version_day} @@ -77,6 +77,9 @@ install -D -m 0644 -p "%{SOURCE1}" "%{buildroot}%{_sysconfdir}/profile.d/%{name} %config(noreplace) %{_sysconfdir}/profile.d/%{name}.sh %changelog +* Sat Oct 22 2022 Vitaly Zaitsev - 2022.10.17-1 +- Updated to version 2022.10.17. + * Fri Oct 14 2022 Vitaly Zaitsev - 2022.10.12-1 - Updated to version 2022.10.12. From d3f3d432bb7ee13e4dc5b55e48a8e7b1c4041988 Mon Sep 17 00:00:00 2001 From: Vitaly Zaitsev Date: Fri, 11 Nov 2022 15:20:55 +0100 Subject: [PATCH 24/69] Updated to version 2022.11.10. --- .gitignore | 1 + sources | 2 +- vcpkg.spec | 7 +++++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index f4bc8f6..df6028d 100644 --- a/.gitignore +++ b/.gitignore @@ -17,3 +17,4 @@ /vcpkg-2022.09.01.tar.gz /vcpkg-2022.10.12.tar.gz /vcpkg-2022.10.17.tar.gz +/vcpkg-2022.11.10.tar.gz diff --git a/sources b/sources index eb3c15a..93387fd 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vcpkg-2022.10.17.tar.gz) = b12493472403d0fe9fe5df0b1c7387f55ac6f7830117098f17b084a2aca5db3a11c8f862e9fdf158c6514d7f84fdb0b1ceb4a7397865299e6826129fd2eb6b65 +SHA512 (vcpkg-2022.11.10.tar.gz) = 941e8f0749d5475ffcc731909b8a506c4b08ab7e6b11752532482260b6f430c23e42903d7bf4431c088ef16b980685da1980e831b9623e831e339319b4ee9085 diff --git a/vcpkg.spec b/vcpkg.spec index ac59a07..29d440a 100644 --- a/vcpkg.spec +++ b/vcpkg.spec @@ -1,6 +1,6 @@ %global version_year 2022 -%global version_month 10 -%global version_day 17 +%global version_month 11 +%global version_day 10 %global repo_name vcpkg-tool %global repo_tag %{version_year}-%{version_month}-%{version_day} @@ -77,6 +77,9 @@ install -D -m 0644 -p "%{SOURCE1}" "%{buildroot}%{_sysconfdir}/profile.d/%{name} %config(noreplace) %{_sysconfdir}/profile.d/%{name}.sh %changelog +* Fri Nov 11 2022 Vitaly Zaitsev - 2022.11.10-1 +- Updated to version 2022.11.10. + * Sat Oct 22 2022 Vitaly Zaitsev - 2022.10.17-1 - Updated to version 2022.10.17. From 970d7de6f5a4bf9c139476c309e919eeb30f523f Mon Sep 17 00:00:00 2001 From: Vitaly Zaitsev Date: Sat, 12 Nov 2022 17:21:51 +0100 Subject: [PATCH 25/69] Added missing BR: cmrc-devel. --- vcpkg.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/vcpkg.spec b/vcpkg.spec index 29d440a..a02fbfd 100644 --- a/vcpkg.spec +++ b/vcpkg.spec @@ -17,6 +17,7 @@ Source1: %{name}.sh BuildRequires: catch-devel >= 2.13.0 BuildRequires: cmake +BuildRequires: cmrc-devel BuildRequires: fmt-devel >= 9.1.0 BuildRequires: gcc-c++ BuildRequires: ninja-build @@ -56,6 +57,7 @@ ln -svf %{_includedir}/catch2/ include/ -DVCPKG_VERSION:STRING=%{repo_tag} \ -DVCPKG_DEVELOPMENT_WARNINGS:BOOL=OFF \ -DVCPKG_WARNINGS_AS_ERRORS:BOOL=OFF \ + -DVCPKG_DEPENDENCY_CMAKERC:BOOL=ON \ -DVCPKG_DEPENDENCY_EXTERNAL_FMT:BOOL=ON \ -DVCPKG_BUILD_TLS12_DOWNLOADER:BOOL=OFF \ -DVCPKG_BUILD_FUZZING:BOOL=OFF \ From 007a5028eff090e8fe099b233a28f0015376c335 Mon Sep 17 00:00:00 2001 From: Vitaly Zaitsev Date: Tue, 13 Dec 2022 17:03:56 +0100 Subject: [PATCH 26/69] Converted license tag to SPDX format. --- .gitignore | 21 +-------------------- README.md | 3 --- 2 files changed, 1 insertion(+), 23 deletions(-) delete mode 100644 README.md diff --git a/.gitignore b/.gitignore index df6028d..016ae64 100644 --- a/.gitignore +++ b/.gitignore @@ -1,20 +1 @@ -/vcpkg-2021.08.03.tar.gz -/vcpkg-2021.08.12.tar.gz -/vcpkg-2021.09.10.tar.gz -/vcpkg-2021.10.25.tar.gz -/vcpkg-2021.11.02.tar.gz -/vcpkg-2021.12.09.tar.gz -/vcpkg-2022.01.19.tar.gz -/vcpkg-2022.02.01.tar.gz -/vcpkg-2022.02.11.tar.gz -/vcpkg-2022.02.18.tar.gz -/vcpkg-2022.03.03.tar.gz -/vcpkg-2022.03.25.tar.gz -/vcpkg-2022.03.30.tar.gz -/vcpkg-2022.05.05.tar.gz -/vcpkg-2022.06.15.tar.gz -/vcpkg-2022.07.14.tar.gz -/vcpkg-2022.09.01.tar.gz -/vcpkg-2022.10.12.tar.gz -/vcpkg-2022.10.17.tar.gz -/vcpkg-2022.11.10.tar.gz +/vcpkg-*.tar.gz diff --git a/README.md b/README.md deleted file mode 100644 index 9e01f13..0000000 --- a/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# vcpkg - -The vcpkg package From c0365fbb052233ae0de022abaf211ac66aaff1b5 Mon Sep 17 00:00:00 2001 From: Vitaly Zaitsev Date: Wed, 21 Dec 2022 22:07:07 +0100 Subject: [PATCH 27/69] Updated to version 2022.12.14. --- sources | 2 +- vcpkg.spec | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/sources b/sources index 93387fd..dc1125a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vcpkg-2022.11.10.tar.gz) = 941e8f0749d5475ffcc731909b8a506c4b08ab7e6b11752532482260b6f430c23e42903d7bf4431c088ef16b980685da1980e831b9623e831e339319b4ee9085 +SHA512 (vcpkg-2022.12.14.tar.gz) = 63db6e7a2f6ac3924e6da07b278549ca043c29d38524ef7d5804dad0d2d0069f542d48ed31601845ddfcbf87471a90a2b4368f645fd3e43066ce7e72aa40bbf6 diff --git a/vcpkg.spec b/vcpkg.spec index a02fbfd..168423b 100644 --- a/vcpkg.spec +++ b/vcpkg.spec @@ -1,6 +1,6 @@ %global version_year 2022 -%global version_month 11 -%global version_day 10 +%global version_month 12 +%global version_day 14 %global repo_name vcpkg-tool %global repo_tag %{version_year}-%{version_month}-%{version_day} @@ -79,6 +79,9 @@ install -D -m 0644 -p "%{SOURCE1}" "%{buildroot}%{_sysconfdir}/profile.d/%{name} %config(noreplace) %{_sysconfdir}/profile.d/%{name}.sh %changelog +* Wed Dec 21 2022 Vitaly Zaitsev - 2022.12.14-1 +- Updated to version 2022.12.14. + * Fri Nov 11 2022 Vitaly Zaitsev - 2022.11.10-1 - Updated to version 2022.11.10. From ce8883786b4d121d5b8be1c6bc25400089c7bc16 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 21 Jan 2023 06:08:24 +0000 Subject: [PATCH 28/69] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- vcpkg.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vcpkg.spec b/vcpkg.spec index 168423b..d2fb2b8 100644 --- a/vcpkg.spec +++ b/vcpkg.spec @@ -7,7 +7,7 @@ Name: vcpkg Version: %{version_year}.%{version_month}.%{version_day} -Release: 1%{?dist} +Release: 2%{?dist} License: MIT Summary: C++ Library Manager @@ -79,6 +79,9 @@ install -D -m 0644 -p "%{SOURCE1}" "%{buildroot}%{_sysconfdir}/profile.d/%{name} %config(noreplace) %{_sysconfdir}/profile.d/%{name}.sh %changelog +* Sat Jan 21 2023 Fedora Release Engineering - 2022.12.14-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Wed Dec 21 2022 Vitaly Zaitsev - 2022.12.14-1 - Updated to version 2022.12.14. From 9d7b8bf60b8d2f31bf0c14ba1d63926a64c79d2d Mon Sep 17 00:00:00 2001 From: Vitaly Zaitsev Date: Mon, 30 Jan 2023 17:15:35 +0100 Subject: [PATCH 29/69] Updated to version 2023.01.24. --- sources | 2 +- vcpkg.spec | 11 +++++++---- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/sources b/sources index dc1125a..4de6ff4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vcpkg-2022.12.14.tar.gz) = 63db6e7a2f6ac3924e6da07b278549ca043c29d38524ef7d5804dad0d2d0069f542d48ed31601845ddfcbf87471a90a2b4368f645fd3e43066ce7e72aa40bbf6 +SHA512 (vcpkg-2023.01.24.tar.gz) = 268592bd75916bd4b19b4bd42535d9886dfd46121b222f991daa32b7bb60c98203b8d944eb711ea61841f9085a3eacb09ca7c9ec8553b9eb82beca06b5631787 diff --git a/vcpkg.spec b/vcpkg.spec index d2fb2b8..b2510c6 100644 --- a/vcpkg.spec +++ b/vcpkg.spec @@ -1,13 +1,13 @@ -%global version_year 2022 -%global version_month 12 -%global version_day 14 +%global version_year 2023 +%global version_month 01 +%global version_day 24 %global repo_name vcpkg-tool %global repo_tag %{version_year}-%{version_month}-%{version_day} Name: vcpkg Version: %{version_year}.%{version_month}.%{version_day} -Release: 2%{?dist} +Release: 1%{?dist} License: MIT Summary: C++ Library Manager @@ -79,6 +79,9 @@ install -D -m 0644 -p "%{SOURCE1}" "%{buildroot}%{_sysconfdir}/profile.d/%{name} %config(noreplace) %{_sysconfdir}/profile.d/%{name}.sh %changelog +* Mon Jan 30 2023 Vitaly Zaitsev - 2023.01.24-1 +- Updated to version 2023.01.24. + * Sat Jan 21 2023 Fedora Release Engineering - 2022.12.14-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From d76d88b03f1eab8dc38221dc191375c6ace9bf62 Mon Sep 17 00:00:00 2001 From: Vitaly Zaitsev Date: Wed, 15 Feb 2023 16:50:27 +0100 Subject: [PATCH 30/69] Updated to version 2023.02.15. --- sources | 2 +- vcpkg.spec | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/sources b/sources index 4de6ff4..7092642 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vcpkg-2023.01.24.tar.gz) = 268592bd75916bd4b19b4bd42535d9886dfd46121b222f991daa32b7bb60c98203b8d944eb711ea61841f9085a3eacb09ca7c9ec8553b9eb82beca06b5631787 +SHA512 (vcpkg-2023.02.15.tar.gz) = 024522729ad6d221c94b4b5498c21371cd361d4df7af84dcaac5fca20e6e92ce743448d7048818798dcbd75b52be09f00f253959d00226a17ec5e4566d11f006 diff --git a/vcpkg.spec b/vcpkg.spec index b2510c6..7d65ce4 100644 --- a/vcpkg.spec +++ b/vcpkg.spec @@ -1,6 +1,6 @@ %global version_year 2023 -%global version_month 01 -%global version_day 24 +%global version_month 02 +%global version_day 15 %global repo_name vcpkg-tool %global repo_tag %{version_year}-%{version_month}-%{version_day} @@ -79,6 +79,9 @@ install -D -m 0644 -p "%{SOURCE1}" "%{buildroot}%{_sysconfdir}/profile.d/%{name} %config(noreplace) %{_sysconfdir}/profile.d/%{name}.sh %changelog +* Wed Feb 15 2023 Vitaly Zaitsev - 2023.02.15-1 +- Updated to version 2023.02.15. + * Mon Jan 30 2023 Vitaly Zaitsev - 2023.01.24-1 - Updated to version 2023.01.24. From 180d708d4dfc103643d46638467da40cf9d13460 Mon Sep 17 00:00:00 2001 From: Vitaly Zaitsev Date: Wed, 22 Feb 2023 15:39:36 +0100 Subject: [PATCH 31/69] Simplified version scheme. --- vcpkg.spec | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/vcpkg.spec b/vcpkg.spec index 7d65ce4..c0bf819 100644 --- a/vcpkg.spec +++ b/vcpkg.spec @@ -1,12 +1,8 @@ -%global version_year 2023 -%global version_month 02 -%global version_day 15 - %global repo_name vcpkg-tool -%global repo_tag %{version_year}-%{version_month}-%{version_day} +%global repo_tag 2023-02-15 Name: vcpkg -Version: %{version_year}.%{version_month}.%{version_day} +Version: %(echo %{repo_tag} | sed 's/-/./g') Release: 1%{?dist} License: MIT From c55d93204b7cefd5db36e5461bc7fa2cc74ab8f5 Mon Sep 17 00:00:00 2001 From: Vitaly Zaitsev Date: Thu, 2 Mar 2023 12:17:00 +0100 Subject: [PATCH 32/69] Updated to version 2023.03.01. --- sources | 2 +- vcpkg.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/sources b/sources index 7092642..5243fcb 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vcpkg-2023.02.15.tar.gz) = 024522729ad6d221c94b4b5498c21371cd361d4df7af84dcaac5fca20e6e92ce743448d7048818798dcbd75b52be09f00f253959d00226a17ec5e4566d11f006 +SHA512 (vcpkg-2023.03.01.tar.gz) = 958b96c39ed7ee34763d75823a430bbff1738fc129016b392e9232398f17a16b07ce1169122446065bee52aa42a23400ad78eb99073d4d7df2af5bcc72fbccd5 diff --git a/vcpkg.spec b/vcpkg.spec index c0bf819..85516d8 100644 --- a/vcpkg.spec +++ b/vcpkg.spec @@ -1,5 +1,5 @@ %global repo_name vcpkg-tool -%global repo_tag 2023-02-15 +%global repo_tag 2023-03-01 Name: vcpkg Version: %(echo %{repo_tag} | sed 's/-/./g') @@ -75,6 +75,9 @@ install -D -m 0644 -p "%{SOURCE1}" "%{buildroot}%{_sysconfdir}/profile.d/%{name} %config(noreplace) %{_sysconfdir}/profile.d/%{name}.sh %changelog +* Thu Mar 02 2023 Vitaly Zaitsev - 2023.03.01-1 +- Updated to version 2023.03.01. + * Wed Feb 15 2023 Vitaly Zaitsev - 2023.02.15-1 - Updated to version 2023.02.15. From 45f69357909d5594dfe5d7b9d4cede7a10bb4b1d Mon Sep 17 00:00:00 2001 From: Vitaly Zaitsev Date: Tue, 14 Mar 2023 08:37:51 +0100 Subject: [PATCH 33/69] Updated to version 2023.03.14. --- sources | 2 +- vcpkg.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/sources b/sources index 5243fcb..6c053cc 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vcpkg-2023.03.01.tar.gz) = 958b96c39ed7ee34763d75823a430bbff1738fc129016b392e9232398f17a16b07ce1169122446065bee52aa42a23400ad78eb99073d4d7df2af5bcc72fbccd5 +SHA512 (vcpkg-2023.03.14.tar.gz) = 2002d3826e359a35b34c0b75966d60abfa09d7c39472a57742ee6cea6c1341215826336e48dd845b0a33e8d1134f924eb3b0b9f516d0ea6e46b57f2ac489e270 diff --git a/vcpkg.spec b/vcpkg.spec index 85516d8..68f76c6 100644 --- a/vcpkg.spec +++ b/vcpkg.spec @@ -1,5 +1,5 @@ %global repo_name vcpkg-tool -%global repo_tag 2023-03-01 +%global repo_tag 2023-03-14 Name: vcpkg Version: %(echo %{repo_tag} | sed 's/-/./g') @@ -75,6 +75,9 @@ install -D -m 0644 -p "%{SOURCE1}" "%{buildroot}%{_sysconfdir}/profile.d/%{name} %config(noreplace) %{_sysconfdir}/profile.d/%{name}.sh %changelog +* Tue Mar 14 2023 Vitaly Zaitsev - 2023.03.14-1 +- Updated to version 2023.03.14. + * Thu Mar 02 2023 Vitaly Zaitsev - 2023.03.01-1 - Updated to version 2023.03.01. From 95abe6675d6dc73d85477bfc40b74eefa9b09873 Mon Sep 17 00:00:00 2001 From: Vitaly Zaitsev Date: Thu, 23 Mar 2023 11:47:21 +0100 Subject: [PATCH 34/69] Updated to version 2023.03.22. --- sources | 2 +- vcpkg.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/sources b/sources index 6c053cc..d122c52 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vcpkg-2023.03.14.tar.gz) = 2002d3826e359a35b34c0b75966d60abfa09d7c39472a57742ee6cea6c1341215826336e48dd845b0a33e8d1134f924eb3b0b9f516d0ea6e46b57f2ac489e270 +SHA512 (vcpkg-2023.03.22.tar.gz) = 3c20b2af64795a0bb7bd63cff8b957b0be192313c49658756cfb88aee93217c303d103d2ac22b97fcc8772fc933193de53ac8c33326301766269f554d561abf0 diff --git a/vcpkg.spec b/vcpkg.spec index 68f76c6..b2b9c0f 100644 --- a/vcpkg.spec +++ b/vcpkg.spec @@ -1,5 +1,5 @@ %global repo_name vcpkg-tool -%global repo_tag 2023-03-14 +%global repo_tag 2023-03-22 Name: vcpkg Version: %(echo %{repo_tag} | sed 's/-/./g') @@ -75,6 +75,9 @@ install -D -m 0644 -p "%{SOURCE1}" "%{buildroot}%{_sysconfdir}/profile.d/%{name} %config(noreplace) %{_sysconfdir}/profile.d/%{name}.sh %changelog +* Thu Mar 23 2023 Vitaly Zaitsev - 2023.03.22-1 +- Updated to version 2023.03.22. + * Tue Mar 14 2023 Vitaly Zaitsev - 2023.03.14-1 - Updated to version 2023.03.14. From 9d87d188a4ff6ac64c08f59e57474140266ec273 Mon Sep 17 00:00:00 2001 From: Vitaly Zaitsev Date: Thu, 30 Mar 2023 14:07:18 +0200 Subject: [PATCH 35/69] Updated to version 2023.03.29. --- sources | 2 +- vcpkg.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/sources b/sources index d122c52..c87e731 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vcpkg-2023.03.22.tar.gz) = 3c20b2af64795a0bb7bd63cff8b957b0be192313c49658756cfb88aee93217c303d103d2ac22b97fcc8772fc933193de53ac8c33326301766269f554d561abf0 +SHA512 (vcpkg-2023.03.29.tar.gz) = 3c80824f31775aac981d13dd5e4aab8565f4ec9b45440cd8d9b2b76d4131071fbcc7170979475f436a355c7f079d41d6b140ec84465c7ff4fac9ca26d20d0a30 diff --git a/vcpkg.spec b/vcpkg.spec index b2b9c0f..1f3fd19 100644 --- a/vcpkg.spec +++ b/vcpkg.spec @@ -1,5 +1,5 @@ %global repo_name vcpkg-tool -%global repo_tag 2023-03-22 +%global repo_tag 2023-03-29 Name: vcpkg Version: %(echo %{repo_tag} | sed 's/-/./g') @@ -75,6 +75,9 @@ install -D -m 0644 -p "%{SOURCE1}" "%{buildroot}%{_sysconfdir}/profile.d/%{name} %config(noreplace) %{_sysconfdir}/profile.d/%{name}.sh %changelog +* Thu Mar 30 2023 Vitaly Zaitsev - 2023.03.29-1 +- Updated to version 2023.03.29. + * Thu Mar 23 2023 Vitaly Zaitsev - 2023.03.22-1 - Updated to version 2023.03.22. From afce61b2a5650669672fc483bd93bf4f4ecf7960 Mon Sep 17 00:00:00 2001 From: Vitaly Zaitsev Date: Wed, 12 Apr 2023 11:13:06 +0200 Subject: [PATCH 36/69] Updated to version 2023.04.07. --- sources | 2 +- vcpkg.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/sources b/sources index c87e731..2cfff3c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vcpkg-2023.03.29.tar.gz) = 3c80824f31775aac981d13dd5e4aab8565f4ec9b45440cd8d9b2b76d4131071fbcc7170979475f436a355c7f079d41d6b140ec84465c7ff4fac9ca26d20d0a30 +SHA512 (vcpkg-2023.04.07.tar.gz) = 89dc32154e22f6a51fa18a8ea22c16263533546469f73cdb4ee168ab7c68ebc2b2a93177284dc03ecf2d2ca438f9fd583def48844788942e98ea45027e8ec2fa diff --git a/vcpkg.spec b/vcpkg.spec index 1f3fd19..fadb18e 100644 --- a/vcpkg.spec +++ b/vcpkg.spec @@ -1,5 +1,5 @@ %global repo_name vcpkg-tool -%global repo_tag 2023-03-29 +%global repo_tag 2023-04-07 Name: vcpkg Version: %(echo %{repo_tag} | sed 's/-/./g') @@ -75,6 +75,9 @@ install -D -m 0644 -p "%{SOURCE1}" "%{buildroot}%{_sysconfdir}/profile.d/%{name} %config(noreplace) %{_sysconfdir}/profile.d/%{name}.sh %changelog +* Wed Apr 12 2023 Vitaly Zaitsev - 2023.04.07-1 +- Updated to version 2023.04.07. + * Thu Mar 30 2023 Vitaly Zaitsev - 2023.03.29-1 - Updated to version 2023.03.29. From ce63cf1fa1369ac3efff96cffa974b251e883a1f Mon Sep 17 00:00:00 2001 From: Vitaly Zaitsev Date: Tue, 27 Jun 2023 08:01:49 +0200 Subject: [PATCH 37/69] Updated to version 2023.06.22. --- sources | 2 +- vcpkg.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/sources b/sources index 2cfff3c..6172577 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vcpkg-2023.04.07.tar.gz) = 89dc32154e22f6a51fa18a8ea22c16263533546469f73cdb4ee168ab7c68ebc2b2a93177284dc03ecf2d2ca438f9fd583def48844788942e98ea45027e8ec2fa +SHA512 (vcpkg-2023.06.22.tar.gz) = 27135301c02ca9bf50e8bf458907daba62e92d7adcc5219b6b27dc835d4ff01f396ec320ea283e4a8de8117588b955f966203fd36f781f21f837d1d6377c03ef diff --git a/vcpkg.spec b/vcpkg.spec index fadb18e..640a55b 100644 --- a/vcpkg.spec +++ b/vcpkg.spec @@ -1,5 +1,5 @@ %global repo_name vcpkg-tool -%global repo_tag 2023-04-07 +%global repo_tag 2023-06-22 Name: vcpkg Version: %(echo %{repo_tag} | sed 's/-/./g') @@ -75,6 +75,9 @@ install -D -m 0644 -p "%{SOURCE1}" "%{buildroot}%{_sysconfdir}/profile.d/%{name} %config(noreplace) %{_sysconfdir}/profile.d/%{name}.sh %changelog +* Fri Jun 23 2023 Vitaly Zaitsev - 2023.06.22-1 +- Updated to version 2023.06.22. + * Wed Apr 12 2023 Vitaly Zaitsev - 2023.04.07-1 - Updated to version 2023.04.07. From e74c86b0df37d75d19a25c9a2b6960caaa300ec2 Mon Sep 17 00:00:00 2001 From: Vitaly Zaitsev Date: Tue, 27 Jun 2023 08:15:19 +0200 Subject: [PATCH 38/69] Fixed build under fmt 9.x. --- vcpkg.spec | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/vcpkg.spec b/vcpkg.spec index 640a55b..5d4101e 100644 --- a/vcpkg.spec +++ b/vcpkg.spec @@ -44,6 +44,11 @@ sed -e "s,\r,," -i README.md rm -rf include/catch2 ln -svf %{_includedir}/catch2/ include/ +# Patching fmt namespace... +%if 0%{?fedora} && 0%{?fedora} <= 39 +sed -e "s/namespace v10/namespace v9/g" -i include/vcpkg/base/fwd/format.h +%endif + %build %cmake -G Ninja \ -DCMAKE_BUILD_TYPE=Release \ From 2498c7c2bee32749fd1223b67434f8e03ba10ad4 Mon Sep 17 00:00:00 2001 From: Vitaly Zaitsev Date: Wed, 28 Jun 2023 10:43:52 +0200 Subject: [PATCH 39/69] Rebuilt due to fmt 10 update. --- vcpkg.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/vcpkg.spec b/vcpkg.spec index 5d4101e..862c753 100644 --- a/vcpkg.spec +++ b/vcpkg.spec @@ -3,7 +3,7 @@ Name: vcpkg Version: %(echo %{repo_tag} | sed 's/-/./g') -Release: 1%{?dist} +Release: 2%{?dist} License: MIT Summary: C++ Library Manager @@ -45,7 +45,7 @@ rm -rf include/catch2 ln -svf %{_includedir}/catch2/ include/ # Patching fmt namespace... -%if 0%{?fedora} && 0%{?fedora} <= 39 +%if 0%{?fedora} && 0%{?fedora} < 39 sed -e "s/namespace v10/namespace v9/g" -i include/vcpkg/base/fwd/format.h %endif @@ -80,6 +80,9 @@ install -D -m 0644 -p "%{SOURCE1}" "%{buildroot}%{_sysconfdir}/profile.d/%{name} %config(noreplace) %{_sysconfdir}/profile.d/%{name}.sh %changelog +* Wed Jun 28 2023 Vitaly Zaitsev - 2023.06.22-2 +- Rebuilt due to fmt 10 update. + * Fri Jun 23 2023 Vitaly Zaitsev - 2023.06.22-1 - Updated to version 2023.06.22. From 687b8ccc19cde602157c88984b1669033772c741 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jul 2023 17:27:22 +0000 Subject: [PATCH 40/69] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- vcpkg.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vcpkg.spec b/vcpkg.spec index 862c753..d39dc8a 100644 --- a/vcpkg.spec +++ b/vcpkg.spec @@ -3,7 +3,7 @@ Name: vcpkg Version: %(echo %{repo_tag} | sed 's/-/./g') -Release: 2%{?dist} +Release: 3%{?dist} License: MIT Summary: C++ Library Manager @@ -80,6 +80,9 @@ install -D -m 0644 -p "%{SOURCE1}" "%{buildroot}%{_sysconfdir}/profile.d/%{name} %config(noreplace) %{_sysconfdir}/profile.d/%{name}.sh %changelog +* Sat Jul 22 2023 Fedora Release Engineering - 2023.06.22-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Wed Jun 28 2023 Vitaly Zaitsev - 2023.06.22-2 - Rebuilt due to fmt 10 update. From bca10522d9a51bb0c71743af5c3fdf77997b7028 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jan 2024 07:33:24 +0000 Subject: [PATCH 41/69] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- vcpkg.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vcpkg.spec b/vcpkg.spec index d39dc8a..181033f 100644 --- a/vcpkg.spec +++ b/vcpkg.spec @@ -3,7 +3,7 @@ Name: vcpkg Version: %(echo %{repo_tag} | sed 's/-/./g') -Release: 3%{?dist} +Release: 4%{?dist} License: MIT Summary: C++ Library Manager @@ -80,6 +80,9 @@ install -D -m 0644 -p "%{SOURCE1}" "%{buildroot}%{_sysconfdir}/profile.d/%{name} %config(noreplace) %{_sysconfdir}/profile.d/%{name}.sh %changelog +* Sat Jan 27 2024 Fedora Release Engineering - 2023.06.22-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Sat Jul 22 2023 Fedora Release Engineering - 2023.06.22-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From 31765dc0e7ba96e206446ebdd8ea2ad870eb890f Mon Sep 17 00:00:00 2001 From: Vitaly Date: Thu, 21 Mar 2024 12:07:21 +0100 Subject: [PATCH 42/69] Converted to %autorelease and %autochangelog. [skip changelog] --- changelog | 2 + vcpkg.spec | 113 +---------------------------------------------------- 2 files changed, 4 insertions(+), 111 deletions(-) create mode 100644 changelog diff --git a/changelog b/changelog new file mode 100644 index 0000000..ff2f44e --- /dev/null +++ b/changelog @@ -0,0 +1,2 @@ +* Sat Jan 27 2024 Fedora Release Engineering - 2023.06.22-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild diff --git a/vcpkg.spec b/vcpkg.spec index 181033f..1640468 100644 --- a/vcpkg.spec +++ b/vcpkg.spec @@ -3,7 +3,7 @@ Name: vcpkg Version: %(echo %{repo_tag} | sed 's/-/./g') -Release: 4%{?dist} +Release: %autorelease License: MIT Summary: C++ Library Manager @@ -80,113 +80,4 @@ install -D -m 0644 -p "%{SOURCE1}" "%{buildroot}%{_sysconfdir}/profile.d/%{name} %config(noreplace) %{_sysconfdir}/profile.d/%{name}.sh %changelog -* Sat Jan 27 2024 Fedora Release Engineering - 2023.06.22-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Sat Jul 22 2023 Fedora Release Engineering - 2023.06.22-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Wed Jun 28 2023 Vitaly Zaitsev - 2023.06.22-2 -- Rebuilt due to fmt 10 update. - -* Fri Jun 23 2023 Vitaly Zaitsev - 2023.06.22-1 -- Updated to version 2023.06.22. - -* Wed Apr 12 2023 Vitaly Zaitsev - 2023.04.07-1 -- Updated to version 2023.04.07. - -* Thu Mar 30 2023 Vitaly Zaitsev - 2023.03.29-1 -- Updated to version 2023.03.29. - -* Thu Mar 23 2023 Vitaly Zaitsev - 2023.03.22-1 -- Updated to version 2023.03.22. - -* Tue Mar 14 2023 Vitaly Zaitsev - 2023.03.14-1 -- Updated to version 2023.03.14. - -* Thu Mar 02 2023 Vitaly Zaitsev - 2023.03.01-1 -- Updated to version 2023.03.01. - -* Wed Feb 15 2023 Vitaly Zaitsev - 2023.02.15-1 -- Updated to version 2023.02.15. - -* Mon Jan 30 2023 Vitaly Zaitsev - 2023.01.24-1 -- Updated to version 2023.01.24. - -* Sat Jan 21 2023 Fedora Release Engineering - 2022.12.14-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Wed Dec 21 2022 Vitaly Zaitsev - 2022.12.14-1 -- Updated to version 2022.12.14. - -* Fri Nov 11 2022 Vitaly Zaitsev - 2022.11.10-1 -- Updated to version 2022.11.10. - -* Sat Oct 22 2022 Vitaly Zaitsev - 2022.10.17-1 -- Updated to version 2022.10.17. - -* Fri Oct 14 2022 Vitaly Zaitsev - 2022.10.12-1 -- Updated to version 2022.10.12. - -* Fri Sep 02 2022 Vitaly Zaitsev - 2022.09.01-1 -- Updated to version 2022.09.01. - -* Sat Jul 23 2022 Fedora Release Engineering - 2022.07.14-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Sat Jul 16 2022 Vitaly Zaitsev - 2022.07.14-1 -- Updated to version 2022.07.14. - -* Sun Jul 10 2022 Vitaly Zaitsev - 2022.06.15-2 -- Rebuilt due to fmt library update. - -* Fri Jun 17 2022 Vitaly Zaitsev - 2022.06.15-1 -- Updated to version 2022.06.15. - -* Sat May 14 2022 Vitaly Zaitsev - 2022.05.05-1 -- Updated to version 2022.05.05. - -* Sat Apr 02 2022 Vitaly Zaitsev - 2022.03.30-1 -- Updated to version 2022.03.30. - -* Tue Mar 29 2022 Vitaly Zaitsev - 2022.03.25-1 -- Updated to version 2022.03.25. - -* Sat Mar 05 2022 Vitaly Zaitsev - 2022.03.03-1 -- Updated to version 2022.03.03. - -* Sat Feb 19 2022 Vitaly Zaitsev - 2022.02.18-1 -- Updated to version 2022.02.18. - -* Tue Feb 15 2022 Vitaly Zaitsev - 2022.02.11-1 -- Updated to version 2022.02.11. - -* Fri Feb 04 2022 Vitaly Zaitsev - 2022.02.01-1 -- Updated to version 2022.02.01. - -* Tue Jan 25 2022 Vitaly Zaitsev - 2022.01.19-1 -- Updated to version 2022.01.19. - -* Sat Jan 22 2022 Fedora Release Engineering - 2021.12.09-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Thu Dec 09 2021 Vitaly Zaitsev - 2021.12.09-1 -- Updated to version 2021.12.09. - -* Tue Nov 09 2021 Vitaly Zaitsev - 2021.11.02-1 -- Updated to version 2021.11.02. - -* Sat Oct 30 2021 Vitaly Zaitsev - 2021.10.25-1 -- Updated to version 2021.10.25. - -* Sun Sep 12 2021 Vitaly Zaitsev - 2021.09.10-1 -- Updated to version 2021.09.10. - -* Tue Aug 17 2021 Vitaly Zaitsev - 2021.08.12-1 -- Updated to version 2021.08.12. - -* Wed Aug 04 2021 Vitaly Zaitsev - 2021.08.03-1 -- Updated to version 2021.08.03. - -* Sun Jul 25 2021 Vitaly Zaitsev - 2021.07.21-1 -- Initial SPEC release. +%autochangelog From 0cf59e1dee7963bedddaef40e456859f6f947617 Mon Sep 17 00:00:00 2001 From: Vitaly Date: Thu, 28 Mar 2024 16:33:19 +0100 Subject: [PATCH 43/69] Updated to version 2024.03.14. --- sources | 2 +- vcpkg.sh | 5 +++++ vcpkg.spec | 32 ++++++++++++++++++++++---------- 3 files changed, 28 insertions(+), 11 deletions(-) diff --git a/sources b/sources index 6172577..a64dd2e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vcpkg-2023.06.22.tar.gz) = 27135301c02ca9bf50e8bf458907daba62e92d7adcc5219b6b27dc835d4ff01f396ec320ea283e4a8de8117588b955f966203fd36f781f21f837d1d6377c03ef +SHA512 (vcpkg-2024.03.14.tar.gz) = d28da01818043a84060a0964d0b7849b425e488f90076408c28b5366aa95c8f688b1917059e59ac5b95420bbd9e4b6e7c9a2a24cee1366476e366f9e9b0025f2 diff --git a/vcpkg.sh b/vcpkg.sh index a68719f..fd72108 100644 --- a/vcpkg.sh +++ b/vcpkg.sh @@ -4,3 +4,8 @@ if [ -z "$VCPKG_DISABLE_METRICS" ]; then export VCPKG_DISABLE_METRICS="1" fi + +# Export the correct vcpkg root directory. +if [ -z "$VCPKG_ROOT" ]; then + export VCPKG_ROOT="$HOME/.local/share/vcpkg" +fi diff --git a/vcpkg.spec b/vcpkg.spec index 1640468..e97f01e 100644 --- a/vcpkg.spec +++ b/vcpkg.spec @@ -1,5 +1,5 @@ %global repo_name vcpkg-tool -%global repo_tag 2023-06-22 +%global repo_tag 2024-03-14 Name: vcpkg Version: %(echo %{repo_tag} | sed 's/-/./g') @@ -30,13 +30,30 @@ Vcpkg is a package manager for the different C and C++ libraries. Vcpkg can collect usage data. The data collected by Microsoft is anonymous. -Fedora package has telemetry disabled by default. If you want to enable -telemetry, you should remove the %{_sysconfdir}/profile.d/%{name}.sh file -or unset the VCPKG_DISABLE_METRICS environment variable. +This package has telemetry disabled by default and doesn't ship the +repository with recipes. + +Please read README.fedora file for more information. %prep %autosetup -n %{repo_name}-%{repo_tag} -p1 +# Adding a file with some useful information... +cat << EOF >> README.fedora +Fedora package has telemetry disabled by default. If you want to enable +it, you should unset the VCPKG_DISABLE_METRICS environment variable +from the %{_sysconfdir}/profile.d/%{name}.sh file. + +Fedora can't ship the official Git repository with recipes for various +reasons (especially legal), so you'll need to manually clone it into +the \$HOME/.local/share/vcpkg directory (the path can be changed in +the %{_sysconfdir}/profile.d/%{name}.sh file): +git clone https://github.com/microsoft/%{name} \$VCPKG_ROOT + +You will have to update it manually too: +git -C \$VCPKG_ROOT pull +EOF + # Fixing line endings... sed -e "s,\r,," -i README.md @@ -44,11 +61,6 @@ sed -e "s,\r,," -i README.md rm -rf include/catch2 ln -svf %{_includedir}/catch2/ include/ -# Patching fmt namespace... -%if 0%{?fedora} && 0%{?fedora} < 39 -sed -e "s/namespace v10/namespace v9/g" -i include/vcpkg/base/fwd/format.h -%endif - %build %cmake -G Ninja \ -DCMAKE_BUILD_TYPE=Release \ @@ -74,7 +86,7 @@ sed -e "s/namespace v10/namespace v9/g" -i include/vcpkg/base/fwd/format.h install -D -m 0644 -p "%{SOURCE1}" "%{buildroot}%{_sysconfdir}/profile.d/%{name}.sh" %files -%doc README.md +%doc README.md README.fedora %license LICENSE.txt NOTICE.txt %{_bindir}/%{name} %config(noreplace) %{_sysconfdir}/profile.d/%{name}.sh From dd0728818278ccee8f1728a683bbbb680b0961b9 Mon Sep 17 00:00:00 2001 From: Vitaly Date: Thu, 25 Apr 2024 09:44:22 +0200 Subject: [PATCH 44/69] Updated to version 2024.04.23. --- sources | 2 +- vcpkg.spec | 11 ++++++----- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/sources b/sources index a64dd2e..2074d6f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vcpkg-2024.03.14.tar.gz) = d28da01818043a84060a0964d0b7849b425e488f90076408c28b5366aa95c8f688b1917059e59ac5b95420bbd9e4b6e7c9a2a24cee1366476e366f9e9b0025f2 +SHA512 (vcpkg-2024.04.23.tar.gz) = 61952aa95f387cd41a69d64211177550f29eff70e68e40b9e5069397a719752fc83e05c1e798b9a0d45f1f5534dc0487242a7c92b4c1b6ef0cf28fa7632f18bf diff --git a/vcpkg.spec b/vcpkg.spec index e97f01e..3efb476 100644 --- a/vcpkg.spec +++ b/vcpkg.spec @@ -1,5 +1,5 @@ %global repo_name vcpkg-tool -%global repo_tag 2024-03-14 +%global repo_tag 2024-04-23 Name: vcpkg Version: %(echo %{repo_tag} | sed 's/-/./g') @@ -14,11 +14,12 @@ Source1: %{name}.sh BuildRequires: catch-devel >= 2.13.0 BuildRequires: cmake BuildRequires: cmrc-devel -BuildRequires: fmt-devel >= 9.1.0 +BuildRequires: fmt-devel >= 10.0.0 BuildRequires: gcc-c++ BuildRequires: ninja-build Requires: cmake%{?_isa} +Requires: curl%{?_isa} Requires: gcc-c++%{?_isa} Requires: git-core%{?_isa} Requires: ninja-build%{?_isa} @@ -46,7 +47,7 @@ from the %{_sysconfdir}/profile.d/%{name}.sh file. Fedora can't ship the official Git repository with recipes for various reasons (especially legal), so you'll need to manually clone it into -the \$HOME/.local/share/vcpkg directory (the path can be changed in +the \$HOME/.local/share/%{name} directory (the path can be changed in the %{_sysconfdir}/profile.d/%{name}.sh file): git clone https://github.com/microsoft/%{name} \$VCPKG_ROOT @@ -66,8 +67,8 @@ ln -svf %{_includedir}/catch2/ include/ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_SKIP_INSTALL_RPATH:BOOL=ON \ -DBUILD_TESTING:BOOL=OFF \ - -DVCPKG_BASE_VERSION:STRING=%{repo_tag} \ - -DVCPKG_VERSION:STRING=%{repo_tag} \ + -DVCPKG_BASE_VERSION:STRING="%{repo_tag}" \ + -DVCPKG_VERSION:STRING="%{release}" \ -DVCPKG_DEVELOPMENT_WARNINGS:BOOL=OFF \ -DVCPKG_WARNINGS_AS_ERRORS:BOOL=OFF \ -DVCPKG_DEPENDENCY_CMAKERC:BOOL=ON \ From 9610df7d99b647c7f3e09848bbea61bde4794090 Mon Sep 17 00:00:00 2001 From: Vitaly Date: Thu, 13 Jun 2024 14:17:24 +0200 Subject: [PATCH 45/69] Updated to version 2024.06.10. --- sources | 2 +- vcpkg.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sources b/sources index 2074d6f..37edd73 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vcpkg-2024.04.23.tar.gz) = 61952aa95f387cd41a69d64211177550f29eff70e68e40b9e5069397a719752fc83e05c1e798b9a0d45f1f5534dc0487242a7c92b4c1b6ef0cf28fa7632f18bf +SHA512 (vcpkg-2024.06.10.tar.gz) = cfb0f97a1b99c68e036a3609f33448fa8279ebf97f75c5d7c6e2ab8cfd920bb10c412b1349ff7ac5ba9494458d3f6265792d4afc4babe4c1142f185d5c9bfd1d diff --git a/vcpkg.spec b/vcpkg.spec index 3efb476..c719105 100644 --- a/vcpkg.spec +++ b/vcpkg.spec @@ -1,5 +1,5 @@ %global repo_name vcpkg-tool -%global repo_tag 2024-04-23 +%global repo_tag 2024-06-10 Name: vcpkg Version: %(echo %{repo_tag} | sed 's/-/./g') From 8460bdb6a6dc7a441e49f99d714de1903efa734f Mon Sep 17 00:00:00 2001 From: Vitaly Date: Tue, 16 Jul 2024 11:13:42 +0200 Subject: [PATCH 46/69] Rebuilt due to fmt library update. From c0f7cf4fc3fe9adb2759587a74ff5d758b1bf992 Mon Sep 17 00:00:00 2001 From: Vitaly Date: Tue, 16 Jul 2024 11:14:31 +0200 Subject: [PATCH 47/69] Rebuilt due to fmt library update. --- vcpkg.spec | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/vcpkg.spec b/vcpkg.spec index c719105..51ec6eb 100644 --- a/vcpkg.spec +++ b/vcpkg.spec @@ -62,6 +62,11 @@ sed -e "s,\r,," -i README.md rm -rf include/catch2 ln -svf %{_includedir}/catch2/ include/ +# Patching fmt namespace... +%if 0%{?fedora} && 0%{?fedora} >= 41 +sed -e "s/namespace v10/namespace v11/g" -i include/vcpkg/base/fwd/fmt.h +%endif + %build %cmake -G Ninja \ -DCMAKE_BUILD_TYPE=Release \ From e0698f5d7dc148fd996411bb2521e68b9805ea5c Mon Sep 17 00:00:00 2001 From: Vitaly Date: Tue, 16 Jul 2024 11:32:35 +0200 Subject: [PATCH 48/69] Rebuilt due to fmt library update. --- ...lude-fmt-ranges.h-for-using-fmt-join.patch | 26 ++++ ...-formatting-StringView-as-a-sequence.patch | 130 ++++++++++++++++++ vcpkg.spec | 4 + 3 files changed, 160 insertions(+) create mode 100644 0001-include-fmt-ranges.h-for-using-fmt-join.patch create mode 100644 0001-prevent-fmt-from-formatting-StringView-as-a-sequence.patch diff --git a/0001-include-fmt-ranges.h-for-using-fmt-join.patch b/0001-include-fmt-ranges.h-for-using-fmt-join.patch new file mode 100644 index 0000000..cebda04 --- /dev/null +++ b/0001-include-fmt-ranges.h-for-using-fmt-join.patch @@ -0,0 +1,26 @@ +From 5337d60d6b9a6fd5ca275203d44fd05ac9f1b7a4 Mon Sep 17 00:00:00 2001 +From: Kefu Chai +Date: Tue, 16 Jul 2024 07:51:21 +0800 +Subject: [PATCH] include fmt/ranges.h for using fmt::join() + +fmt::join() was moved into fmt/ranges.h in fmt 11, so let's include +this header file for using it. + +Signed-off-by: Kefu Chai +--- + include/vcpkg/base/fmt.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/include/vcpkg/base/fmt.h b/include/vcpkg/base/fmt.h +index 55ce1cb..1358d1a 100644 +--- a/include/vcpkg/base/fmt.h ++++ b/include/vcpkg/base/fmt.h +@@ -14,4 +14,5 @@ VCPKG_MSVC_WARNING(push) + VCPKG_MSVC_WARNING(disable : 6239 4189 4702) + #include + #include ++#include + VCPKG_MSVC_WARNING(pop) +-- +2.45.2 + diff --git a/0001-prevent-fmt-from-formatting-StringView-as-a-sequence.patch b/0001-prevent-fmt-from-formatting-StringView-as-a-sequence.patch new file mode 100644 index 0000000..17647d3 --- /dev/null +++ b/0001-prevent-fmt-from-formatting-StringView-as-a-sequence.patch @@ -0,0 +1,130 @@ +From 9d67b1ebb60491cf4760bd8c3f2719cc9c74e9f5 Mon Sep 17 00:00:00 2001 +From: Kefu Chai +Date: Tue, 16 Jul 2024 09:27:03 +0800 +Subject: [PATCH] prevent fmt from formatting StringView as a sequence +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +in fmt 11, fmt/ranges.h tries to format sequence-like containers as +a sequence. but we already have a specialization for `StringView`, +this confuses compiler: + +``` +/usr/bin/g++ -DFMT_SHARED -DVCPKG_BASE_VERSION=2024-06-10 -DVCPKG_VERSION=2.fc41 -D_FILE_OFFSET_BITS=64 -I/builddir/build/BUILD/vcpkg-2024.06.10-build/vcpkg-tool-2024-06-10/include -I/builddir/build/BUILD/vcpkg-2024.06.10-build/vcpkg-tool-2024-06-10/redhat-linux-build/_cmrc/include -O2 -flto=auto -ffat-lto-objects -fexceptions -g -grecord-gcc-switches -pipe -Wall -Werror=format-security -Wp,-U_FORTIFY_SOURCE,-D_FORTIFY_SOURCE=3 -Wp,-D_GLIBCXX_ASSERTIONS -specs=/usr/lib/rpm/redhat/redhat-hardened-cc1 -fstack-protector-strong -specs=/usr/lib/rpm/redhat/redhat-annobin-cc1 -mbranch-protection=standard -fasynchronous-unwind-tables -fstack-clash-protection -fno-omit-frame-pointer -mno-omit-leaf-frame-pointer -DNDEBUG -std=c++17 -MD -MT CMakeFiles/vcpkg.dir/src/vcpkg.cpp.o -MF CMakeFiles/vcpkg.dir/src/vcpkg.cpp.o.d -o CMakeFiles/vcpkg.dir/src/vcpkg.cpp.o -c /builddir/build/BUILD/vcpkg-2024.06.10-build/vcpkg-tool-2024-06-10/src/vcpkg.cpp +In file included from /usr/include/c++/14/bits/char_traits.h:50, + from /usr/include/c++/14/string:42, + from /builddir/build/BUILD/vcpkg-2024.06.10-build/vcpkg-tool-2024-06-10/include/vcpkg/base/lineinfo.h:5, + from /builddir/build/BUILD/vcpkg-2024.06.10-build/vcpkg-tool-2024-06-10/include/vcpkg/base/checks.h:3, + from /builddir/build/BUILD/vcpkg-2024.06.10-build/vcpkg-tool-2024-06-10/include/vcpkg/base/optional.h:5, + from /builddir/build/BUILD/vcpkg-2024.06.10-build/vcpkg-tool-2024-06-10/include/vcpkg/base/chrono.h:5, + from /builddir/build/BUILD/vcpkg-2024.06.10-build/vcpkg-tool-2024-06-10/src/vcpkg.cpp:3: +/usr/include/c++/14/type_traits: In substitution of ‘template using std::__is_constructible_impl = std::__bool_constant<__is_constructible(_Tp, _Args ...)> [with _Tp = fmt::v11::formatter; _Args = {}]’: +/usr/include/c++/14/type_traits:1115:12: required from ‘struct std::is_constructible >’ + 1115 | struct is_constructible + | ^~~~~~~~~~~~~~~~ +/usr/include/fmt/base.h:1509:66: required from ‘struct fmt::v11::detail::arg_mapper::formattable’ + 1509 | (has_formatter::value && + | ^~~~~ +/usr/include/fmt/base.h:1516:25: required by substitution of ‘template::formattable::type>::value), int>::type > constexpr fmt::v11::detail::unformattable fmt::v11::detail::arg_mapper::do_map(T&) [with T = const vcpkg::StringView; typename std::enable_if<(! fmt::v11::detail::arg_mapper::formattable::type>::value), int>::type = ]’ + 1516 | template ::value)> + | ^ +/usr/include/fmt/base.h:1529:68: required by substitution of ‘template::value || std::is_enum<_Tp2>::value) || std::is_union::value) || std::is_fundamental::value) && (! fmt::v11::detail::has_to_string_view::value)) && (! fmt::v11::is_char::value)) && (! fmt::v11::detail::is_named_arg::value)) && (! std::is_integral<_Size>::value)) && (! std::is_arithmetic::type>::value)), int>::type > constexpr decltype (((fmt::v11::detail::arg_mapper*)this)->fmt::v11::detail::arg_mapper::do_map(val)) fmt::v11::detail::arg_mapper::map(T&) [with T = const vcpkg::StringView; U = vcpkg::StringView; typename std::enable_if<((((((((std::is_class::value || std::is_enum<_Tp2>::value) || std::is_union::value) || std::is_fundamental::value) && (! fmt::v11::detail::has_to_string_view::value)) && (! fmt::v11::is_char::value)) && (! fmt::v11::detail::is_named_arg::value)) && (! std::is_integral<_Size>::value)) && (! std::is_arithmetic::type>::value)), int>::type = 0]’ + 1529 | FMT_MAP_API auto map(T& val) -> decltype(FMT_DECLTYPE_THIS do_map(val)) { + | ~~~~~~^~~~~ +/usr/include/fmt/base.h:1545:53: required by substitution of ‘template using fmt::v11::detail::mapped_type_constant = fmt::v11::detail::type_constant().map(declval())), typename Context::char_type> [with T = vcpkg::StringView; Context = fmt::v11::context]’ + 1545 | type_constant().map(std::declval())), + | ~~~~~~~~~~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~ +/usr/include/fmt/base.h:1584:68: required from ‘constexpr long long unsigned int fmt::v11::detail::encode_types() [with Context = fmt::v11::context; Arg = vcpkg::StringView; Args = {}]’ + 1584 | return static_cast(mapped_type_constant::value) | + | ^~~~~ +/usr/include/fmt/base.h:1590:67: required from ‘constexpr long long unsigned int fmt::v11::detail::make_descriptor() [with Context = fmt::v11::context; T = {vcpkg::StringView}; long unsigned int NUM_ARGS = 1]’ + 1590 | return NUM_ARGS <= max_packed_args ? encode_types() + | ~~~~~~~~~~~~~~~~~~~~~~~~~~~^~ +/usr/include/fmt/base.h:2011:53: required by substitution of ‘template::type > constexpr fmt::v11::detail::format_arg_store fmt::v11::make_format_args(T& ...) [with Context = fmt::v11::context; T = {vcpkg::StringView}; long unsigned int NUM_NAMED_ARGS = 0; long long unsigned int DESC = ; typename std::enable_if<(NUM_NAMED_ARGS != 0), int>::type = ]’ + 2011 | detail::make_descriptor() | + | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~^~ +/usr/include/fmt/format.h:4357:44: required from ‘std::string fmt::v11::format(format_string, T&& ...) [with T = {vcpkg::StringView&}; std::string = std::__cxx11::basic_string; format_string = basic_format_string]’ + 4357 | return vformat(fmt, fmt::make_format_args(args...)); + | ~~~~~~~~~~~~~~~~~~~~~^~~~~~~~~ +/builddir/build/BUILD/vcpkg-2024.06.10-build/vcpkg-tool-2024-06-10/include/vcpkg/base/json.h:256:65: required from here + 256 | Checks::unreachable(VCPKG_LINE_INFO, fmt::format("JSON object missing key {}", key)); + | ~~~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +/usr/include/c++/14/type_traits:1110:25: error: ambiguous template instantiation for ‘struct fmt::v11::formatter’ + 1110 | = __bool_constant<__is_constructible(_Tp, _Args...)>; + | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +In file included from /builddir/build/BUILD/vcpkg-2024.06.10-build/vcpkg-tool-2024-06-10/include/vcpkg/base/fmt.h:17, + from /builddir/build/BUILD/vcpkg-2024.06.10-build/vcpkg-tool-2024-06-10/include/vcpkg/base/messages.h:5, + from /builddir/build/BUILD/vcpkg-2024.06.10-build/vcpkg-tool-2024-06-10/include/vcpkg/base/checks.h:4: +/usr/include/fmt/ranges.h:517:8: note: candidates are: ‘template struct fmt::v11::formatter::value != fmt::v11::range_format::disabled) && (fmt::v11::range_format_kind::value != fmt::v11::range_format::map)) && (fmt::v11::range_format_kind::value != fmt::v11::range_format::string)) && (fmt::v11::range_format_kind::value != fmt::v11::range_format::debug_string))>, fmt::v11::detail::is_formattable_delayed >::value, void>::type> [with R = vcpkg::StringView; Char = char]’ + 517 | struct formatter< + | ^~~~~~~~~~ + 518 | R, Char, + | ~~~~~~~~ + 519 | enable_if_t::value != range_format::disabled && + | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + 522 | range_format_kind::value != range_format::map && + | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + 523 | range_format_kind::value != range_format::string && + | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + 524 | range_format_kind::value != range_format::debug_string> + | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + 525 | // Workaround a bug in MSVC 2015 and earlier. + | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + 526 | #if !FMT_MSC_VERSION || FMT_MSC_VERSION >= 1910 + | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + 527 | , + | ~ + 528 | detail::is_formattable_delayed + | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + 529 | #endif + | ~~~~~~ + 530 | >::value>> { + | ~~~~~~~~~~ +``` + +so in order to disambiguate the resolution, let's explicitly +disable the range formatter. + +Signed-off-by: Kefu Chai +--- + include/vcpkg/base/stringview.h | 13 +++++++++++++ + 1 file changed, 13 insertions(+) + +diff --git a/include/vcpkg/base/stringview.h b/include/vcpkg/base/stringview.h +index 40b9a5e..311b13e 100644 +--- a/include/vcpkg/base/stringview.h ++++ b/include/vcpkg/base/stringview.h +@@ -105,6 +105,10 @@ namespace vcpkg + }; + } + ++template ++struct fmt::range_format_kind : std::integral_constant ++{}; ++ + template + struct fmt::formatter : fmt::formatter, Char, void> + { +@@ -115,5 +119,14 @@ struct fmt::formatter : fmt::formatter ++struct fmt::range_format_kind : std::integral_constant ++{}; ++ + VCPKG_FORMAT_AS(vcpkg::ZStringView, vcpkg::StringView); ++ ++template ++struct fmt::range_format_kind : std::integral_constant ++{}; ++ + VCPKG_FORMAT_AS(vcpkg::StringLiteral, vcpkg::StringView); +-- +2.45.2 + diff --git a/vcpkg.spec b/vcpkg.spec index 51ec6eb..fa887b6 100644 --- a/vcpkg.spec +++ b/vcpkg.spec @@ -11,6 +11,10 @@ URL: https://github.com/microsoft/%{repo_name} Source0: %{url}/archive/%{repo_tag}/%{name}-%{version}.tar.gz Source1: %{name}.sh +# https://github.com/microsoft/vcpkg/issues/39946 +Patch100: 0001-include-fmt-ranges.h-for-using-fmt-join.patch +Patch101: 0001-prevent-fmt-from-formatting-StringView-as-a-sequence.patch + BuildRequires: catch-devel >= 2.13.0 BuildRequires: cmake BuildRequires: cmrc-devel From a6f84cef6486da3d2d8dad1a86b385538b19b62e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 20 Jul 2024 08:36:33 +0000 Subject: [PATCH 49/69] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From a9a4c760688376880c1ae13f2695847479145991 Mon Sep 17 00:00:00 2001 From: Vitaly Date: Tue, 23 Jul 2024 11:08:50 +0200 Subject: [PATCH 50/69] Updated to version 2024.07.10. --- sources | 2 +- vcpkg.spec | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sources b/sources index 37edd73..3bb7d02 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vcpkg-2024.06.10.tar.gz) = cfb0f97a1b99c68e036a3609f33448fa8279ebf97f75c5d7c6e2ab8cfd920bb10c412b1349ff7ac5ba9494458d3f6265792d4afc4babe4c1142f185d5c9bfd1d +SHA512 (vcpkg-2024.07.10.tar.gz) = e34d28345fd9a1b7296d97ffd141293396b0262fd92cd0a61c7fc1433b2944d936fcb685c65eaafecbe2c24a4c30039e75aaf2ecbf53e7080efa1ca63d9447b8 diff --git a/vcpkg.spec b/vcpkg.spec index fa887b6..8e8e8ca 100644 --- a/vcpkg.spec +++ b/vcpkg.spec @@ -1,5 +1,5 @@ %global repo_name vcpkg-tool -%global repo_tag 2024-06-10 +%global repo_tag 2024-07-10 Name: vcpkg Version: %(echo %{repo_tag} | sed 's/-/./g') @@ -11,7 +11,7 @@ URL: https://github.com/microsoft/%{repo_name} Source0: %{url}/archive/%{repo_tag}/%{name}-%{version}.tar.gz Source1: %{name}.sh -# https://github.com/microsoft/vcpkg/issues/39946 +# https://github.com/microsoft/vcpkg-tool/pull/1457 Patch100: 0001-include-fmt-ranges.h-for-using-fmt-join.patch Patch101: 0001-prevent-fmt-from-formatting-StringView-as-a-sequence.patch From 950a1b392fc25415b3a6e983d124e06e30d792bb Mon Sep 17 00:00:00 2001 From: Vitaly Date: Mon, 23 Sep 2024 10:23:52 +0200 Subject: [PATCH 51/69] Updated to version 2024.09.18. --- ...lude-fmt-ranges.h-for-using-fmt-join.patch | 26 ---- ...-formatting-StringView-as-a-sequence.patch | 130 ------------------ sources | 2 +- vcpkg.spec | 13 +- 4 files changed, 3 insertions(+), 168 deletions(-) delete mode 100644 0001-include-fmt-ranges.h-for-using-fmt-join.patch delete mode 100644 0001-prevent-fmt-from-formatting-StringView-as-a-sequence.patch diff --git a/0001-include-fmt-ranges.h-for-using-fmt-join.patch b/0001-include-fmt-ranges.h-for-using-fmt-join.patch deleted file mode 100644 index cebda04..0000000 --- a/0001-include-fmt-ranges.h-for-using-fmt-join.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 5337d60d6b9a6fd5ca275203d44fd05ac9f1b7a4 Mon Sep 17 00:00:00 2001 -From: Kefu Chai -Date: Tue, 16 Jul 2024 07:51:21 +0800 -Subject: [PATCH] include fmt/ranges.h for using fmt::join() - -fmt::join() was moved into fmt/ranges.h in fmt 11, so let's include -this header file for using it. - -Signed-off-by: Kefu Chai ---- - include/vcpkg/base/fmt.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/include/vcpkg/base/fmt.h b/include/vcpkg/base/fmt.h -index 55ce1cb..1358d1a 100644 ---- a/include/vcpkg/base/fmt.h -+++ b/include/vcpkg/base/fmt.h -@@ -14,4 +14,5 @@ VCPKG_MSVC_WARNING(push) - VCPKG_MSVC_WARNING(disable : 6239 4189 4702) - #include - #include -+#include - VCPKG_MSVC_WARNING(pop) --- -2.45.2 - diff --git a/0001-prevent-fmt-from-formatting-StringView-as-a-sequence.patch b/0001-prevent-fmt-from-formatting-StringView-as-a-sequence.patch deleted file mode 100644 index 17647d3..0000000 --- a/0001-prevent-fmt-from-formatting-StringView-as-a-sequence.patch +++ /dev/null @@ -1,130 +0,0 @@ -From 9d67b1ebb60491cf4760bd8c3f2719cc9c74e9f5 Mon Sep 17 00:00:00 2001 -From: Kefu Chai -Date: Tue, 16 Jul 2024 09:27:03 +0800 -Subject: [PATCH] prevent fmt from formatting StringView as a sequence -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -in fmt 11, fmt/ranges.h tries to format sequence-like containers as -a sequence. but we already have a specialization for `StringView`, -this confuses compiler: - -``` -/usr/bin/g++ -DFMT_SHARED -DVCPKG_BASE_VERSION=2024-06-10 -DVCPKG_VERSION=2.fc41 -D_FILE_OFFSET_BITS=64 -I/builddir/build/BUILD/vcpkg-2024.06.10-build/vcpkg-tool-2024-06-10/include -I/builddir/build/BUILD/vcpkg-2024.06.10-build/vcpkg-tool-2024-06-10/redhat-linux-build/_cmrc/include -O2 -flto=auto -ffat-lto-objects -fexceptions -g -grecord-gcc-switches -pipe -Wall -Werror=format-security -Wp,-U_FORTIFY_SOURCE,-D_FORTIFY_SOURCE=3 -Wp,-D_GLIBCXX_ASSERTIONS -specs=/usr/lib/rpm/redhat/redhat-hardened-cc1 -fstack-protector-strong -specs=/usr/lib/rpm/redhat/redhat-annobin-cc1 -mbranch-protection=standard -fasynchronous-unwind-tables -fstack-clash-protection -fno-omit-frame-pointer -mno-omit-leaf-frame-pointer -DNDEBUG -std=c++17 -MD -MT CMakeFiles/vcpkg.dir/src/vcpkg.cpp.o -MF CMakeFiles/vcpkg.dir/src/vcpkg.cpp.o.d -o CMakeFiles/vcpkg.dir/src/vcpkg.cpp.o -c /builddir/build/BUILD/vcpkg-2024.06.10-build/vcpkg-tool-2024-06-10/src/vcpkg.cpp -In file included from /usr/include/c++/14/bits/char_traits.h:50, - from /usr/include/c++/14/string:42, - from /builddir/build/BUILD/vcpkg-2024.06.10-build/vcpkg-tool-2024-06-10/include/vcpkg/base/lineinfo.h:5, - from /builddir/build/BUILD/vcpkg-2024.06.10-build/vcpkg-tool-2024-06-10/include/vcpkg/base/checks.h:3, - from /builddir/build/BUILD/vcpkg-2024.06.10-build/vcpkg-tool-2024-06-10/include/vcpkg/base/optional.h:5, - from /builddir/build/BUILD/vcpkg-2024.06.10-build/vcpkg-tool-2024-06-10/include/vcpkg/base/chrono.h:5, - from /builddir/build/BUILD/vcpkg-2024.06.10-build/vcpkg-tool-2024-06-10/src/vcpkg.cpp:3: -/usr/include/c++/14/type_traits: In substitution of ‘template using std::__is_constructible_impl = std::__bool_constant<__is_constructible(_Tp, _Args ...)> [with _Tp = fmt::v11::formatter; _Args = {}]’: -/usr/include/c++/14/type_traits:1115:12: required from ‘struct std::is_constructible >’ - 1115 | struct is_constructible - | ^~~~~~~~~~~~~~~~ -/usr/include/fmt/base.h:1509:66: required from ‘struct fmt::v11::detail::arg_mapper::formattable’ - 1509 | (has_formatter::value && - | ^~~~~ -/usr/include/fmt/base.h:1516:25: required by substitution of ‘template::formattable::type>::value), int>::type > constexpr fmt::v11::detail::unformattable fmt::v11::detail::arg_mapper::do_map(T&) [with T = const vcpkg::StringView; typename std::enable_if<(! fmt::v11::detail::arg_mapper::formattable::type>::value), int>::type = ]’ - 1516 | template ::value)> - | ^ -/usr/include/fmt/base.h:1529:68: required by substitution of ‘template::value || std::is_enum<_Tp2>::value) || std::is_union::value) || std::is_fundamental::value) && (! fmt::v11::detail::has_to_string_view::value)) && (! fmt::v11::is_char::value)) && (! fmt::v11::detail::is_named_arg::value)) && (! std::is_integral<_Size>::value)) && (! std::is_arithmetic::type>::value)), int>::type > constexpr decltype (((fmt::v11::detail::arg_mapper*)this)->fmt::v11::detail::arg_mapper::do_map(val)) fmt::v11::detail::arg_mapper::map(T&) [with T = const vcpkg::StringView; U = vcpkg::StringView; typename std::enable_if<((((((((std::is_class::value || std::is_enum<_Tp2>::value) || std::is_union::value) || std::is_fundamental::value) && (! fmt::v11::detail::has_to_string_view::value)) && (! fmt::v11::is_char::value)) && (! fmt::v11::detail::is_named_arg::value)) && (! std::is_integral<_Size>::value)) && (! std::is_arithmetic::type>::value)), int>::type = 0]’ - 1529 | FMT_MAP_API auto map(T& val) -> decltype(FMT_DECLTYPE_THIS do_map(val)) { - | ~~~~~~^~~~~ -/usr/include/fmt/base.h:1545:53: required by substitution of ‘template using fmt::v11::detail::mapped_type_constant = fmt::v11::detail::type_constant().map(declval())), typename Context::char_type> [with T = vcpkg::StringView; Context = fmt::v11::context]’ - 1545 | type_constant().map(std::declval())), - | ~~~~~~~~~~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~ -/usr/include/fmt/base.h:1584:68: required from ‘constexpr long long unsigned int fmt::v11::detail::encode_types() [with Context = fmt::v11::context; Arg = vcpkg::StringView; Args = {}]’ - 1584 | return static_cast(mapped_type_constant::value) | - | ^~~~~ -/usr/include/fmt/base.h:1590:67: required from ‘constexpr long long unsigned int fmt::v11::detail::make_descriptor() [with Context = fmt::v11::context; T = {vcpkg::StringView}; long unsigned int NUM_ARGS = 1]’ - 1590 | return NUM_ARGS <= max_packed_args ? encode_types() - | ~~~~~~~~~~~~~~~~~~~~~~~~~~~^~ -/usr/include/fmt/base.h:2011:53: required by substitution of ‘template::type > constexpr fmt::v11::detail::format_arg_store fmt::v11::make_format_args(T& ...) [with Context = fmt::v11::context; T = {vcpkg::StringView}; long unsigned int NUM_NAMED_ARGS = 0; long long unsigned int DESC = ; typename std::enable_if<(NUM_NAMED_ARGS != 0), int>::type = ]’ - 2011 | detail::make_descriptor() | - | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~^~ -/usr/include/fmt/format.h:4357:44: required from ‘std::string fmt::v11::format(format_string, T&& ...) [with T = {vcpkg::StringView&}; std::string = std::__cxx11::basic_string; format_string = basic_format_string]’ - 4357 | return vformat(fmt, fmt::make_format_args(args...)); - | ~~~~~~~~~~~~~~~~~~~~~^~~~~~~~~ -/builddir/build/BUILD/vcpkg-2024.06.10-build/vcpkg-tool-2024-06-10/include/vcpkg/base/json.h:256:65: required from here - 256 | Checks::unreachable(VCPKG_LINE_INFO, fmt::format("JSON object missing key {}", key)); - | ~~~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -/usr/include/c++/14/type_traits:1110:25: error: ambiguous template instantiation for ‘struct fmt::v11::formatter’ - 1110 | = __bool_constant<__is_constructible(_Tp, _Args...)>; - | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -In file included from /builddir/build/BUILD/vcpkg-2024.06.10-build/vcpkg-tool-2024-06-10/include/vcpkg/base/fmt.h:17, - from /builddir/build/BUILD/vcpkg-2024.06.10-build/vcpkg-tool-2024-06-10/include/vcpkg/base/messages.h:5, - from /builddir/build/BUILD/vcpkg-2024.06.10-build/vcpkg-tool-2024-06-10/include/vcpkg/base/checks.h:4: -/usr/include/fmt/ranges.h:517:8: note: candidates are: ‘template struct fmt::v11::formatter::value != fmt::v11::range_format::disabled) && (fmt::v11::range_format_kind::value != fmt::v11::range_format::map)) && (fmt::v11::range_format_kind::value != fmt::v11::range_format::string)) && (fmt::v11::range_format_kind::value != fmt::v11::range_format::debug_string))>, fmt::v11::detail::is_formattable_delayed >::value, void>::type> [with R = vcpkg::StringView; Char = char]’ - 517 | struct formatter< - | ^~~~~~~~~~ - 518 | R, Char, - | ~~~~~~~~ - 519 | enable_if_t::value != range_format::disabled && - | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - 522 | range_format_kind::value != range_format::map && - | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - 523 | range_format_kind::value != range_format::string && - | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - 524 | range_format_kind::value != range_format::debug_string> - | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - 525 | // Workaround a bug in MSVC 2015 and earlier. - | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - 526 | #if !FMT_MSC_VERSION || FMT_MSC_VERSION >= 1910 - | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - 527 | , - | ~ - 528 | detail::is_formattable_delayed - | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - 529 | #endif - | ~~~~~~ - 530 | >::value>> { - | ~~~~~~~~~~ -``` - -so in order to disambiguate the resolution, let's explicitly -disable the range formatter. - -Signed-off-by: Kefu Chai ---- - include/vcpkg/base/stringview.h | 13 +++++++++++++ - 1 file changed, 13 insertions(+) - -diff --git a/include/vcpkg/base/stringview.h b/include/vcpkg/base/stringview.h -index 40b9a5e..311b13e 100644 ---- a/include/vcpkg/base/stringview.h -+++ b/include/vcpkg/base/stringview.h -@@ -105,6 +105,10 @@ namespace vcpkg - }; - } - -+template -+struct fmt::range_format_kind : std::integral_constant -+{}; -+ - template - struct fmt::formatter : fmt::formatter, Char, void> - { -@@ -115,5 +119,14 @@ struct fmt::formatter : fmt::formatter -+struct fmt::range_format_kind : std::integral_constant -+{}; -+ - VCPKG_FORMAT_AS(vcpkg::ZStringView, vcpkg::StringView); -+ -+template -+struct fmt::range_format_kind : std::integral_constant -+{}; -+ - VCPKG_FORMAT_AS(vcpkg::StringLiteral, vcpkg::StringView); --- -2.45.2 - diff --git a/sources b/sources index 3bb7d02..4264b25 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vcpkg-2024.07.10.tar.gz) = e34d28345fd9a1b7296d97ffd141293396b0262fd92cd0a61c7fc1433b2944d936fcb685c65eaafecbe2c24a4c30039e75aaf2ecbf53e7080efa1ca63d9447b8 +SHA512 (vcpkg-2024.09.18.tar.gz) = f833f98aaa5030ddcb28725de28d17161b16e0e37b3a947649c3e6bca00cfbf3292fb32ff3e4acd8672a6eaad913f52d8ba9bfe2aadabd19f4173c0916254a3b diff --git a/vcpkg.spec b/vcpkg.spec index 8e8e8ca..d7fe9c2 100644 --- a/vcpkg.spec +++ b/vcpkg.spec @@ -1,5 +1,5 @@ %global repo_name vcpkg-tool -%global repo_tag 2024-07-10 +%global repo_tag 2024-09-18 Name: vcpkg Version: %(echo %{repo_tag} | sed 's/-/./g') @@ -11,14 +11,10 @@ URL: https://github.com/microsoft/%{repo_name} Source0: %{url}/archive/%{repo_tag}/%{name}-%{version}.tar.gz Source1: %{name}.sh -# https://github.com/microsoft/vcpkg-tool/pull/1457 -Patch100: 0001-include-fmt-ranges.h-for-using-fmt-join.patch -Patch101: 0001-prevent-fmt-from-formatting-StringView-as-a-sequence.patch - BuildRequires: catch-devel >= 2.13.0 BuildRequires: cmake BuildRequires: cmrc-devel -BuildRequires: fmt-devel >= 10.0.0 +BuildRequires: fmt-devel >= 11.0.0 BuildRequires: gcc-c++ BuildRequires: ninja-build @@ -66,11 +62,6 @@ sed -e "s,\r,," -i README.md rm -rf include/catch2 ln -svf %{_includedir}/catch2/ include/ -# Patching fmt namespace... -%if 0%{?fedora} && 0%{?fedora} >= 41 -sed -e "s/namespace v10/namespace v11/g" -i include/vcpkg/base/fwd/fmt.h -%endif - %build %cmake -G Ninja \ -DCMAKE_BUILD_TYPE=Release \ From 106d862ec3cb78039951342ab50ce692619205db Mon Sep 17 00:00:00 2001 From: Vitaly Date: Sat, 19 Oct 2024 11:48:05 +0200 Subject: [PATCH 52/69] Updated to version 2024.10.18. --- sources | 2 +- vcpkg.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sources b/sources index 4264b25..1e8ad06 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vcpkg-2024.09.18.tar.gz) = f833f98aaa5030ddcb28725de28d17161b16e0e37b3a947649c3e6bca00cfbf3292fb32ff3e4acd8672a6eaad913f52d8ba9bfe2aadabd19f4173c0916254a3b +SHA512 (vcpkg-2024.10.18.tar.gz) = 35bb6b95746a9c567fb5a5ad6d8d0c637093745c2487f3def6f84b1d3a7ae4753d7e41efde44fd34bc4f9c72e9bbecf1d042cda9542f734728f3f8d94d4f35e7 diff --git a/vcpkg.spec b/vcpkg.spec index d7fe9c2..03a264f 100644 --- a/vcpkg.spec +++ b/vcpkg.spec @@ -1,5 +1,5 @@ %global repo_name vcpkg-tool -%global repo_tag 2024-09-18 +%global repo_tag 2024-10-18 Name: vcpkg Version: %(echo %{repo_tag} | sed 's/-/./g') From 78bc58a054dd924438a8f61a26e96dd2655598c5 Mon Sep 17 00:00:00 2001 From: Vitaly Date: Wed, 11 Dec 2024 08:59:57 +0100 Subject: [PATCH 53/69] Updated to version 2024.12.09. --- sources | 2 +- vcpkg.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sources b/sources index 1e8ad06..d6479e9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vcpkg-2024.10.18.tar.gz) = 35bb6b95746a9c567fb5a5ad6d8d0c637093745c2487f3def6f84b1d3a7ae4753d7e41efde44fd34bc4f9c72e9bbecf1d042cda9542f734728f3f8d94d4f35e7 +SHA512 (vcpkg-2024.12.09.tar.gz) = d93f45ce2aa1d2226927553378bda869f8933206aeda83db5785cba0217c790f309e5596b878e21f94bda7bf280f817aee41eb704da3bb015b69fc5e565d0fea diff --git a/vcpkg.spec b/vcpkg.spec index 03a264f..8fced6d 100644 --- a/vcpkg.spec +++ b/vcpkg.spec @@ -1,5 +1,5 @@ %global repo_name vcpkg-tool -%global repo_tag 2024-10-18 +%global repo_tag 2024-12-09 Name: vcpkg Version: %(echo %{repo_tag} | sed 's/-/./g') From ef7f292a3143e2f7aac919bd155dea25e3f0af21 Mon Sep 17 00:00:00 2001 From: Vitaly Date: Sun, 12 Jan 2025 09:19:46 +0100 Subject: [PATCH 54/69] Updated to version 2025.01.11. --- sources | 2 +- vcpkg.spec | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/sources b/sources index d6479e9..3f7e23c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vcpkg-2024.12.09.tar.gz) = d93f45ce2aa1d2226927553378bda869f8933206aeda83db5785cba0217c790f309e5596b878e21f94bda7bf280f817aee41eb704da3bb015b69fc5e565d0fea +SHA512 (vcpkg-2025.01.11.tar.gz) = f4449167e6294aa38541f2c82c19c0afad3f883e9b53d884650d73e4f3918b2d1e6000c28e869a44189e0a3bf90f05972f9fd13e1832f65de2566037bcb41899 diff --git a/vcpkg.spec b/vcpkg.spec index 8fced6d..8374705 100644 --- a/vcpkg.spec +++ b/vcpkg.spec @@ -1,5 +1,5 @@ %global repo_name vcpkg-tool -%global repo_tag 2024-12-09 +%global repo_tag 2025-01-11 Name: vcpkg Version: %(echo %{repo_tag} | sed 's/-/./g') @@ -11,6 +11,11 @@ URL: https://github.com/microsoft/%{repo_name} Source0: %{url}/archive/%{repo_tag}/%{name}-%{version}.tar.gz Source1: %{name}.sh +# https://fedoraproject.org/wiki/Changes/EncourageI686LeafRemoval +%if 0%{?fedora} && 0%{?fedora} >= 42 +ExcludeArch: %{ix86} +%endif + BuildRequires: catch-devel >= 2.13.0 BuildRequires: cmake BuildRequires: cmrc-devel From b3c5a075d44c3f87852632bc7de60707f5f2953b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 19 Jan 2025 14:09:12 +0000 Subject: [PATCH 55/69] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From 13b105fb6a0784207e398d017232dfb17fc3e3db Mon Sep 17 00:00:00 2001 From: Vitaly Date: Wed, 12 Feb 2025 09:58:32 +0100 Subject: [PATCH 56/69] Updated to version 2025.02.11. --- sources | 2 +- vcpkg.spec | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sources b/sources index 3f7e23c..992cfcd 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vcpkg-2025.01.11.tar.gz) = f4449167e6294aa38541f2c82c19c0afad3f883e9b53d884650d73e4f3918b2d1e6000c28e869a44189e0a3bf90f05972f9fd13e1832f65de2566037bcb41899 +SHA512 (vcpkg-2025.02.11.tar.gz) = 117b7d3dc2736d634f1dd5e999e151707a7524640228f39664b7332369423bb7a105602fabcb31d40593eba8827042216446c62dccd735263d5bdb5774404878 diff --git a/vcpkg.spec b/vcpkg.spec index 8374705..fdb7b5c 100644 --- a/vcpkg.spec +++ b/vcpkg.spec @@ -1,5 +1,5 @@ %global repo_name vcpkg-tool -%global repo_tag 2025-01-11 +%global repo_tag 2025-02-11 Name: vcpkg Version: %(echo %{repo_tag} | sed 's/-/./g') @@ -54,7 +54,7 @@ Fedora can't ship the official Git repository with recipes for various reasons (especially legal), so you'll need to manually clone it into the \$HOME/.local/share/%{name} directory (the path can be changed in the %{_sysconfdir}/profile.d/%{name}.sh file): -git clone https://github.com/microsoft/%{name} \$VCPKG_ROOT +git clone https://github.com/microsoft/%{name}.git \$VCPKG_ROOT You will have to update it manually too: git -C \$VCPKG_ROOT pull From ab741995783a57aff5ee962575e37bccba5fbc23 Mon Sep 17 00:00:00 2001 From: Vitaly Date: Sat, 15 Mar 2025 12:04:15 +0100 Subject: [PATCH 57/69] Updated to version 2025.03.13. --- sources | 2 +- vcpkg.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sources b/sources index 992cfcd..843a83d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vcpkg-2025.02.11.tar.gz) = 117b7d3dc2736d634f1dd5e999e151707a7524640228f39664b7332369423bb7a105602fabcb31d40593eba8827042216446c62dccd735263d5bdb5774404878 +SHA512 (vcpkg-2025.03.13.tar.gz) = 87ab747bf1b74f826fb43a79beaa57e32feaf46825c32b72b506ee7c6421a8457fba14a516c29ec2128ccd59218a10b6d2f8bba2cbe59069c64a8e27c67684cd diff --git a/vcpkg.spec b/vcpkg.spec index fdb7b5c..435cb94 100644 --- a/vcpkg.spec +++ b/vcpkg.spec @@ -1,5 +1,5 @@ %global repo_name vcpkg-tool -%global repo_tag 2025-02-11 +%global repo_tag 2025-03-13 Name: vcpkg Version: %(echo %{repo_tag} | sed 's/-/./g') From 3fa6ff75736f4d2feeb8469b0bb941d6258b3336 Mon Sep 17 00:00:00 2001 From: Vitaly Date: Tue, 8 Apr 2025 08:58:38 +0200 Subject: [PATCH 58/69] Updated to version 2025.04.07. --- sources | 2 +- vcpkg.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sources b/sources index 843a83d..a791119 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vcpkg-2025.03.13.tar.gz) = 87ab747bf1b74f826fb43a79beaa57e32feaf46825c32b72b506ee7c6421a8457fba14a516c29ec2128ccd59218a10b6d2f8bba2cbe59069c64a8e27c67684cd +SHA512 (vcpkg-2025.04.07.tar.gz) = 541be6b9037e541c910eeec20d77d8d0d78e059a98af911f3e760bbf1e1b22606389e3d2492f02195882cfeea0e5bd24dc7c142adbb79066298edbe15c907365 diff --git a/vcpkg.spec b/vcpkg.spec index 435cb94..fe2e355 100644 --- a/vcpkg.spec +++ b/vcpkg.spec @@ -1,5 +1,5 @@ %global repo_name vcpkg-tool -%global repo_tag 2025-03-13 +%global repo_tag 2025-04-07 Name: vcpkg Version: %(echo %{repo_tag} | sed 's/-/./g') From f8cf8ac5a8df3a35375e980ee3d6f988d0f29a45 Mon Sep 17 00:00:00 2001 From: Vitaly Date: Tue, 8 Apr 2025 12:21:38 +0200 Subject: [PATCH 59/69] Fixed build with packaged cmakerc. --- vcpkg-fix-packaged-cmakerc.patch | 28 ++++++++++++++++++++++++++++ vcpkg.spec | 3 +++ 2 files changed, 31 insertions(+) create mode 100644 vcpkg-fix-packaged-cmakerc.patch diff --git a/vcpkg-fix-packaged-cmakerc.patch b/vcpkg-fix-packaged-cmakerc.patch new file mode 100644 index 0000000..60996fb --- /dev/null +++ b/vcpkg-fix-packaged-cmakerc.patch @@ -0,0 +1,28 @@ +--- a/cmake/FindCMakeRC.cmake ++++ b/cmake/FindCMakeRC.cmake +@@ -1,5 +1,10 @@ + option(VCPKG_DEPENDENCY_CMAKERC "CMake-based C++ resource compiler" OFF) + ++if(VCPKG_DEPENDENCY_CMAKERC) ++ find_package(CMakeRC CONFIG REQUIRED) ++ return() ++endif() ++ + # This option exists to allow the URI to be replaced with a Microsoft-internal URI in official + # builds which have restricted internet access; see azure-pipelines/signing.yml + # Note that the SHA512 is the same, so vcpkg-tool contributors need not be concerned that we built +@@ -18,13 +23,8 @@ FetchContent_Declare( + URL_HASH "SHA512=cb69ff4545065a1a89e3a966e931a58c3f07d468d88ecec8f00da9e6ce3768a41735a46fc71af56e0753926371d3ca5e7a3f2221211b4b1cf634df860c2c997f" + PATCH_COMMAND "${GIT_EXECUTABLE}" apply "${CMAKE_CURRENT_LIST_DIR}/CMakeRC_cmake_4.patch" + ) ++FetchContent_MakeAvailable(CMakeRC) + + if(NOT CMakeRC_FIND_REQUIRED) + message(FATAL_ERROR "CMakeRC must be REQUIRED") + endif() +- +-if(VCPKG_DEPENDENCY_CMAKERC) +- find_package(CMakeRC CONFIG REQUIRED) +-else() +- FetchContent_MakeAvailable(CMakeRC) +-endif() diff --git a/vcpkg.spec b/vcpkg.spec index fe2e355..83c5f51 100644 --- a/vcpkg.spec +++ b/vcpkg.spec @@ -11,6 +11,9 @@ URL: https://github.com/microsoft/%{repo_name} Source0: %{url}/archive/%{repo_tag}/%{name}-%{version}.tar.gz Source1: %{name}.sh +# https://github.com/microsoft/vcpkg-tool/pull/1644 +Patch100: %{name}-fix-packaged-cmakerc.patch + # https://fedoraproject.org/wiki/Changes/EncourageI686LeafRemoval %if 0%{?fedora} && 0%{?fedora} >= 42 ExcludeArch: %{ix86} From 99cda604e210dc60970e9ac8d8faa0c41868a69b Mon Sep 17 00:00:00 2001 From: Vitaly Date: Thu, 17 Apr 2025 09:52:43 +0200 Subject: [PATCH 60/69] Updated to version 2025.04.16. --- sources | 2 +- vcpkg-fix-packaged-cmakerc.patch | 28 ---------------------------- vcpkg.spec | 5 +---- 3 files changed, 2 insertions(+), 33 deletions(-) delete mode 100644 vcpkg-fix-packaged-cmakerc.patch diff --git a/sources b/sources index a791119..434bd66 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vcpkg-2025.04.07.tar.gz) = 541be6b9037e541c910eeec20d77d8d0d78e059a98af911f3e760bbf1e1b22606389e3d2492f02195882cfeea0e5bd24dc7c142adbb79066298edbe15c907365 +SHA512 (vcpkg-2025.04.16.tar.gz) = 524f9e7a14a3c66eb745ef4491a3b5127ddc1837902449399cd6ae7f54ccd48f4058289b0ba64ccdb11d9967a7cfb6650f089bca83736dd1b4a8bc87ceffcb24 diff --git a/vcpkg-fix-packaged-cmakerc.patch b/vcpkg-fix-packaged-cmakerc.patch deleted file mode 100644 index 60996fb..0000000 --- a/vcpkg-fix-packaged-cmakerc.patch +++ /dev/null @@ -1,28 +0,0 @@ ---- a/cmake/FindCMakeRC.cmake -+++ b/cmake/FindCMakeRC.cmake -@@ -1,5 +1,10 @@ - option(VCPKG_DEPENDENCY_CMAKERC "CMake-based C++ resource compiler" OFF) - -+if(VCPKG_DEPENDENCY_CMAKERC) -+ find_package(CMakeRC CONFIG REQUIRED) -+ return() -+endif() -+ - # This option exists to allow the URI to be replaced with a Microsoft-internal URI in official - # builds which have restricted internet access; see azure-pipelines/signing.yml - # Note that the SHA512 is the same, so vcpkg-tool contributors need not be concerned that we built -@@ -18,13 +23,8 @@ FetchContent_Declare( - URL_HASH "SHA512=cb69ff4545065a1a89e3a966e931a58c3f07d468d88ecec8f00da9e6ce3768a41735a46fc71af56e0753926371d3ca5e7a3f2221211b4b1cf634df860c2c997f" - PATCH_COMMAND "${GIT_EXECUTABLE}" apply "${CMAKE_CURRENT_LIST_DIR}/CMakeRC_cmake_4.patch" - ) -+FetchContent_MakeAvailable(CMakeRC) - - if(NOT CMakeRC_FIND_REQUIRED) - message(FATAL_ERROR "CMakeRC must be REQUIRED") - endif() -- --if(VCPKG_DEPENDENCY_CMAKERC) -- find_package(CMakeRC CONFIG REQUIRED) --else() -- FetchContent_MakeAvailable(CMakeRC) --endif() diff --git a/vcpkg.spec b/vcpkg.spec index 83c5f51..d10bda6 100644 --- a/vcpkg.spec +++ b/vcpkg.spec @@ -1,5 +1,5 @@ %global repo_name vcpkg-tool -%global repo_tag 2025-04-07 +%global repo_tag 2025-04-16 Name: vcpkg Version: %(echo %{repo_tag} | sed 's/-/./g') @@ -11,9 +11,6 @@ URL: https://github.com/microsoft/%{repo_name} Source0: %{url}/archive/%{repo_tag}/%{name}-%{version}.tar.gz Source1: %{name}.sh -# https://github.com/microsoft/vcpkg-tool/pull/1644 -Patch100: %{name}-fix-packaged-cmakerc.patch - # https://fedoraproject.org/wiki/Changes/EncourageI686LeafRemoval %if 0%{?fedora} && 0%{?fedora} >= 42 ExcludeArch: %{ix86} From 001a888a1395e2512471f68a3522d1d033fcefdd Mon Sep 17 00:00:00 2001 From: Vitaly Date: Tue, 20 May 2025 08:30:34 +0200 Subject: [PATCH 61/69] Updated to version 2025.05.19. --- sources | 2 +- vcpkg.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sources b/sources index 434bd66..75399ed 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vcpkg-2025.04.16.tar.gz) = 524f9e7a14a3c66eb745ef4491a3b5127ddc1837902449399cd6ae7f54ccd48f4058289b0ba64ccdb11d9967a7cfb6650f089bca83736dd1b4a8bc87ceffcb24 +SHA512 (vcpkg-2025.05.19.tar.gz) = d928c08b511d93acff107d88212abfa0067febde5a78696b9799a56760380dcf4545c8357105bcdd70563c935b9c73f565c57eba0a2ee7daba6e28bbb88825b4 diff --git a/vcpkg.spec b/vcpkg.spec index d10bda6..4a9c93d 100644 --- a/vcpkg.spec +++ b/vcpkg.spec @@ -1,5 +1,5 @@ %global repo_name vcpkg-tool -%global repo_tag 2025-04-16 +%global repo_tag 2025-05-19 Name: vcpkg Version: %(echo %{repo_tag} | sed 's/-/./g') From bfa777c8cfc631d18e23a8aacefd785cabf119e5 Mon Sep 17 00:00:00 2001 From: Vitaly Date: Wed, 4 Jun 2025 08:35:05 +0200 Subject: [PATCH 62/69] Updated to version 2025.06.02. --- sources | 2 +- vcpkg.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sources b/sources index 75399ed..559f6f6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vcpkg-2025.05.19.tar.gz) = d928c08b511d93acff107d88212abfa0067febde5a78696b9799a56760380dcf4545c8357105bcdd70563c935b9c73f565c57eba0a2ee7daba6e28bbb88825b4 +SHA512 (vcpkg-2025.06.02.tar.gz) = fc9f864e7b40838325200e929c5dbc623989bd5e8afba438aceeb206a4e32f50032995e39f4c0de0a0d2e5fa02b8c60b6423d8779b49c40b29b23328a2a83047 diff --git a/vcpkg.spec b/vcpkg.spec index 4a9c93d..b0fc327 100644 --- a/vcpkg.spec +++ b/vcpkg.spec @@ -1,5 +1,5 @@ %global repo_name vcpkg-tool -%global repo_tag 2025-05-19 +%global repo_tag 2025-06-02 Name: vcpkg Version: %(echo %{repo_tag} | sed 's/-/./g') From e3630d6236258d375536faff6109bfc3f896e611 Mon Sep 17 00:00:00 2001 From: Vitaly Date: Thu, 17 Jul 2025 09:59:28 +0200 Subject: [PATCH 63/69] Updated to version 2025.07.16. --- sources | 2 +- vcpkg.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sources b/sources index 559f6f6..22bc37f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vcpkg-2025.06.02.tar.gz) = fc9f864e7b40838325200e929c5dbc623989bd5e8afba438aceeb206a4e32f50032995e39f4c0de0a0d2e5fa02b8c60b6423d8779b49c40b29b23328a2a83047 +SHA512 (vcpkg-2025.07.16.tar.gz) = 96fe9cb1d6d8c49d921c77224ca806d0f204c53ebe8a11f0180579896c3a69f361032b7607c6370ca114139ae4232fcc2608a4d4666a0caec4d124ca832c47cb diff --git a/vcpkg.spec b/vcpkg.spec index b0fc327..e7db01b 100644 --- a/vcpkg.spec +++ b/vcpkg.spec @@ -1,5 +1,5 @@ %global repo_name vcpkg-tool -%global repo_tag 2025-06-02 +%global repo_tag 2025-07-16 Name: vcpkg Version: %(echo %{repo_tag} | sed 's/-/./g') From 726db61a42e06fbdc750d56bc585f9f510b2cab1 Mon Sep 17 00:00:00 2001 From: Vitaly Date: Tue, 22 Jul 2025 09:43:00 +0200 Subject: [PATCH 64/69] Updated to version 2025.07.21. --- sources | 2 +- vcpkg.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sources b/sources index 22bc37f..b9e88c0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vcpkg-2025.07.16.tar.gz) = 96fe9cb1d6d8c49d921c77224ca806d0f204c53ebe8a11f0180579896c3a69f361032b7607c6370ca114139ae4232fcc2608a4d4666a0caec4d124ca832c47cb +SHA512 (vcpkg-2025.07.21.tar.gz) = a9aa7ff8aa35765cb02b4b59d30d6c79a168c39b0427e82bdd28aeb1364a5a9476763c82e9dd6364fcdeb782db063fe7d76f490a7045c4af251328eee5ec8a86 diff --git a/vcpkg.spec b/vcpkg.spec index e7db01b..2913e47 100644 --- a/vcpkg.spec +++ b/vcpkg.spec @@ -1,5 +1,5 @@ %global repo_name vcpkg-tool -%global repo_tag 2025-07-16 +%global repo_tag 2025-07-21 Name: vcpkg Version: %(echo %{repo_tag} | sed 's/-/./g') From c4a96d4be62ac8ffac291f27eb6507b5754eaeb4 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 19:59:23 +0000 Subject: [PATCH 65/69] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From 0c0867eeea12ac000f7cff3ad8a75f2ecbb83620 Mon Sep 17 00:00:00 2001 From: Vitaly Date: Tue, 9 Sep 2025 10:17:04 +0200 Subject: [PATCH 66/69] Updated to version 2025.09.03. --- sources | 2 +- vcpkg.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sources b/sources index b9e88c0..c4707e5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vcpkg-2025.07.21.tar.gz) = a9aa7ff8aa35765cb02b4b59d30d6c79a168c39b0427e82bdd28aeb1364a5a9476763c82e9dd6364fcdeb782db063fe7d76f490a7045c4af251328eee5ec8a86 +SHA512 (vcpkg-2025.09.03.tar.gz) = f39a7b58d798d4d2dc27c87fbdad3968c4565a8394dd640af9cadebbf69c7456eb49765d64dd0e5b0f5436586fa43b2037c0f9b2f8be1c7e71d67037a4590aa8 diff --git a/vcpkg.spec b/vcpkg.spec index 2913e47..2370a05 100644 --- a/vcpkg.spec +++ b/vcpkg.spec @@ -1,5 +1,5 @@ %global repo_name vcpkg-tool -%global repo_tag 2025-07-21 +%global repo_tag 2025-09-03 Name: vcpkg Version: %(echo %{repo_tag} | sed 's/-/./g') From 24cd3a547b14872faea6ce02f65e4de07288bfe2 Mon Sep 17 00:00:00 2001 From: Vitaly Date: Sat, 11 Oct 2025 11:34:33 +0200 Subject: [PATCH 67/69] Updated to version 2025.10.10. --- sources | 2 +- vcpkg.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sources b/sources index c4707e5..55f6dcb 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vcpkg-2025.09.03.tar.gz) = f39a7b58d798d4d2dc27c87fbdad3968c4565a8394dd640af9cadebbf69c7456eb49765d64dd0e5b0f5436586fa43b2037c0f9b2f8be1c7e71d67037a4590aa8 +SHA512 (vcpkg-2025.10.10.tar.gz) = 632a675d63cbe762faff2b01e396898abe83e7dbed66cbfe19ff284b5d2b0733ed4ad4b7f2cdb439c8e89d3f2709d8d57b8a0cbf184be52246d6436fdefb72db diff --git a/vcpkg.spec b/vcpkg.spec index 2370a05..8af0d66 100644 --- a/vcpkg.spec +++ b/vcpkg.spec @@ -1,5 +1,5 @@ %global repo_name vcpkg-tool -%global repo_tag 2025-09-03 +%global repo_tag 2025-10-10 Name: vcpkg Version: %(echo %{repo_tag} | sed 's/-/./g') From eb011eac26df56afbe2afd068b08ec8fc3377fd8 Mon Sep 17 00:00:00 2001 From: Vitaly Date: Sun, 19 Oct 2025 10:22:54 +0200 Subject: [PATCH 68/69] Updated to version 2025.10.16. --- sources | 2 +- vcpkg.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sources b/sources index 55f6dcb..c2d5838 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vcpkg-2025.10.10.tar.gz) = 632a675d63cbe762faff2b01e396898abe83e7dbed66cbfe19ff284b5d2b0733ed4ad4b7f2cdb439c8e89d3f2709d8d57b8a0cbf184be52246d6436fdefb72db +SHA512 (vcpkg-2025.10.16.tar.gz) = 571947e361ed8d90e19f0ad64886d0ce8890b8b8e79591ac218c679411bf5338c4560bc058a3ccf556f6aa54dd431e8058c55db0b581c32b7985407a5dd2b8d9 diff --git a/vcpkg.spec b/vcpkg.spec index 8af0d66..4a98269 100644 --- a/vcpkg.spec +++ b/vcpkg.spec @@ -1,5 +1,5 @@ %global repo_name vcpkg-tool -%global repo_tag 2025-10-10 +%global repo_tag 2025-10-16 Name: vcpkg Version: %(echo %{repo_tag} | sed 's/-/./g') From 32761e1effeba1ce4843df5f2d9da68303a4054e Mon Sep 17 00:00:00 2001 From: Scott Talbert Date: Wed, 17 Dec 2025 19:59:20 -0500 Subject: [PATCH 69/69] Update to new upstream release 2025.12.16 --- sources | 2 +- vcpkg.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sources b/sources index c2d5838..77fef80 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vcpkg-2025.10.16.tar.gz) = 571947e361ed8d90e19f0ad64886d0ce8890b8b8e79591ac218c679411bf5338c4560bc058a3ccf556f6aa54dd431e8058c55db0b581c32b7985407a5dd2b8d9 +SHA512 (vcpkg-2025.12.16.tar.gz) = 49adbcfa37b8e349555f60a6bfcc3ba24bd1f17c69e7fd62e351f630afc3c944a535b559d2c122ec58d513cbe383408f16f6aa1f1857d7bf7a6033d0af54dcbd diff --git a/vcpkg.spec b/vcpkg.spec index 4a98269..5fb2444 100644 --- a/vcpkg.spec +++ b/vcpkg.spec @@ -1,5 +1,5 @@ %global repo_name vcpkg-tool -%global repo_tag 2025-10-16 +%global repo_tag 2025-12-16 Name: vcpkg Version: %(echo %{repo_tag} | sed 's/-/./g')