From owner-svn-ports-head@freebsd.org Sat Jun 2 20:22:17 2018 Return-Path: Delivered-To: svn-ports-head@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 36541FE2117; Sat, 2 Jun 2018 20:22:17 +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 DCF6F75EDB; Sat, 2 Jun 2018 20:22:16 +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 BF25514A47; Sat, 2 Jun 2018 20:22:16 +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 w52KMGD9069356; Sat, 2 Jun 2018 20:22:16 GMT (envelope-from adridg@FreeBSD.org) Received: (from adridg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w52KMGP1069355; Sat, 2 Jun 2018 20:22:16 GMT (envelope-from adridg@FreeBSD.org) Message-Id: <201806022022.w52KMGP1069355@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: adridg set sender to adridg@FreeBSD.org using -f From: Adriaan de Groot Date: Sat, 2 Jun 2018 20:22:16 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r471403 - head/databases/qt5-sqldrivers-mysql/files X-SVN-Group: ports-head X-SVN-Commit-Author: adridg X-SVN-Commit-Paths: head/databases/qt5-sqldrivers-mysql/files X-SVN-Commit-Revision: 471403 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 02 Jun 2018 20:22:17 -0000 Author: adridg Date: Sat Jun 2 20:22:16 2018 New Revision: 471403 URL: https://svnweb.freebsd.org/changeset/ports/471403 Log: Comment on patch for databases/qt5-sqldrivers-mysql Add a note to the patch for MariaDB-compatibility on how to do it without ifdefs, which therefore would track changes in MariaDB definitions (if it follows the MySQL change) automatically. Modified: head/databases/qt5-sqldrivers-mysql/files/patch-src_plugins_sqldrivers_mysql_qsql__mysql.cpp 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 Sat Jun 2 20:05:45 2018 (r471402) +++ head/databases/qt5-sqldrivers-mysql/files/patch-src_plugins_sqldrivers_mysql_qsql__mysql.cpp Sat Jun 2 20:22:16 2018 (r471403) @@ -10,6 +10,13 @@ now requires a C++ or C99 compiler to compile. (Bug #25597667) +For Qt5, which requires C++11, the following line single-line +definition for mysql_bool is less-fragile and more C++y: + using mysql_bool = decltype(MYSQL_BIND::is_null_value); +This does not apply to the Qt4 port, which allows older compilers +and the less-fragile approach would therefore break on old-gcc-in-base +architectures. + --- src/plugins/sqldrivers/mysql/qsql_mysql.cpp.orig 2018-04-29 07:25:09 UTC +++ src/plugins/sqldrivers/mysql/qsql_mysql.cpp @@ -74,6 +74,14 @@ Q_DECLARE_METATYPE(MYSQL_STMT*)