From owner-svn-ports-head@freebsd.org Sun Feb 5 18:58:01 2017 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 437DFCD2675; Sun, 5 Feb 2017 18:58:01 +0000 (UTC) (envelope-from jbeich@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 mx1.freebsd.org (Postfix) with ESMTPS id EC5CD1B0B; Sun, 5 Feb 2017 18:58:00 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v15Iw0Wi022200; Sun, 5 Feb 2017 18:58:00 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v15Ivxwe022196; Sun, 5 Feb 2017 18:57:59 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201702051857.v15Ivxwe022196@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Sun, 5 Feb 2017 18:57:59 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r433443 - in head/comms/linpsk: . files X-SVN-Group: ports-head 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.23 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: Sun, 05 Feb 2017 18:58:01 -0000 Author: jbeich Date: Sun Feb 5 18:57:59 2017 New Revision: 433443 URL: https://svnweb.freebsd.org/changeset/ports/433443 Log: comms/linpsk: unbreak with clang 4.0 crxdisplay.cpp:101:16: error: ordered comparison between pointer and zero ('Input *' and 'int') if ( Sound <= NULL ) ~~~~~ ^ ~~~~ PR: 216234 Submitted by: tcberner Approved by: maintainer timeout (2 weeks) Added: head/comms/linpsk/files/patch-gui_crxdisplay.cpp (contents, props changed) head/comms/linpsk/files/patch-gui_linpsk.cpp (contents, props changed) Modified: head/comms/linpsk/Makefile (contents, props changed) Modified: head/comms/linpsk/Makefile ============================================================================== --- head/comms/linpsk/Makefile Sun Feb 5 18:57:52 2017 (r433442) +++ head/comms/linpsk/Makefile Sun Feb 5 18:57:59 2017 (r433443) @@ -2,6 +2,7 @@ PORTNAME= linpsk PORTVERSION= 1.2 +PORTREVISION= 1 CATEGORIES= comms hamradio MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION} Added: head/comms/linpsk/files/patch-gui_crxdisplay.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/comms/linpsk/files/patch-gui_crxdisplay.cpp Sun Feb 5 18:57:59 2017 (r433443) @@ -0,0 +1,13 @@ +Fix bogus pointer comparison. + +--- gui/crxdisplay.cpp.orig 2017-01-22 12:03:47 UTC ++++ gui/crxdisplay.cpp +@@ -98,7 +98,7 @@ bool CRxDisplay::start_process_loop() + } + else + Sound = new CSound ( settings.serial ); +- if ( Sound <= NULL ) ++ if ( !Sound ) + return false; + + connect ( Sound, SIGNAL ( samplesAvailable() ), this, SLOT ( process_rxdata() ) ); Added: head/comms/linpsk/files/patch-gui_linpsk.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/comms/linpsk/files/patch-gui_linpsk.cpp Sun Feb 5 18:57:59 2017 (r433443) @@ -0,0 +1,22 @@ +Fix bogus pointer comparison. + +--- gui/linpsk.cpp.orig 2017-01-22 12:03:55 UTC ++++ gui/linpsk.cpp +@@ -387,7 +387,7 @@ void LinPSK::startTx() + Info = "BPSK"; + break; + } +- if ( Sound <= NULL ) // Only create Sound Device once for output ++ if ( !Sound ) // Only create Sound Device once for output + { + if ( settings.DemoMode ) + { +@@ -401,7 +401,7 @@ void LinPSK::startTx() + Sound = new CSound ( settings.serial ); + connect ( Sound, SIGNAL ( samplesAvailable() ), this, SLOT ( process_txdata() ) ); + } +- if ( Sound <= NULL ) ++ if ( !Sound ) + { + QMessageBox::critical ( 0, " Programm Error! LinPsk", "Could not create Sound Device for Output" ); + TxDisplay->TxFunctions->setStatus ( ON );