repo: revert backport-with-fmt-version.patch

This was a temporary fix for a v17 rebuild. The upstream has fixed
many, many fmt issues in the new release.

Reverts: 7dfdbe1
Reverts: 34d11c3

3 files changed, 0 insertions, 23 deletions

diff --git a/.SRCINFO b/.SRCINFO
index e19057b2f099..c4aa8d9b7c29 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -100,7 +100,6 @@ pkgbase = ceph
 	source = ceph-17.2.6-mgr-dashboard-node-version.patch
 	source = ceph-17.2.6-mgr-dashboard-cherrypy-18.patch
 	source = ceph-17.2.6-mgr-dashboard-pylint-217.patch
-	source = ceph-17.2.6-backport-with-fmt-version.patch
 	source = ceph-17.2.6-cython-fixes.patch
 	sha512sums = dca9aea2ce210c15fcc34cb06a5dc5b4488ffa36d684166d47ebd87e48b54b6fee0882e1c67007a780e1c25754e9bc6e760cc10f60ea1183263f8504ef2dbd9b
 	sha512sums = 4354001c1abd9a0c385ba7bd529e3638fb6660b6a88d4e49706d4ac21c81b8e829303a20fb5445730bdac18c4865efb10bc809c1cd56d743c12aa9a52e160049
@@ -121,7 +120,6 @@ pkgbase = ceph
 	sha512sums = d9729c33f2b8c03ab918919e3b62cbc0825314ad09596dc12984ac5964f8b421db3376b84fa26e0952e0781deb218f8aff6ba32f9c8e5a22bd27afac8dcaf6d3
 	sha512sums = 79be1630ae4a599509e5d789d4aefe412ce47e67ad482f853664fa4b01e063c20593e3da668e6a776ad038fb07606ae948eea41bab20776c33c87f9ab49505e0
 	sha512sums = c767a8e6fd02ea2ab88e99b50b206d0f825acdf177136ded38d93594fc7663b7c9612af7195b85e0b2b501d8ee482af5e088e9abb5ebee7b8a69e0153ce89782
-	sha512sums = 6b4d829c9ecacdc8fbbc6d36eb59bcd844544b728121f75101d5078fd87f6531aeafff5de636c325ebcb88eb0da49f9f62f947bf7d7db4be426ab8ddb02996f6
 	sha512sums = 0c5124693bd317a73707dfd34b17664cc05233aec08e07739fe08fc9a73be7a1f4446052b1addde832cba141a382c35f45e60c89a00bb7dab81cee7ed6be07e1
 
 pkgname = ceph-common
diff --git a/PKGBUILD b/PKGBUILD
index 006d625e55b4..209ce8eb3e7f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -109,10 +109,6 @@ source=(
   # Fixes inspect.formatargspec errors in pylint2.6->wrapt due to removal in py3.11
   'ceph-17.2.6-mgr-dashboard-pylint-217.patch'
 
-  # Backports a cmake opt to allow us to use the bundled fmtlib rather than system
-  # Should be removed before v18
-  'ceph-17.2.6-backport-with-fmt-version.patch'
-
   # Fixes a couple breaking changes from cython v3.0.0
   'ceph-17.2.6-cython-fixes.patch'
 )
@@ -135,7 +131,6 @@ sha512sums=('dca9aea2ce210c15fcc34cb06a5dc5b4488ffa36d684166d47ebd87e48b54b6fee0
             'd9729c33f2b8c03ab918919e3b62cbc0825314ad09596dc12984ac5964f8b421db3376b84fa26e0952e0781deb218f8aff6ba32f9c8e5a22bd27afac8dcaf6d3'
             '79be1630ae4a599509e5d789d4aefe412ce47e67ad482f853664fa4b01e063c20593e3da668e6a776ad038fb07606ae948eea41bab20776c33c87f9ab49505e0'
             'c767a8e6fd02ea2ab88e99b50b206d0f825acdf177136ded38d93594fc7663b7c9612af7195b85e0b2b501d8ee482af5e088e9abb5ebee7b8a69e0153ce89782'
-            '6b4d829c9ecacdc8fbbc6d36eb59bcd844544b728121f75101d5078fd87f6531aeafff5de636c325ebcb88eb0da49f9f62f947bf7d7db4be426ab8ddb02996f6'
             '0c5124693bd317a73707dfd34b17664cc05233aec08e07739fe08fc9a73be7a1f4446052b1addde832cba141a382c35f45e60c89a00bb7dab81cee7ed6be07e1')
 __version="${pkgver}-${pkgrel}"
 
@@ -229,7 +224,6 @@ build() {
     -DWITH_SYSTEM_ZSTD=ON \
     -DWITH_SYSTEM_GTEST=OFF \
     -DWITH_SYSTEM_NPM=OFF \
-    -DWITH_FMT_VERSION="9.0.0" \
     -DENABLE_SHARED=ON \
     -DWITH_TESTS=ON \
     -Wno-dev
diff --git a/ceph-17.2.6-backport-with-fmt-version.patch b/ceph-17.2.6-backport-with-fmt-version.patch
deleted file mode 100644
index 178c149d0909..000000000000
--- a/ceph-17.2.6-backport-with-fmt-version.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index b03f76bff80..c670d055854 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -296,7 +296,9 @@ include_directories(SYSTEM "${CMAKE_SOURCE_DIR}/src/xxHash")
- include_directories(SYSTEM "${CMAKE_SOURCE_DIR}/src/rapidjson/include")
- 
- option(WITH_FMT_HEADER_ONLY "use header-only version of fmt library" OFF)
--find_package(fmt 6.0.0 QUIET)
-+set(WITH_FMT_VERSION "7.0.0" CACHE
-+  STRING "build with fmt version")
-+find_package(fmt ${WITH_FMT_VERSION} EXACT QUIET)
- if(fmt_FOUND)
-   include_directories(SYSTEM "${fmt_INCLUDE_DIR}")
- else()