From owner-svn-ports-all@freebsd.org Wed Jun 3 23:44:53 2020 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 3E50F2F7723; Wed, 3 Jun 2020 23:44:53 +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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 49clrP0z3mz44VP; Wed, 3 Jun 2020 23:44:53 +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 1835716485; Wed, 3 Jun 2020 23:44:53 +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 053NiqpL089882; Wed, 3 Jun 2020 23:44:52 GMT (envelope-from adridg@FreeBSD.org) Received: (from adridg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 053NiqNb089881; Wed, 3 Jun 2020 23:44:52 GMT (envelope-from adridg@FreeBSD.org) Message-Id: <202006032344.053NiqNb089881@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: adridg set sender to adridg@FreeBSD.org using -f From: Adriaan de Groot Date: Wed, 3 Jun 2020 23:44:52 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r537857 - head/audio/hydrogen/files X-SVN-Group: ports-head X-SVN-Commit-Author: adridg X-SVN-Commit-Paths: head/audio/hydrogen/files X-SVN-Commit-Revision: 537857 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.33 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: Wed, 03 Jun 2020 23:44:53 -0000 Author: adridg Date: Wed Jun 3 23:44:52 2020 New Revision: 537857 URL: https://svnweb.freebsd.org/changeset/ports/537857 Log: Prep-work for Qt 5.15 An ambiguous constructor for QSplashScreen has appeared in Qt 5.14, so previous uses of NULL / nullptr now cause a compile error like src/gui/src/SplashScreen.cpp:35:4: error: call to constructor of 'QSplashScreen' is ambiguous : QSplashScreen( NULL ) ^ ~~~~ /usr/local/include/qt5/QtWidgets/qsplashscreen.h:58:5: note: candidate constructor QSplashScreen(QScreen *screen, const QPixmap &pixmap = QPixmap(), Qt::WindowFlags f = Qt::WindowFlags()); /usr/local/include/qt5/QtWidgets/qsplashscreen.h:61:5: note: candidate constructor QSplashScreen(QWidget *parent, const QPixmap &pixmap = QPixmap(), Qt::WindowFlags f = Qt::WindowFlags()); This patch just explicitly casts to the right type of nullptr. Mentioned in an issue upstream as well. Not bumping PORTREVISION since this doesn't affect the built code at all and it will get rebuilt when Qt 5.15 lands anyway. Added: head/audio/hydrogen/files/patch-src_gui_src_SplashScreen.cpp (contents, props changed) Added: head/audio/hydrogen/files/patch-src_gui_src_SplashScreen.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/audio/hydrogen/files/patch-src_gui_src_SplashScreen.cpp Wed Jun 3 23:44:52 2020 (r537857) @@ -0,0 +1,11 @@ +--- src/gui/src/SplashScreen.cpp.orig 2020-06-03 21:33:30 UTC ++++ src/gui/src/SplashScreen.cpp +@@ -32,7 +32,7 @@ + const char* SplashScreen::__class_name = "SplashScreen"; + + SplashScreen::SplashScreen() +- : QSplashScreen( NULL ) ++ : QSplashScreen( (QWidget*)nullptr ) + , Object( __class_name ) + { + //INFOLOG( "SplashScreen" );