From aa5578ed6d705c67b388c6a01d6c3a6d41bd18d417f0ab3c30dda53ed82f7809 Mon Sep 17 00:00:00 2001
From: Danilo Spinella <danilo.spinella@suse.com>
Date: Wed, 8 Mar 2023 10:32:33 +0000
Subject: [PATCH] Accepting request 1070139 from
 home:marxin:branches:server:database

- Cherry-pick upstream changes (gcc13-fix.patch) for GCC 13.

OBS-URL: https://build.opensuse.org/request/show/1070139
OBS-URL: https://build.opensuse.org/package/show/server:database/mariadb?expand=0&rev=307
---
 gcc13-fix.patch | 72 +++++++++++++++++++++++++++++++++++++++++++++++++
 mariadb.changes |  5 ++++
 mariadb.spec    |  4 ++-
 3 files changed, 80 insertions(+), 1 deletion(-)
 create mode 100644 gcc13-fix.patch

diff --git a/gcc13-fix.patch b/gcc13-fix.patch
new file mode 100644
index 0000000..2433dc8
--- /dev/null
+++ b/gcc13-fix.patch
@@ -0,0 +1,72 @@
+diff --git a/storage/rocksdb/rocksdb/db/compaction/compaction_iteration_stats.h b/storage/rocksdb/rocksdb/db/compaction/compaction_iteration_stats.h
+index 963c1d8e..73487edd 100644
+--- a/storage/rocksdb/rocksdb/db/compaction/compaction_iteration_stats.h
++++ b/storage/rocksdb/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/storage/rocksdb/rocksdb/env/composite_env_wrapper.h b/storage/rocksdb/rocksdb/env/composite_env_wrapper.h
+index fbc0b93f..e10d617b 100644
+--- a/storage/rocksdb/rocksdb/env/composite_env_wrapper.h
++++ b/storage/rocksdb/rocksdb/env/composite_env_wrapper.h
+@@ -5,6 +5,7 @@
+ 
+ #pragma once
+ 
++#include <cstdint>
+ #include "rocksdb/env.h"
+ #include "rocksdb/file_system.h"
+ 
+diff --git a/storage/rocksdb/rocksdb/include/rocksdb/utilities/checkpoint.h b/storage/rocksdb/rocksdb/include/rocksdb/utilities/checkpoint.h
+index c7f93b4c..3c2ab805 100644
+--- 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"
+diff --git a/storage/rocksdb/rocksdb/table/block_based/data_block_hash_index.h b/storage/rocksdb/rocksdb/table/block_based/data_block_hash_index.h
+index f356395f..6eaf7173 100644
+--- a/storage/rocksdb/rocksdb/table/block_based/data_block_hash_index.h
++++ b/storage/rocksdb/rocksdb/table/block_based/data_block_hash_index.h
+@@ -7,6 +7,7 @@
+ 
+ #include <string>
+ #include <vector>
++#include <cstdint>
+ 
+ #include "rocksdb/slice.h"
+ 
+diff --git a/storage/rocksdb/rocksdb/util/string_util.h b/storage/rocksdb/rocksdb/util/string_util.h
+index a761be66..2e57eda2 100644
+--- a/storage/rocksdb/rocksdb/util/string_util.h
++++ b/storage/rocksdb/rocksdb/util/string_util.h
+@@ -10,6 +10,7 @@
+ #include <string>
+ #include <unordered_map>
+ #include <vector>
++#include <cstdint>
+ 
+ #include "rocksdb/rocksdb_namespace.h"
+ 
+diff --git a/tpool/aio_linux.cc b/tpool/aio_linux.cc
+index 5d01c588..90888622 100644
+--- a/tpool/aio_linux.cc
++++ b/tpool/aio_linux.cc
+@@ -20,6 +20,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111 - 1301 USA*/
+ # include <atomic>
+ # include <libaio.h>
+ # include <sys/syscall.h>
++# include <cstdio>
+ 
+ /**
+   Invoke the io_getevents() system call, without timeout parameter.
diff --git a/mariadb.changes b/mariadb.changes
index 4a521ed..a2e4166 100644
--- a/mariadb.changes
+++ b/mariadb.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed Mar  8 10:28:23 UTC 2023 - Martin Liška <mliska@suse.cz>
+
+- Cherry-pick upstream changes (gcc13-fix.patch) for GCC 13.
+
 -------------------------------------------------------------------
 Wed Mar  1 10:49:52 UTC 2023 - Danilo Spinella <danilo.spinella@suse.com>
 
diff --git a/mariadb.spec b/mariadb.spec
index f478471..2843e54 100644
--- a/mariadb.spec
+++ b/mariadb.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package mariadb
 #
-# Copyright (c) 2022 SUSE LLC
+# Copyright (c) 2023 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -80,6 +80,7 @@ Patch6:         mariadb-10.4.12-harden_setuid.patch
 Patch7:         mariadb-10.4.12-fix-install-db.patch
 Patch9:         func_math_tests_MDEV-26645.diff
 Patch10:        fix-pamdir.patch
+Patch11:        gcc13-fix.patch
 # needed for bison SQL parser and wsrep API
 BuildRequires:  bison
 BuildRequires:  cmake
@@ -365,6 +366,7 @@ find . -name "*.jar" -type f -exec rm --verbose -f {} \;
 %if 0%{?suse_version} > 1500
 %patch10 -p1
 %endif
+%patch11 -p1
 
 cp %{_sourcedir}/suse-test-run .