[gentoo-commits] repo/gentoo:master commit in: dev-cpp/folly/files/

["Alfredo Tupone" <tupone@gentoo.org>]

commit:     2ea7ea9cc6a5dd54120650b2fade2205f34c2d07
Author:     Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Wed Feb 22 16:39:54 2023 +0000
Commit:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Thu Feb 23 20:46:39 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2ea7ea9c

dev-cpp/folly: remove unused patches

Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/29729
Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org>

 .../folly/files/folly-2023.01.16.00-gcc13.patch    | 24 ----------
 .../folly/files/folly-2023.01.16.00-liburing.patch | 54 ----------------------
 2 files changed, 78 deletions(-)

diff --git a/dev-cpp/folly/files/folly-2023.01.16.00-gcc13.patch b/dev-cpp/folly/files/folly-2023.01.16.00-gcc13.patch
deleted file mode 100644
index 6779274d2fa1..000000000000
--- a/dev-cpp/folly/files/folly-2023.01.16.00-gcc13.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-https://github.com/facebook/folly/pull/1922
-
-From e3cba5dd4f59c695d9cbf6bd02249af7103cc300 Mon Sep 17 00:00:00 2001
-From: Sam James <sam@gentoo.org>
-Date: Sun, 22 Jan 2023 05:06:16 +0000
-Subject: [PATCH] Fix build with GCC 13 (add missing includes)
-
-GCC 13 (as usual for new compiler releases) shuffles around some
-internal includes and so <stdexcept> etc is no longer transitively included.
-
-Signed-off-by: Sam James <sam@gentoo.org>
---- a/folly/system/AtFork.cpp
-+++ b/folly/system/AtFork.cpp
-@@ -14,6 +14,9 @@
-  * limitations under the License.
-  */
- 
-+#include <stdexcept>
-+#include <system_error>
-+
- #include <folly/system/AtFork.h>
- 
- #include <folly/ScopeGuard.h>
-

diff --git a/dev-cpp/folly/files/folly-2023.01.16.00-liburing.patch b/dev-cpp/folly/files/folly-2023.01.16.00-liburing.patch
deleted file mode 100644
index e2a692cea50c..000000000000
--- a/dev-cpp/folly/files/folly-2023.01.16.00-liburing.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-https://bugs.gentoo.org/891633
-https://github.com/facebook/folly/issues/1908
-https://github.com/facebook/folly/commit/259c9d6a4f0eb6d80e0263c2fe5d1af5bff116dc
-
-From 259c9d6a4f0eb6d80e0263c2fe5d1af5bff116dc Mon Sep 17 00:00:00 2001
-From: Dylan Yudaken <dylany@meta.com>
-Date: Mon, 16 Jan 2023 01:20:04 -0800
-Subject: [PATCH] io_uring: implement io_uring_enable_rings locally (#1915)
-
-Summary:
-Pull Request resolved: https://github.com/facebook/folly/pull/1915
-
-io_uring_enable_rings was missing from liburing upstream (see https://github.com/axboe/liburing/issues/773) which is breaking the open source build. See https://github.com/facebook/folly/issues/1908
-
-Instead just implement it locally, as it's trivial
-
-Reviewed By: dmm-fb
-
-Differential Revision: D42497664
-
-fbshipit-source-id: 7241785a36046e867f907bfe74623aaeb38c4b70
---- a/folly/experimental/io/IoUringBackend.cpp
-+++ b/folly/experimental/io/IoUringBackend.cpp
-@@ -56,6 +56,20 @@ namespace folly {
- 
- namespace {
- 
-+#if FOLLY_IO_URING_UP_TO_DATE
-+int ioUringEnableRings(FOLLY_MAYBE_UNUSED struct io_uring* ring) {
-+  // Ideally this would call ::io_uring_enable_rings directly which just runs
-+  // the below however this was missing from a stable version of liburing, which
-+  // means that some distributions were not able to compile it. see
-+  // https://github.com/axboe/liburing/issues/773
-+
-+  // since it is so simple, just implement it here until the fix rolls out to an
-+  // acceptable number of OSS distributions.
-+  return ::io_uring_register(
-+      ring->ring_fd, IORING_REGISTER_ENABLE_RINGS, nullptr, 0);
-+}
-+#endif
-+
- struct SignalRegistry {
-   struct SigInfo {
-     struct sigaction sa_ {};
-@@ -1360,7 +1374,7 @@ void IoUringBackend::delayedInit() {
-   if (usingDeferTaskrun_) {
-     // usingDeferTaskrun_ is guarded already on having an up to date liburing
- #if FOLLY_IO_URING_UP_TO_DATE
--    int ret = ::io_uring_enable_rings(&ioRing_);
-+    int ret = ioUringEnableRings(&ioRing_);
-     if (ret) {
-       LOG(ERROR) << "io_uring_enable_rings gave " << folly::errnoStr(-ret);
-     }
-