From owner-svn-ports-all@freebsd.org Sun Jul 7 08:05:47 2019 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 A533415DE95D; Sun, 7 Jul 2019 08:05:47 +0000 (UTC) (envelope-from tcberner@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) server-signature RSA-PSS (4096 bits) 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 44D57726FC; Sun, 7 Jul 2019 08:05:47 +0000 (UTC) (envelope-from tcberner@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 11EB826170; Sun, 7 Jul 2019 08:05:47 +0000 (UTC) (envelope-from tcberner@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x6785kCc041090; Sun, 7 Jul 2019 08:05:46 GMT (envelope-from tcberner@FreeBSD.org) Received: (from tcberner@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x6785ktj041089; Sun, 7 Jul 2019 08:05:46 GMT (envelope-from tcberner@FreeBSD.org) Message-Id: <201907070805.x6785ktj041089@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tcberner set sender to tcberner@FreeBSD.org using -f From: "Tobias C. Berner" Date: Sun, 7 Jul 2019 08:05:46 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r506108 - head/graphics/nomacs/files X-SVN-Group: ports-head X-SVN-Commit-Author: tcberner X-SVN-Commit-Paths: head/graphics/nomacs/files X-SVN-Commit-Revision: 506108 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 44D57726FC X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.93 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_SHORT(-0.94)[-0.935,0]; ASN(0.00)[asn:12874, ipnet:2000::/3, country:IT]; NEURAL_HAM_LONG(-1.00)[-1.000,0] X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 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: Sun, 07 Jul 2019 08:05:47 -0000 Author: tcberner Date: Sun Jul 7 08:05:46 2019 New Revision: 506108 URL: https://svnweb.freebsd.org/changeset/ports/506108 Log: graphics/nomacs: fix logic Added: head/graphics/nomacs/files/patch-src_DkCore_DkPluginManager.cpp (contents, props changed) Added: head/graphics/nomacs/files/patch-src_DkCore_DkPluginManager.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/nomacs/files/patch-src_DkCore_DkPluginManager.cpp Sun Jul 7 08:05:46 2019 (r506108) @@ -0,0 +1,19 @@ +/wrkdirs/usr/ports/graphics/nomacs/work/nomacs-3.6.1/ImageLounge/src/DkCore/DkPluginManager.cpp:371:13: warning: '&&' within '||' [-Wlogical-op-parentheses] + else if (p && p->interfaceType() == DkPluginInterface::interface_basic || p->interfaceType() == DkPluginInterface::interface_batch) { + ~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ~~ +/wrkdirs/usr/ports/graphics/nomacs/work/nomacs-3.6.1/ImageLounge/src/DkCore/DkPluginManager.cpp:371:13: note: place parentheses around the '&&' expression to silence this warning + else if (p && p->interfaceType() == DkPluginInterface::interface_basic || p->interfaceType() == DkPluginInterface::interface_batch) { + ^ + ( ) + +--- src/DkCore/DkPluginManager.cpp.orig 2019-07-07 07:04:23 UTC ++++ src/DkCore/DkPluginManager.cpp +@@ -368,7 +368,7 @@ void DkPluginContainer::run() { + connect(vPlugin->getViewPort(), SIGNAL(showToolbar(QToolBar*, bool)), vPlugin->getMainWindow(), SLOT(showToolbar(QToolBar*, bool))); + emit runPlugin(vPlugin, false); + } +- else if (p && p->interfaceType() == DkPluginInterface::interface_basic || p->interfaceType() == DkPluginInterface::interface_batch) { ++ else if (p && (p->interfaceType() == DkPluginInterface::interface_basic || p->interfaceType() == DkPluginInterface::interface_batch)) { + + QAction* a = qobject_cast(QObject::sender()); +