gentoo auto-resync : 27:01:2023 - 07:57:53

3 files changed, 75 insertions, 2 deletions

diff --git a/dev-db/mariadb/Manifest b/dev-db/mariadb/Manifest
index 018ded4bbfa0..4bdcac51afb9 100644
--- a/dev-db/mariadb/Manifest
+++ b/dev-db/mariadb/Manifest
@@ -1,3 +1,4 @@
+AUX mariadb-10.6.11-gcc-13.patch 2093 BLAKE2B a61c373848b63123af5760e07c03f919c0dabe2cf2225ef5a1e6de38fc814b597ac8db35dd9cfeaa0425cd2d3fb43b79ba11839e852cb074fe12612868afec1e SHA512 257fdaa306e2fc52174dcf36472383482116e2957f834f9228ad250837e86e8b57fd892153cf0c94b1fb0fd42d6ef6da69402089cf9795835d8a82fffa9b5496
 AUX mariadb-10.6.11-gssapi.patch 1824 BLAKE2B 5d0fefad9ff2d35d06dc4df3bcdd08a737a6f5ab7492673102c031c0e88fdd3fd7eeef977fb4128be170b9c948850e6a69a6d11f972d234cf49f2ea742838478 SHA512 0acee9c539782f11480b8e274576bb3b06cc7b2a914fee2d8f85fb692700b014da1f47e08f5f36d5ed264c9b5f820a123791de5b010fdc25f194dc215e890162
 AUX mariadb-10.6.11-include.patch 2044 BLAKE2B 050729672c228818658f45b02ef5a70a8153eb43b7729569edcd7b0c9420a5b16a57359f153862232c634a817a21d0d6a20028104ef5cfdc53f3de25e7e63425 SHA512 cb8150274538fd2e3c26f9fde8fdbf0e8c31c2c26efe9e99ca97d984ae17fe967aabf315c7aee4d2659c3c477eaac604afc948f44de7475ee248cd502dac0fa5
 AUX my.cnf-10.2 140 BLAKE2B 3a56b7e38c3dc00215cae4bdc3270e30e85299d3290c0c995a611e4b8b15e66f40d6ac40ab18369e7863742ab6eda94259be5a7f363a26020c6fce28a7582e94 SHA512 85c650670e364f5f71842d9ab07b59c5de6e26e774e7192102562e56f94ed5f8fbc487cef31c134209c22b72fde38f7f53b7279cead97a8af608436d1ecc8857
@@ -22,5 +23,5 @@ EBUILD mariadb-10.4.27.ebuild 42079 BLAKE2B 4dd73392405ef22c0d366e3be03d5329fbeb
 EBUILD mariadb-10.5.17.ebuild 42039 BLAKE2B 4b6a08ef9a8673356833f4d9495b07f548a9f9b6e4dfc90af5fab478ef13f91f451bb444b1a132a9d3418b20ea2149621cb24e593529864c7338f1e211fe6284 SHA512 acc33064c0ce6aba4568f79d21e0124d7fcf3eb75755697f0986925fd196a770dc79b91237eaeb051027530da250fff40760477a96f2af476e1991dcb1834e82
 EBUILD mariadb-10.5.18.ebuild 42038 BLAKE2B 00aa21e6ef21413fb9bbb22cefd4431910ecc9970867b6a931f3f357319e4fec6e20d78c527498b3194029ec6541030dfd7966f529db73e3217b4e0535e7523a SHA512 b3ef6c099808a17b568ccc9a1e9fbed357508d9c25f303271f8f049cd03c4eb098823bbb1b2504fd00ed49f69dc822254c03db3476504bfdbbc72c7515a19c4c
 EBUILD mariadb-10.6.10.ebuild 42414 BLAKE2B ce19b4626b496ffb7b9390e88e653c5ec38e4e54774d6f5aa4bcd7b14da22250a7d91a84f92738e2cc283424a214862c96e3867d8b360b9e716ab78d4ebf0f0c SHA512 12a7284a5ed095c335a224acffebe5ba8f8968d6d4f5829e57582a36ecc84e28679545b740b490ff966789deb46bf1f1c43f1f241df54b2077fc30c46f72517d
-EBUILD mariadb-10.6.11.ebuild 42521 BLAKE2B 0b6a3839c618e396435d9d683ec719418017d676f52a8bfedbf0f9547ea75fac2adf704b7bb4549dca32dd6bbf607137a139f9c242cff791b2e300dd1be868fa SHA512 85c1313af0571e3cd2edfb6406bed1ef562ad65a1b1589967fe6796152407f46d4cbbebb61ccea9842428d0b24404f10f7e82f72c1b0f593a12651b0f039da31
+EBUILD mariadb-10.6.11.ebuild 42568 BLAKE2B c4dae2c276a60bf86982ac71de5ddf0e759733dbda6aff31551f458a4313e144cf712bff61c64e22d77c9be04b2ba4e0b50da8fb34337ea1077bd96384e0d403 SHA512 b45e4bc7563f06615f88a76198a5edd3a9e6b9c1bea459c6b72624bd9c738f405b061e6abbf9bdd91f11a8c68a647da9b643983178e091d76fa8ae293ac5d3d0
 MISC metadata.xml 2602 BLAKE2B 7d388158062c76f40bca2feba53f292bbdab51cf0c3dba59ce2b74c3dedcb07cd7d4f1b5b52f7bf42c814dfc817a0670fcd8e39dccb2395337b46be98deda258 SHA512 a53f2612f8aea11cf7037847dc6f8b2acc87f710778b1bc18d7e1821c95061c1b08deefd3019789810eea2e5445b50c604b8686f3d491397793be3cbf86a35be
diff --git a/dev-db/mariadb/files/mariadb-10.6.11-gcc-13.patch b/dev-db/mariadb/files/mariadb-10.6.11-gcc-13.patch
new file mode 100644
index 000000000000..322e5003a1dc
--- /dev/null
+++ b/dev-db/mariadb/files/mariadb-10.6.11-gcc-13.patch
@@ -0,0 +1,71 @@
+https://github.com/MariaDB/server/pull/2460
+https://github.com/facebook/rocksdb/pull/11118
+https://github.com/facebook/rocksdb/commit/bda8d93ba95f34aa91ae8578fe7d3454f3324f6a
+
+From e534c26cb5ce4f62d8f413c91d67ef9e214fd30e Mon Sep 17 00:00:00 2001
+From: Heiko Becker <heirecka@exherbo.org>
+Date: Tue, 24 Jan 2023 14:07:18 +0100
+Subject: [PATCH] Add include for std::runtime_error
+
+--- a/tpool/aio_liburing.cc
++++ b/tpool/aio_liburing.cc
+@@ -24,6 +24,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111 - 1301 USA*/
+ #include <vector>
+ #include <thread>
+ #include <mutex>
++#include <stdexcept>
+ 
+ namespace
+ {
+
+From 7e32e24397cf651412113017f9abd133a9d2a600 Mon Sep 17 00:00:00 2001
+From: Heiko Becker <heirecka@exherbo.org>
+Date: Tue, 24 Jan 2023 16:23:03 +0100
+Subject: [PATCH] Fix build with gcc 13 by including <cstdint>
+
+Like other versions before, gcc 13 moved some includes around and as a
+result <cstdint> is no longer transitively included [1]. Explicitly include
+it for uint{32,64}_t.
+
+[1] https://gcc.gnu.org/gcc-13/porting_to.html#header-dep-changes
+--- a/storage/rocksdb/rocksdb/db/compaction/compaction_iteration_stats.h
++++ b/storage/rocksdb/rocksdb/db/compaction/compaction_iteration_stats.h
+@@ -5,6 +5,8 @@
+ 
+ #pragma once
+ 
++#include <cstdint>
++
+ #include "rocksdb/rocksdb_namespace.h"
+ 
+ struct CompactionIterationStats {
+--- a/storage/rocksdb/rocksdb/include/rocksdb/utilities/checkpoint.h
++++ b/storage/rocksdb/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"
+--- a/storage/rocksdb/rocksdb/table/block_based/data_block_hash_index.h
++++ b/storage/rocksdb/rocksdb/table/block_based/data_block_hash_index.h
+@@ -5,6 +5,7 @@
+ 
+ #pragma once
+ 
++#include <cstdint>
+ #include <string>
+ #include <vector>
+ 
+--- a/storage/rocksdb/rocksdb/util/string_util.h
++++ b/storage/rocksdb/rocksdb/util/string_util.h
+@@ -6,6 +6,7 @@
+ 
+ #pragma once
+ 
++#include <cstdint>
+ #include <sstream>
+ #include <string>
+ #include <unordered_map>
diff --git a/dev-db/mariadb/mariadb-10.6.11.ebuild b/dev-db/mariadb/mariadb-10.6.11.ebuild
index 55d260617012..52e66368df00 100644
--- a/dev-db/mariadb/mariadb-10.6.11.ebuild
+++ b/dev-db/mariadb/mariadb-10.6.11.ebuild
@@ -208,7 +208,8 @@ src_unpack() {
 src_prepare() {
 	eapply "${WORKDIR}"/mariadb-patches
 	eapply "${FILESDIR}"/${PN}-10.6.11-gssapi.patch
-	eapply "${FILESDIR}"/mariadb-10.6.11-include.patch
+	eapply "${FILESDIR}"/${PN}-10.6.11-include.patch
+	eapply "${FILESDIR}"/${PN}-10.6.11-gcc-13.patch
 
 	eapply_user