[fmt] Update to 10.2.0 (microsoft#35971)

waywardmonkeys · Jan 2, 2024 · a344996 · a344996
1 parent c5c8f07
commit a344996
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 20 deletions.
diff --git a/ports/fmt/fix-format-conflict.patch b/ports/fmt/fix-format-conflict.patch
diff --git 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 288c349baac5f96f527d5b1bed0fa5f031aa509b4526560c684281388e91909a280c3262a2474d963b5d1bf7064b1c9930c6677fe54a0d8f86982d063296a54c
+    SHA512 b90f8ab1692fcae9146f8cad5c5c26a2b5ceb6a0460003e01cabe8a75c0aa2fea1c3760dc3214eddaf08984a1695747ea8b1f3124c40c54cbadfd45458fa4b2d
     HEAD_REF master
     PATCHES
         fix-write-batch.patch
-        fix-format-conflict.patch
 )
 
 vcpkg_cmake_configure(
@@ -35,4 +34,4 @@ file(REMOVE_RECURSE
 )
 
 file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
-vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.rst")
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
diff --git a/ports/fmt/vcpkg.json b/ports/fmt/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "fmt",
-  "version": "10.1.1",
+  "version": "10.2.0",
   "description": "Formatting library for C++. It can be used as a safe alternative to printf or as a fast alternative to IOStreams.",
   "homepage": "https://github.com/fmtlib/fmt",
   "license": "MIT",

diff --git a/versions/baseline.json b/versions/baseline.json
@@ -2713,7 +2713,7 @@
       "port-version": 2
     },
     "fmt": {
-      "baseline": "10.1.1",
+      "baseline": "10.2.0",
       "port-version": 0
     },
     "folly": {

diff --git a/versions/f-/fmt.json b/versions/f-/fmt.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "f91bb86075f45f6fad0c35ab9e87d8ea43c9d389",
+      "version": "10.2.0",
+      "port-version": 0
+    },
     {
       "git-tree": "dfe9aa860f5a8317f341a21d317be1cf44e89f18",
       "version": "10.1.1",