From a70e34c1579dd91e43db1b02d462d8e3877d2a49 Mon Sep 17 00:00:00 2001
From: Kevin Mihelich <kevin@archlinuxarm.org>
Date: Tue, 22 Dec 2020 15:00:03 +0000
Subject: [PATCH] community/percona-server to 8.0.22_13-2

---
 community/percona-server/PKGBUILD    |  5 ++++-
 community/percona-server/icu68.patch | 17 +++++++++++++++++
 2 files changed, 21 insertions(+), 1 deletion(-)
 create mode 100644 community/percona-server/icu68.patch

diff --git a/community/percona-server/PKGBUILD b/community/percona-server/PKGBUILD
index 5e4339c29..68f2df8b8 100644
--- a/community/percona-server/PKGBUILD
+++ b/community/percona-server/PKGBUILD
@@ -10,7 +10,7 @@ pkgver=8.0.22_13
 _boost_ver=1.73.0
 _pkgver=${pkgver/_/-}
 _myver=${pkgver/_rel*}
-pkgrel=1
+pkgrel=2
 arch=('x86_64')
 makedepends=('cmake' 'zlib' 'lz4' 'zstd' 'libaio' 'systemd-tools' 'pam' 'numactl' 'jemalloc' 'openssl' 'rpcsvc-proto' 'boost' 'doxygen' 'graphviz')
 license=('GPL')
@@ -20,6 +20,7 @@ source=("https://www.percona.com/downloads/Percona-Server-${pkgver%.*_*}/Percona
         'my.cnf'
         'mysql-user.conf'
         'mysqlrouter-user.conf'
+        'icu68.patch'
         'build-hostname.patch'
         'no-werror.patch'
         'rocksdb-make.patch'
@@ -29,6 +30,7 @@ sha256sums=('614249dc7790e82cabf22fdb20492be7ec5b8e98550f662204a17e0e8797cc9a'
             'b467b04d6d06152b2abc33f2a6de63fef0fc922dd5119d2ee1d07d3c1a489731'
             '5d7710fe88ec6d298175a309c0b776142397b119c468830b2865980292ed5da6'
             '4ca7ffdcb2d1716d4f31e4c7dd314e5d76e64f13fdc67c5d81c53650b793f5e0'
+            '80189c3d1c171eea06567aa9c66e10675d7f43721d0475fa2fca5d1e6ae03ea8'
             '1537fdbb92dd1c135c1eb9f4d10c44fd02e652db66c933d731990a1196f1397c'
             '2343a191c452b91caa458b03b0c1ef3f5afb0e7031816c68467af5c6a6ffe253'
             '2ff495d271f99c4d0dba89e8ccde7e6b9789a4ea6b55034de9b9217b47e32c03'
@@ -38,6 +40,7 @@ prepare() {
 	cd $pkgbase-$_pkgver
 	rm -v sql/sql_yacc.{cc,h}
 
+	patch -p0 -i "$srcdir"/icu68.patch
 	patch -p1 -i "$srcdir"/build-hostname.patch
 	patch -p1 -i "$srcdir"/no-werror.patch
 	patch -p1 -i "$srcdir"/rocksdb-make.patch
diff --git a/community/percona-server/icu68.patch b/community/percona-server/icu68.patch
new file mode 100644
index 000000000..89f0f9b4a
--- /dev/null
+++ b/community/percona-server/icu68.patch
@@ -0,0 +1,17 @@
+Regressed by https://github.com/unicode-org/icu/commit/c3fe7e09d844
+
+sql/mysqld.cc:6915:30: error: use of undeclared identifier 'TRUE'
+    my_getopt_skip_unknown = TRUE;
+                             ^
+
+--- sql/mysqld.cc.orig	2020-06-16 16:31:03 UTC
++++ sql/mysqld.cc
+@@ -6910,7 +6912,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,