From owner-svn-ports-all@freebsd.org Sun Jan 28 17:00:08 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 37267ED2831; Sun, 28 Jan 2018 17:00:08 +0000 (UTC) (envelope-from danfe@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 E0DDE85B06; Sun, 28 Jan 2018 17:00:07 +0000 (UTC) (envelope-from danfe@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 DBB911C57D; Sun, 28 Jan 2018 17:00:07 +0000 (UTC) (envelope-from danfe@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w0SH078D017235; Sun, 28 Jan 2018 17:00:07 GMT (envelope-from danfe@FreeBSD.org) Received: (from danfe@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w0SH07BA017231; Sun, 28 Jan 2018 17:00:07 GMT (envelope-from danfe@FreeBSD.org) Message-Id: <201801281700.w0SH07BA017231@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: danfe set sender to danfe@FreeBSD.org using -f From: Alexey Dokuchaev Date: Sun, 28 Jan 2018 17:00:07 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r460224 - head/audio/ardour/files X-SVN-Group: ports-head X-SVN-Commit-Author: danfe X-SVN-Commit-Paths: head/audio/ardour/files X-SVN-Commit-Revision: 460224 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.25 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, 28 Jan 2018 17:00:08 -0000 Author: danfe Date: Sun Jan 28 17:00:07 2018 New Revision: 460224 URL: https://svnweb.freebsd.org/changeset/ports/460224 Log: Add four more patches that should've been part of r460055. Added: head/audio/ardour/files/patch-gtk2__ardour_editor.cc (contents, props changed) head/audio/ardour/files/patch-gtk2__ardour_gain__meter.cc (contents, props changed) head/audio/ardour/files/patch-gtk2__ardour_route__time__axis.cc (contents, props changed) head/audio/ardour/files/patch-libs_gtkmm2ext_fastmeter.cc (contents, props changed) Added: head/audio/ardour/files/patch-gtk2__ardour_editor.cc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/audio/ardour/files/patch-gtk2__ardour_editor.cc Sun Jan 28 17:00:07 2018 (r460224) @@ -0,0 +1,23 @@ +--- gtk2_ardour/editor.cc.orig 2012-03-16 14:33:28 UTC ++++ gtk2_ardour/editor.cc +@@ -803,16 +803,16 @@ Editor::Editor () + list > window_icons; + Glib::RefPtr icon; + +- if ((icon = ::get_icon ("ardour_icon_16px")) != 0) { ++ if ((icon = ::get_icon ("ardour_icon_16px"))) { + window_icons.push_back (icon); + } +- if ((icon = ::get_icon ("ardour_icon_22px")) != 0) { ++ if ((icon = ::get_icon ("ardour_icon_22px"))) { + window_icons.push_back (icon); + } +- if ((icon = ::get_icon ("ardour_icon_32px")) != 0) { ++ if ((icon = ::get_icon ("ardour_icon_32px"))) { + window_icons.push_back (icon); + } +- if ((icon = ::get_icon ("ardour_icon_48px")) != 0) { ++ if ((icon = ::get_icon ("ardour_icon_48px"))) { + window_icons.push_back (icon); + } + if (!window_icons.empty()) { Added: head/audio/ardour/files/patch-gtk2__ardour_gain__meter.cc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/audio/ardour/files/patch-gtk2__ardour_gain__meter.cc Sun Jan 28 17:00:07 2018 (r460224) @@ -0,0 +1,25 @@ +--- gtk2_ardour/gain_meter.cc.orig 2010-04-20 17:28:37 UTC ++++ gtk2_ardour/gain_meter.cc +@@ -63,7 +63,7 @@ Glib::RefPtr GainMeter::slider; + void + GainMeter::setup_slider_pix () + { +- if ((slider = ::get_icon ("fader_belt")) == 0) { ++ if (!(slider = ::get_icon ("fader_belt"))) { + throw failed_constructor(); + } + } +@@ -89,11 +89,11 @@ GainMeterBase::GainMeterBase (Session& s, + if (horizontal) { + gain_slider = manage (new HSliderController (pix, + &gain_adjustment, +- false)); ++ 0x0)); + } else { + gain_slider = manage (new VSliderController (pix, + &gain_adjustment, +- false)); ++ 0x0)); + } + + level_meter = new LevelMeter(_session); Added: head/audio/ardour/files/patch-gtk2__ardour_route__time__axis.cc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/audio/ardour/files/patch-gtk2__ardour_route__time__axis.cc Sun Jan 28 17:00:07 2018 (r460224) @@ -0,0 +1,11 @@ +--- gtk2_ardour/route_time_axis.cc.orig 2010-04-17 15:23:01 UTC ++++ gtk2_ardour/route_time_axis.cc +@@ -89,7 +89,7 @@ Glib::RefPtr RouteTimeAxisView::slider; + void + RouteTimeAxisView::setup_slider_pix () + { +- if ((slider = ::get_icon ("fader_belt_h")) == 0) { ++ if (!(slider = ::get_icon ("fader_belt_h"))) { + throw failed_constructor (); + } + } Added: head/audio/ardour/files/patch-libs_gtkmm2ext_fastmeter.cc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/audio/ardour/files/patch-libs_gtkmm2ext_fastmeter.cc Sun Jan 28 17:00:07 2018 (r460224) @@ -0,0 +1,11 @@ +--- libs/gtkmm2ext/fastmeter.cc.orig 2009-02-24 12:37:45 UTC ++++ libs/gtkmm2ext/fastmeter.cc +@@ -476,7 +476,7 @@ FastMeter::set (float lvl) + + Glib::RefPtr win; + +- if ((win = get_window()) == 0) { ++ if (!(win = get_window())) { + queue_draw (); + return; + }