[gentoo-commits] repo/gentoo:master commit in: dev-db/percona-xtrabackup/files/

[Conrad Kostecki]

commit:     07b7466e378c823a3013faf0c72c0df22362199a
Author:     Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Fri Oct  1 15:50:07 2021 +0000
Commit:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Fri Oct  8 21:51:01 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=07b7466e

dev-db/percona-xtrabackup: remove unused patches

Closes: https://github.com/gentoo/gentoo/pull/22459
Package-Manager: Portage-3.0.23, Repoman-3.0.3
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>

 .../percona-xtrabackup-8.0.13-remove-rpm.patch     | 32 -----------------
 ...backup-8.0.22-fix-building-against-ICU-68.patch | 28 ---------------
 .../percona-xtrabackup-8.0.22-remove-rpm.patch     | 31 ----------------
 .../files/percona-xtrabackup-8.0.23-gcc11.patch    | 41 ----------------------
 4 files changed, 132 deletions(-)

diff --git a/dev-db/percona-xtrabackup/files/percona-xtrabackup-8.0.13-remove-rpm.patch b/dev-db/percona-xtrabackup/files/percona-xtrabackup-8.0.13-remove-rpm.patch
deleted file mode 100644
index 759598637a8..00000000000
--- a/dev-db/percona-xtrabackup/files/percona-xtrabackup-8.0.13-remove-rpm.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 1b9865e2..e3c82cdd 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -181,27 +181,6 @@ ENDIF()
- OPTION(FORCE_UNSUPPORTED_COMPILER "Disable compiler version checks" OFF)
- MARK_AS_ADVANCED(WITHOUT_SERVER FORCE_UNSUPPORTED_COMPILER)
- 
--# Use 'uname -r' and 'rpm -qf /' to figure out host system.
--# For Docker images we cannot trust uname, so use rpm instead.
--IF(UNIX)
--  FIND_PROGRAM(MY_UNAME uname /bin /usr/bin /usr/local/bin /sbin)
--  IF(MY_UNAME)
--    EXECUTE_PROCESS(COMMAND ${MY_UNAME} -s
--      OUTPUT_VARIABLE MY_HOST_SYSTEM_NAME
--      OUTPUT_STRIP_TRAILING_WHITESPACE
--      RESULT_VARIABLE MY_UNAME_RESULT
--      )
--  ENDIF()
--  FIND_PROGRAM(MY_RPM rpm /bin /usr/bin)
--  IF(MY_RPM)
--    EXECUTE_PROCESS(COMMAND ${MY_RPM} -qf /
--      OUTPUT_VARIABLE MY_HOST_FILESYSTEM_NAME
--      OUTPUT_STRIP_TRAILING_WHITESPACE
--      RESULT_VARIABLE MY_RPM_RESULT
--      )
--  ENDIF()
--ENDIF()
--
- IF(CMAKE_HOST_UNIX AND NOT FORCE_UNSUPPORTED_COMPILER
-     AND NOT CMAKE_C_COMPILER AND NOT CMAKE_CXX_COMPILER)
-   # Cannot INCLUDE(CMakeDetermineSystem) prior to PROJECT initialization below.

diff --git a/dev-db/percona-xtrabackup/files/percona-xtrabackup-8.0.22-fix-building-against-ICU-68.patch b/dev-db/percona-xtrabackup/files/percona-xtrabackup-8.0.22-fix-building-against-ICU-68.patch
deleted file mode 100644
index b3e1662a0cf..00000000000
--- a/dev-db/percona-xtrabackup/files/percona-xtrabackup-8.0.22-fix-building-against-ICU-68.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 16048ed60bef16d4bf1e361a59e7899845b9426a Mon Sep 17 00:00:00 2001
-From: Thomas Deutschmann <whissi@g.o>
-Date: Sun, 20 Dec 2020 21:47:33 +0100
-Subject: [PATCH 10/10] Fix building against >=ICU-68
-
-Link: https://github.com/unicode-org/icu/commit/a18df7ba2834afc2b577a1d5a7d906868ade6fa9
-Bug: https://bugs.gentoo.org/759070
-Signed-off-by: Thomas Deutschmann <whissi@g.o>
----
- sql/mysqld.cc | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/sql/mysqld.cc b/sql/mysqld.cc
-index c400e5584..5d2ebfaea 100644
---- a/sql/mysqld.cc
-+++ b/sql/mysqld.cc
-@@ -7323,7 +7323,7 @@ int mysqld_main(int argc, char **argv)
-   if (opt_keyring_migration_source || opt_keyring_migration_destination ||
-       migrate_connect_options) {
-     Migrate_keyring mk;
--    my_getopt_skip_unknown = TRUE;
-+    my_getopt_skip_unknown = true;
-     if (mk.init(remaining_argc, remaining_argv, opt_keyring_migration_source,
-                 opt_keyring_migration_destination, opt_keyring_migration_user,
-                 opt_keyring_migration_host, opt_keyring_migration_password,
--- 
-2.29.2
-

diff --git a/dev-db/percona-xtrabackup/files/percona-xtrabackup-8.0.22-remove-rpm.patch b/dev-db/percona-xtrabackup/files/percona-xtrabackup-8.0.22-remove-rpm.patch
deleted file mode 100644
index 91f67c43716..00000000000
--- a/dev-db/percona-xtrabackup/files/percona-xtrabackup-8.0.22-remove-rpm.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -222,28 +222,6 @@ ENDIF()
- OPTION(FORCE_UNSUPPORTED_COMPILER "Disable compiler version checks" OFF)
- MARK_AS_ADVANCED(WITHOUT_SERVER FORCE_UNSUPPORTED_COMPILER)
- 
--# Use 'uname -r' and 'rpm -qf /' to figure out host system.
--# For Docker images we cannot trust uname, so use rpm instead.
--IF(UNIX)
--  FIND_PROGRAM(MY_UNAME uname /bin /usr/bin /usr/local/bin /sbin)
--  IF(MY_UNAME)
--    EXECUTE_PROCESS(COMMAND ${MY_UNAME} -s
--      OUTPUT_VARIABLE MY_HOST_SYSTEM_NAME
--      OUTPUT_STRIP_TRAILING_WHITESPACE
--      RESULT_VARIABLE MY_UNAME_RESULT
--      )
--    EXEC_PROGRAM(${MY_UNAME} ARGS -r OUTPUT_VARIABLE MY_HOST_SYSTEM_VERSION)
--  ENDIF()
--  FIND_PROGRAM(MY_RPM rpm /bin /usr/bin)
--  IF(MY_RPM)
--    EXECUTE_PROCESS(COMMAND ${MY_RPM} -qf /
--      OUTPUT_VARIABLE MY_HOST_FILESYSTEM_NAME
--      OUTPUT_STRIP_TRAILING_WHITESPACE
--      RESULT_VARIABLE MY_RPM_RESULT
--      )
--  ENDIF()
--ENDIF()
--
- # See comments above, about CMAKE_MINIMUM_REQUIRED VERSION and macOS 11.
- IF(APPLE)
-   IF(MY_HOST_SYSTEM_VERSION VERSION_GREATER_EQUAL 20)

diff --git a/dev-db/percona-xtrabackup/files/percona-xtrabackup-8.0.23-gcc11.patch b/dev-db/percona-xtrabackup/files/percona-xtrabackup-8.0.23-gcc11.patch
deleted file mode 100644
index 83aa6ab78a5..00000000000
--- a/dev-db/percona-xtrabackup/files/percona-xtrabackup-8.0.23-gcc11.patch
+++ /dev/null
@@ -1,41 +0,0 @@
---- a/extra/robin-hood-hashing/robin_hood.h
-+++ b/extra/robin-hood-hashing/robin_hood.h
-@@ -42,6 +42,7 @@
- #include <algorithm>
- #include <cstdlib>
- #include <cstring>
-+#include <limits>
- #include <functional>
- #include <memory> // only to support hash of smart pointers
- #include <stdexcept>
---- a/include/my_alloc.h
-+++ b/include/my_alloc.h
-@@ -32,6 +32,7 @@
- 
- #include <string.h>
- 
-+#include <cstdint>
- #include <memory>
- #include <new>
- #include <type_traits>
---- a/include/mysql/components/services/page_track_service.h
-+++ b/include/mysql/components/services/page_track_service.h
-@@ -27,6 +27,7 @@
- #include <mysql/components/service.h>
- #include <functional>
- 
-+#include <stddef.h>
- #include <stdint.h>
- 
- #ifdef __cplusplus
---- a/sql-common/sql_string.cc
-+++ b/sql-common/sql_string.cc
-@@ -23,6 +23,7 @@
- #include "sql_string.h"
- 
- #include <algorithm>
-+#include <limits>
- 
- #include "my_dbug.h"
- #include "my_macros.h"
-