From 23380cdc506401badca569810c6b0bed15930424 Mon Sep 17 00:00:00 2001 From: rremilian <92378685+rremilian@users.noreply.github.com> Date: Thu, 30 Jan 2025 14:15:49 +0200 Subject: [PATCH] [fmt] update to 11.1.3 --- ...-only-if-the-compiler-is-MSVC-at-build.patch | 17 ----------------- ports/fmt/portfile.cmake | 3 +-- ports/fmt/vcpkg.json | 3 +-- versions/baseline.json | 4 ++-- versions/f-/fmt.json | 5 +++++ 5 files changed, 9 insertions(+), 23 deletions(-) delete mode 100644 ports/fmt/fix-pass-utf-8-only-if-the-compiler-is-MSVC-at-build.patch diff --git a/ports/fmt/fix-pass-utf-8-only-if-the-compiler-is-MSVC-at-build.patch b/ports/fmt/fix-pass-utf-8-only-if-the-compiler-is-MSVC-at-build.patch deleted file mode 100644 index 920cf3937ffa6f..00000000000000 --- a/ports/fmt/fix-pass-utf-8-only-if-the-compiler-is-MSVC-at-build.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 1ca64fff..1606e886 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -365,8 +365,8 @@ if (NOT MSVC) - # Unicode is always supported on compilers other than MSVC. - elseif (FMT_UNICODE) - # Unicode support requires compiling with /utf-8. -- target_compile_options(fmt PUBLIC $<$:/utf-8>) -- target_compile_options(fmt-header-only INTERFACE $<$:/utf-8>) -+ target_compile_options(fmt PUBLIC $<$,$>:/utf-8>) -+ target_compile_options(fmt-header-only INTERFACE $<$,$>:/utf-8>) - else () - target_compile_definitions(fmt PUBLIC FMT_UNICODE=0) - endif () --- -2.34.1 diff --git a/ports/fmt/portfile.cmake b/ports/fmt/portfile.cmake index 66824ea20a0eba..8c336553bdf0a3 100644 --- a/ports/fmt/portfile.cmake +++ b/ports/fmt/portfile.cmake @@ -2,11 +2,10 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO fmtlib/fmt REF "${VERSION}" - SHA512 47ff6d289dcc22681eea6da465b0348172921e7cafff8fd57a1540d3232cc6b53250a4625c954ee0944c87963b17680ecbc3ea123e43c2c822efe0dc6fa6cef3 + SHA512 c1b94ab149d8b1c750dc91fcc1dc9b680d4bd01a9da1e5e74151b2e2f82f811e845e3362922e75b12fcca172ee3f2606e061c001bfa358a86f25cce4ff2d36ef HEAD_REF master PATCHES fix-write-batch.patch - fix-pass-utf-8-only-if-the-compiler-is-MSVC-at-build.patch # remove in next release ) vcpkg_cmake_configure( diff --git a/ports/fmt/vcpkg.json b/ports/fmt/vcpkg.json index f2610d46f162bf..d22ddd6ab94821 100644 --- a/ports/fmt/vcpkg.json +++ b/ports/fmt/vcpkg.json @@ -1,7 +1,6 @@ { "name": "fmt", - "version": "11.0.2", - "port-version": 1, + "version": "11.1.3", "description": "{fmt} is an open-source formatting library providing a fast and safe alternative to C stdio and C++ iostreams.", "homepage": "https://github.com/fmtlib/fmt", "license": "MIT", diff --git a/versions/baseline.json b/versions/baseline.json index e12be702b3de6b..d2ed0ffe819f8f 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2849,8 +2849,8 @@ "port-version": 2 }, "fmt": { - "baseline": "11.0.2", - "port-version": 1 + "baseline": "11.1.3", + "port-version": 0 }, "folly": { "baseline": "2025.01.27.00", diff --git a/versions/f-/fmt.json b/versions/f-/fmt.json index 8037abb4cc3fa6..16efc5a48a057b 100644 --- a/versions/f-/fmt.json +++ b/versions/f-/fmt.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "af6a49f326a0c054a9bb228fc77b9a971c3964c6", + "version": "11.1.3", + "port-version": 0 + }, { "git-tree": "07a73a7565e5de9eb42e90c16c133bdfdfebbcda", "version": "11.0.2",