diff options
author | Jan Beich <jbeich@FreeBSD.org> | 2020-11-03 00:56:26 +0000 |
---|---|---|
committer | Jan Beich <jbeich@FreeBSD.org> | 2020-11-03 00:56:26 +0000 |
commit | 6d5d6429d5880f9fdf4b4b54c0fb53e44b3927f9 (patch) | |
tree | db7a5d68a7b148f62f63c9562391af1272e3f376 /databases/mysql80-server | |
parent | graphics/mesa-devel: update to 20.2.b.3686 (diff) |
devel/icu: update to 68.1
Changes: http://site.icu-project.org/download/68
ABI: https://abi-laboratory.pro/tracker/timeline/icu4c/
Reported by: GitHub (watch releases)
Diffstat (limited to 'databases/mysql80-server')
-rw-r--r-- | databases/mysql80-server/Makefile | 2 | ||||
-rw-r--r-- | databases/mysql80-server/files/patch-icu68 | 17 |
2 files changed, 18 insertions, 1 deletions
diff --git a/databases/mysql80-server/Makefile b/databases/mysql80-server/Makefile index 382ae8751f70..ef14dd816d74 100644 --- a/databases/mysql80-server/Makefile +++ b/databases/mysql80-server/Makefile @@ -3,7 +3,7 @@ PORTNAME?= mysql PORTVERSION= 8.0.22 -PORTREVISION?= 0 +PORTREVISION?= 1 CATEGORIES= databases MASTER_SITES= MYSQL/MySQL-8.0 PKGNAMESUFFIX?= 80-server diff --git a/databases/mysql80-server/files/patch-icu68 b/databases/mysql80-server/files/patch-icu68 new file mode 100644 index 000000000000..89f0f9b4a54b --- /dev/null +++ b/databases/mysql80-server/files/patch-icu68 @@ -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, |