From 46a65a19cb03c567c3718bd931f2a2ee382df060 Mon Sep 17 00:00:00 2001 From: joerg Date: Thu, 15 Dec 2016 23:45:07 +0000 Subject: Fix C++11 fallout. --- audio/ardour/distinfo | 8 ++++- audio/ardour/patches/patch-gtk2__ardour_editor.cc | 27 +++++++++++++++++ .../patches/patch-gtk2__ardour_fft__graph.cc | 24 +++++++++++++++ audio/ardour/patches/patch-gtk2__ardour_startup.cc | 35 ++++++++++++++++++++++ .../patches/patch-libs_canvas_stateful__image.cc | 15 ++++++++++ .../ardour/patches/patch-libs_gtkmm2ext_actions.cc | 15 ++++++++++ .../patches/patch-libs_gtkmm2ext_fastmeter.cc | 15 ++++++++++ 7 files changed, 138 insertions(+), 1 deletion(-) create mode 100644 audio/ardour/patches/patch-gtk2__ardour_editor.cc create mode 100644 audio/ardour/patches/patch-gtk2__ardour_fft__graph.cc create mode 100644 audio/ardour/patches/patch-gtk2__ardour_startup.cc create mode 100644 audio/ardour/patches/patch-libs_canvas_stateful__image.cc create mode 100644 audio/ardour/patches/patch-libs_gtkmm2ext_actions.cc create mode 100644 audio/ardour/patches/patch-libs_gtkmm2ext_fastmeter.cc (limited to 'audio') diff --git a/audio/ardour/distinfo b/audio/ardour/distinfo index a6162fb99a7..fb2c658f6a3 100644 --- a/audio/ardour/distinfo +++ b/audio/ardour/distinfo @@ -1,16 +1,22 @@ -$NetBSD: distinfo,v 1.2 2016/08/27 18:09:16 joerg Exp $ +$NetBSD: distinfo,v 1.3 2016/12/15 23:45:07 joerg Exp $ SHA1 (ardour-4.7.tar.gz) = 95047ccb3fc599ce11c473a0fd7f1eb012c3e440 RMD160 (ardour-4.7.tar.gz) = 366f7057fab9878ac425dd70a751899984abc030 SHA512 (ardour-4.7.tar.gz) = 5daff563ec0b2dc38ec6ca55bb12526ef54da9d8d5a29a9fd6d869f54b83e6fe5ff3c28ef654e6700455110b4a46ce42a33902eb66d96330c6c0948eb3cd3096 Size (ardour-4.7.tar.gz) = 9863149 bytes SHA1 (patch-gtk2__ardour_ardour.sh.in) = 4949797546a2644604aa70e24742b529512d3ad6 +SHA1 (patch-gtk2__ardour_editor.cc) = fe6a6891539d6b04823b6e6b8e8c418e8fa54c69 +SHA1 (patch-gtk2__ardour_fft__graph.cc) = ba111bed3d2cbaf13d5b78283354d0b20c39f3ac +SHA1 (patch-gtk2__ardour_startup.cc) = caba55a5cadf2e5cfa78d74da4d2745d24448b80 SHA1 (patch-gtk2__ardour_wscript) = ab2e95282d82ba08aad83b59f8d2acf9fe45e3c6 SHA1 (patch-libs_ardour_session__state.cc) = 168f67f4af32181d2e3d85d2759383f9acfcbf29 SHA1 (patch-libs_ardouralsautil_wscript) = 7867f29bc2590219ad0cca387bae27bc503374f4 SHA1 (patch-libs_backends_alsa_zita-alsa-pcmi.cc) = bb9efc33e62e840ba253031b60d4de323b7c3e21 SHA1 (patch-libs_backends_jack_wscript) = a048453911b72c9005a5821a5227443e9f78c2e6 +SHA1 (patch-libs_canvas_stateful__image.cc) = 50744261c1c6123bf23dff736246e41171f44936 SHA1 (patch-libs_fst_wscript) = b94e18a903fe3fc0bc71edefa1fd690adc17ee6d +SHA1 (patch-libs_gtkmm2ext_actions.cc) = 2eab170215d58b074fbcb88a850e78fcc5fb9a92 +SHA1 (patch-libs_gtkmm2ext_fastmeter.cc) = 0cd66143d512ec4609f9f79f5ab6bc6334dd038c SHA1 (patch-libs_pbd_fpu.cc) = ebdb6d345bf2e3db0402165412978cb1c9043950 SHA1 (patch-libs_pbd_mountpoint.cc) = 001b8112c08086d32989c82ab699335ecb92ede6 SHA1 (patch-libs_pbd_wscript) = 0caa774358b511d9790e146e92454a0c34a8d5ef diff --git a/audio/ardour/patches/patch-gtk2__ardour_editor.cc b/audio/ardour/patches/patch-gtk2__ardour_editor.cc new file mode 100644 index 00000000000..d16ec52325b --- /dev/null +++ b/audio/ardour/patches/patch-gtk2__ardour_editor.cc @@ -0,0 +1,27 @@ +$NetBSD: patch-gtk2__ardour_editor.cc,v 1.1 2016/12/15 23:45:07 joerg Exp $ + +Use bool conversion, RefPtr doesn't compare to 0 in C++11 mode. + +--- gtk2_ardour/editor.cc.orig 2016-12-15 17:18:50.532467126 +0000 ++++ gtk2_ardour/editor.cc +@@ -714,16 +714,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()) { diff --git a/audio/ardour/patches/patch-gtk2__ardour_fft__graph.cc b/audio/ardour/patches/patch-gtk2__ardour_fft__graph.cc new file mode 100644 index 00000000000..14e0e8330ca --- /dev/null +++ b/audio/ardour/patches/patch-gtk2__ardour_fft__graph.cc @@ -0,0 +1,24 @@ +$NetBSD: patch-gtk2__ardour_fft__graph.cc,v 1.1 2016/12/15 23:45:07 joerg Exp $ + +Use bool conversion, RefPtr doesn't compare to 0 in C++11 mode. + +--- gtk2_ardour/fft_graph.cc.orig 2016-12-15 17:21:24.763867051 +0000 ++++ gtk2_ardour/fft_graph.cc +@@ -203,7 +203,7 @@ FFTGraph::draw_scales(Glib::RefPtrset_rgb_fg_color( grey ); + +- if (layout == 0) { ++ if (!layout) { + layout = create_pango_layout (""); + layout->set_font_description (get_style()->get_font()); + } diff --git a/audio/ardour/patches/patch-gtk2__ardour_startup.cc b/audio/ardour/patches/patch-gtk2__ardour_startup.cc new file mode 100644 index 00000000000..2176a2edf0d --- /dev/null +++ b/audio/ardour/patches/patch-gtk2__ardour_startup.cc @@ -0,0 +1,35 @@ +$NetBSD: patch-gtk2__ardour_startup.cc,v 1.1 2016/12/15 23:45:07 joerg Exp $ + +Use bool conversion, RefPtr doesn't compare to 0 in C++11 mode. + +--- gtk2_ardour/startup.cc.orig 2016-12-15 17:23:30.130893869 +0000 ++++ gtk2_ardour/startup.cc +@@ -79,23 +79,23 @@ ArdourStartup::ArdourStartup () + set_position (WIN_POS_CENTER); + set_border_width (12); + +- if ((icon_pixbuf = ::get_icon ("ardour_icon_48px")) == 0) { ++ if (!(icon_pixbuf = ::get_icon ("ardour_icon_48px"))) { + throw failed_constructor(); + } + + 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 ()) { diff --git a/audio/ardour/patches/patch-libs_canvas_stateful__image.cc b/audio/ardour/patches/patch-libs_canvas_stateful__image.cc new file mode 100644 index 00000000000..5ac834f6077 --- /dev/null +++ b/audio/ardour/patches/patch-libs_canvas_stateful__image.cc @@ -0,0 +1,15 @@ +$NetBSD: patch-libs_canvas_stateful__image.cc,v 1.1 2016/12/15 23:45:07 joerg Exp $ + +Use bool conversion, RefPtr doesn't compare to 0 in C++11 mode. + +--- libs/canvas/stateful_image.cc.orig 2016-12-15 17:12:09.614013045 +0000 ++++ libs/canvas/stateful_image.cc +@@ -108,7 +108,7 @@ StatefulImage::load_states (const XMLNod + continue; + } + +- if ((s.image = find_image (prop->value())) == 0) { ++ if (!(s.image = find_image (prop->value()))) { + error << string_compose (_("image %1 not found for state"), prop->value()) << endmsg; + continue; + } diff --git a/audio/ardour/patches/patch-libs_gtkmm2ext_actions.cc b/audio/ardour/patches/patch-libs_gtkmm2ext_actions.cc new file mode 100644 index 00000000000..5545259d329 --- /dev/null +++ b/audio/ardour/patches/patch-libs_gtkmm2ext_actions.cc @@ -0,0 +1,15 @@ +$NetBSD: patch-libs_gtkmm2ext_actions.cc,v 1.1 2016/12/15 23:45:07 joerg Exp $ + +Use bool conversion, RefPtr doesn't compare to 0 in C++11 mode. + +--- libs/gtkmm2ext/actions.cc.orig 2016-12-15 17:09:46.201195818 +0000 ++++ libs/gtkmm2ext/actions.cc +@@ -401,7 +401,7 @@ ActionManager::get_action (const char* g + gtkmm2.6, so we fall back to the C level. + */ + +- if (ui_manager == 0) { ++ if (!ui_manager) { + return RefPtr (); + } + diff --git a/audio/ardour/patches/patch-libs_gtkmm2ext_fastmeter.cc b/audio/ardour/patches/patch-libs_gtkmm2ext_fastmeter.cc new file mode 100644 index 00000000000..406566f12a9 --- /dev/null +++ b/audio/ardour/patches/patch-libs_gtkmm2ext_fastmeter.cc @@ -0,0 +1,15 @@ +$NetBSD: patch-libs_gtkmm2ext_fastmeter.cc,v 1.1 2016/12/15 23:45:07 joerg Exp $ + +Use bool conversion, RefPtr doesn't compare to 0 in C++11 mode. + +--- libs/gtkmm2ext/fastmeter.cc.orig 2016-12-15 17:10:48.369372136 +0000 ++++ libs/gtkmm2ext/fastmeter.cc +@@ -731,7 +731,7 @@ FastMeter::set (float lvl, float peak) + + Glib::RefPtr win; + +- if ((win = get_window()) == 0) { ++ if (!(win = get_window())) { + queue_draw (); + return; + } -- cgit v1.2.3