[gentoo-commits] repo/gentoo:master commit in: dev-libs/redland/files/, dev-libs/redland/

[David Seifert]

commit:     4ab8c1f0f18b08e0d9a3cdcf99b08bf962a1a81f
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 20 15:53:18 2020 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Thu Feb 20 15:53:18 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4ab8c1f0

dev-libs/redland: Fix building against mysql 8

Closes: https://bugs.gentoo.org/692462
Package-Manager: Portage-2.3.89, Repoman-2.3.20
Acked-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
Signed-off-by: David Seifert <soap <AT> gentoo.org>

 .../redland/files/redland-1.0.17-mysql-8-my_bool.patch    | 15 +++++++++++++++
 dev-libs/redland/redland-1.0.17-r2.ebuild                 |  2 ++
 2 files changed, 17 insertions(+)

diff --git a/dev-libs/redland/files/redland-1.0.17-mysql-8-my_bool.patch b/dev-libs/redland/files/redland-1.0.17-mysql-8-my_bool.patch
new file mode 100644
index 00000000000..a59c456e84f
--- /dev/null
+++ b/dev-libs/redland/files/redland-1.0.17-mysql-8-my_bool.patch
@@ -0,0 +1,15 @@
+--- a/src/rdf_storage_mysql.c
++++ b/src/rdf_storage_mysql.c
+@@ -445,11 +445,11 @@
+   /* Initialize closed MySQL connection handle */
+   connection->handle=mysql_init(connection->handle);
+ 
+ #ifdef HAVE_MYSQL_OPT_RECONNECT
+   if(1) {
+-    my_bool value=(context->reconnect) ? 1 : 0;
++    bool value=(context->reconnect) ? 1 : 0;
+     mysql_options(connection->handle, MYSQL_OPT_RECONNECT, &value);
+   }
+ #endif
+ 
+   /* Create connection to database for handle */

diff --git a/dev-libs/redland/redland-1.0.17-r2.ebuild b/dev-libs/redland/redland-1.0.17-r2.ebuild
index b106ff79dde..78f47b1290f 100644
--- a/dev-libs/redland/redland-1.0.17-r2.ebuild
+++ b/dev-libs/redland/redland-1.0.17-r2.ebuild
@@ -25,6 +25,8 @@ RDEPEND="dev-libs/libltdl:0
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
+PATCHES=( "${FILESDIR}"/${PN}-1.0.17-mysql-8-my_bool.patch )
+
 MAKEOPTS="${MAKEOPTS} -j1" #500574, required for both src_compile() and src_install()
 
 src_prepare() {