pkgbuild: rm upstreamed gcc13 patches

The changes within are now included in the upstream, and are no longer
needed

Upstream-ref: https://github.com/ceph/ceph/pull/50438

4 files changed, 0 insertions, 136 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 9350836a98e1..06df0dcac47b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -93,8 +93,6 @@ pkgbase = ceph
 	source = ceph-17.2.4-pybind-unmock-cythonize.patch
 	source = ceph-17.2.5-fix-iterator-depreciations.patch
 	source = ceph-17.2.5-rgw-client-boost-string-view.patch
-	source = ceph-17.2.6-rocksdb-gcc13-includes.patch
-	source = ceph-17.2.6-ceph-gcc13-includes.patch
 	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
@@ -111,8 +109,6 @@ pkgbase = ceph
 	sha512sums = 781a01e622a70d56bf1948bdc0b427ffa95a86cec7dd9d26c6007a9ec024a942a8ca55f2acc3d37344862f1d6bf11cae998d8071754cd841a66bfba4ec9c58bf
 	sha512sums = 2a6f33791760e14543c90077bfc6bf1b6b82ee2996e80b4762eadb887a0d9a67c221b6f10832ddf780dc6abaed246a1e2ee7680c9c861c4ff70e61b752a37b36
 	sha512sums = 02ca1a9bf15f9cd6f474f264ba2bf66ae725bac990a7cac315dabe377c66935a7afd8117f18a1f82c78bdf9ab2c3e5a2a227f2ffc166974dd7bb99b290f1f233
-	sha512sums = 1897ddfcd21fbbd1f18f304db6fddb5ba9336bbe2be365ece57a3ae8195f075ceb66f40fc37a4b5bf6481e8a87561383108493aa88cb01d78a904c9da28bb36c
-	sha512sums = 2971475ed43480802d6053e259e8540475b3da0d2a84edc9df05e822d51f31b25de450f387fb33e1f7034d3139e502e8da1b0b00ccbb066d01091055e880804b
 	sha512sums = d9729c33f2b8c03ab918919e3b62cbc0825314ad09596dc12984ac5964f8b421db3376b84fa26e0952e0781deb218f8aff6ba32f9c8e5a22bd27afac8dcaf6d3
 	sha512sums = 79be1630ae4a599509e5d789d4aefe412ce47e67ad482f853664fa4b01e063c20593e3da668e6a776ad038fb07606ae948eea41bab20776c33c87f9ab49505e0
 	sha512sums = c767a8e6fd02ea2ab88e99b50b206d0f825acdf177136ded38d93594fc7663b7c9612af7195b85e0b2b501d8ee482af5e088e9abb5ebee7b8a69e0153ce89782
diff --git a/PKGBUILD b/PKGBUILD
index 1b179ca33be6..a9de2beec619 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -88,10 +88,6 @@ source=(
   # https://github.com/boostorg/beast/issues/2594
   'ceph-17.2.5-rgw-client-boost-string-view.patch'
 
-  # Fix missing includes from gcc 13 changes
-  'ceph-17.2.6-rocksdb-gcc13-includes.patch'
-  'ceph-17.2.6-ceph-gcc13-includes.patch'
-
   # Fixes node-gyp errors due to py3.11 incompatibilities
   'ceph-17.2.6-mgr-dashboard-node-version.patch'
 
@@ -116,8 +112,6 @@ sha512sums=('dca9aea2ce210c15fcc34cb06a5dc5b4488ffa36d684166d47ebd87e48b54b6fee0
             '781a01e622a70d56bf1948bdc0b427ffa95a86cec7dd9d26c6007a9ec024a942a8ca55f2acc3d37344862f1d6bf11cae998d8071754cd841a66bfba4ec9c58bf'
             '2a6f33791760e14543c90077bfc6bf1b6b82ee2996e80b4762eadb887a0d9a67c221b6f10832ddf780dc6abaed246a1e2ee7680c9c861c4ff70e61b752a37b36'
             '02ca1a9bf15f9cd6f474f264ba2bf66ae725bac990a7cac315dabe377c66935a7afd8117f18a1f82c78bdf9ab2c3e5a2a227f2ffc166974dd7bb99b290f1f233'
-            '1897ddfcd21fbbd1f18f304db6fddb5ba9336bbe2be365ece57a3ae8195f075ceb66f40fc37a4b5bf6481e8a87561383108493aa88cb01d78a904c9da28bb36c'
-            '2971475ed43480802d6053e259e8540475b3da0d2a84edc9df05e822d51f31b25de450f387fb33e1f7034d3139e502e8da1b0b00ccbb066d01091055e880804b'
             'd9729c33f2b8c03ab918919e3b62cbc0825314ad09596dc12984ac5964f8b421db3376b84fa26e0952e0781deb218f8aff6ba32f9c8e5a22bd27afac8dcaf6d3'
             '79be1630ae4a599509e5d789d4aefe412ce47e67ad482f853664fa4b01e063c20593e3da668e6a776ad038fb07606ae948eea41bab20776c33c87f9ab49505e0'
             'c767a8e6fd02ea2ab88e99b50b206d0f825acdf177136ded38d93594fc7663b7c9612af7195b85e0b2b501d8ee482af5e088e9abb5ebee7b8a69e0153ce89782'
diff --git a/ceph-17.2.6-ceph-gcc13-includes.patch b/ceph-17.2.6-ceph-gcc13-includes.patch
deleted file mode 100644
index 4d7ec8b986c4..000000000000
--- a/ceph-17.2.6-ceph-gcc13-includes.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-diff --git a/src/librbd/api/PoolMetadata.h b/src/librbd/api/PoolMetadata.h
-index c0a8173596e..8d982879aa9 100644
---- a/src/librbd/api/PoolMetadata.h
-+++ b/src/librbd/api/PoolMetadata.h
-@@ -9,6 +9,7 @@
- 
- #include <map>
- #include <string>
-+#include <cstdint>
- 
- namespace librbd {
- 
-diff --git a/src/msg/async/compression_onwire.h b/src/msg/async/compression_onwire.h
-index dcd6d26c4ca..d3b35a4655c 100644
---- a/src/msg/async/compression_onwire.h
-+++ b/src/msg/async/compression_onwire.h
-@@ -4,6 +4,7 @@
- #ifndef CEPH_COMPRESSION_ONWIRE_H
- #define CEPH_COMPRESSION_ONWIRE_H
- 
-+#include <cstdint>
- #include <optional>
- 
- #include "compressor/Compressor.h"
-diff --git a/src/test/librados/op_speed.cc b/src/test/librados/op_speed.cc
-index 90c7bdac571..c477f552ab9 100644
---- a/src/test/librados/op_speed.cc
-+++ b/src/test/librados/op_speed.cc
-@@ -3,6 +3,8 @@
- 
- #include "include/rados/librados.hpp"
- 
-+#include <cstdint>
-+
- constexpr int to_create = 10'000'000;
- 
- int main() {
-diff --git a/src/test/mon/test_log_rss_usage.cc b/src/test/mon/test_log_rss_usage.cc
-index f6e85f414c8..53b9f1834df 100644
---- a/src/test/mon/test_log_rss_usage.cc
-+++ b/src/test/mon/test_log_rss_usage.cc
-@@ -8,6 +8,7 @@
- #include <stdlib.h>
- #include <stdio.h>
- #include <unistd.h>
-+#include <cstdint>
- 
- using namespace std;
- 
diff --git a/ceph-17.2.6-rocksdb-gcc13-includes.patch b/ceph-17.2.6-rocksdb-gcc13-includes.patch
deleted file mode 100644
index 8c986d7255ce..000000000000
--- a/ceph-17.2.6-rocksdb-gcc13-includes.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-diff --git a/src/rocksdb/table/block_based/data_block_hash_index.h b/src/rocksdb/table/block_based/data_block_hash_index.h
-index f356395f329..3215221755d 100644
---- a/src/rocksdb/table/block_based/data_block_hash_index.h
-+++ b/src/rocksdb/table/block_based/data_block_hash_index.h
-@@ -5,6 +5,7 @@
- 
- #pragma once
- 
-+#include <cstdint>
- #include <string>
- #include <vector>
- 
-diff --git a/src/rocksdb/util/string_util.h b/src/rocksdb/util/string_util.h
-index 55d106fff02..11178fd1d7b 100644
---- a/src/rocksdb/util/string_util.h
-+++ b/src/rocksdb/util/string_util.h
-@@ -6,6 +6,7 @@
- 
- #pragma once
- 
-+#include <cstdint>
- #include <sstream>
- #include <string>
- #include <unordered_map>
-
-diff --git a/src/rocksdb/db/compaction/compaction_iteration_stats.h b/src/rocksdb/db/compaction/compaction_iteration_stats.h
-index 963c1d8..73487ed 100644
---- a/src/rocksdb/db/compaction/compaction_iteration_stats.h
-+++ b/src/rocksdb/db/compaction/compaction_iteration_stats.h
-@@ -5,6 +5,7 @@
- 
- #pragma once
- 
-+#include <cstdint>
- #include "rocksdb/rocksdb_namespace.h"
- 
- struct CompactionIterationStats {
-
-diff --git a/src/rocksdb/utilities/checkpoint/checkpoint_impl.h b/src/rocksdb/utilities/checkpoint/checkpoint_impl.h
-index dfa8460..9a899e8 100644
---- a/src/rocksdb/utilities/checkpoint/checkpoint_impl.h
-+++ b/src/rocksdb/utilities/checkpoint/checkpoint_impl.h
-@@ -8,6 +8,7 @@
- 
- #include "rocksdb/utilities/checkpoint.h"
- 
-+#include <cstdint>
- #include <string>
- #include "file/filename.h"
- #include "rocksdb/db.h"
-
-diff --git a/src/rocksdb/include/rocksdb/utilities/checkpoint.h b/src/rocksdb/include/rocksdb/utilities/checkpoint.h
-index 1b6a740..ad54ca7 100644
---- a/src/rocksdb/include/rocksdb/utilities/checkpoint.h
-+++ b/src/rocksdb/include/rocksdb/utilities/checkpoint.h
-@@ -8,6 +8,7 @@
- #pragma once
- #ifndef ROCKSDB_LITE
- 
-+#include <cstdint>
- #include <string>
- #include <vector>
- #include "rocksdb/status.h"
-
-diff --git a/src/rocksdb/third-party/folly/folly/synchronization/detail/ProxyLockable-inl.h b/src/rocksdb/third-party/folly/folly/synchronization/detail/ProxyLockable-inl.h
-index 573330c..ada1e63 100644
---- a/src/rocksdb/third-party/folly/folly/synchronization/detail/ProxyLockable-inl.h
-+++ b/src/rocksdb/third-party/folly/folly/synchronization/detail/ProxyLockable-inl.h
-@@ -14,6 +14,7 @@
- #include <mutex>
- #include <stdexcept>
- #include <utility>
-+#include <system_error>
- 
- namespace folly {
- namespace detail {
-