From owner-svn-ports-all@freebsd.org Fri Jun 1 22:16:42 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 49D5FFD4187; Fri, 1 Jun 2018 22:16:42 +0000 (UTC) (envelope-from adridg@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id F2093774F9; Fri, 1 Jun 2018 22:16:41 +0000 (UTC) (envelope-from adridg@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id D261C2EB83; Fri, 1 Jun 2018 22:16:41 +0000 (UTC) (envelope-from adridg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w51MGff5087069; Fri, 1 Jun 2018 22:16:41 GMT (envelope-from adridg@FreeBSD.org) Received: (from adridg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w51MGfWT087067; Fri, 1 Jun 2018 22:16:41 GMT (envelope-from adridg@FreeBSD.org) Message-Id: <201806012216.w51MGfWT087067@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: adridg set sender to adridg@FreeBSD.org using -f From: Adriaan de Groot Date: Fri, 1 Jun 2018 22:16:41 +0000 (UTC) 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 X-SVN-Group: ports-head X-SVN-Commit-Author: adridg X-SVN-Commit-Paths: in head/databases: qt4-mysql-plugin/files qt5-sqldrivers-mysql/files X-SVN-Commit-Revision: 471301 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 01 Jun 2018 22:16:42 -0000 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;