Date: Fri, 1 Jun 2018 22:16:41 +0000 (UTC) From: Adriaan de Groot <adridg@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r471301 - in head/databases: qt4-mysql-plugin/files qt5-sqldrivers-mysql/files Message-ID: <201806012216.w51MGfWT087067@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: adridg Date: Fri Jun 1 22:16:41 2018 New Revision: 471301 URL: https://svnweb.freebsd.org/changeset/ports/471301 Log: Fix build of the Qt SQL plugins for MySQL against MariaDB 10. Recent MySQL code has deprecated the my_bool type, so r469165 added a check for that recent version. MariaDB pretends to be MySQL, and has an even newer version, which nonetheless hasn't taken over the drop-my_bool-type change. So my_bool still exists there. Assume, for now, that MariaDB has my_bool regardless, to fix incompatibilities reported after PR227813 was closed. PR: 227813 Reported by: Jashank Jeremy Modified: head/databases/qt4-mysql-plugin/files/patch-src_sql_drivers_mysql_qsql__mysql.cpp head/databases/qt5-sqldrivers-mysql/files/patch-src_plugins_sqldrivers_mysql_qsql__mysql.cpp Modified: head/databases/qt4-mysql-plugin/files/patch-src_sql_drivers_mysql_qsql__mysql.cpp ============================================================================== --- head/databases/qt4-mysql-plugin/files/patch-src_sql_drivers_mysql_qsql__mysql.cpp Fri Jun 1 22:16:11 2018 (r471300) +++ head/databases/qt4-mysql-plugin/files/patch-src_sql_drivers_mysql_qsql__mysql.cpp Fri Jun 1 22:16:41 2018 (r471301) @@ -18,7 +18,7 @@ now requires a C++ or C99 compiler to compile. +// MYSQL 8.0.1 no longer uses the my_bool type: +// https://dev.mysql.com/doc/relnotes/mysql/8.0/en/news-8-0-1.html -+#if MYSQL_VERSION_ID >= 80001 ++#if (MYSQL_VERSION_ID >= 80001) && !defined(MARIADB_BASE_VERSION) +typedef bool mysql_bool; +#else +typedef my_bool mysql_bool; Modified: head/databases/qt5-sqldrivers-mysql/files/patch-src_plugins_sqldrivers_mysql_qsql__mysql.cpp ============================================================================== --- head/databases/qt5-sqldrivers-mysql/files/patch-src_plugins_sqldrivers_mysql_qsql__mysql.cpp Fri Jun 1 22:16:11 2018 (r471300) +++ head/databases/qt5-sqldrivers-mysql/files/patch-src_plugins_sqldrivers_mysql_qsql__mysql.cpp Fri Jun 1 22:16:41 2018 (r471301) @@ -18,7 +18,7 @@ now requires a C++ or C99 compiler to compile. +// MYSQL 8.0.1 no longer uses the my_bool type: +// https://dev.mysql.com/doc/relnotes/mysql/8.0/en/news-8-0-1.html -+#if MYSQL_VERSION_ID >= 80001 ++#if (MYSQL_VERSION_ID >= 80001) && !defined(MARIADB_BASE_VERSION) +typedef bool mysql_bool; +#else +typedef my_bool mysql_bool;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201806012216.w51MGfWT087067>