summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Deutschmann <whissi@gentoo.org>2020-07-27 12:45:54 +0200
committerThomas Deutschmann <whissi@gentoo.org>2020-07-27 12:46:20 +0200
commit0a2bddbf014ae3b7bfa42203066f14f04fbe5ede (patch)
treecc19c3afd7942bc851ea82387475408710a88a68
parentwww-apps/nextcloud: 19.0.1, 18.0.7, 17.0.8 bumps (diff)
downloadgentoo-0a2bddbf014ae3b7bfa42203066f14f04fbe5ede.tar.gz
gentoo-0a2bddbf014ae3b7bfa42203066f14f04fbe5ede.tar.bz2
gentoo-0a2bddbf014ae3b7bfa42203066f14f04fbe5ede.zip
dev-libs/apr-util: improve my_bool patch
Closes: https://bugs.gentoo.org/734020 Package-Manager: Portage-3.0.0, Repoman-2.3.23 Signed-off-by: Thomas Deutschmann <whissi@gentoo.org>
-rw-r--r--dev-libs/apr-util/files/apr-util-1.6.1-my_bool.patch12
1 files changed, 4 insertions, 8 deletions
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 6cd875bcde89..48816555a21c 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,17 +1,13 @@
-Description: Reintroduce my_bool to fix build with MySQL 8
-Author: Robie Basak <robie.basak@canonical.com>
-Bug-Ubuntu: https://bugs.launchpad.net/bugs/1863026
-Forwarded: no
-Last-Update: 2020-02-18
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
--- a/dbd/apr_dbd_mysql.c
+++ b/dbd/apr_dbd_mysql.c
-@@ -41,6 +41,7 @@
+@@ -41,6 +41,10 @@
#endif
#endif
#include <mysql.h>
++#ifndef HAVE_TYPE_MY_BOOL
++#include <stdbool.h>
+typedef bool my_bool;
++#endif
#include <errmsg.h>
#endif