commit:     0a2bddbf014ae3b7bfa42203066f14f04fbe5ede
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 27 10:45:54 2020 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Mon Jul 27 10:46:20 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0a2bddbf

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 <AT> gentoo.org>

 dev-libs/apr-util/files/apr-util-1.6.1-my_bool.patch | 12 ++++--------
 1 file 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 6cd875bcde8..48816555a21 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 <[email protected]>
-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
  

Reply via email to