commit: 5a8c2df53d8abbe67ae89546075dcd31b65b61f9 Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> AuthorDate: Mon Jul 27 22:08:19 2020 +0000 Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> CommitDate: Mon Jul 27 22:08:36 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5a8c2df5
dev-libs/apr-util: update my_bool patch We need to take a different solution because MariaDB Connector C is still defining my_bool. Closes: https://bugs.gentoo.org/734020 Package-Manager: Portage-3.0.0, Repoman-2.3.23 Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org> .../{apr-util-1.6.1-r5.ebuild => apr-util-1.6.1-r6.ebuild} | 0 dev-libs/apr-util/files/apr-util-1.6.1-my_bool.patch | 8 +++++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dev-libs/apr-util/apr-util-1.6.1-r5.ebuild b/dev-libs/apr-util/apr-util-1.6.1-r6.ebuild similarity index 100% rename from dev-libs/apr-util/apr-util-1.6.1-r5.ebuild rename to dev-libs/apr-util/apr-util-1.6.1-r6.ebuild diff --git a/dev-libs/apr-util/files/apr-util-1.6.1-my_bool.patch b/dev-libs/apr-util/files/apr-util-1.6.1-my_bool.patch index 48816555a21..eda0cd04128 100644 --- a/dev-libs/apr-util/files/apr-util-1.6.1-my_bool.patch +++ b/dev-libs/apr-util/files/apr-util-1.6.1-my_bool.patch @@ -1,12 +1,14 @@ --- a/dbd/apr_dbd_mysql.c +++ b/dbd/apr_dbd_mysql.c -@@ -41,6 +41,10 @@ +@@ -41,6 +41,12 @@ #endif #endif #include <mysql.h> -+#ifndef HAVE_TYPE_MY_BOOL -+#include <stdbool.h> ++// MariaDB still include definition of my_bool but has a higher version ID ++#ifndef MARIADB_VERSION_ID ++#if MYSQL_VERSION_ID > 80000 +typedef bool my_bool; ++#endif +#endif #include <errmsg.h> #endif
