[arch-commits] Commit in percona-server/trunk (PKGBUILD icu68.patch)

[Evangelos Foutras]

    Date: Saturday, December 19, 2020 @ 11:07:00
  Author: foutrelis
Revision: 779947

Fix build with ICU 68 (patch from FreeBSD)

Added:
  percona-server/trunk/icu68.patch
Modified:
  percona-server/trunk/PKGBUILD

-------------+
 PKGBUILD    |    3 +++
 icu68.patch |   17 +++++++++++++++++
 2 files changed, 20 insertions(+)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-12-19 10:51:03 UTC (rev 779946)
+++ PKGBUILD	2020-12-19 11:07:00 UTC (rev 779947)
@@ -16,6 +16,7 @@
         'my.cnf'
         'mysql-user.conf'
         'mysqlrouter-user.conf'
+        'icu68.patch'
         'build-hostname.patch'
         'no-werror.patch'
         'rocksdb-make.patch')
@@ -24,6 +25,7 @@
             'b467b04d6d06152b2abc33f2a6de63fef0fc922dd5119d2ee1d07d3c1a489731'
             '5d7710fe88ec6d298175a309c0b776142397b119c468830b2865980292ed5da6'
             '4ca7ffdcb2d1716d4f31e4c7dd314e5d76e64f13fdc67c5d81c53650b793f5e0'
+            '80189c3d1c171eea06567aa9c66e10675d7f43721d0475fa2fca5d1e6ae03ea8'
             '1537fdbb92dd1c135c1eb9f4d10c44fd02e652db66c933d731990a1196f1397c'
             '2343a191c452b91caa458b03b0c1ef3f5afb0e7031816c68467af5c6a6ffe253'
             '2ff495d271f99c4d0dba89e8ccde7e6b9789a4ea6b55034de9b9217b47e32c03')
@@ -32,6 +34,7 @@
 	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

Added: icu68.patch
===================================================================
--- icu68.patch	                        (rev 0)
+++ icu68.patch	2020-12-19 11:07:00 UTC (rev 779947)
@@ -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,