Architecture specific change in rpms/glusterfs.git
by githook-noreply@fedoraproject.org
The package rpms/glusterfs.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/glusterfs.git/commit/?id=06620abb....
Change:
+%ifarch s390 s390x %{arm}
Thanks.
Full change:
============
commit 1a75503d909e4b84bd5958263cfab6264eeb0752
Merge: f715df0 97c4e2f
Author: Kaleb S. KEITHLEY <kkeithle(a)redhat.com>
Date: Tue Mar 20 08:28:14 2018 -0400
4.0.0 GA (v4.0.0-2)
Signed-off-by: Kaleb S. KEITHLEY <kkeithle(a)redhat.com>
diff --cc glusterfs.spec
index ed594ad,9f62e55..6daddd6
--- a/glusterfs.spec
+++ b/glusterfs.spec
@@@ -1367,15 -1450,21 +1450,15 @@@ exit
%endif
%changelog
+ * Tue Mar 6 2018 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 4.0.0-2
+ - 4.0.0 GA (v4.0.0-2)
+
-* Tue Mar 6 2018 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 4.0.0-1
-- 4.0.0 GA
+* Thu Mar 1 2018 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 3.13.2-3
+- python2-prettytable, .../rpms/pull-request/3
-* Thu Mar 1 2018 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 4.0.0-0.2rc1
-- 4.0.0 RC1, python2-prettytable, .../rpms/glusterfs/pull-request/3
-
-* Tue Feb 27 2018 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 4.0.0-0.1rc1
-- 4.0.0 RC1
-
-* Fri Feb 2 2018 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 4.0.0rc0-1
-- 4.0.0 RC0
+* Thu Feb 15 2018 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 3.13.2-2
+- shared lib scriptlets, ldconfig
- * Wed Feb 07 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 3.13.2-1.1
- - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
-
* Sat Jan 20 2018 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 3.13.2-1
- 3.13.2 GA
commit 97c4e2fb0440d34dde2bffcf6338d8b04cd023fb
Author: Kaleb S. KEITHLEY <kkeithle(a)redhat.com>
Date: Mon Mar 12 07:31:40 2018 -0400
4.0.0 GA (v4.0.0-2)
Signed-off-by: Kaleb S. KEITHLEY <kkeithle(a)redhat.com>
diff --git a/glusterfs.spec b/glusterfs.spec
index ec19e4b..9f62e55 100644
--- a/glusterfs.spec
+++ b/glusterfs.spec
@@ -222,7 +222,7 @@ Summary: Distributed File System
%if ( 0%{_for_fedora_koji_builds} )
Name: glusterfs
Version: 4.0.0
-Release: %{?prereltag:0.}1%{?prereltag:.%{prereltag}}%{?dist}
+Release: %{?prereltag:0.}2%{?prereltag:.%{prereltag}}%{?dist}
%else
Name: @PACKAGE_NAME@
Version: @PACKAGE_VERSION@
@@ -406,7 +406,7 @@ This package provides the development libraries and include files.
%package events
Summary: GlusterFS Events
Requires: %{name}-server%{?_isa} = %{version}-%{release}
-Requires: python2 python2-prettytable
+Requires: python2 python-prettytable
Requires: python2-gluster = %{version}-%{release}
%if ( 0%{?rhel} )
Requires: python-requests
@@ -484,7 +484,7 @@ Summary: GlusterFS Geo-replication
Requires: %{name} = %{version}-%{release}
Requires: %{name}-server = %{version}-%{release}
Requires: python2
-Requires: python2-prettytable
+Requires: python-prettytable
%if ( 0%{?rhel} && 0%{?rhel} <= 7 )
BuildRequires: python-ctypes
%endif
@@ -1450,6 +1450,9 @@ exit 0
%endif
%changelog
+* Tue Mar 6 2018 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 4.0.0-2
+- 4.0.0 GA (v4.0.0-2)
+
* Tue Mar 6 2018 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 4.0.0-1
- 4.0.0 GA
diff --git a/sources b/sources
index a48fd64..0472c10 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (glusterfs-4.0.0.tar.gz) = acd3c462a8e15fb31f4b30d2e217928488e32d66ae7d1061df3e166354a4ddcdeb0ba0bcc994b7563f83376c882800fad07e190e0086fda987915c195266421f
+SHA512 (glusterfs-4.0.0.tar.gz) = fca4020fb0e3fd7dbabb7b6e6ec270157a7a577941a73bf213770ba2f12a30e281e2a08d796c3a3e101fbef5f6f1958cf12e0696c7dd90d826fbd4d281d9afe4
commit bef36a0b9d32873222bdadd722f160b6351bdfdb
Author: Kaleb S. KEITHLEY <kkeithle(a)redhat.com>
Date: Tue Mar 6 11:11:10 2018 -0500
4.0.0 GA
Signed-off-by: Kaleb S. KEITHLEY <kkeithle(a)redhat.com>
diff --git a/glusterfs.spec b/glusterfs.spec
index 3348c35..ec19e4b 100644
--- a/glusterfs.spec
+++ b/glusterfs.spec
@@ -1,13 +1,9 @@
%global _hardened_build 1
-%if ( 0%{?fedora} && 0%{?fedora} > 27 )
-%undefine _strict_symbol_defs_build
-%endif
-
%global _for_fedora_koji_builds 1
# uncomment and add '%' to use the prereltag for pre-releases
-%global prereltag rc1
+# %%global prereltag rc1
##-----------------------------------------------------------------------------
## All argument definitions should be placed here and keep them sorted
@@ -226,7 +222,7 @@ Summary: Distributed File System
%if ( 0%{_for_fedora_koji_builds} )
Name: glusterfs
Version: 4.0.0
-Release: %{?prereltag:0.}2%{?prereltag:.%{prereltag}}%{?dist}
+Release: %{?prereltag:0.}1%{?prereltag:.%{prereltag}}%{?dist}
%else
Name: @PACKAGE_NAME@
Version: @PACKAGE_VERSION@
@@ -235,7 +231,7 @@ Release: 0.@PACKAGE_RELEASE(a)%{?dist}.5
License: GPLv2 or LGPLv3+
URL: http://docs.gluster.org/
%if ( 0%{_for_fedora_koji_builds} )
-Source0: http://download.gluster.org/pub/gluster/%{name}/qa-releases/%{version}%{?...
+Source0: http://download.gluster.org/pub/gluster/%{name}/4.0/%{version}%{?prerelta...
Source1: glusterd.sysconfig
Source2: glusterfsd.sysconfig
Source6: rhel5-load-fuse-modules
@@ -1454,6 +1450,9 @@ exit 0
%endif
%changelog
+* Tue Mar 6 2018 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 4.0.0-1
+- 4.0.0 GA
+
* Thu Mar 1 2018 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 4.0.0-0.2rc1
- 4.0.0 RC1, python2-prettytable, .../rpms/glusterfs/pull-request/3
diff --git a/sources b/sources
index d42037c..a48fd64 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (glusterfs-4.0.0rc1.tar.gz) = afba232d8d4c7ce3932f64463bd41d902c97dea48bd6b2fc6dd52d2e35d69233adbada2e564f91752e25370d92e4a6de74bc3f6883a9133dfed8545d57ff0a06
+SHA512 (glusterfs-4.0.0.tar.gz) = acd3c462a8e15fb31f4b30d2e217928488e32d66ae7d1061df3e166354a4ddcdeb0ba0bcc994b7563f83376c882800fad07e190e0086fda987915c195266421f
commit 2853f8d9239a857a818787550c6861c98f63f8de
Author: Kaleb S. KEITHLEY <kkeithle(a)redhat.com>
Date: Thu Mar 1 07:58:23 2018 -0500
4.0.0 RC1, python2-prettytable, .../rpms/glusterfs/pull-request/3
Signed-off-by: Kaleb S. KEITHLEY <kkeithle(a)redhat.com>
diff --git a/0001-libtirpc.patch b/0001-libtirpc.patch
deleted file mode 100644
index a88e781..0000000
--- a/0001-libtirpc.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index 14fc0b826..0b48807f1 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -293,6 +293,10 @@ else
- CFLAGS="${CFLAGS} -g -rdynamic"
- fi
-
-+AC_ARG_WITH([libtirpc],
-+ AS_HELP_STRING([--with-libtirpc], [Use libtirpc as RPC implementation (instead of sunrpc)]),
-+ [], [with_libtirpc=no])
-+
- AC_ARG_WITH([ipv6-default], AC_HELP_STRING([--with-ipv6-default], [Set IPv6 as default.]))
- if test "x$with_ipv6_default" = "xyes"; then
- IPV6_DEFAULT=yes
-@@ -1066,6 +1070,14 @@ AC_SUBST(GF_DISTRIBUTION)
- GF_HOST_OS=""
- GF_LDFLAGS="-rdynamic"
-
-+dnl include tirpc for IPv6 builds
-+if test "x$with_libtirpc" = "xyes" || test "x$IPV6_DEFAULT" = "xyes" ; then
-+ PKG_CHECK_MODULES([TIRPC], [libtirpc],
-+ [GF_CFLAGS="$GF_CFLAGS $TIRPC_CFLAGS"; GF_LDFLAGS="$GF_LDFLAGS $TIRPC_LIBS";],
-+ [AC_MSG_ERROR([libtirpc requested or needed for IPv6 default but library not found])]
-+ )
-+fi
-+
- dnl include tirpc for IPv6 builds
- if test "x$IPV6_DEFAULT" = "xyes"; then
- AC_CHECK_LIB([tirpc], [xdr_string], , AC_MSG_ERROR([libtirpc is required to build glusterfs with IPv6 default]))
diff --git a/glusterfs.spec b/glusterfs.spec
index f204578..3348c35 100644
--- a/glusterfs.spec
+++ b/glusterfs.spec
@@ -226,7 +226,7 @@ Summary: Distributed File System
%if ( 0%{_for_fedora_koji_builds} )
Name: glusterfs
Version: 4.0.0
-Release: %{?prereltag:0.}1%{?prereltag:.%{prereltag}}%{?dist}
+Release: %{?prereltag:0.}2%{?prereltag:.%{prereltag}}%{?dist}
%else
Name: @PACKAGE_NAME@
Version: @PACKAGE_VERSION@
@@ -410,7 +410,7 @@ This package provides the development libraries and include files.
%package events
Summary: GlusterFS Events
Requires: %{name}-server%{?_isa} = %{version}-%{release}
-Requires: python2 python-prettytable
+Requires: python2 python2-prettytable
Requires: python2-gluster = %{version}-%{release}
%if ( 0%{?rhel} )
Requires: python-requests
@@ -488,7 +488,7 @@ Summary: GlusterFS Geo-replication
Requires: %{name} = %{version}-%{release}
Requires: %{name}-server = %{version}-%{release}
Requires: python2
-Requires: python-prettytable
+Requires: python2-prettytable
%if ( 0%{?rhel} && 0%{?rhel} <= 7 )
BuildRequires: python-ctypes
%endif
@@ -1454,7 +1454,10 @@ exit 0
%endif
%changelog
-* Tue Feb 27 2018 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 4.0.0rc1-1
+* Thu Mar 1 2018 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 4.0.0-0.2rc1
+- 4.0.0 RC1, python2-prettytable, .../rpms/glusterfs/pull-request/3
+
+* Tue Feb 27 2018 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 4.0.0-0.1rc1
- 4.0.0 RC1
* Fri Feb 2 2018 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 4.0.0rc0-1
commit 06620abb6ea10bd86972d5305340115d8f258a04
Author: Kaleb S. KEITHLEY <kkeithle(a)redhat.com>
Date: Tue Feb 27 08:58:41 2018 -0500
4.0.0 RC1
Signed-off-by: Kaleb S. KEITHLEY <kkeithle(a)redhat.com>
diff --git a/glusterfs.spec b/glusterfs.spec
index 471c082..f204578 100644
--- a/glusterfs.spec
+++ b/glusterfs.spec
@@ -1,51 +1,58 @@
%global _hardened_build 1
+%if ( 0%{?fedora} && 0%{?fedora} > 27 )
+%undefine _strict_symbol_defs_build
+%endif
+
%global _for_fedora_koji_builds 1
# uncomment and add '%' to use the prereltag for pre-releases
-# %%global prereltag rc1
+%global prereltag rc1
##-----------------------------------------------------------------------------
## All argument definitions should be placed here and keep them sorted
##
-# if you wish to compile an rpm with debugging...
-# rpmbuild -ta @PACKAGE_NAME@-@PACKAGE_VERSION@.tar.gz --with debug
-%{?_with_debug:%global _with_debug --enable-debug}
-
-# if you wish to compile an rpm to run all processes under valgrind...
-# rpmbuild -ta @PACKAGE_NAME@-@PACKAGE_VERSION@.tar.gz --with valgrind
-%{?_with_valgrind:%global _with_valgrind --enable-valgrind}
+# bd
+# if you wish to compile an rpm without the BD map support...
+# rpmbuild -ta @PACKAGE_NAME@-@PACKAGE_VERSION@.tar.gz --without bd
+%{?_without_bd:%global _without_bd --disable-bd-xlator}
-# if you wish to compile an rpm with IPv6 default...
-# rpmbuild -ta @PACKAGE_NAME@-@PACKAGE_VERSION@.tar.gz --with ipv6default
-%{?_with_ipv6default:%global _with_ipv6default --with-ipv6default}
+%if ( 0%{?rhel} && 0%{?rhel} < 6 || 0%{?sles_version} )
+%global _without_bd --disable-bd-xlator
+%endif
+# cmocka
# if you wish to compile an rpm with cmocka unit testing...
# rpmbuild -ta @PACKAGE_NAME@-@PACKAGE_VERSION@.tar.gz --with cmocka
%{?_with_cmocka:%global _with_cmocka --enable-cmocka}
-# if you wish to compile an rpm without rdma support, compile like this...
-# rpmbuild -ta @PACKAGE_NAME@-@PACKAGE_VERSION@.tar.gz --without rdma
-%{?_without_rdma:%global _without_rdma --disable-ibverbs}
-
-# No RDMA Support on s390(x)
-%ifarch s390 s390x %{arm}
-%global _without_rdma --disable-ibverbs
-%endif
+# debug
+# if you wish to compile an rpm with debugging...
+# rpmbuild -ta @PACKAGE_NAME@-@PACKAGE_VERSION@.tar.gz --with debug
+%{?_with_debug:%global _with_debug --enable-debug}
+# epoll
# if you wish to compile an rpm without epoll...
# rpmbuild -ta @PACKAGE_NAME@-@PACKAGE_VERSION@.tar.gz --without epoll
%{?_without_epoll:%global _without_epoll --disable-epoll}
+# fusermount
# if you wish to compile an rpm without fusermount...
# rpmbuild -ta @PACKAGE_NAME@-@PACKAGE_VERSION@.tar.gz --without fusermount
%{?_without_fusermount:%global _without_fusermount --disable-fusermount}
+# geo-rep
# if you wish to compile an rpm without geo-replication support, compile like this...
# rpmbuild -ta @PACKAGE_NAME@-@PACKAGE_VERSION@.tar.gz --without georeplication
%{?_without_georeplication:%global _without_georeplication --disable-georeplication}
+# Disable geo-replication on EL5, as its default Python is too old
+%if ( 0%{?rhel} && 0%{?rhel} < 6 )
+%global _without_georeplication --disable-georeplication
+%endif
+
+# gnfs
# if you wish to compile an rpm with the legacy gNFS server xlator
# rpmbuild -ta @PACKAGE_NAME@-@PACKAGE_VERSION@.tar.gz --with gnfs
%{?_with_gnfs:%global _with_gnfs --enable-gnfs}
@@ -54,15 +61,48 @@
%global _with_gnfs --enable-gnfs
%endif
-# Disable geo-replication on EL5, as its default Python is too old
-%if ( 0%{?rhel} && 0%{?rhel} < 6 )
-%global _without_georeplication --disable-georeplication
+# ipv6default
+# if you wish to compile an rpm with IPv6 default...
+# rpmbuild -ta @PACKAGE_NAME@-@PACKAGE_VERSION@.tar.gz --with ipv6default
+%{?_with_ipv6default:%global _with_ipv6default --with-ipv6default}
+
+# libtirpc
+# if you wish to compile an rpm without TIRPC (i.e. use legacy glibc rpc)
+# rpmbuild -ta @PACKAGE_NAME@-@PACKAGE_VERSION@.tar.gz --without libtirpc
+%{?_without_libtirpc:%global _without_libtirpc --without-libtirpc}
+
+# Do not use libtirpc on EL6, it does not have xdr_uint64_t() and xdr_uint32_t
+# Do not use libtirpc on EL7, it does not have xdr_sizeof()
+%if ( 0%{?rhel} && 0%{?rhel} <= 7 )
+%global _without_libtirpc --without-libtirpc
%endif
+# ocf
# if you wish to compile an rpm without the OCF resource agents...
# rpmbuild -ta @PACKAGE_NAME@-@PACKAGE_VERSION@.tar.gz --without ocf
%{?_without_ocf:%global _without_ocf --without-ocf}
+#rdma
+# if you wish to compile an rpm without rdma support, compile like this...
+# rpmbuild -ta @PACKAGE_NAME@-@PACKAGE_VERSION@.tar.gz --without rdma
+%{?_without_rdma:%global _without_rdma --disable-ibverbs}
+
+# No RDMA Support on s390(x)
+%ifarch s390 s390x %{arm}
+%global _without_rdma --disable-ibverbs
+%endif
+
+# server
+# if you wish to build rpms without server components, compile like this
+# rpmbuild -ta @PACKAGE_NAME@-@PACKAGE_VERSION@.tar.gz --without server
+%{?_without_server:%global _without_server --without-server}
+
+# disable server components forcefully as rhel <= 6
+%if ( 0%{?rhel} && 0%{?rhel} <= 6 )
+%global _without_server --without-server
+%endif
+
+# syslog
# if you wish to build rpms without syslog logging, compile like this
# rpmbuild -ta @PACKAGE_NAME@-@PACKAGE_VERSION@.tar.gz --without syslog
%{?_without_syslog:%global _without_syslog --disable-syslog}
@@ -71,40 +111,34 @@
# Fedora deprecated syslog, see
# https://fedoraproject.org/wiki/Changes/NoDefaultSyslog
# (And what about RHEL7?)
-%if ( 0%{?fedora} && 0%{?fedora} >= 20 ) || ( 0%{?rhel} && 0%{?rhel} < 7 )
+%if ( ( 0%{?fedora} && 0%{?fedora} >= 20 ) || ( 0%{?rhel} && 0%{?rhel} < 7 ) )
%global _without_syslog --disable-syslog
%endif
-# if you wish to compile an rpm without the BD map support...
-# rpmbuild -ta @PACKAGE_NAME@-@PACKAGE_VERSION@.tar.gz --without bd
-%{?_without_bd:%global _without_bd --disable-bd-xlator}
-
-%if ( 0%{?rhel} && 0%{?rhel} < 6 || 0%{?sles_version} )
-%global _without_bd --disable-bd-xlator
-%endif
-
+# tier
# Disable data-tiering on EL5, sqlite is too old
%if ( 0%{?rhel} && 0%{?rhel} < 6 )
%global _without_tiering --disable-tiering
%endif
-%if ( 0%{?fedora} && 0%{?fedora} > 27 )
-%global _with_libtirpc --with-libtirpc
-%endif
+# valgrind
+# if you wish to compile an rpm to run all processes under valgrind...
+# rpmbuild -ta @PACKAGE_NAME@-@PACKAGE_VERSION@.tar.gz --with valgrind
+%{?_with_valgrind:%global _with_valgrind --enable-valgrind}
##-----------------------------------------------------------------------------
## All %%global definitions should be placed here and keep them sorted
##
-%if ( 0%{?fedora} ) || ( 0%{?rhel} && 0%{?rhel} > 6 )
+%if ( 0%{?fedora} || ( 0%{?rhel} && 0%{?rhel} > 6 ) )
%global _with_systemd true
%endif
-%if ( 0%{?fedora} ) || ( 0%{?rhel} && 0%{?rhel} > 6 )
+%if ( 0%{?fedora} || ( 0%{?rhel} && 0%{?rhel} > 6 ) )
%global _with_firewalld --enable-firewalld
%endif
-%if 0%{?_tmpfilesdir:1}
+%if ( 0%{?_tmpfilesdir:1} )
%global _with_tmpfilesdir --with-tmpfilesdir=%{_tmpfilesdir}
%else
%global _with_tmpfilesdir --without-tmpfilesdir
@@ -115,6 +149,14 @@
%global _without_events --disable-events
%endif
+# without server should also disable some server-only components
+%if ( 0%{?_without_server:1} )
+%global _without_events --disable-events
+%global _without_georeplication --disable-georeplication
+%global _with_gnfs %{nil}
+%global _without_tiering --disable-tiering
+%endif
+
# From https://fedoraproject.org/wiki/Packaging:Python#Macros
%if ( 0%{?rhel} && 0%{?rhel} < 7 )
%{!?python2_sitelib: %global python2_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")}
@@ -183,17 +225,17 @@
Summary: Distributed File System
%if ( 0%{_for_fedora_koji_builds} )
Name: glusterfs
-Version: 3.13.2
-Release: %{?prereltag:0.}2%{?prereltag:.%{prereltag}}%{?dist}
+Version: 4.0.0
+Release: %{?prereltag:0.}1%{?prereltag:.%{prereltag}}%{?dist}
%else
Name: @PACKAGE_NAME@
Version: @PACKAGE_VERSION@
-Release: 0.@PACKAGE_RELEASE(a)%{?dist}.6
+Release: 0.@PACKAGE_RELEASE(a)%{?dist}.5
%endif
License: GPLv2 or LGPLv3+
URL: http://docs.gluster.org/
%if ( 0%{_for_fedora_koji_builds} )
-Source0: http://bits.gluster.org/pub/gluster/%{name}/src/%{name}-%{version}%{?prer...
+Source0: http://download.gluster.org/pub/gluster/%{name}/qa-releases/%{version}%{?...
Source1: glusterd.sysconfig
Source2: glusterfsd.sysconfig
Source6: rhel5-load-fuse-modules
@@ -202,8 +244,8 @@ Source8: glusterfsd.init
%else
Source0: @PACKAGE_NAME@-@PACKAGE_VERSION@.tar.gz
%endif
-Patch0: 0001-libtirpc.patch
+BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
Requires(pre): shadow-utils
%if ( 0%{?rhel} && 0%{?rhel} < 6 )
@@ -226,7 +268,7 @@ BuildRequires: python2-devel
%if ( 0%{?rhel} && 0%{?rhel} <= 7 )
BuildRequires: python-ctypes
%endif
-%if ( 0%{?fedora} && 0%{?fedora} > 27 ) || ( 0%{?_with_ipv6default:1} )
+%if ( 0%{?_with_ipv6default:1} || 0%{!?_without_libtirpc:1} )
BuildRequires: libtirpc-devel
%endif
%if ( 0%{?fedora} && 0%{?fedora} > 27 )
@@ -254,7 +296,7 @@ BuildRequires: lvm2-devel
BuildRequires: libattr-devel
%endif
-%if (0%{?_with_firewalld:1})
+%if ( 0%{?_with_firewalld:1} )
BuildRequires: firewalld
%endif
@@ -315,6 +357,7 @@ is in user space and easily manageable.
This package provides the api include files.
+%if ( 0%{!?_without_server:1} )
%package cli
Summary: GlusterFS CLI
Requires: %{name}-libs = %{version}-%{release}
@@ -329,6 +372,7 @@ called Translators from GNU Hurd kernel. Much of the code in GlusterFS
is in user space and easily manageable.
This package provides the GlusterFS CLI application and its man page
+%endif
%package client-xlators
Summary: GlusterFS client-side translators
@@ -370,10 +414,8 @@ Requires: python2 python-prettytable
Requires: python2-gluster = %{version}-%{release}
%if ( 0%{?rhel} )
Requires: python-requests
-Requires: python-jwt
%else
Requires: python2-requests
-Requires: python2-jwt
%endif
%if ( 0%{?rhel} && 0%{?rhel} < 7 )
Requires: python-argparse
@@ -595,6 +637,7 @@ Open Cluster Framework (OCF) compliant cluster resource managers,
like Pacemaker.
%endif
+%if ( 0%{!?_without_server:1} )
%package server
Summary: Distributed file-system server
Requires: %{name} = %{version}-%{release}
@@ -602,9 +645,6 @@ Requires: %{name}-libs = %{version}-%{release}
Requires: %{name}-cli = %{version}-%{release}
# some daemons (like quota) use a fuse-mount, glusterfsd is part of -fuse
Requires: %{name}-fuse = %{version}-%{release}
-%if ( 0%{?_with_ipv6default:1} )
-Requires: libtirpc
-%endif
# self-heal daemon, rebalance, nfs-server etc. are actually clients
Requires: %{name}-api = %{version}-%{release}
Requires: %{name}-client-xlators = %{version}-%{release}
@@ -657,11 +697,11 @@ called Translators from GNU Hurd kernel. Much of the code in GlusterFS
is in user space and easily manageable.
This package provides the glusterfs server daemon.
+%endif
%prep
%setup -q -n %{name}-%{version}%{?prereltag}
-%patch0 -p1
%build
%if ( 0%{?rhel} && 0%{?rhel} < 6 )
@@ -685,9 +725,10 @@ sed -i -e 's/--quiet//' configure.ac
%{?_without_ocf} \
%{?_without_rdma} \
%{?_without_syslog} \
+ %{?_without_server} \
%{?_without_tiering} \
%{?_with_ipv6default} \
- %{?_with_libtirpc}
+ %{?_without_libtirpc}
# fix hardening and remove rpath in shlibs
%if ( 0%{?fedora} ) || ( 0%{?rhel} && 0%{?rhel} > 6 )
@@ -713,9 +754,11 @@ install -D -p -m 0644 %{SOURCE1} \
install -D -p -m 0644 %{SOURCE2} \
%{buildroot}%{_sysconfdir}/sysconfig/glusterfsd
%else
+%if ( 0%{!?_without_server:1} )
install -D -p -m 0644 extras/glusterd-sysconfig \
%{buildroot}%{_sysconfdir}/sysconfig/glusterd
%endif
+%endif
%if ( 0%{_for_fedora_koji_builds} )
%if ( 0%{?rhel} && 0%{?rhel} < 6 )
@@ -762,12 +805,14 @@ rm -f %{buildroot}%{_defaultdocdir}/%{name}/glusterfs-mode.el
rm -f %{buildroot}%{_defaultdocdir}/%{name}/glusterfs.vim
%endif
+%if ( 0%{!?_without_server:1} )
# Create working directory
mkdir -p %{buildroot}%{_sharedstatedir}/glusterd
# Update configuration file to /var/lib working directory
sed -i 's|option working-directory /etc/glusterd|option working-directory %{_sharedstatedir}/glusterd|g' \
%{buildroot}%{_sysconfdir}/glusterfs/glusterd.vol
+%endif
# Install glusterfsd .service or init.d file
%if ( 0%{_for_fedora_koji_builds} )
@@ -785,6 +830,7 @@ install -D -p -m 0644 extras/glusterfs-georep-logrotate \
%{buildroot}%{_sysconfdir}/logrotate.d/glusterfs-georep
%endif
+%if ( 0%{!?_without_server:1} )
# the rest of the ghosts
touch %{buildroot}%{_sharedstatedir}/glusterd/glusterd.info
touch %{buildroot}%{_sharedstatedir}/glusterd/options
@@ -803,19 +849,26 @@ mkdir -p %{buildroot}%{_sharedstatedir}/glusterd/snaps
mkdir -p %{buildroot}%{_sharedstatedir}/glusterd/ss_brick
touch %{buildroot}%{_sharedstatedir}/glusterd/nfs/nfs-server.vol
touch %{buildroot}%{_sharedstatedir}/glusterd/nfs/run/nfs.pid
+%endif
%if ( ! 0%{_for_fedora_koji_builds} )
find ./tests ./run-tests.sh -type f | cpio -pd %{buildroot}%{_prefix}/share/glusterfs
%endif
+%if ( 0%{!?_without_server:1} )
## Install bash completion for cli
install -p -m 0755 -D extras/command-completion/gluster.bash \
%{buildroot}%{_sysconfdir}/bash_completion.d/gluster
+%endif
+
+%clean
+rm -rf %{buildroot}
##-----------------------------------------------------------------------------
## All %%post should be placed here and keep them sorted
##
%post
+/sbin/ldconfig
%if ( 0%{!?_without_syslog:1} )
%if ( 0%{?fedora} ) || ( 0%{?rhel} && 0%{?rhel} >= 6 )
%systemd_postun_with_restart rsyslog
@@ -823,6 +876,8 @@ install -p -m 0755 -D extras/command-completion/gluster.bash \
%endif
exit 0
+%post api -p /sbin/ldconfig
+
%if ( 0%{!?_without_events:1} )
%post events
%systemd_post glustereventsd
@@ -843,6 +898,11 @@ fi
exit 0
%endif
+%post libs
+/sbin/ldconfig
+exit 0
+
+%if ( 0%{!?_without_server:1} )
%post server
# Legacy server
%systemd_post glusterd
@@ -885,6 +945,7 @@ fi
# BZ 834847
if [ -e /etc/ld.so.conf.d/glusterfs.conf ]; then
rm -f /etc/ld.so.conf.d/glusterfs.conf
+ /sbin/ldconfig
fi
%if (0%{?_with_firewalld:1})
@@ -913,6 +974,7 @@ else
rm -f %{_rundir}/glusterd.socket
fi
exit 0
+%endif
##-----------------------------------------------------------------------------
## All %%pre should be placed here and keep them sorted
@@ -936,6 +998,7 @@ fi
exit 0
%endif
+%if ( 0%{!?_without_server:1} )
%preun server
if [ $1 -eq 0 ]; then
if [ -f %glusterfsd_svcfile ]; then
@@ -954,11 +1017,13 @@ if [ $1 -ge 1 ]; then
%systemd_postun_with_restart glusterd
fi
exit 0
+%endif
##-----------------------------------------------------------------------------
## All %%postun should be placed here and keep them sorted
##
%postun
+/sbin/ldconfig
%if ( 0%{!?_without_syslog:1} )
%if ( 0%{?fedora} ) || ( 0%{?rhel} && 0%{?rhel} >= 6 )
%systemd_postun_with_restart rsyslog
@@ -966,11 +1031,22 @@ exit 0
%endif
exit 0
+%postun api
+/sbin/ldconfig
+exit 0
+
+%postun libs
+/sbin/ldconfig
+exit 0
+
+%if ( 0%{!?_without_server:1} )
%postun server
+/sbin/ldconfig
%if (0%{?_with_firewalld:1})
%firewalld_reload
%endif
exit 0
+%endif
##-----------------------------------------------------------------------------
## All %%files should be placed here and keep them sorted by groups
@@ -979,16 +1055,20 @@ exit 0
%{!?_licensedir:%global license %%doc}
%license COPYING-GPLV2 COPYING-LGPLV3
%doc ChangeLog INSTALL README.md THANKS
+%if ( 0%{!?_without_server:1} )
%{_mandir}/man8/*gluster*.8*
+%endif
%exclude %{_mandir}/man8/gluster.8*
%dir %{_localstatedir}/log/glusterfs
%if ( 0%{!?_without_rdma:1} )
%exclude %{_libdir}/glusterfs/%{version}%{?prereltag}/rpc-transport/rdma*
%endif
+%if ( 0%{!?_without_server:1} )
%dir %{_datadir}/glusterfs
%dir %{_datadir}/glusterfs/scripts
%{_datadir}/glusterfs/scripts/post-upgrade-script-for-quota.sh
%{_datadir}/glusterfs/scripts/pre-upgrade-script-for-quota.sh
+%endif
# xlators that are needed on the client- and on the server-side
%dir %{_libdir}/glusterfs
%dir %{_libdir}/glusterfs/%{version}%{?prereltag}
@@ -1034,7 +1114,7 @@ exit 0
%dir %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/system
%{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/system/posix-acl.so
%dir %attr(0775,gluster,gluster) %{_rundir}/gluster
-%if 0%{?_tmpfilesdir:1}
+%if 0%{?_tmpfilesdir:1} && 0%{!?_without_server:1}
%{_tmpfilesdir}/gluster.conf
%endif
@@ -1052,10 +1132,12 @@ exit 0
%dir %{_includedir}/glusterfs/api
%{_includedir}/glusterfs/api/*
+%if ( 0%{!?_without_server:1} )
%files cli
%{_sbindir}/gluster
%{_mandir}/man8/gluster.8*
%{_sysconfdir}/bash_completion.d/gluster
+%endif
%files client-xlators
%dir %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/cluster
@@ -1114,7 +1196,7 @@ exit 0
%endif
%endif
-%if ( 0%{?_with_gnfs:1} )
+%if ( 0%{?_with_gnfs:1} && 0%{!?_without_server:1} )
%files gnfs
%dir %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/nfs
%{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/nfs/*
@@ -1199,6 +1281,7 @@ exit 0
%{_prefix}/lib/ocf/resource.d/glusterfs
%endif
+%if ( 0%{!?_without_server:1} )
%files server
%doc extras/clear_xattrs.sh
# sysconf
@@ -1239,6 +1322,7 @@ exit 0
%{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/arbiter.so
%{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/bit-rot.so
%{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/bitrot-stub.so
+ %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/sdfs.so
%if ( 0%{!?_without_tiering:1} )
%{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/changetimerecorder.so
%{_libdir}/libgfdb.so.*
@@ -1334,6 +1418,8 @@ exit 0
%{_datadir}/glusterfs/scripts/stop-all-gluster-processes.sh
%if ( 0%{?_with_systemd:1} )
%{_libexecdir}/glusterfs/mount-shared-storage.sh
+ %{_datadir}/glusterfs/scripts/control-cpu-load.sh
+ %{_datadir}/glusterfs/scripts/control-mem.sh
%endif
# Incrementalapi
@@ -1345,6 +1431,7 @@ exit 0
%if ( 0%{?_with_firewalld:1} )
%{_prefix}/lib/firewalld/services/glusterfs.xml
%endif
+%endif
# Events
%if ( 0%{!?_without_events:1} )
@@ -1367,11 +1454,11 @@ exit 0
%endif
%changelog
-* Thu Feb 15 2018 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 3.13.2-2
-- shared lib scriptlets, ldconfig
+* Tue Feb 27 2018 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 4.0.0rc1-1
+- 4.0.0 RC1
-* Wed Feb 07 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 3.13.2-1.1
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+* Fri Feb 2 2018 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 4.0.0rc0-1
+- 4.0.0 RC0
* Sat Jan 20 2018 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 3.13.2-1
- 3.13.2 GA
diff --git a/sources b/sources
index fd2ca38..d42037c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (glusterfs-3.13.2.tar.gz) = 5c89390805b8c5cb3b1eed91300e239a3772a076c2ee1c14332688b509cb396e7ef5772d0b45905807515798bcaeef26c806017bdcdbb0efc83048c07b772d81
+SHA512 (glusterfs-4.0.0rc1.tar.gz) = afba232d8d4c7ce3932f64463bd41d902c97dea48bd6b2fc6dd52d2e35d69233adbada2e564f91752e25370d92e4a6de74bc3f6883a9133dfed8545d57ff0a06
6 years, 1 month
[Report] Packages Restricting Arches
by root
New package excluding arches (2)
============================
- glusterd2
ExclusiveArch: %{go_arches}
- safetyblanket
ExclusiveArch: %{arm} %{ix86} x86_64 %{mips} aarch64 ppc64
List of packages currently excluding arches (2539)
===========================================
- 0ad
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64
- 90-Second-Portraits
ExclusiveArch: %{arm} %{ix86} x86_64 %{mips} aarch64 ppc64
- GtkAda
ExclusiveArch: %{GPRbuild_arches}
- GtkAda3
ExclusiveArch: %{GPRbuild_arches}
- LuxRender
ExclusiveArch: x86_64
- OpenTK
ExclusiveArch: %mono_arches
- PragmARC
ExclusiveArch: %{GPRbuild_arches}
- R-DynDoc
ExclusiveArch: armv7, ppc, go_arch
- RdRand
ExclusiveArch: %{ix86} x86_64
- SLOF
ExclusiveArch: ppc64le
- YafaRay
ExclusiveArch: %{ix86} x86_64
- aboot
ExclusiveArch: alpha
- acpid
ExclusiveArch: ia64 x86_64 %{ix86} %{arm} aarch64
- ahven
ExclusiveArch: %{GPRbuild_arches}
- alleyoop
ExclusiveArch: %{ix86} x86_64 ppc ppc64 ppc64le s390x %{arm} aarch64
- american-fuzzy-lop
ExclusiveArch: %{ix86} x86_64
- anet
ExclusiveArch: %{GPRbuild_arches}
- apmd
ExclusiveArch: %{ix86}
- apmud
ExclusiveArch: ppc
- appstream-generator
ExclusiveArch: x86_64 %{ix86} %{arm}
- arduino
ExclusiveArch: %{go_arches}
- arduino-builder
ExclusiveArch: %{go_arches}
- arm-boot-config
ExclusiveArch: %{arm}
- arm-trusted-firmware
ExclusiveArch: aarch64
- atomic
ExclusiveArch: i386 i486 i586 i686 pentium3 pentium4 athlon geode x86_64 armv3l armv4b armv4l armv4tl armv5tel armv5tejl armv6l armv6hl armv7l armv7hl armv7hnl aarch64 ppc64le s390x mips mipsel mipsr6 mipsr6el mips64 mips64el mips64r6 mips64r6el
ExclusiveArch: x86_64 ppc64le
- aunit
ExclusiveArch: %GPRbuild_arches
- avgtime
ExclusiveArch: %{ldc_arches}
- aws
ExclusiveArch: %GPRbuild_arches
- banshee
ExclusiveArch: %{mono_arches}
- banshee-community-extensions
ExclusiveArch: %ix86 x86_64 ppc ppc64 ia64 %{arm} sparcv9 alpha s390x
- bareftp
ExclusiveArch: %{mono_arches}
- bcal
ExclusiveArch: x86_64 aarch64 ia64 ppc64 ppc64le s390x
- bcc
ExclusiveArch: x86_64 %{power64}
- bcm283x-firmware
ExclusiveArch: %{arm} aarch64
- beignet
ExclusiveArch: x86_64 %{ix86}
- berusky2
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 %{mips}
- biosdevname
ExclusiveArch: %{ix86} x86_64 ia64
- bless
ExclusiveArch: %mono_arches
- boo
ExclusiveArch: %{mono_arches}
- buildah
ExclusiveArch: x86_64 %{arm} aarch64 ppc64le s390x
- bwa
ExclusiveArch: x86_64
- caddy
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 ppc64le
- cadvisor
ExclusiveArch: %{ix86} x86_64 aarch64 ppc64le
- calamares
ExclusiveArch: %{ix86} x86_64
- cargo
ExclusiveArch: %{rust_arches}
- carto
ExclusiveArch: %{nodejs_arches} noarch
- ccdciel
ExclusiveArch: %{fpc_arches}
- cdcollect
ExclusiveArch: %{mono_arches}
- ceph
ExclusiveArch: x86_64 aarch64 ppc64 ppc64le
ExclusiveArch: x86_64 aarch64 ppc64le s390x
- chromium
ExclusiveArch: x86_64 i686
ExclusiveArch: x86_64 i686 aarch64
- cjdns
ExclusiveArch: %{nodejs_arches}
- cmospwd
ExclusiveArch: %{ix86} x86_64
- cmrt
ExclusiveArch: %{ix86} x86_64 ia64
- coffee-script
ExclusiveArch: %{nodejs_arches} noarch
- colorful
ExclusiveArch: %{fpc_arches}
- compat-gcc-296
ExclusiveArch: %{ix86} ia64 ppc
- consul
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- containerd
ExclusiveArch: %{go_arches}
- corosync
ExclusiveArch: i686 x86_64
- cpuid
ExclusiveArch: %{ix86} x86_64
- cqrlog
ExclusiveArch: %{fpc_arches}
- crash
ExclusiveArch: %{ix86} ia64 x86_64 ppc ppc64 s390 s390x %{arm} aarch64 ppc64le
- cri-tools
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- criu
ExclusiveArch: x86_64 %{arm} ppc64le aarch64
ExclusiveArch: x86_64 %{arm} ppc64le aarch64 s390x
- cryptlib
ExclusiveArch: x86_64 %{ix86} aarch64 ppc64 ppc64le
- cryptobone
ExclusiveArch: x86_64 %{ix86} ppc64 ppc64le aarch64
- daq
ExclusiveArch: x86_64 aarch64
- darktable
ExclusiveArch: x86_64 aarch64
- dbus-sharp
ExclusiveArch: %mono_arches
- dbus-sharp-glib
ExclusiveArch: %mono_arches
- dbxtool
ExclusiveArch: i386 x86_64 aarch64
- deepin-api
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- deepin-daemon
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- deepin-dbus-generator
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- deepin-gir-generator
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- derelict
ExclusiveArch: %{ldc_arches}
- direnv
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- dlm
ExclusiveArch: i686 x86_64
- dmidecode
ExclusiveArch: %{ix86} x86_64 ia64 aarch64
- dmtcp
ExclusiveArch: %ix86 x86_64 aarch64
- docco
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- docker
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 ppc64le s390x %{mips}
- docker-anaconda-addon
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 ppc64le s390x %{mips}
- docker-distribution
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- docker-latest
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 ppc64le s390x %{mips}
- dolphin-emu
ExclusiveArch: x86_64 armv7l aarch64
- douceur
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- dpdk
ExclusiveArch: x86_64 i686 aarch64 ppc64le
- dssi-vst
ExclusiveArch: %{ix86} x86_64
- dustmite
ExclusiveArch: %{ldc_arches}
- dyninst
ExclusiveArch: %{ix86} x86_64 ppc ppc64
- e3
ExclusiveArch: %{ix86} x86_64
- edac-utils
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 %{power64}
- edb
ExclusiveArch: %{ix86} x86_64
- edk2
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64
ExclusiveArch: x86_64 aarch64
- efibootmgr
ExclusiveArch: %{ix86} x86_64 aarch64 arm
- efivar
ExclusiveArch: %{ix86} x86_64 aarch64 %{arm}
- elasticdump
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
ExclusiveArch: %{nodejs_arches} noarch
- elk
ExclusiveArch: x86_64 %{ix86}
ExclusiveArch: x86_64 %{ix86} aarch64 %{arm} %{power64}
- embree
ExclusiveArch: x86_64
- envytools
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64
- exciting
ExclusiveArch: x86_64 %{ix86}
ExclusiveArch: x86_64 %{ix86} aarch64 %{arm} %{power64}
- exercism
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- expresso
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- extlinux-bootloader
ExclusiveArch: %{arm} aarch64
- fcitx-libpinyin
ExclusiveArch: %{qt5_qtwebengine_arches}
- fedora-developer-portal
ExclusiveArch: ix86 x86_64
- fedora-dockerfiles
ExclusiveArch: %{go_arches}
- fedora-gnat-project-common
ExclusiveArch: noarch %{GNAT_arches}
- fence-virt
ExclusiveArch: i686 x86_64
- fes
ExclusiveArch: x86_64
- firmware-addon-dell
ExclusiveArch: x86_64 ia64 %{ix86}
- flannel
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 ppc64le s390x
- florist
ExclusiveArch: %{GPRbuild_arches}
- fluxcapacitor
ExclusiveArch: %{ix86} x86_64 %{arm}
- fpc
ExclusiveArch: %{arm} %{ix86} x86_64 ppc ppc64
- freshmaker
ExclusiveArch: %{ix86} x86_64
- frysk
ExclusiveArch: %{ix86} x86_64 ppc64
- fst
ExclusiveArch: i686
- fwts
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 s390x %{power64}
- fwupdate
ExclusiveArch: x86_64 aarch64
- fzf
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- ga
ExclusiveArch: %{ix86} x86_64
- gbrainy
ExclusiveArch: %mono_arches
- gdata-sharp
ExclusiveArch: %mono_arches
- gdb-exploitable
ExclusiveArch: x86_64 i386
ExclusiveArch: x86_64 noarch
- gela-asis
ExclusiveArch: %GPRbuild_arches
- ghdl
ExclusiveArch: %{GNAT_arches}
- gio-sharp
ExclusiveArch: %mono_arches
- gir-to-d
ExclusiveArch: %{ldc_arches}
- git-lfs
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm} aarch64 ppc64le s390x}
- git-octopus
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- giver
ExclusiveArch: %{mono_arches}
- gkeyfile-sharp
ExclusiveArch: %mono_arches
- gl3n
ExclusiveArch: %{ldc_arches}
- glibc32
ExclusiveArch: x86_64 ppc64 s390x
- glusterd2
ExclusiveArch: %{go_arches}
- gmqcc
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64
- gnatcoll
ExclusiveArch: %GPRbuild_arches
- gnome-boxes
ExclusiveArch: x86_64
- gnome-desktop-sharp
ExclusiveArch: %mono_arches
- gnome-do
ExclusiveArch: %mono_arches
- gnome-guitar
ExclusiveArch: %{mono_arches}
- gnome-keyring-sharp
ExclusiveArch: %mono_arches
- gnome-rdp
ExclusiveArch: %{mono_arches}
- gnome-sharp
ExclusiveArch: %mono_arches
- gnome-subtitles
ExclusiveArch: %mono_arches
- gnu-efi
ExclusiveArch: x86_64 aarch64 %{arm} %{ix86}
- gnu-smalltalk
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 ppc64le
- go-bindata
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- go-compilers
ExclusiveArch: %{go_arches}
- go-i18n
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- gocomplete
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- godep
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- godotenv
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- gofed
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 ppc64le s390x %{mips}
- golang
ExclusiveArch: %{golang_arches}
- golang-bitbucket-kardianos-osext
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-deepin-dbus-factory
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-deepin-go-lib
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-10gen-openssl
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 ppc64le s390x
- golang-github-AudriusButkevicius-cli
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-AudriusButkevicius-go-nat-pmp
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-AudriusButkevicius-kcp-go
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-AudriusButkevicius-pfilter
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-BurntSushi-freetype-go
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-BurntSushi-graphics-go
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-BurntSushi-toml-test
ExclusiveArch: %{go_arches}
- golang-github-BurntSushi-xgb
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-BurntSushi-xgbutil
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-Jeffail-gabs
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-PuerkitoBio-goquery
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-PuerkitoBio-purell
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-PuerkitoBio-urlesc
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-RangelReale-osin
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-RangelReale-osincli
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-SAP-go-hdb
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-SeanDolphin-bqschema
ExclusiveArch: %{go_arches}
ExclusiveArch: %{ix86} x86_64 %{arm}
- golang-github-SermoDigital-jose
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-Shopify-sarama
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-Shopify-toxiproxy
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-ThomsonReutersEikon-go-ntlm
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-alecthomas-assert
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-alecthomas-chroma
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-alecthomas-colour
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-alecthomas-kingpin
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-alecthomas-repr
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-alecthomas-template
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-alecthomas-units
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-andybalholm-cascadia
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-appc-spec
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-armon-go-metrics
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-armon-go-proxyproto
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-asaskevich-govalidator
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-auth0-go-jwt-middleware
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-axgle-mahonia
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-bep-gitmap
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-bep-inflect
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-bgentry-go-netrc
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-bkaradzic-go-lz4
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-boombuler-barcode
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-bradfitz-gomemcache
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-calmh-du
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-calmh-luhn
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-calmh-xdr
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-ccding-go-stun
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-cespare-xxhash
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-chaseadamsio-goorgeous
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-cheekybits-is
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-chmduquesne-rollinghash
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-chrismalek-oktasdk-go
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-client9-gospell
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-cloudfoundry-incubator-candiedyaml
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-cockroachdb-cockroach-go
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-codahale-aesnicheck
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-codegangsta-negroni
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-coreos-go-etcd
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-cryptix-wav
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-cznic-b
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-cznic-fileutil
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-cznic-golex
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-cznic-internal
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-cznic-lex
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-cznic-lexer
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-cznic-lldb
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-cznic-mathutil
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-cznic-ql
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-cznic-sortutil
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-cznic-strutil
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-cznic-zappy
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-d4l3k-messagediff
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-danwakefield-fnmatch
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-dchest-cssmin
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-dchest-siphash
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-denisenkom-go-mssqldb
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-disintegration-imaging
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-dlclark-regexp2
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-docker-libkv
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-docopt-docopt-go
ExclusiveArch: %{go_arches}
- golang-github-duosecurity-duo_api_golang
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-edsrzf-mmap-go
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-eknkc-amber
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-endophage-gotuf
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-fatih-color
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-fatih-structs
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-flynn-go-shlex
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-fortytw2-leaktest
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-fsnotify-fsnotify
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-fsouza-go-dockerclient
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-fullsailor-pkcs7
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-gdamore-encoding
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-gdamore-tcell
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-git-lfs-wildmatch
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-glacjay-goini
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-go-errors-errors
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-go-macaron-inject
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-go-mgo-mgo
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-go-tomb-tomb
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-gobuffalo-envy
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-gobwas-glob
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-gocql-gocql
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-golang-image
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-google-go-cmp
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-google-go-github
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-goraft-raft
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-gorilla-css
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-gorilla-sessions
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-gosexy-gettext
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-hailocab-go-hostpool
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-hashicorp-go-hclog
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-hashicorp-go-plugin
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-hashicorp-go-rootcerts
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-howeyc-fsnotify
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-inconshreveable-go-vhost
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-influxdb-influxdb
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-jackpal-gateway
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-jdkato-prose
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-jdkato-syllables
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-jefferai-jsonx
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-justinas-alice
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-kdar-factorlog
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-keybase-go-crypto
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-klauspost-cpuid
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-klauspost-reedsolomon
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-knieriem-markdown
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-kyokomi-emoji
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-linuxdeepin-go-x11-client
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-lpabon-godbc
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-lucasb-eyer-go-colorful
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-markbates-inflect
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-mattn-go-colorable
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-mattn-go-shellwords
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-mgutz-ansi
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-mgutz-logxi
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-michaelklishin-rabbit-hole
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-miekg-mmark
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-miekg-pkcs11
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-milochristiansen-axis2
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-milochristiansen-lua
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-minio-sha256-simd
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-mistifyio-go-zfs
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-mitchellh-cli
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-mitchellh-copystructure
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-mitchellh-go-homedir
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-mitchellh-go-testing-interface
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-mitchellh-go-wordwrap
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-mitchellh-goamz
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-mitchellh-mapstructure
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-mitchellh-reflectwalk
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-montanaflynn-stats
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-mreiferson-go-httpclient
ExclusiveArch: %{go_arches}
ExclusiveArch: %{ix86} x86_64 %{arm}
ExclusiveArch: %{go_arches}
ExclusiveArch: %{ix86} x86_64 %{arm}
- golang-github-msteinert-pam
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-muesli-smartcrop
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-mvo5-goconfigparser
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-mvo5-uboot-go
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-mxk-go-flowrate
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-ncw-dropbox-sdk-go-unofficial
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-ncw-go-acd
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-ncw-swift
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-neurosnap-sentences
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-nfnt-resize
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-noahdesu-go-ceph
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-ojii-gettext.go
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-olekukonko-tablewriter
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-olekukonko-ts
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-olivere-elastic
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-onsi-ginkgo
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-onsi-gomega
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-opencontainers-runtime-spec
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-opencontainers-specs
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-openshift-go-json-rest
ExclusiveArch: %{go_arches}
ExclusiveArch: %{ix86} x86_64 %{arm}
ExclusiveArch: %{go_arches}
ExclusiveArch: %{ix86} x86_64 %{arm}
- golang-github-openshift-go-systemd
ExclusiveArch: %{go_arches}
ExclusiveArch: %{ix86} x86_64 %{arm}
ExclusiveArch: %{go_arches}
ExclusiveArch: %{ix86} x86_64 %{arm}
- golang-github-openshift-openshift-sdn
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-oschwald-geoip2-golang
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-oschwald-maxminddb-golang
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-patrickmn-go-cache
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-paulrosania-go-charset
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-pelletier-go-buffruneio
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-petar-GoLLRB
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-peterh-liner
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-petermattis-goid
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-pkg-profile
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-pkg-sftp
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-pmezard-go-difflib
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-pquerna-otp
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-prometheus-client_golang
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-prometheus-client_model
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-prometheus-common
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-prometheus-procfs
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-prometheus-prometheus
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-racker-perigee
ExclusiveArch: %{go_arches}
ExclusiveArch: %{ix86} x86_64 %{arm}
ExclusiveArch: %{go_arches}
ExclusiveArch: %{ix86} x86_64 %{arm}
- golang-github-rackspace-gophercloud
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-rakyll-globalconf
ExclusiveArch: %{go_arches}
ExclusiveArch: %{ix86} x86_64 %{arm}
ExclusiveArch: %{go_arches}
ExclusiveArch: %{ix86} x86_64 %{arm}
- golang-github-rakyll-pb
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-rakyll-statik
ExclusiveArch: %{go_arches}
ExclusiveArch: %{ix86} x86_64 %{arm}
ExclusiveArch: %{go_arches}
ExclusiveArch: %{ix86} x86_64 %{arm}
- golang-github-rasky-go-xdr
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-rcrowley-go-metrics
ExclusiveArch: %{go_arches}
ExclusiveArch: %{ix86} x86_64 %{arm}
ExclusiveArch: %{go_arches}
ExclusiveArch: %{ix86} x86_64 %{arm}
- golang-github-remeh-sizedwaitgroup
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-remyoudompheng-bigfft
ExclusiveArch: %{ix86} x86_64 %{arm}
- golang-github-ryanuber-columnize
ExclusiveArch: %{go_arches}
ExclusiveArch: %{ix86} x86_64 %{arm}
ExclusiveArch: %{go_arches}
ExclusiveArch: %{ix86} x86_64 %{arm}
- golang-github-ryanuber-go-glob
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-samalba-dockerclient
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-samuel-go-zookeeper
ExclusiveArch: %{go_arches}
ExclusiveArch: %{ix86} x86_64 %{arm}
ExclusiveArch: %{go_arches}
ExclusiveArch: %{ix86} x86_64 %{arm}
- golang-github-sasha-s-go-deadlock
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-seccomp-libseccomp-golang
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-sergi-go-diff
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-sethgrid-pester
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-shiena-ansicolor
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-shogo82148-go-shuffle
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-shurcooL-sanitized_anchor_name
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-skarademir-naturalsort
ExclusiveArch: %{go_arches}
ExclusiveArch: %{ix86} x86_64 %{arm}
ExclusiveArch: %{go_arches}
ExclusiveArch: %{ix86} x86_64 %{arm}
- golang-github-skratchdot-open-golang
ExclusiveArch: %{go_arches}
ExclusiveArch: %{ix86} x86_64 %{arm}
ExclusiveArch: %{go_arches}
ExclusiveArch: %{ix86} x86_64 %{arm}
- golang-github-skynetservices-skydns
ExclusiveArch: %{go_arches}
ExclusiveArch: %{ix86} x86_64 %{arm}
ExclusiveArch: %{go_arches}
ExclusiveArch: %{ix86} x86_64 %{arm}
- golang-github-smartystreets-assertions
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-smartystreets-go-aws-auth
ExclusiveArch: %{go_arches}
ExclusiveArch: %{ix86} x86_64 %{arm}
ExclusiveArch: %{go_arches}
ExclusiveArch: %{ix86} x86_64 %{arm}
- golang-github-smartystreets-goconvey
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-spacejam-loghisto
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-spacemonkeygo-openssl
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm} ppc64le s390x}
- golang-github-spaolacci-murmur3
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-spf13-afero
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-spf13-fsync
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-spf13-nitro
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-spf13-viper
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-sstarcher-go-okta
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-stathat-go
ExclusiveArch: %{go_arches}
ExclusiveArch: %{ix86} x86_64 %{arm}
ExclusiveArch: %{go_arches}
ExclusiveArch: %{ix86} x86_64 %{arm}
- golang-github-stevvooe-resumable
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-streadway-amqp
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-stretchr-objx
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-stretchr-testify
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-syndtr-gocapability
ExclusiveArch: %{go_arches}
ExclusiveArch: %{ix86} x86_64 %{arm}
ExclusiveArch: %{go_arches}
ExclusiveArch: %{ix86} x86_64 %{arm}
- golang-github-syndtr-goleveldb
ExclusiveArch: %{go_arches}
ExclusiveArch: %{ix86} x86_64 %{arm}
ExclusiveArch: %{go_arches}
ExclusiveArch: %{ix86} x86_64 %{arm}
- golang-github-syndtr-gosnappy
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-templexxx-cpufeat
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-templexxx-reedsolomon
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-templexxx-xor
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-tent-http-link-go
ExclusiveArch: %{go_arches}
ExclusiveArch: %{ix86} x86_64 %{arm}
ExclusiveArch: %{go_arches}
ExclusiveArch: %{ix86} x86_64 %{arm}
- golang-github-thejerf-suture
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-tjfoc-gmsm
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-tonnerre-golang-pretty
ExclusiveArch: %{go_arches}
ExclusiveArch: %{ix86} x86_64 %{arm}
ExclusiveArch: %{go_arches}
ExclusiveArch: %{ix86} x86_64 %{arm}
- golang-github-urfave-cli
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-vaughan0-go-ini
ExclusiveArch: %{go_arches}
ExclusiveArch: %{ix86} x86_64 %{arm}
ExclusiveArch: %{go_arches}
ExclusiveArch: %{ix86} x86_64 %{arm}
- golang-github-vbatts-tar-split
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-vishvananda-netlink
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} aarch64 x86_64 %{arm}}
- golang-github-vishvananda-netns
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-vitrun-qart
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-vjeantet-asn1-ber
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-vmware-govcloudair
ExclusiveArch: %{go_arches}
ExclusiveArch: %{ix86} x86_64 %{arm}
ExclusiveArch: %{go_arches}
ExclusiveArch: %{ix86} x86_64 %{arm}
- golang-github-wsxiaoys-terminal
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-xeipuuv-gojsonpointer
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-xeipuuv-gojsonreference
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-xeipuuv-gojsonschema
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-xiang90-probing
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-xrash-smetrics
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-xtaci-kcp-go
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-xtaci-smux
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-yosssi-ace
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-yosssi-gohtml
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-yvasiyarov-go-metrics
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-yvasiyarov-gorelic
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-yvasiyarov-newrelic_platform_go
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-zillode-notify
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-google-golangorg-cloud
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-googlecode-gcfg
ExclusiveArch: %{go_arches}
ExclusiveArch: %{ix86} x86_64 %{arm}
ExclusiveArch: %{go_arches}
ExclusiveArch: %{ix86} x86_64 %{arm}
- golang-googlecode-go-decimal-inf
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-googlecode-go-exp
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-googlecode-goauth2
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-googlecode-gomock
ExclusiveArch: %{go_arches}
ExclusiveArch: %{ix86} x86_64 %{arm}
ExclusiveArch: %{go_arches}
ExclusiveArch: %{ix86} x86_64 %{arm}
- golang-googlecode-google-api-client
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-googlecode-log4go
ExclusiveArch: %{go_arches}
ExclusiveArch: %{ix86} x86_64 %{arm}
ExclusiveArch: %{go_arches}
ExclusiveArch: %{ix86} x86_64 %{arm}
- golang-googlecode-sqlite
ExclusiveArch: %{go_arches}
ExclusiveArch: %{ix86} x86_64 %{arm}
ExclusiveArch: %{go_arches}
ExclusiveArch: %{ix86} x86_64 %{arm}
- golang-googlecode-uuid
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-gopkg-check
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-gopkg-go-check-check
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-gopkg-go-macaroon-macaroon
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-gopkg-retry-v1
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-gopkg-yaml
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-layeh-gopher-luar
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-torproject-pluggable-transports-goptlib
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golint
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- gomtree
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- gotags
ExclusiveArch: %{go_arches}
- gotun
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
ExclusiveArch: x86_64
- gprbuild
ExclusiveArch: %{GPRbuild_arches} %{bootstrap_arch}
- gprolog
ExclusiveArch: x86_64 %{ix86} ppc alpha
- gsf-sharp
ExclusiveArch: %mono_arches
- gtk-sharp-beans
ExclusiveArch: %mono_arches
- gtk-sharp2
ExclusiveArch: %mono_arches
- gtk-sharp3
ExclusiveArch: %{mono_arches}
- gtkd
ExclusiveArch: %{ldc_arches}
- gudev-sharp
ExclusiveArch: %mono_arches
- hedgewars
ExclusiveArch: %{fpc_arches}
- heketi
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- hsakmt
ExclusiveArch: x86_64 aarch64
- hub
ExclusiveArch: %{go_arches}
- hugo
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- hyena
ExclusiveArch: %{mono_arches}
- hyperscan
ExclusiveArch: x86_64
- hyperv-daemons
ExclusiveArch: i686 x86_64
- icaro
ExclusiveArch: %{ix86} %{arm} x86_64 noarch
- ikarus
ExclusiveArch: %{ix86}
- imvirt
ExclusiveArch: %{ix86} x86_64 ia64
- indistarter
ExclusiveArch: %{fpc_arches}
- infinipath-psm
ExclusiveArch: x86_64
- insect
ExclusiveArch: %{nodejs_arches} noarch
- intel-cmt-cat
ExclusiveArch: x86_64 i686 i586
ExclusiveArch: x86_64 i686 i586
- ioport
ExclusiveArch: %{ix86} x86_64
- ipw2100-firmware
ExclusiveArch: noarch i386 x86_64
- ipw2200-firmware
ExclusiveArch: noarch i386 x86_64
- ispc
ExclusiveArch: %{arm} %{ix86} x86_64
- iucode-tool
ExclusiveArch: %{ix86} x86_64
- iwyu
ExclusiveArch: %{ix86} x86_64
- ixpdimm_sw
ExclusiveArch: x86_64
- jake
ExclusiveArch: %{nodejs_arches} noarch
- jasmine-node
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- java-1.8.0-openjdk-aarch32
ExclusiveArch: %{arm}
- jid
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- julia
ExclusiveArch: %{ix86} x86_64
- keepass
ExclusiveArch: %{mono_arches}
- kernel
ExclusiveArch: %{all_x86} x86_64 ppc64 s390x %{arm} aarch64 ppc64le
- kicad
ExclusiveArch: %{ix86} x86_64 %{arm} ppc64 ppc64le aarch64
- knot-resolver
ExclusiveArch: %{ix86} x86_64
ExclusiveArch: %{arm} aarch64 %{ix86} x86_64
- kompose
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 s390x
- kosmtik
ExclusiveArch: %{nodejs_arches} noarch
- kubernetes
ExclusiveArch: x86_64 aarch64 ppc64le s390x
- latrace
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 %{power64}
- lazarus
ExclusiveArch: %{fpc_arches}
- ldc
ExclusiveArch: %{ldc_arches}
- libbsr
ExclusiveArch: %{power64}
- libclc
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 %{power64} s390x
- libcxl
ExclusiveArch: %{power64}
- libflatarray
ExclusiveArch: %{ix86} x86_64
- libhfi1
ExclusiveArch: x86_64
- libica
ExclusiveArch: s390 s390x
- libinvm-cim
ExclusiveArch: x86_64
- libinvm-cli
ExclusiveArch: x86_64
- libinvm-i18n
ExclusiveArch: x86_64
- libipt
ExclusiveArch: %{ix86} x86_64
ExclusiveArch: %{ix86} x86_64
- libjingle
ExclusiveArch: %{ix86} x86_64 %{arm}
- libmfx
ExclusiveArch: %{ix86} x86_64
- libpsm2
ExclusiveArch: x86_64
- libquentier
ExclusiveArch: %{qt5_qtwebengine_arches}
- librtas
ExclusiveArch: ppc %{power64}
- libseccomp
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 mipsel mips64el ppc64 ppc64le s390 s390x
- libservicelog
ExclusiveArch: ppc %{power64}
- libsmbios
ExclusiveArch: x86_64 %{ix86}
- libunwind
ExclusiveArch: %{arm} aarch64 hppa ia64 mips ppc %{power64} %{ix86} x86_64
- libva-intel-hybrid-driver
ExclusiveArch: %{ix86} x86_64 ia64
- libvmi
ExclusiveArch: x86_64
- libvpd
ExclusiveArch: ppc %{power64}
- libxsmm
ExclusiveArch: x86_64
- libzfcphbaapi
ExclusiveArch: s390 s390x
- lldb
ExclusiveArch: %{arm} aarch64 %{ix86} x86_64
- lodash
ExclusiveArch: %{nodejs_arches} noarch
- log4net
ExclusiveArch: %mono_arches
- lrmi
ExclusiveArch: %{ix86}
- lsvpd
ExclusiveArch: ppc %{power64}
- luajit
ExclusiveArch: %{arm} %{ix86} x86_64 %{mips} aarch64
- mactel-boot
ExclusiveArch: x86_64
- manifest-tool
ExclusiveArch: x86_64 aarch64 ppc64le s390x
- marked
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- matreshka
ExclusiveArch: %GPRbuild_arches
- maven-eclipse-plugin
ExclusiveArch: %{ix86} x86_64
- maxima
ExclusiveArch: %{arm} %{ix86} x86_64 aarch64 ppc sparcv9
ExclusiveArch: %{ix86} x86_64 ppc sparcv9
- mcelog
ExclusiveArch: i686 x86_64
- mediaconch
ExclusiveArch: %{qt5_qtwebengine_arches}
- mellowplayer
ExclusiveArch: %{qt5_qtwebengine_arches}
- memkind
ExclusiveArch: x86_64
- memtest86+
ExclusiveArch: %{ix86} x86_64
- mesos
ExclusiveArch: x86_64
- micro
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- microcode_ctl
ExclusiveArch: %{ix86} x86_64
- micropython
ExclusiveArch: %{arm} x86_64
- mine_detector
ExclusiveArch: %{GPRbuild_arches}
- minetest
ExclusiveArch: %{ix86} x86_64
ExclusiveArch: %{arm} %{ix86} x86_64 %{mips} aarch64
- mingw-wine-gecko
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64
- mkbootdisk
ExclusiveArch: %{ix86} sparc sparc64 x86_64
- mnemosyne
ExclusiveArch: noarch %{qt5_qtwebengine_arches}
- mocha
ExclusiveArch: %{nodejs_arches} noarch
- mod_mono
ExclusiveArch: %mono_arches
- module-build-service
ExclusiveArch: %{ix86} x86_64 noarch
- mokutil
ExclusiveArch: %{ix86} x86_64 aarch64
- mongo-tools
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 ppc64le s390x
- mono
ExclusiveArch: %mono_arches
- mono-addins
ExclusiveArch: %mono_arches
- mono-basic
ExclusiveArch: %{mono_arches}
- mono-bouncycastle
ExclusiveArch: %mono_arches
- mono-cecil
ExclusiveArch: %mono_arches
- mono-cecil-flowanalysis
ExclusiveArch: %mono_arches
- mono-debugger
ExclusiveArch: %ix86 x86_64
- mono-reflection
ExclusiveArch: %mono_arches
- mono-tools
ExclusiveArch: %mono_arches
- mono-zeroconf
ExclusiveArch: %mono_arches
- monobristol
ExclusiveArch: %{mono_arches}
- monodevelop
ExclusiveArch: %mono_arches
- monodevelop-debugger-gdb
ExclusiveArch: %{mono_arches}
- monosim
ExclusiveArch: %mono_arches
- mrrescue
ExclusiveArch: %{arm} %{ix86} x86_64 %{mips} aarch64 ppc64
- msr-tools
ExclusiveArch: %{ix86} x86_64
- mustache-d
ExclusiveArch: %{ldc_arches}
- mysql-connector-net
ExclusiveArch: %{mono_arches}
- nacl-arm-binutils
ExclusiveArch: x86_64
- nacl-arm-gcc
ExclusiveArch: x86_64
- nacl-arm-newlib
ExclusiveArch: x86_64
- nacl-binutils
ExclusiveArch: x86_64
- nacl-gcc
ExclusiveArch: x86_64
- nacl-newlib
ExclusiveArch: x86_64
- nant
ExclusiveArch: %mono_arches
- nbc
ExclusiveArch: %{fpc_arches}
- nbdkit
ExclusiveArch: x86_64
- ndesk-dbus
ExclusiveArch: %{mono_arches}
- ndesk-dbus-glib
ExclusiveArch: %{mono_arches}
- newtonsoft-json
ExclusiveArch: %{mono_arches}
- nim
ExclusiveArch: %{nim_arches}
- nini
ExclusiveArch: %{mono_arches}
- node-gyp
ExclusiveArch: %{nodejs_arches} noarch
- nodejs
ExclusiveArch: %{nodejs_arches}
- nodejs-Base64
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-abbrev
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-accepts
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-acorn
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-acorn-object-spread
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-after
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-agent-base
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-agentkeepalive
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-ain2
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-align-text
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-alter
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-ansi
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-ansi-bgblack
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-ansi-bgblue
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-ansi-bgcyan
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-ansi-bggreen
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-ansi-bgmagenta
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-ansi-bgred
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-ansi-bgwhite
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-ansi-bgyellow
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-ansi-black
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-ansi-blue
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-ansi-bold
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-ansi-colors
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-ansi-cyan
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-ansi-dim
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-ansi-font
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-ansi-gray
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-ansi-green
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-ansi-grey
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-ansi-hidden
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-ansi-inverse
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-ansi-italic
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-ansi-magenta
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-ansi-red
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-ansi-regex
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-ansi-reset
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-ansi-strikethrough
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-ansi-styles
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-ansi-underline
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-ansi-white
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-ansi-wrap
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-ansi-yellow
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-ansicolors
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-ansidiff
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-ansistyles
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-any-promise
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-ap
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-append-field
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-append-transform
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-aproba
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-archiver
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-archiver-utils
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-archy
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-are-we-there-yet
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-argparse
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-argsparser
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-arr-diff
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-arr-exclude
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-arr-flatten
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-arr-union
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-array-buffer-from-string
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-array-differ
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-array-filter
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-array-find
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-array-find-index
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-array-flatten
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-array-foreach
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-array-ify
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-array-index
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-array-map
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-array-reduce
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-array-union
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-array-uniq
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-array-unique
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-arraybuffer-dot-slice
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-arraybuffer-equal
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-arrify
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-as-number
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-asap
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-ascii-tree
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-ascli
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-asn1
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-assert-plus
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-assertion-error
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-assume
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-ast-traverse
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-ast-types
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-astral
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-astral-angular-annotate
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-astral-pass
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-async
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-async-array-reduce
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-async-cache
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-async-each
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-async-limiter
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-async-queue
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-async-some
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-asynckit
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-atob
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-auto-bind
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-autoresolve
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-ava-init
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-aws-sign
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-aws-sign2
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-aws4
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-babel-messages
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-babel-runtime
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-backbone
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-backoff
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-balanced-match
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-base
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-base-option
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-base-plugins
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-base32-encode
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-base64-arraybuffer
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-base64-js
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-base64-url
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-base64id
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-bash-match
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-basic-auth
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-basic-auth-connect
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-basic-auth-parser
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-batch
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-bcrypt
ExclusiveArch: %{nodejs_arches}
ExclusiveArch: %{ix86} x86_64 %{arm}
- nodejs-bcryptjs
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-beeper
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-benchmark
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-better-assert
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-better-than-before
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-bignumber-js
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-bind-obj-methods
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-bindings
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-bl
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-blob
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-block-stream
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-bluebird
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-body-parser
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-boolbase
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-boom
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-brace-expansion
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-braces
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-breakable
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-browser-request
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-browser-stdout
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-bson
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-buble
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-buf-compare
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-buffer-crc32
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-buffer-equal
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-buffer-shims
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-buffer-writer
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-buffertools
ExclusiveArch: %{nodejs_arches}
- nodejs-bufferutil
ExclusiveArch: %{nodejs_arches}
- nodejs-builtin-modules
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-builtins
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-bundle-dependencies
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-bunker
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-bunyan
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-burrito
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-busboy
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-byline
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-bytes
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-cache-base
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-caching-transform
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-call-delayed
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-call-matcher
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-call-signature
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-callback-stream
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-caller-callsite
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-caller-path
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-callsite
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-callsites
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-camel-case
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-camelcase
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-camelcase-keys
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-caniuse-db
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-capture-stack-trace
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-carrier
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-caseless
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-center-align
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-chai
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-chai-connect-middleware
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-chai-oauth2orize-grant
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-chai-passport-strategy
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-chainer
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-chainsaw
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-chalk
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-change-case
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-char-spinner
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-character-parser
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-charenc
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-charm
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-cheerio
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-child-process-close
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-chmodr
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-chownr
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-chroma-js
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-chrono
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-circular-json
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-cjson
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-clap
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-class-utils
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-clean-css
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-clean-yaml-object
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-cli
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-cli-color
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-cli-spinner
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-cli-table
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-cliui
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-clone
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-clone-deep
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-clone-stats
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-closure-compiler
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-cls
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-cmd-shim
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-co
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-co-mocha
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-co-with-promise
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-coa
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-code-point-at
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-codemirror
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-coffee-coverage
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-collection-visit
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-collections
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-color-support
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-colors
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-colour
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-columnify
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-combined-stream
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-commander
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-common-path-prefix
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-commondir
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-commoner
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-commonmark
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-compare-func
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-component-emitter
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-component-indexof
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-component-inherit
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-compress-commons
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-compressible
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-compression
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-concat-map
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-concat-stream
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-config-chain
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-connect
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-connect-livereload
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-connect-timeout
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-console-browserify
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-console-dot-log
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-consolemd
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-constant-case
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-constantinople
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-content-disposition
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-content-type
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-conventional-changelog-angular
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-conventional-changelog-preset-loader
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-conventional-changelog-writer
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-conventional-commits-filter
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-conventional-commits-parser
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-convert-hex
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-convert-source-map
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-cookie
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-cookie-jar
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-cookie-parser
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-cookie-session
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-cookie-signature
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-cookiejar
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-cookies
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-copy-descriptor
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-core-assert
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-core-js
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-core-util-is
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-cors
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-couch-login
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-coveralls
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-crc
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-crc32-stream
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-create-error-class
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-cross-spawn
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-cross-spawn-async
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-crypt
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-cryptiles
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-csrf
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-css
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-css-parse
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-css-select
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-css-stringify
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-css-tree
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-css-what
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-csscomb-core
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-csslint
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-csso
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-cssom
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-csurf
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-csv
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-csv-generate
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-csv-parse
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-csv-spectrum
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-csv-stringify
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-ctype
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-currently-unhandled
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-cycle
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-cyclist
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-d
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-dargs
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-dashdash
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-data-uri-to-buffer
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-date-now
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-dateformat
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-death
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-debug
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-debug-fabulous
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-debuglog
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-decamelize
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-decimal-js
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-decompress-response
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-dedent
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-deep-eql
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-deep-equal
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-deep-extend
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-deep-is
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-deeper
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-default-require-extensions
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-default-resolution
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-defaults
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-defence
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-defence-cli
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-deferred
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-define-properties
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-define-property
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-defined
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-defs
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-degenerator
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-del
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-delayed-stream
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-delegates
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-delete
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-dep-graph
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-depd
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-dependency-lister
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-deprecated
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-destroy
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-detect-file
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-detect-indent
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-detect-newline
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-detect-node
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-detective
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-dezalgo
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-dicer
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-diff
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-difflet
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-difflib
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-docopt
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-doctrine
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-dom-serializer
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-domelementtype
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-domhandler
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-domutils
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-dot-case
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-dot-prop
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-dotfile-regex
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-dreamopt
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-dryice
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-dtree
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-duplex
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-duplexer
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-duplexer2
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-duplexer3
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-duplexify
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-duration
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-each
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-each-async
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-ebnf-parser
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-echomd
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-ecstatic
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-editor
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-ee-first
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-ejs
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-emojione
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-empty-dir
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-encodeurl
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-encoding
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-end-of-stream
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-engine-dot-io-client
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-engine-dot-io-parser
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-entities
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-error-ex
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-error-symbol
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-errorhandler
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-errs
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-es-abstract
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-es-to-primitive
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-es5-ext
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-es5-shim
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-es6-iterator
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-es6-map
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-es6-promise
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-es6-promisify
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-es6-set
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-es6-shim
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-es6-symbol
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-es6-weak-map
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-escallmatch
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-escape-html
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-escape-regexp-component
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-escape-string-regexp
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-escodegen
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-escope
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-espower
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-espower-location-detector
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-esprima
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-esprima-fb
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-esprima-harmony-jscs
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-espurify
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-esrecurse
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-estraverse
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-estraverse-fb
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-esutils
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-etag
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-event-emitter
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-event-stream
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-eventemitter2
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-eventemitter3
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-events
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-events-to-array
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-everything-dot-js
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-execa
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-exit
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-expand-brackets
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-expand-range
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-expand-tilde
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-expect
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-expect-dot-js
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-express
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-express-session
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-extend
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-extend-shallow
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-extglob
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-extsprintf
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-eyes
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-fake
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-fancy-log
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-far
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-fast-levenshtein
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-fastfall
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-faucet
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-faye-websocket
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-fd
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-fd-slicer
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-fg-lodash
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-figures
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-file-entry-cache
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-file-sync-cmp
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-file-uri-to-path
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-filed
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-filelist
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-filename-regex
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-fileset
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-fill-keys
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-fill-range
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-finalhandler
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-find-cache-dir
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-find-up
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-findup-sync
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-first-chunk-stream
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-flagged-respawn
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-flat-cache
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-flot
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-flush-write-stream
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-fmix
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-fn-dot-name
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-fn-name
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-follow
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-follow-redirects
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-for-in
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-for-own
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-foreach
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-foreground-child
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-forever-agent
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-form-data
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-formatio
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-formidable
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-forwarded
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-fragment-cache
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-freetree
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-fresh
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-from
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-from2
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-fs-dot-notify
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-fs-exists-cached
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-fs-exists-sync
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-fs-ext
ExclusiveArch: %{nodejs_arches}
- nodejs-fs-extra
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-fs-promise
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-fs-temp
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-fs-vacuum
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-fs-write-stream-atomic
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-fs2
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-fstream
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-fstream-ignore
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-fstream-npm
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-ftp
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-function-bind
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-function-loop
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-gauge
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-gaze
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-gdal
ExclusiveArch: %{nodejs_arches}
- nodejs-generate-function
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-generate-object-property
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-generic-pool
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-get-pkg-repo
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-get-port
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-get-stdin
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-get-stream
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-get-uri
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-get-value
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-getobject
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-gettext-parser
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-git-dummy-commit
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-git-raw-commits
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-git-remote-origin-url
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-git-semver-tags
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-git-tails
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-gitconfiglocal
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-github-url-from-git
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-github-url-from-username-repo
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-glob
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-glob-base
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-glob-expand
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-glob-parent
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-global-modules
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-global-prefix
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-globals
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-globby
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-globule
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-glogg
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-gnode
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-gonzales-pe
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-got
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-graceful-fs
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-graceful-readlink
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-grip
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-growl
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-grunt
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-grunt-angular-templates
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-grunt-banner
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-grunt-cli
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-grunt-compare-size
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-grunt-contrib-clean
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-grunt-contrib-concat
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-grunt-contrib-connect
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-grunt-contrib-copy
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-grunt-contrib-csslint
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-grunt-contrib-cssmin
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-grunt-contrib-htmlmin
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-grunt-contrib-internal
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-grunt-contrib-less
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-grunt-contrib-nodeunit
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-grunt-contrib-requirejs
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-grunt-contrib-uglify
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-grunt-contrib-watch
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-grunt-git-authors
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-grunt-html-validation
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-grunt-init
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-grunt-known-options
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-grunt-legacy-log
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-grunt-legacy-log-utils
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-grunt-legacy-util
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-grunt-lib-contrib
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-grunt-saucelabs
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-grunt-sed
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-grunt-simple-mocha
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-grunt-svgmin
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-grunt-util-args
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-grunt-util-options
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-grunt-util-process
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-grunt-util-property
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-grunt-wrap
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-gulp-mocha
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-gulp-util
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-gulplog
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-gzip-size
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-handle-thing
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-handlebars
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-har-validator
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-has
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-has-ansi
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-has-binary
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-has-binary2
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-has-color
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-has-cors
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-has-flag
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-has-glob
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-has-gulplog
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-has-unicode
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-has-value
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-has-values
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-has-yarn
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-hash_file
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-hawk
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-he
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-heap
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-hex-to-array-buffer
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-highlight-js
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-historic-readline
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-hock
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-hoek
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-homedir-polyfill
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-hook-std
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-hooker
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-hosted-git-info
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-hsluv
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-html-minifier
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-htmlparser2
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-http-deceiver
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-http-errors
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-http-proxy
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-http-proxy-agent
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-http-server
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-http-signature
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-http2
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-https-proxy-agent
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-humanize-ms
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-i
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-i18n-transform
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-i2c
ExclusiveArch: %{nodejs_arches}
- nodejs-iconv
ExclusiveArch: %{nodejs_arches}
- nodejs-iconv-lite
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-iferr
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-ignore
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-imul
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-imurmurhash
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-indent-string
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-indexof
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-infinity-agent
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-inflight
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-info-symbol
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-inherit
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-inherits
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-inherits1
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-ini
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-init-package-json
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-inline-source-map
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-install
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-int64-buffer
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-interpret
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-into-stream
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-invert-kv
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-ip
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-ipaddr-dot-js
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-irc-colors
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-irregular-plurals
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-is
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-is-absolute
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-is-accessor-descriptor
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-is-arrayish
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-is-arrow-function
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-is-boolean-object
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-is-buffer
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-is-builtin-module
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-is-callable
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-is-data-descriptor
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-is-date-object
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-is-descriptor
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-is-dir
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-is-dotfile
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-is-equal
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-is-equal-shallow
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-is-error
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-is-extendable
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-is-extglob
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-is-finite
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-is-fullwidth-code-point
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-is-generator
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-is-generator-fn
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-is-generator-function
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-is-glob
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-is-lower-case
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-is-my-json-valid
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-is-negated-glob
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-is-number
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-is-number-object
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-is-obj
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-is-object
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-is-observable
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-is-path-cwd
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-is-path-in-cwd
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-is-path-inside
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-is-plain-obj
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-is-plain-object
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-is-primitive
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-is-promise
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-is-property
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-is-redirect
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-is-regex
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-is-regexp
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-is-registered
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-is-relative
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-is-retry-allowed
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-is-stream
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-is-string
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-is-subset
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-is-symbol
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-is-text-path
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-is-typedarray
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-is-unc-path
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-is-upper-case
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-is-url
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-is-utf8
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-is-valid-glob
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-is-valid-instance
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-is-windows
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-isarray
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-isexe
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-iso8601
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-isobject
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-isodate
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-isstream
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-istanbul
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-jade
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-jasmine-growl-reporter
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-jasmine-reporters
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-jison
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-jison-lex
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-jju
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-joose
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-joosex-namespace-depended
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-joosex-simplerequest
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-js-base64
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-js-string-escape
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-js-yaml
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-jschardet
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-jscoverage
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-jshint
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-json-diff
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-json-localizer
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-json-parse-helpfulerror
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-json-stable-stringify
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-json-stringify-safe
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-json3
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-jsonfile
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-jsonify
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-jsonm
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-jsonparse
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-jsonpointer
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-jsonselect
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-jwt-simple
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-keep-alive-agent
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-keygrip
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-keypress
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-kind-of
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-klaw
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-kuler2gpl
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-langdetect
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-latest-version
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-lazy-cache
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-lazystream
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-lcid
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-lcov-parse
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-leaflet
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-leaflet-formbuilder
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-leaflet-hash
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-leche
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-left-pad
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-less
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-levn
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-lex-parser
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-libpq
ExclusiveArch: %{nodejs_arches}
- nodejs-libxmljs
ExclusiveArch: %{nodejs_arches}
ExclusiveArch: %{ix86} x86_64 %{arm}
- nodejs-line-numbers
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-line-reader
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-linefix
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-linkify-it
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-load-grunt-tasks
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-load-json-file
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-locate-path
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-lockfile
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-log-driver
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-log-ok
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-log-symbols
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-log-utils
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-lolex
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-longest
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-loud-rejection
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-lower-case
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-lower-case-first
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-lowercase-keys
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-lru-cache
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-lru-queue
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-ltx
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-magic-string
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-make-arrow-function
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-make-dir
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-make-generator-function
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-make-node
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-makedir
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-makeerror
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-map-cache
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-map-obj
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-map-stream
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-map-visit
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-mapnik
ExclusiveArch: %{nodejs_arches}
- nodejs-mapnik-pool
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-mapnik-vector-tile
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-markdown
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-markdown-it-testgen
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-marked
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-matched
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-max-timeout
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-maxmin
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-mbtiles
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-md5
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-md5-hex
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-md5-o-matic
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-mdn-data
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-mdurl
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-media-typer
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-memoize-path
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-memoizee
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-memwatch-next
ExclusiveArch: %{nodejs_arches}
- nodejs-meow
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-merge-descriptors
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-merge-stream
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-metascript
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-method-override
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-methods
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-millstone
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-mime
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-mime-db
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-mime-types
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-mimeparse
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-minimalistic-assert
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-minimatch
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-minimist
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-minstache
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-mixin-deep
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-mixin-object
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-mkdirp
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-mkfiletree
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-mock-bin
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-mock-fs
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-mock-git
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-modify-values
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-module-not-found-error
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-moment
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-moment-timezone
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-mongodb
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-mongodb-core
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-monocle
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-morgan
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-ms
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-muffin
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-multiline
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-multimatch
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-multiparty
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-multipipe
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-murmur-32
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-mustache
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-mute-stream
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-mv
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-mysql
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-mz
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-nan
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-nan0
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-nan1
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-nano
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-nanoseconds
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-native-or-bluebird
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-ncp
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-needle
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-negotiator
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-nested-error-stacks
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-net-browserify-alt
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-netmask
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-next
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-next-tick
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-node-expat
ExclusiveArch: %{nodejs_arches}
ExclusiveArch: %{ix86} x86_64 %{arm}
- nodejs-node-int64
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-node-markdown
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-node-print
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-node-static
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-node-status-codes
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-node-stringprep
ExclusiveArch: %{nodejs_arches}
- nodejs-node-uuid
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-nomnom
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-noncharacters
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-nopt
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-nopt-usage
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-noptify
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-normalize-git-url
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-normalize-package-data
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-normalize-path
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-npm-cache-filename
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-npm-install-checks
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-npm-license
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-npm-package-arg
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-npm-registry-client
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-npm-run-path
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-npm-stats
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-npm-user-validate
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-npmlog
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-nsp-api
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-nsp-audit-shrinkwrap
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-nth-check
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-number-is-nan
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-numeral
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-oauth
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-oauth-sign
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-oauth2orize
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-object-assign
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-object-copy
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-object-dot-entries
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-object-dot-omit
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-object-dot-pick
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-object-inspect
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-object-is
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-object-keys
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-object-visit
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-observable-to-promise
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-obuf
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-okay
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-on-finished
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-on-headers
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-once
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-onetime
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-only-shallow
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-oop
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-open
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-opener
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-opn
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-option-cache
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-option-chain
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-optionator
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-options
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-optjs
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-opts
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-orchestrator
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-ordered-read-streams
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-os-homedir
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-os-locale
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-os-shim
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-os-tmpdir
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-osenv
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-output-file-sync
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-own-or
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-own-or-env
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-p-finally
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-p-is-promise
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-p-limit
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-p-locate
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-pac-proxy-agent
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-pac-resolver
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-package
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-package-info
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-package-json
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-package-license
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-packaging
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-packet-reader
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-pad
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-pad-left
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-paperboy
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-param-case
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-parse-github-repo-url
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-parse-glob
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-parse-json
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-parse-ms
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-parse-passwd
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-parsejson
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-parseqs
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-parserlib
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-parseuri
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-parseurl
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-pascal-case
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-pascalcase
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-passport-http-bearer
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-passport-oauth
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-passport-oauth1
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-passport-oauth2
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-passport-oauth2-client-password
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-passport-strategy
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-path-array
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-path-case
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-path-dirname
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-path-exists
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-path-extra
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-path-is-absolute
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-path-is-inside
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-path-key
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-path-to-regexp
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-path-type
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-path2
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-pathval
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-pause
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-pause-stream
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-pbkdf2-password
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-pedding
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-pegjs
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-pem
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-pend
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-pff
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-pg
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-pg-connection-string
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-pg-cursor
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-pg-escape
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-pg-int8
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-pg-native
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-pg-pool
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-pg-types
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-pgpass
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-pify
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-pinkie
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-pinkie-promise
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-pkg-dir
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-pkg-up
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-pkginfo
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-platform
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-plur
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-portfinder
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-portscanner
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-posix-character-classes
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-posix-getopt
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-postgres-array
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-postgres-bytea
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-postgres-date
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-postgres-interval
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-precond
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-prelude-ls
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-prepend-http
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-preserve
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-pretty-bytes
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-pretty-hrtime
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-pretty-ms
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-pretty-time
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-private
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-process-nextick-args
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-progress
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-progress-stream
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-promise
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-promises-aplus-tests
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-prompt
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-promzard
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-propagate
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-proto-list
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-proxy
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-proxy-addr
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-proxy-agent
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-proxyquire
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-pruddy-error
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-pseudomap
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-pubcontrol
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-pump
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-pumpify
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-q
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-q-io
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-qs
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-qtdatastream
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-queue-async
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-quick-lru
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-qunit-extras
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-qunitjs
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-rainbowsocks
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-random-bytes
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-random-path
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-randomatic
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-range-parser
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-raw-body
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-rc
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-re-emitter
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-read
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-read-all-stream
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-read-cmd-shim
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-read-dir-files
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-read-file
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-read-installed
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-read-json-sync
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-read-package-json
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-read-package-tree
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-read-pkg
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-read-pkg-up
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-readable-stream
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-readdir-scoped-modules
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-readdirp
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-realize-package-specifier
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-recast
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-rechoir
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-redent
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-reduce-component
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-regenerator
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-regex-cache
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-regex-not
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-registry-url
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-relateurl
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-remove-trailing-separator
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-repeat-element
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-repeat-string
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-repeating
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-repl
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-replace
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-replace-ext
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-replace-require-self
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-request
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-requestretry
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-require-cs
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-require-directory
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-require-inject
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-require-uncached
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-require-yaml
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-requirejs
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-requires-port
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-resolve
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-resolve-cwd
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-resolve-dir
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-resolve-from
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-resolve-pkg
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-resolve-url
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-response-time
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-resumer
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-retry
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-reusify
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-revalidator
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-rewire
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-rfile
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-rhea
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-right-align
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-rimraf
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-rndm
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-rollup
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-ronn
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-run-parallel-limit
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-runforcover
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-safe-buffer
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-safe-json-stringify
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-safecb
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-samsam
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-sauce-tunnel
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-saucelabs
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-sax
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-scmp
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-secure-random
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-seedrandom
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-select-hose
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-semver
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-send
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-sentence-case
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-sentiment
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-seq
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-sequencify
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-serialize-error
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-serve-index
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-serve-static
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-server-destroy
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-set-blocking
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-set-getter
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-set-immediate
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-set-immediate-shim
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-set-value
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-setimmediate
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-setprototypeof
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-sha
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-shallow-clone
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-shebang-command
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-shebang-regex
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-shelljs
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-shelljs-nodecli
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-should
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-should-equal
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-should-format
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-should-http
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-should-type
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-showdown
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-sigmund
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-signal-exit
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-silent-npm-registry-client
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-simple-assert
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-simple-asyncify
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-simple-fmt
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-simple-is
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-simple-markdown
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-single-line-log
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-sinon
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-sinon-chai
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-sinon-restore
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-slash
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-sliced
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-slide
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-smart-buffer
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-snake-case
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-snapdragon
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-snapdragon-capture
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-snapdragon-capture-set
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-snapdragon-node
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-snapdragon-util
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-snockets
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-sntp
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-socks-client
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-socks-proxy-agent
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-sort-keys
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-sorted-object
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-source-map
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-source-map-fixtures
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-source-map-resolve
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-source-map-support
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-source-map-url
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-sparkles
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-spawn-sync
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-spawn-wrap
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-spdx-correct
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-spdx-exceptions
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-spdx-expression-parse
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-spdx-license-ids
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-spec
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-speedometer
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-split
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-split-string
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-split2
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-sprintf
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-sprintf-js
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-sqlite3
ExclusiveArch: %{nodejs_arches}
- nodejs-srs
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-ssri
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-st
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-stable
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-stack-trace
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-stack-utils
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-static-extend
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-static-favicon
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-statuses
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-std-mocks
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-stream-combiner
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-stream-consume
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-stream-counter
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-stream-each
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-stream-equal
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-stream-pair
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-stream-reduce
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-stream-replace
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-stream-shift
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-stream-spigot
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-stream-to-array
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-stream-transform
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-streamsearch
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-streamsink
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-streamtest
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-string
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-string-dot-prototype-dot-repeat
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-string-dot-prototype-dot-trim
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-string-width
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-string_decoder
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-stringmap
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-stringscanner
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-stringset
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-stringstream
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-strip-ansi
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-strip-bom
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-strip-bom-stream
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-strip-bom-string
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-strip-color
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-strip-eof
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-strip-indent
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-strip-json-comments
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-strip-path
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-strong-log-transformer
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-strscanner
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-stylus
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-success-symbol
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-superagent
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-superagent-proxy
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-supertest
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-supervisor
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-supports-color
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-suspend
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-svgmin
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-svgo
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-swap-case
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-symbol-observable
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-tad
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-tap
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-tap-mocha-reporter
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-tap-out
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-tap-parser
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-tap-spec
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-tape
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-tapes
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-tar
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-tar-pack
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-tar-stream
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-temp
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-temp-dir
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-temp-write
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-temporary
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-tern
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-tern-cordovajs
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-tern-liferay
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-terst
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-test
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-testdata-w3c-json-form
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-testjs
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-testswarm
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-testutil
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-text-extensions
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-text-table
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-thenify
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-thenify-all
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-thread-sleep
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-through
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-through2
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-through2-filter
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-thunkify
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-tildify
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-tilejson
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-tilelive
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-tilelive-mapnik
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-tiletype
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-time-diff
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-time-stamp
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-timed-out
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-timekeeper
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-timers-ext
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-tiny-lr-fork
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-title-case
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-tlds
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-tmatch
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-tmp
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-tmpl
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-to-absolute-glob
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-to-object-path
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-to-regex
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-to-regex-range
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-tough-cookie
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-tracejs
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-transformers
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-traverse
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-treeify
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-tressa
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-trim
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-trim-newlines
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-trim-off-newlines
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-trivial-deferred
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-try-open
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-try-thread-sleep
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-tryor
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-tsame
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-tsscmp
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-ttembed-js
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-tunnel-agent
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-type-check
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-type-detect
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-type-is
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-type-name
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-typeahead.js
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-typedarray
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-typescript
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-uc-dot-micro
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-uglify-to-browserify
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-uid-number
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-uid-safe
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-uid2
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-ultron
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-umask
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-unc-path-regex
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-underscore
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-underscore-dot-logger
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-unicode-7.0.0
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-unicode-length
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-union
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-union-value
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-unique-filename
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-unique-slug
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-unique-stream
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-unique-temp-dir
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-unpipe
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-unset-value
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-upper-case
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-upper-case-first
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-uri-path
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-urix
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-url-join
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-url-parse-lax
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-url2
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-use
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-user-home
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-utf8
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-utfx
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-util
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-util-deprecate
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-util-extend
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-utile
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-utilities
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-utils-merge
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-uuid
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-vali-date
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-validate-npm-package-license
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-validate-npm-package-name
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-vary
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-vasync
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-verror
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-vhost
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-vinyl
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-vlq
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-vow
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-vow-fs
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-vow-queue
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-vows
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-w3cjs
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-walkdir
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-walker
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-ware
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-warning-symbol
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-watchit
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-watershed
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-wbuf
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-wcwidth
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-weak-map
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-websocket-driver
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-when
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-whet-dot-extend
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-which
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-win-spawn
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-window-size
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-winston
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-with
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-woothee
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-wordwrap
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-wrap-ansi
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-wrap-fn
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-wrappy
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-write
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-write-file-atomic
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-write-json-file
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-write-pkg
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-ws
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-xdg-basedir
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-xml2js
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-xmlbuilder
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-xmldom
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-xmlhttprequest-ssl
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-xregexp
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-xtend
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-y18n
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-yallist
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-yapool
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-yargs
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-yargs-parser
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-yauzl
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-yeast
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-zap
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-zip-stream
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-zipfile
ExclusiveArch: %{nodejs_arches}
- nodejs-zlib-browserify
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-zlibjs
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodeunit
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- notify-sharp
ExclusiveArch: %{mono_arches}
- notify-sharp3
ExclusiveArch: %{mono_arches}
- nuget
ExclusiveArch: %{mono_arches}
- numatop
ExclusiveArch: %{ix86} x86_64
- nunit
ExclusiveArch: %{mono_arches}
- nunit2
ExclusiveArch: %{mono_arches}
- nvml
ExclusiveArch: x86_64
- nwchem
ExclusiveArch: x86_64 %{ix86}
- obfs4
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- oci-kvm-hook
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- oci-register-machine
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- oci-umount
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 ppc64le s390x %{mips}
- ocitools
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- odcs
ExclusiveArch: %{ix86} x86_64
- olpc-kbdshim
ExclusiveArch: %{ix86} %{arm}
- olpc-netutils
ExclusiveArch: %{ix86} %{arm}
- olpc-powerd
ExclusiveArch: %{ix86} %{arm}
- olpc-utils
ExclusiveArch: %{ix86} %{arm}
- onedrive
ExclusiveArch: %{ldc_arches}
- opal-prd
ExclusiveArch: ppc64le
- open-vm-tools
ExclusiveArch: x86_64
ExclusiveArch: %{ix86} x86_64
- openblas
ExclusiveArch: %{openblas_arches}
- openclonk
ExclusiveArch: x86_64 %{ix86}
- openjfx
ExclusiveArch: %{ix86} x86_64
- openlibm
ExclusiveArch: %{arm} %{ix86} x86_64 aarch64 %{power64}
- openmx
ExclusiveArch: x86_64 %{ix86}
- openni
ExclusiveArch: %{ix86} x86_64 %{arm}
- openni-primesense
ExclusiveArch: %{ix86} x86_64 %{arm}
- openssl-ibmca
ExclusiveArch: s390 s390x
- openvswitch
ExclusiveArch: x86_64 aarch64 ppc64le s390x
- origin
ExclusiveArch: %{go_arches}
ExclusiveArch: x86_64 aarch64 ppc64le s390x
- orion
ExclusiveArch: %{qt5_qtwebengine_arches}
- orocos-bfl
ExclusiveArch: %{ix86} x86_64
- orthorobot
ExclusiveArch: %{arm} %{ix86} x86_64 %{mips} aarch64 ppc64
- paflib
ExclusiveArch: ppc %{power64}
- pcc
ExclusiveArch: %{ix86} x86_64
- pcmciautils
ExclusiveArch: %{ix86} x86_64 ia64 ppc ppc64 %{arm}
- pdfmod
ExclusiveArch: %mono_arches
- perl-Dumbbench
ExclusiveArch: %{ix86} x86_64 noarch
- perl-Parse-DMIDecode
ExclusiveArch: %{ix86} x86_64 ia64 aarch64
- pesign
ExclusiveArch: %{ix86} x86_64 ia64 aarch64 %{arm}
- pesign-test-app
ExclusiveArch: i686 x86_64 ia64 aarch64
- pinta
ExclusiveArch: %mono_arches
- pioneer
ExclusiveArch: %{ix86} x86_64
- playonlinux
ExclusiveArch: %{arm} aarch64 %{ix86} x86_64
- plv8
ExclusiveArch: %v8_arches
- podman
ExclusiveArch: aarch64 %{arm} ppc64le s390x x86_64
- poppler-sharp
ExclusiveArch: %mono_arches
- popub
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- powerline-go
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- powerpc-utils
ExclusiveArch: ppc %{power64}
- ppc64-diag
ExclusiveArch: ppc %{power64}
- ppc64-utils
ExclusiveArch: ppc %{power64}
- publican-jboss
ExclusiveArch: i686 x86_64
- pvs-sbcl
ExclusiveArch: %{ix86} x86_64 ppc sparcv9
- python-afl
ExclusiveArch: %{ix86} x86_64
- python-etcd
ExclusiveArch: noarch %{ix86} x86_64 %{arm} aarch64 ppc64le s390x
- python-healpy
ExclusiveArch: aarch64 ppc64 ppc64le x86_64 s390x
- python-openoffice
ExclusiveArch: noarch x86_64
- python-ovirt-register
ExclusiveArch: %{ix86} x86_64
- python-pymoc
ExclusiveArch: aarch64 ppc64 ppc64le x86_64 s390x
- python-rpi-gpio
ExclusiveArch: %{arm} aarch64
- q4wine
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64
- qcint
ExclusiveArch: x86_64
- qclib
ExclusiveArch: s390 s390x
- qevercloud
ExclusiveArch: %{qt5_qtwebengine_arches}
- qt4pas
ExclusiveArch: %{fpc_arches}
- qt5-qtwebengine
ExclusiveArch: %{qt5_qtwebengine_arches}
- quantum-espresso
ExclusiveArch: x86_64 %{ix86}
ExclusiveArch: %{openblas_arches}
- quentier
ExclusiveArch: %{qt5_qtwebengine_arches}
- rclone
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- rear
ExclusiveArch: %ix86 x86_64 ppc ppc64 ppc64le ia64
- redhat-lsb
ExclusiveArch: %{ix86} ia64 x86_64 ppc ppc64 s390 s390x %{arm} aarch64 ppc64le
- reg
ExclusiveArch: x86_64
- renderdoc
ExclusiveArch: %{ix86} x86_64
- reptyr
ExclusiveArch: %{ix86} x86_64 %{arm}
- rescene
ExclusiveArch: %{mono_arches}
- restsharp
ExclusiveArch: %{mono_arches}
- rhythmbox-alternative-toolbar
ExclusiveArch: %{ix86} %{arm} x86_64 ppc64 ppc64le
- rkt
ExclusiveArch: x86_64 aarch64 %{arm} %{ix86}
- rocm-runtime
ExclusiveArch: x86_64 aarch64
- rssguard
ExclusiveArch: %{qt5_qtwebengine_arches}
- runc
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 ppc64le %{mips} s390x
- rust
ExclusiveArch: %{rust_arches}
- rust-addr2line
ExclusiveArch: %{rust_arches}
- rust-adler32
ExclusiveArch: %{rust_arches}
- rust-aho-corasick
ExclusiveArch: %{rust_arches}
- rust-ansi_term
ExclusiveArch: %{rust_arches}
- rust-arrayref
ExclusiveArch: %{rust_arches}
- rust-arrayvec
ExclusiveArch: %{rust_arches}
- rust-atk-sys
ExclusiveArch: %{rust_arches}
- rust-atty
ExclusiveArch: %{rust_arches}
- rust-backtrace
ExclusiveArch: %{rust_arches}
- rust-backtrace-sys
ExclusiveArch: %{rust_arches}
- rust-base100
ExclusiveArch: %{rust_arches}
- rust-base64
ExclusiveArch: %{rust_arches}
- rust-bencher
ExclusiveArch: %{rust_arches}
- rust-bincode
ExclusiveArch: %{rust_arches}
- rust-bincode0.8
ExclusiveArch: %{rust_arches}
- rust-bitflags
ExclusiveArch: %{rust_arches}
- rust-bitflags0.9
ExclusiveArch: %{rust_arches}
- rust-brev
ExclusiveArch: %{rust_arches}
- rust-build_const
ExclusiveArch: %{rust_arches}
- rust-bytecount
ExclusiveArch: %{rust_arches}
- rust-byteorder
ExclusiveArch: %{rust_arches}
- rust-bytes
ExclusiveArch: %{rust_arches}
- rust-bytes0.3
ExclusiveArch: %{rust_arches}
- rust-c_vec
ExclusiveArch: %{rust_arches}
- rust-cairo-rs
ExclusiveArch: %{rust_arches}
- rust-cairo-sys-rs
ExclusiveArch: %{rust_arches}
- rust-cbindgen
ExclusiveArch: %{rust_arches}
- rust-cc
ExclusiveArch: %{rust_arches}
- rust-cfg-if
ExclusiveArch: %{rust_arches}
- rust-chan
ExclusiveArch: %{rust_arches}
- rust-chrono
ExclusiveArch: %{rust_arches}
- rust-clap
ExclusiveArch: %{rust_arches}
- rust-cmake
ExclusiveArch: %{rust_arches}
- rust-coco
ExclusiveArch: %{rust_arches}
- rust-cpp_demangle
ExclusiveArch: %{rust_arches}
- rust-crc
ExclusiveArch: %{rust_arches}
- rust-crc-core
ExclusiveArch: %{rust_arches}
- rust-crossbeam
ExclusiveArch: %{rust_arches}
- rust-crossbeam-deque
ExclusiveArch: %{rust_arches}
- rust-crossbeam-epoch
ExclusiveArch: %{rust_arches}
- rust-crossbeam-utils
ExclusiveArch: %{rust_arches}
- rust-crypto-hash
ExclusiveArch: %{rust_arches}
- rust-cryptovec
ExclusiveArch: %{rust_arches}
- rust-cssparser
ExclusiveArch: %{rust_arches}
- rust-cssparser-macros
ExclusiveArch: %{rust_arches}
- rust-ctrlc
ExclusiveArch: %{rust_arches}
- rust-curl
ExclusiveArch: %{rust_arches}
- rust-curl-sys
ExclusiveArch: %{rust_arches}
- rust-custom_derive
ExclusiveArch: %{rust_arches}
- rust-data-encoding
ExclusiveArch: %{rust_arches}
- rust-datetime
ExclusiveArch: %{rust_arches}
- rust-dbus
ExclusiveArch: %{rust_arches}
- rust-deque
ExclusiveArch: %{rust_arches}
- rust-devicemapper
ExclusiveArch: %{rust_arches}
- rust-diff
ExclusiveArch: %{rust_arches}
- rust-difference
ExclusiveArch: %{rust_arches}
- rust-docopt
ExclusiveArch: %{rust_arches}
- rust-downcast-rs
ExclusiveArch: %{rust_arches}
- rust-dtoa
ExclusiveArch: %{rust_arches}
- rust-dtoa-short
ExclusiveArch: %{rust_arches}
- rust-edit-distance
ExclusiveArch: %{rust_arches}
- rust-either
ExclusiveArch: %{rust_arches}
- rust-encoding
ExclusiveArch: %{rust_arches}
- rust-encoding-index-japanese
ExclusiveArch: %{rust_arches}
- rust-encoding-index-korean
ExclusiveArch: %{rust_arches}
- rust-encoding-index-simpchinese
ExclusiveArch: %{rust_arches}
- rust-encoding-index-singlebyte
ExclusiveArch: %{rust_arches}
- rust-encoding-index-tradchinese
ExclusiveArch: %{rust_arches}
- rust-encoding_index_tests
ExclusiveArch: %{rust_arches}
- rust-encoding_rs
ExclusiveArch: %{rust_arches}
- rust-enum_primitive
ExclusiveArch: %{rust_arches}
- rust-env_logger
ExclusiveArch: %{rust_arches}
- rust-env_logger0.4
ExclusiveArch: %{rust_arches}
- rust-errln
ExclusiveArch: %{rust_arches}
- rust-errno
ExclusiveArch: %{rust_arches}
- rust-error-chain
ExclusiveArch: %{rust_arches}
- rust-exa
ExclusiveArch: %{rust_arches}
- rust-extprim
ExclusiveArch: %{rust_arches}
- rust-extprim_literals_macros
ExclusiveArch: %{rust_arches}
- rust-failure
ExclusiveArch: %{rust_arches}
- rust-failure_derive
ExclusiveArch: %{rust_arches}
- rust-fallible-iterator
ExclusiveArch: %{rust_arches}
- rust-fd-find
ExclusiveArch: %{rust_arches}
- rust-filetime
ExclusiveArch: %{rust_arches}
- rust-fixedbitset
ExclusiveArch: %{rust_arches}
- rust-flame
ExclusiveArch: %{rust_arches}
- rust-flate2
ExclusiveArch: %{rust_arches}
- rust-float-cmp
ExclusiveArch: %{rust_arches}
- rust-fnv
ExclusiveArch: %{rust_arches}
- rust-foreign-types
ExclusiveArch: %{rust_arches}
- rust-foreign-types-shared
ExclusiveArch: %{rust_arches}
- rust-fs2
ExclusiveArch: %{rust_arches}
- rust-futures
ExclusiveArch: %{rust_arches}
- rust-futures-cpupool
ExclusiveArch: %{rust_arches}
- rust-gdk
ExclusiveArch: %{rust_arches}
- rust-gdk-pixbuf
ExclusiveArch: %{rust_arches}
- rust-gdk-pixbuf-sys
ExclusiveArch: %{rust_arches}
- rust-gdk-sys
ExclusiveArch: %{rust_arches}
- rust-getopts
ExclusiveArch: %{rust_arches}
- rust-gimli
ExclusiveArch: %{rust_arches}
- rust-gio
ExclusiveArch: %{rust_arches}
- rust-gio-sys
ExclusiveArch: %{rust_arches}
- rust-git2
ExclusiveArch: %{rust_arches}
- rust-glib
ExclusiveArch: %{rust_arches}
- rust-glib-sys
ExclusiveArch: %{rust_arches}
- rust-glob
ExclusiveArch: %{rust_arches}
- rust-globset
ExclusiveArch: %{rust_arches}
- rust-gobject-sys
ExclusiveArch: %{rust_arches}
- rust-goblin
ExclusiveArch: %{rust_arches}
- rust-grep
ExclusiveArch: %{rust_arches}
- rust-gtk
ExclusiveArch: %{rust_arches}
- rust-gtk-rs-lgpl-docs
ExclusiveArch: %{rust_arches}
- rust-gtk-source-sys
ExclusiveArch: %{rust_arches}
- rust-gtk-sys
ExclusiveArch: %{rust_arches}
- rust-gzip-header
ExclusiveArch: %{rust_arches}
- rust-hamcrest
ExclusiveArch: %{rust_arches}
- rust-handlebars
ExclusiveArch: %{rust_arches}
- rust-heapsize
ExclusiveArch: %{rust_arches}
- rust-hex
ExclusiveArch: %{rust_arches}
- rust-home
ExclusiveArch: %{rust_arches}
- rust-horrorshow
ExclusiveArch: %{rust_arches}
- rust-http
ExclusiveArch: %{rust_arches}
- rust-httparse
ExclusiveArch: %{rust_arches}
- rust-humantime
ExclusiveArch: %{rust_arches}
- rust-hyper
ExclusiveArch: %{rust_arches}
- rust-idna
ExclusiveArch: %{rust_arches}
- rust-ignore
ExclusiveArch: %{rust_arches}
- rust-indexmap
ExclusiveArch: %{rust_arches}
- rust-intervaltree
ExclusiveArch: %{rust_arches}
- rust-iovec
ExclusiveArch: %{rust_arches}
- rust-iso8601
ExclusiveArch: %{rust_arches}
- rust-itertools
ExclusiveArch: %{rust_arches}
- rust-itoa
ExclusiveArch: %{rust_arches}
- rust-jobserver
ExclusiveArch: %{rust_arches}
- rust-language-tags
ExclusiveArch: %{rust_arches}
- rust-lazy_static
ExclusiveArch: %{rust_arches}
- rust-lazycell
ExclusiveArch: %{rust_arches}
- rust-libc
ExclusiveArch: %{rust_arches}
- rust-libdbus-sys
ExclusiveArch: %{rust_arches}
- rust-libgit2-sys
ExclusiveArch: %{rust_arches}
- rust-libloading
ExclusiveArch: %{rust_arches}
- rust-libssh2-sys
ExclusiveArch: %{rust_arches}
- rust-libudev
ExclusiveArch: %{rust_arches}
- rust-libudev-sys
ExclusiveArch: %{rust_arches}
- rust-libz-sys
ExclusiveArch: %{rust_arches}
- rust-linked-hash-map
ExclusiveArch: %{rust_arches}
- rust-lipsum
ExclusiveArch: %{rust_arches}
- rust-locale
ExclusiveArch: %{rust_arches}
- rust-log
ExclusiveArch: %{rust_arches}
- rust-log0.3
ExclusiveArch: %{rust_arches}
- rust-loopdev
ExclusiveArch: %{rust_arches}
- rust-lzma-sys
ExclusiveArch: %{rust_arches}
- rust-macro-attr
ExclusiveArch: %{rust_arches}
- rust-maplit
ExclusiveArch: %{rust_arches}
- rust-matches
ExclusiveArch: %{rust_arches}
- rust-md5
ExclusiveArch: %{rust_arches}
- rust-memchr
ExclusiveArch: %{rust_arches}
- rust-memmap
ExclusiveArch: %{rust_arches}
- rust-memoffset
ExclusiveArch: %{rust_arches}
- rust-metadeps
ExclusiveArch: %{rust_arches}
- rust-mime
ExclusiveArch: %{rust_arches}
- rust-miniz-sys
ExclusiveArch: %{rust_arches}
- rust-miniz_oxide
ExclusiveArch: %{rust_arches}
- rust-miniz_oxide_c_api
ExclusiveArch: %{rust_arches}
- rust-mio
ExclusiveArch: %{rust_arches}
- rust-mio-uds
ExclusiveArch: %{rust_arches}
- rust-mnt
ExclusiveArch: %{rust_arches}
- rust-modifier
ExclusiveArch: %{rust_arches}
- rust-multimap
ExclusiveArch: %{rust_arches}
- rust-natord
ExclusiveArch: %{rust_arches}
- rust-net2
ExclusiveArch: %{rust_arches}
- rust-newtype_derive
ExclusiveArch: %{rust_arches}
- rust-nix
ExclusiveArch: %{rust_arches}
- rust-nodrop
ExclusiveArch: %{rust_arches}
- rust-nom
ExclusiveArch: %{rust_arches}
- rust-num
ExclusiveArch: %{rust_arches}
- rust-num-bigint
ExclusiveArch: %{rust_arches}
- rust-num-complex
ExclusiveArch: %{rust_arches}
- rust-num-integer
ExclusiveArch: %{rust_arches}
- rust-num-iter
ExclusiveArch: %{rust_arches}
- rust-num-rational
ExclusiveArch: %{rust_arches}
- rust-num-traits
ExclusiveArch: %{rust_arches}
- rust-num-traits0.1
ExclusiveArch: %{rust_arches}
- rust-num_cpus
ExclusiveArch: %{rust_arches}
- rust-number_prefix
ExclusiveArch: %{rust_arches}
- rust-object
ExclusiveArch: %{rust_arches}
- rust-openssl
ExclusiveArch: %{rust_arches}
- rust-openssl-probe
ExclusiveArch: %{rust_arches}
- rust-openssl-sys
ExclusiveArch: %{rust_arches}
- rust-ordermap
ExclusiveArch: %{rust_arches}
- rust-owning_ref
ExclusiveArch: %{rust_arches}
- rust-packaging
ExclusiveArch: %{rust_arches} noarch
- rust-pad
ExclusiveArch: %{rust_arches}
- rust-pager
ExclusiveArch: %{rust_arches}
- rust-pango
ExclusiveArch: %{rust_arches}
- rust-pango-sys
ExclusiveArch: %{rust_arches}
- rust-peeking_take_while
ExclusiveArch: %{rust_arches}
- rust-percent-encoding
ExclusiveArch: %{rust_arches}
- rust-permutate
ExclusiveArch: %{rust_arches}
- rust-permutohedron
ExclusiveArch: %{rust_arches}
- rust-pest
ExclusiveArch: %{rust_arches}
- rust-pest_derive
ExclusiveArch: %{rust_arches}
- rust-phf
ExclusiveArch: %{rust_arches}
- rust-phf_codegen
ExclusiveArch: %{rust_arches}
- rust-phf_generator
ExclusiveArch: %{rust_arches}
- rust-phf_shared
ExclusiveArch: %{rust_arches}
- rust-pkg-config
ExclusiveArch: %{rust_arches}
- rust-plain
ExclusiveArch: %{rust_arches}
- rust-pretty-git-prompt
ExclusiveArch: %{rust_arches}
- rust-pretty_env_logger
ExclusiveArch: %{rust_arches}
- rust-proc-macro2
ExclusiveArch: %{rust_arches}
- rust-procedural-masquerade
ExclusiveArch: %{rust_arches}
- rust-pulldown-cmark
ExclusiveArch: %{rust_arches}
- rust-quick-error
ExclusiveArch: %{rust_arches}
- rust-quickcheck
ExclusiveArch: %{rust_arches}
- rust-quickersort
ExclusiveArch: %{rust_arches}
- rust-quote
ExclusiveArch: %{rust_arches}
- rust-rand
ExclusiveArch: %{rust_arches}
- rust-rayon
ExclusiveArch: %{rust_arches}
- rust-rayon-core
ExclusiveArch: %{rust_arches}
- rust-regex
ExclusiveArch: %{rust_arches}
- rust-regex-syntax
ExclusiveArch: %{rust_arches}
- rust-relay
ExclusiveArch: %{rust_arches}
- rust-remove_dir_all
ExclusiveArch: %{rust_arches}
- rust-ripgrep
ExclusiveArch: %{rust_arches}
- rust-rustc-demangle
ExclusiveArch: %{rust_arches}
- rust-rustc-serialize
ExclusiveArch: %{rust_arches}
- rust-rustc-test
ExclusiveArch: %{rust_arches}
- rust-rustc_version
ExclusiveArch: %{rust_arches}
- rust-rustdoc-stripper
ExclusiveArch: %{rust_arches}
- rust-rustfilt
ExclusiveArch: %{rust_arches}
- rust-rustfmt
ExclusiveArch: %{rust_arches}
- rust-safemem
ExclusiveArch: %{rust_arches}
- rust-same-file
ExclusiveArch: %{rust_arches}
- rust-scoped-tls
ExclusiveArch: %{rust_arches}
- rust-scoped_threadpool
ExclusiveArch: %{rust_arches}
- rust-scopeguard
ExclusiveArch: %{rust_arches}
- rust-scroll
ExclusiveArch: %{rust_arches}
- rust-scroll_derive
ExclusiveArch: %{rust_arches}
- rust-seahash
ExclusiveArch: %{rust_arches}
- rust-semver
ExclusiveArch: %{rust_arches}
- rust-semver-parser
ExclusiveArch: %{rust_arches}
- rust-serde
ExclusiveArch: %{rust_arches}
- rust-serde0.8
ExclusiveArch: %{rust_arches}
- rust-serde_bytes
ExclusiveArch: %{rust_arches}
- rust-serde_cbor
ExclusiveArch: %{rust_arches}
- rust-serde_derive
ExclusiveArch: %{rust_arches}
- rust-serde_derive_internals
ExclusiveArch: %{rust_arches}
- rust-serde_ignored
ExclusiveArch: %{rust_arches}
- rust-serde_json
ExclusiveArch: %{rust_arches}
- rust-serde_json0.8
ExclusiveArch: %{rust_arches}
- rust-serde_test
ExclusiveArch: %{rust_arches}
- rust-serde_urlencoded
ExclusiveArch: %{rust_arches}
- rust-serde_yaml
ExclusiveArch: %{rust_arches}
- rust-sha1
ExclusiveArch: %{rust_arches}
- rust-shell-escape
ExclusiveArch: %{rust_arches}
- rust-shlex
ExclusiveArch: %{rust_arches}
- rust-siphasher
ExclusiveArch: %{rust_arches}
- rust-slab
ExclusiveArch: %{rust_arches}
- rust-slab0.3
ExclusiveArch: %{rust_arches}
- rust-smallvec
ExclusiveArch: %{rust_arches}
- rust-socket2
ExclusiveArch: %{rust_arches}
- rust-sourceview
ExclusiveArch: %{rust_arches}
- rust-spin
ExclusiveArch: %{rust_arches}
- rust-spmc
ExclusiveArch: %{rust_arches}
- rust-stable_deref_trait
ExclusiveArch: %{rust_arches}
- rust-streaming-stats
ExclusiveArch: %{rust_arches}
- rust-strings
ExclusiveArch: %{rust_arches}
- rust-strsim
ExclusiveArch: %{rust_arches}
- rust-structopt
ExclusiveArch: %{rust_arches}
- rust-structopt-derive
ExclusiveArch: %{rust_arches}
- rust-syn
ExclusiveArch: %{rust_arches}
- rust-synom
ExclusiveArch: %{rust_arches}
- rust-synstructure
ExclusiveArch: %{rust_arches}
- rust-syntex_errors
ExclusiveArch: %{rust_arches}
- rust-syntex_pos
ExclusiveArch: %{rust_arches}
- rust-syntex_syntax
ExclusiveArch: %{rust_arches}
- rust-sys-info
ExclusiveArch: %{rust_arches}
- rust-tabwriter
ExclusiveArch: %{rust_arches}
- rust-take
ExclusiveArch: %{rust_arches}
- rust-tar
ExclusiveArch: %{rust_arches}
- rust-tempdir
ExclusiveArch: %{rust_arches}
- rust-tempfile
ExclusiveArch: %{rust_arches}
- rust-term
ExclusiveArch: %{rust_arches}
- rust-term_grid
ExclusiveArch: %{rust_arches}
- rust-term_size
ExclusiveArch: %{rust_arches}
- rust-termcolor
ExclusiveArch: %{rust_arches}
- rust-termion
ExclusiveArch: %{rust_arches}
- rust-test-assembler
ExclusiveArch: %{rust_arches}
- rust-textwrap
ExclusiveArch: %{rust_arches}
- rust-thread-id
ExclusiveArch: %{rust_arches}
- rust-thread_local
ExclusiveArch: %{rust_arches}
- rust-threadpool
ExclusiveArch: %{rust_arches}
- rust-time
ExclusiveArch: %{rust_arches}
- rust-tokei
ExclusiveArch: %{rust_arches}
- rust-tokio
ExclusiveArch: %{rust_arches}
- rust-tokio-core
ExclusiveArch: %{rust_arches}
- rust-tokio-executor
ExclusiveArch: %{rust_arches}
- rust-tokio-io
ExclusiveArch: %{rust_arches}
- rust-tokio-process
ExclusiveArch: %{rust_arches}
- rust-tokio-proto
ExclusiveArch: %{rust_arches}
- rust-tokio-reactor
ExclusiveArch: %{rust_arches}
- rust-tokio-service
ExclusiveArch: %{rust_arches}
- rust-tokio-signal
ExclusiveArch: %{rust_arches}
- rust-tokio-threadpool
ExclusiveArch: %{rust_arches}
- rust-toml
ExclusiveArch: %{rust_arches}
- rust-traitobject
ExclusiveArch: %{rust_arches}
- rust-typed-arena
ExclusiveArch: %{rust_arches}
- rust-ucd-util
ExclusiveArch: %{rust_arches}
- rust-unicase
ExclusiveArch: %{rust_arches}
- rust-unicode-bidi
ExclusiveArch: %{rust_arches}
- rust-unicode-normalization
ExclusiveArch: %{rust_arches}
- rust-unicode-segmentation
ExclusiveArch: %{rust_arches}
- rust-unicode-width
ExclusiveArch: %{rust_arches}
- rust-unicode-xid
ExclusiveArch: %{rust_arches}
- rust-unindent
ExclusiveArch: %{rust_arches}
- rust-unreachable
ExclusiveArch: %{rust_arches}
- rust-unsafe-any
ExclusiveArch: %{rust_arches}
- rust-untrusted
ExclusiveArch: %{rust_arches}
- rust-url
ExclusiveArch: %{rust_arches}
- rust-users
ExclusiveArch: %{rust_arches}
- rust-utf8-ranges
ExclusiveArch: %{rust_arches}
- rust-uuid
ExclusiveArch: %{rust_arches}
- rust-vec_map
ExclusiveArch: %{rust_arches}
- rust-version-sync
ExclusiveArch: %{rust_arches}
- rust-version_check
ExclusiveArch: %{rust_arches}
- rust-void
ExclusiveArch: %{rust_arches}
- rust-wait-timeout
ExclusiveArch: %{rust_arches}
- rust-walkdir
ExclusiveArch: %{rust_arches}
- rust-which
ExclusiveArch: %{rust_arches}
- rust-xattr
ExclusiveArch: %{rust_arches}
- rust-xz2
ExclusiveArch: %{rust_arches}
- rust-yaml-rust
ExclusiveArch: %{rust_arches}
- rust-yaml-rust0.3
ExclusiveArch: %{rust_arches}
- rust-yubibomb
ExclusiveArch: %{rust_arches}
- rust-zoneinfo_compiled
ExclusiveArch: %{rust_arches}
- s390utils
ExclusiveArch: s390 s390x
- safetyblanket
ExclusiveArch: %{arm} %{ix86} x86_64 %{mips} aarch64 ppc64
- sagemath
ExclusiveArch: aarch64 %{arm} %{ix86} x86_64 ppc sparcv9
- sbcl
ExclusiveArch: %{arm} %{ix86} x86_64 ppc sparcv9 aarch64
- sbd
ExclusiveArch: i686 x86_64 s390x
- seabios
ExclusiveArch: x86_64
- seamonkey
ExclusiveArch: %{ix86} x86_64
- servicelog
ExclusiveArch: ppc %{power64}
- sgabios
ExclusiveArch: %{ix86} x86_64
- sharpfont
ExclusiveArch: %mono_arches
- sharpziplib
ExclusiveArch: %{mono_arches}
- shim
ExclusiveArch: x86_64 aarch64
- shim-signed
ExclusiveArch: x86_64 aarch64
- shim-unsigned-aarch64
ExclusiveArch: aarch64
- shim-unsigned-x64
ExclusiveArch: x86_64
- sigul
ExclusiveArch: x86_64
- skychart
ExclusiveArch: %{fpc_arches}
- smuxi
ExclusiveArch: %{ix86} x86_64 %{arm} ppc64le
- snapd
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 ppc64le s390x
- source-to-image
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- sparkleshare
ExclusiveArch: %{mono_arches}
- spicctrl
ExclusiveArch: %{ix86} x86_64
- spice
ExclusiveArch: x86_64
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64
- spice-xpi
ExclusiveArch: i686 x86_64 armv6l armv7l armv7hl aarch64
- spring
ExclusiveArch: %{ix86} x86_64
- springlobby
ExclusiveArch: %{ix86} x86_64
- startdde
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- statsd
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- stratis-cli
ExclusiveArch: %{rust_arches} noarch
- stratisd
ExclusiveArch: %{rust_arches}
- stripesnoop
ExclusiveArch: %{ix86} x86_64
- supermin
ExclusiveArch: x86_64
- syncthing
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- sysbench
ExclusiveArch: %{arm} %{ix86} x86_64 %{mips}
ExclusiveArch: %{arm} %{ix86} x86_64 %{mips} aarch64
- syslinux
ExclusiveArch: %{ix86} x86_64
ExclusiveArch: %{ix86} x86_64
ExclusiveArch: %{ix86} x86_64
ExclusiveArch: %{ix86} x86_64
- taglib-sharp
ExclusiveArch: %{mono_arches}
- tarantool
ExclusiveArch: %{ix86} x86_64 armv7hl armv7hnl aarch64
- tboot
ExclusiveArch: %{ix86} x86_64
- templates_parser
ExclusiveArch: %GPRbuild_arches
- ternimal
ExclusiveArch: %{rust_arches}
- themonospot-base
ExclusiveArch: %mono_arches
- themonospot-console
ExclusiveArch: %mono_arches
- themonospot-gui-gtk
ExclusiveArch: %mono_arches
- themonospot-plugin-avi
ExclusiveArch: %mono_arches
- themonospot-plugin-mkv
ExclusiveArch: %mono_arches
- thermald
ExclusiveArch: %{ix86} x86_64
- thunderbird-enigmail
ExclusiveArch: %{ix86} %{arm} ppc64 ppc64le s390x x86_64 noarch
- tilix
ExclusiveArch: %{ldc_arches}
- tmux-top
ExclusiveArch: %{go_arches}
- tomboy
ExclusiveArch: %{mono_arches}
- uClibc
ExclusiveArch: %{arm} %{ix86} x86_64 %{mips}
- ucx
ExclusiveArch: aarch64 ppc64le x86_64
- ugene
ExclusiveArch: %{ix86} x86_64
- uglify-js
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- uglify-js1
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- unetbootin
ExclusiveArch: %{ix86} x86_64
- v8
ExclusiveArch: %{ix86} x86_64 %{arm} ppc mipsel mips64el
- v8-314
ExclusiveArch: %{ix86} x86_64 %{arm} mips mipsel ppc ppc64
- valgrind
ExclusiveArch: %{ix86} x86_64 ppc ppc64 ppc64le s390x armv7hl aarch64
- vboot-utils
ExclusiveArch: %{arm} aarch64 %{ix86} x86_64
- vdsm
ExclusiveArch: x86_64 %{power64} aarch64
- vim-go
ExclusiveArch: %{?golang_arches}%{!?golang_arches:%{ix86} x86_64 %{arm}}
- virtualbox-guest-additions
ExclusiveArch: i686 x86_64
- virtualplanet
ExclusiveArch: %{fpc_arches}
- vrq
ExclusiveArch: %{ix86} x86_64
- warsow
ExclusiveArch: %{ix86} x86_64 %{arm}
- warsow-data
ExclusiveArch: %{ix86} x86_64 %{arm}
- webkit-sharp
ExclusiveArch: %mono_arches
- webkit2-sharp
ExclusiveArch: %mono_arches
- wine
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64
ExclusiveArch: %{ix86} %{arm}
- winetricks
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64
- wiredtiger
ExclusiveArch: x86_64 aarch64 ppc64le
- wraplinux
ExclusiveArch: %{ix86} x86_64
- wxMaxima
ExclusiveArch: %{arm} %{ix86} x86_64 aarch64 ppc sparcv9
- x2goclient
ExclusiveArch: x86_64
- x86info
ExclusiveArch: %{ix86} x86_64
- xen
ExclusiveArch: %{ix86} x86_64 armv7hl aarch64
- xmlada
ExclusiveArch: %{GPRbuild_arches}
- xorg-x11-drv-armsoc
ExclusiveArch: %{arm} aarch64
- xorg-x11-drv-geode
ExclusiveArch: %{ix86}
- xorg-x11-drv-intel
ExclusiveArch: %{ix86} x86_64 ia64
- xorg-x11-drv-omap
ExclusiveArch: %{arm}
- xorg-x11-drv-openchrome
ExclusiveArch: %{ix86} x86_64
- xorg-x11-drv-opentegra
ExclusiveArch: %{arm}
- xorg-x11-drv-vesa
ExclusiveArch: %{ix86} x86_64
- xorg-x11-drv-vmware
ExclusiveArch: %{ix86} x86_64 ia64
- xsp
ExclusiveArch: %mono_arches
- xsupplicant
ExclusiveArch: %{ix86} x86_64 ppc %{power64}
- ycssmin
ExclusiveArch: %{nodejs_arches} noarch
- zeromq-ada
ExclusiveArch: %{GPRbuild_arches}
- zlib-ada
ExclusiveArch: %{GPRbuild_arches}
6 years, 1 month
Architecture specific change in rpms/golang-github-ncw-go-acd.git
by githook-noreply@fedoraproject.org
The package rpms/golang-github-ncw-go-acd.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/golang-github-ncw-go-acd.git/comm....
Change:
-ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
Thanks.
Full change:
============
commit 3a47ab48a16f5625772da6c24518effee2e0670c
Author: Robert-André Mauchin <zebob.m(a)gmail.com>
Date: Tue Mar 20 12:55:03 2018 +0100
Renamed to golang-github-ncw-acd.
diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index 10fc360..0000000
--- a/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-/go-acd-96a49aa.tar.gz
-/go-acd-887eb06.tar.gz
diff --git a/dead.package b/dead.package
new file mode 100644
index 0000000..ea85b72
--- /dev/null
+++ b/dead.package
@@ -0,0 +1 @@
+Renamed to golang-github-ncw-acd.
diff --git a/golang-github-ncw-go-acd.spec b/golang-github-ncw-go-acd.spec
deleted file mode 100644
index d548827..0000000
--- a/golang-github-ncw-go-acd.spec
+++ /dev/null
@@ -1,196 +0,0 @@
-# If any of the following macros should be set otherwise,
-# you can wrap any of them with the following conditions:
-# - %%if 0%%{centos} == 7
-# - %%if 0%%{?rhel} == 7
-# - %%if 0%%{?fedora} == 23
-# Or just test for particular distribution:
-# - %%if 0%%{centos}
-# - %%if 0%%{?rhel}
-# - %%if 0%%{?fedora}
-#
-# Be aware, on centos, both %%rhel and %%centos are set. If you want to test
-# rhel specific macros, you can use %%if 0%%{?rhel} && 0%%{?centos} == 0 condition.
-# (Don't forget to replace double percentage symbol with single one in order to apply a condition)
-
-# Generate devel rpm
-%global with_devel 1
-# Build project from bundled dependencies
-%global with_bundled 0
-# Build with debug info rpm
-%global with_debug 0
-# Run tests in check section
-%global with_check 1
-# Generate unit-test rpm
-%global with_unit_test 1
-
-%if 0%{?with_debug}
-%global _dwz_low_mem_die_limit 0
-%else
-%global debug_package %{nil}
-%endif
-
-
-%global provider github
-%global provider_tld com
-%global project ncw
-%global repo go-acd
-# https://github.com/ncw/go-acd
-%global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo}
-%global import_path %{provider_prefix}
-%global commit 887eb06ab6a255fbf5744b5812788e884078620a
-%global shortcommit %(c=%{commit}; echo ${c:0:7})
-%global commitdate 20171119
-
-Name: golang-%{provider}-%{project}-%{repo}
-Version: 0
-Release: 0.2.%{commitdate}git%{shortcommit}%{?dist}
-Summary: Go library for accessing the Amazon Cloud Drive
-# Detected licences
-# - ISC at 'LICENSE'
-License: ISC
-URL: https://%{provider_prefix}
-Source0: https://%{provider_prefix}/archive/%{commit}/%{repo}-%{shortcommit}.tar.gz
-
-# e.g. el6 has ppc64 arch without gcc-go, so EA tag is required
-ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
-# If go_compiler is not set to 1, there is no virtual provide. Use golang instead.
-BuildRequires: %{?go_compiler:compiler(go-compiler)}%{!?go_compiler:golang}
-
-
-
-%description
-%{summary}
-
-%if 0%{?with_devel}
-%package devel
-Summary: %{summary}
-BuildArch: noarch
-
-%if 0%{?with_check} && ! 0%{?with_bundled}
-BuildRequires: golang(github.com/google/go-querystring/query)
-%endif
-
-Requires: golang(github.com/google/go-querystring/query)
-
-Provides: golang(%{import_path}) = %{version}-%{release}
-
-%description devel
-%{summary}
-
-This package contains library source intended for
-building other packages which use import path with
-%{import_path} prefix.
-%endif
-
-%if 0%{?with_unit_test} && 0%{?with_devel}
-%package unit-test-devel
-Summary: Unit tests for %{name} package
-%if 0%{?with_check}
-#Here comes all BuildRequires: PACKAGE the unit tests
-#in %%check section need for running
-%endif
-
-# test subpackage tests code from devel subpackage
-Requires: %{name}-devel = %{version}-%{release}
-
-%if 0%{?with_check} && ! 0%{?with_bundled}
-BuildRequires: golang(github.com/stretchr/testify/assert)
-%endif
-
-Requires: golang(github.com/stretchr/testify/assert)
-
-%description unit-test-devel
-%{summary}
-
-This package contains unit tests for project
-providing packages with %{import_path} prefix.
-%endif
-
-%prep
-%setup -q -n %{repo}-%{commit}
-
-%build
-%install
-# source codes for building projects
-%if 0%{?with_devel}
-install -d -p %{buildroot}/%{gopath}/src/%{import_path}/
-echo "%%dir %%{gopath}/src/%%{import_path}/." >> devel.file-list
-# find all *.go but no *_test.go files and generate devel.file-list
-for file in $(find . \( -iname "*.go" -or -iname "*.s" \) \! -iname "*_test.go") ; do
- dirprefix=$(dirname $file)
- install -d -p %{buildroot}/%{gopath}/src/%{import_path}/$dirprefix
- cp -pav $file %{buildroot}/%{gopath}/src/%{import_path}/$file
- echo "%%{gopath}/src/%%{import_path}/$file" >> devel.file-list
-
- while [ "$dirprefix" != "." ]; do
- echo "%%dir %%{gopath}/src/%%{import_path}/$dirprefix" >> devel.file-list
- dirprefix=$(dirname $dirprefix)
- done
-done
-%endif
-
-# testing files for this project
-%if 0%{?with_unit_test} && 0%{?with_devel}
-install -d -p %{buildroot}/%{gopath}/src/%{import_path}/
-# find all *_test.go files and generate unit-test-devel.file-list
-for file in $(find . -iname "*_test.go") ; do
- dirprefix=$(dirname $file)
- install -d -p %{buildroot}/%{gopath}/src/%{import_path}/$dirprefix
- cp -pav $file %{buildroot}/%{gopath}/src/%{import_path}/$file
- echo "%%{gopath}/src/%%{import_path}/$file" >> unit-test-devel.file-list
-
- while [ "$dirprefix" != "." ]; do
- echo "%%dir %%{gopath}/src/%%{import_path}/$dirprefix" >> devel.file-list
- dirprefix=$(dirname $dirprefix)
- done
-done
-%endif
-
-%if 0%{?with_devel}
-sort -u -o devel.file-list devel.file-list
-%endif
-
-%check
-%if 0%{?with_check} && 0%{?with_unit_test} && 0%{?with_devel}
-%if ! 0%{?with_bundled}
-export GOPATH=%{buildroot}/%{gopath}:%{gopath}
-%else
-# No dependency directories so far
-
-export GOPATH=%{buildroot}/%{gopath}:%{gopath}
-%endif
-
-%if ! 0%{?gotest:1}
-%global gotest go test
-%endif
-
-%gotest %{import_path}
-%endif
-
-#define license tag if not already defined
-%{!?_licensedir:%global license %doc}
-
-
-%if 0%{?with_devel}
-%files devel -f devel.file-list
-%license LICENSE
-%doc README.md
-%dir %{gopath}/src/%{provider}.%{provider_tld}/%{project}
-%endif
-
-%if 0%{?with_unit_test} && 0%{?with_devel}
-%files unit-test-devel -f unit-test-devel.file-list
-%license LICENSE
-%doc README.md
-%endif
-
-%changelog
-* Wed Feb 07 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 0-0.2.20171119git887eb06
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
-
-* Thu Dec 07 2017 Robert-André Mauchin <zebob.m(a)gmail.com> - 0-0.1.20171119git887eb06
-- Upstream GIT revision 887eb06
-
-* Mon Jul 24 2017 Robert-André Mauchin <zebob.m(a)gmail.com> - 0-0.1.20170306git96a49aa
-- First package for Fedora
-
diff --git a/sources b/sources
deleted file mode 100644
index 40a370e..0000000
--- a/sources
+++ /dev/null
@@ -1 +0,0 @@
-SHA512 (go-acd-887eb06.tar.gz) = bf105d7de2a64fcdaa022b3d6162eab2379d40bf23a72c9cccbc08553a8372621f0f44eb3cd21dc18143af1ad3bf8bd74dfb85564893dd716392f4545cbac05e
6 years, 1 month
Architecture specific change in rpms/golang-github-ncw-go-acd.git
by githook-noreply@fedoraproject.org
The package rpms/golang-github-ncw-go-acd.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/golang-github-ncw-go-acd.git/comm....
Change:
-ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
Thanks.
Full change:
============
commit 45e010db7a67b5777aadf687ce5e813d65155126
Author: Robert-André Mauchin <zebob.m(a)gmail.com>
Date: Tue Mar 20 12:54:39 2018 +0100
Renamed to golang-github-ncw-acd.
diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index 10fc360..0000000
--- a/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-/go-acd-96a49aa.tar.gz
-/go-acd-887eb06.tar.gz
diff --git a/dead.package b/dead.package
new file mode 100644
index 0000000..ea85b72
--- /dev/null
+++ b/dead.package
@@ -0,0 +1 @@
+Renamed to golang-github-ncw-acd.
diff --git a/golang-github-ncw-go-acd.spec b/golang-github-ncw-go-acd.spec
deleted file mode 100644
index d548827..0000000
--- a/golang-github-ncw-go-acd.spec
+++ /dev/null
@@ -1,196 +0,0 @@
-# If any of the following macros should be set otherwise,
-# you can wrap any of them with the following conditions:
-# - %%if 0%%{centos} == 7
-# - %%if 0%%{?rhel} == 7
-# - %%if 0%%{?fedora} == 23
-# Or just test for particular distribution:
-# - %%if 0%%{centos}
-# - %%if 0%%{?rhel}
-# - %%if 0%%{?fedora}
-#
-# Be aware, on centos, both %%rhel and %%centos are set. If you want to test
-# rhel specific macros, you can use %%if 0%%{?rhel} && 0%%{?centos} == 0 condition.
-# (Don't forget to replace double percentage symbol with single one in order to apply a condition)
-
-# Generate devel rpm
-%global with_devel 1
-# Build project from bundled dependencies
-%global with_bundled 0
-# Build with debug info rpm
-%global with_debug 0
-# Run tests in check section
-%global with_check 1
-# Generate unit-test rpm
-%global with_unit_test 1
-
-%if 0%{?with_debug}
-%global _dwz_low_mem_die_limit 0
-%else
-%global debug_package %{nil}
-%endif
-
-
-%global provider github
-%global provider_tld com
-%global project ncw
-%global repo go-acd
-# https://github.com/ncw/go-acd
-%global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo}
-%global import_path %{provider_prefix}
-%global commit 887eb06ab6a255fbf5744b5812788e884078620a
-%global shortcommit %(c=%{commit}; echo ${c:0:7})
-%global commitdate 20171119
-
-Name: golang-%{provider}-%{project}-%{repo}
-Version: 0
-Release: 0.2.%{commitdate}git%{shortcommit}%{?dist}
-Summary: Go library for accessing the Amazon Cloud Drive
-# Detected licences
-# - ISC at 'LICENSE'
-License: ISC
-URL: https://%{provider_prefix}
-Source0: https://%{provider_prefix}/archive/%{commit}/%{repo}-%{shortcommit}.tar.gz
-
-# e.g. el6 has ppc64 arch without gcc-go, so EA tag is required
-ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
-# If go_compiler is not set to 1, there is no virtual provide. Use golang instead.
-BuildRequires: %{?go_compiler:compiler(go-compiler)}%{!?go_compiler:golang}
-
-
-
-%description
-%{summary}
-
-%if 0%{?with_devel}
-%package devel
-Summary: %{summary}
-BuildArch: noarch
-
-%if 0%{?with_check} && ! 0%{?with_bundled}
-BuildRequires: golang(github.com/google/go-querystring/query)
-%endif
-
-Requires: golang(github.com/google/go-querystring/query)
-
-Provides: golang(%{import_path}) = %{version}-%{release}
-
-%description devel
-%{summary}
-
-This package contains library source intended for
-building other packages which use import path with
-%{import_path} prefix.
-%endif
-
-%if 0%{?with_unit_test} && 0%{?with_devel}
-%package unit-test-devel
-Summary: Unit tests for %{name} package
-%if 0%{?with_check}
-#Here comes all BuildRequires: PACKAGE the unit tests
-#in %%check section need for running
-%endif
-
-# test subpackage tests code from devel subpackage
-Requires: %{name}-devel = %{version}-%{release}
-
-%if 0%{?with_check} && ! 0%{?with_bundled}
-BuildRequires: golang(github.com/stretchr/testify/assert)
-%endif
-
-Requires: golang(github.com/stretchr/testify/assert)
-
-%description unit-test-devel
-%{summary}
-
-This package contains unit tests for project
-providing packages with %{import_path} prefix.
-%endif
-
-%prep
-%setup -q -n %{repo}-%{commit}
-
-%build
-%install
-# source codes for building projects
-%if 0%{?with_devel}
-install -d -p %{buildroot}/%{gopath}/src/%{import_path}/
-echo "%%dir %%{gopath}/src/%%{import_path}/." >> devel.file-list
-# find all *.go but no *_test.go files and generate devel.file-list
-for file in $(find . \( -iname "*.go" -or -iname "*.s" \) \! -iname "*_test.go") ; do
- dirprefix=$(dirname $file)
- install -d -p %{buildroot}/%{gopath}/src/%{import_path}/$dirprefix
- cp -pav $file %{buildroot}/%{gopath}/src/%{import_path}/$file
- echo "%%{gopath}/src/%%{import_path}/$file" >> devel.file-list
-
- while [ "$dirprefix" != "." ]; do
- echo "%%dir %%{gopath}/src/%%{import_path}/$dirprefix" >> devel.file-list
- dirprefix=$(dirname $dirprefix)
- done
-done
-%endif
-
-# testing files for this project
-%if 0%{?with_unit_test} && 0%{?with_devel}
-install -d -p %{buildroot}/%{gopath}/src/%{import_path}/
-# find all *_test.go files and generate unit-test-devel.file-list
-for file in $(find . -iname "*_test.go") ; do
- dirprefix=$(dirname $file)
- install -d -p %{buildroot}/%{gopath}/src/%{import_path}/$dirprefix
- cp -pav $file %{buildroot}/%{gopath}/src/%{import_path}/$file
- echo "%%{gopath}/src/%%{import_path}/$file" >> unit-test-devel.file-list
-
- while [ "$dirprefix" != "." ]; do
- echo "%%dir %%{gopath}/src/%%{import_path}/$dirprefix" >> devel.file-list
- dirprefix=$(dirname $dirprefix)
- done
-done
-%endif
-
-%if 0%{?with_devel}
-sort -u -o devel.file-list devel.file-list
-%endif
-
-%check
-%if 0%{?with_check} && 0%{?with_unit_test} && 0%{?with_devel}
-%if ! 0%{?with_bundled}
-export GOPATH=%{buildroot}/%{gopath}:%{gopath}
-%else
-# No dependency directories so far
-
-export GOPATH=%{buildroot}/%{gopath}:%{gopath}
-%endif
-
-%if ! 0%{?gotest:1}
-%global gotest go test
-%endif
-
-%gotest %{import_path}
-%endif
-
-#define license tag if not already defined
-%{!?_licensedir:%global license %doc}
-
-
-%if 0%{?with_devel}
-%files devel -f devel.file-list
-%license LICENSE
-%doc README.md
-%dir %{gopath}/src/%{provider}.%{provider_tld}/%{project}
-%endif
-
-%if 0%{?with_unit_test} && 0%{?with_devel}
-%files unit-test-devel -f unit-test-devel.file-list
-%license LICENSE
-%doc README.md
-%endif
-
-%changelog
-* Wed Feb 07 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 0-0.2.20171119git887eb06
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
-
-* Thu Dec 07 2017 Robert-André Mauchin <zebob.m(a)gmail.com> - 0-0.1.20171119git887eb06
-- Upstream GIT revision 887eb06
-
-* Mon Jul 24 2017 Robert-André Mauchin <zebob.m(a)gmail.com> - 0-0.1.20170306git96a49aa
-- First package for Fedora
-
diff --git a/sources b/sources
deleted file mode 100644
index 40a370e..0000000
--- a/sources
+++ /dev/null
@@ -1 +0,0 @@
-SHA512 (go-acd-887eb06.tar.gz) = bf105d7de2a64fcdaa022b3d6162eab2379d40bf23a72c9cccbc08553a8372621f0f44eb3cd21dc18143af1ad3bf8bd74dfb85564893dd716392f4545cbac05e
6 years, 1 month
Architecture specific change in rpms/deepin-daemon.git
by githook-noreply@fedoraproject.org
The package rpms/deepin-daemon.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/deepin-daemon.git/commit/?id=f65e....
Change:
+ExcludeArch: ppc64le aarch64
Thanks.
Full change:
============
commit f65e866b224fa777c3dacb28f14db05d796d7438
Author: mosquito <sensor.wen(a)gmail.com>
Date: Tue Mar 20 19:52:21 2018 +0800
Exclude aarch64
diff --git a/deepin-daemon.spec b/deepin-daemon.spec
index 63190cc..88cf9d6 100644
--- a/deepin-daemon.spec
+++ b/deepin-daemon.spec
@@ -14,14 +14,13 @@ Patch0: https://raw.github.com/jouyouyun/tap-gesture-patches/master/patc
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
# https://github.com/golang/go/issues/21947
-ExcludeArch: ppc64le
+ExcludeArch: ppc64le aarch64
BuildRequires: %{?go_compiler:compiler(go-compiler)}%{!?go_compiler:golang}
BuildRequires: deepin-gettext-tools
BuildRequires: deepin-gir-generator
BuildRequires: fontpackages-devel
BuildRequires: librsvg2-tools
BuildRequires: pam-devel
-BuildRequires: rsync
BuildRequires: pkgconfig(alsa)
BuildRequires: pkgconfig(fontconfig)
BuildRequires: pkgconfig(gnome-keyring-1)
@@ -111,10 +110,6 @@ sed -i 's|/usr/lib|%{_libexecdir}|' \
sed -i 's|boot/grub|boot/grub2|' grub2/{theme,log,entry,grub_params}.go
sed -i 's|default_background.jpg|default.png|' accounts/user.go
-# Copy files to gopath directory
-sed -i -E 's|\$\(dir.*\)|${GOPKG_PREFIX}|' Makefile
-sed -i -E 's|ln.{16}|rsync -a --exclude ${GOPATH_DIR} *|' Makefile
-
%build
export GOPATH="$(pwd)/build:%{gopath}"
%make_build
6 years, 1 month
Architecture specific change in rpms/ardour2.git
by githook-noreply@fedoraproject.org
The package rpms/ardour2.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/ardour2.git/commit/?id=1fbda0629d....
Change:
-%ifarch x86_64
Thanks.
Full change:
============
commit 1fbda0629d146e0f6704227575300f4236ec3874
Author: Nils Philippsen <nils(a)redhat.com>
Date: Tue Mar 20 12:20:37 2018 +0100
Obsoleted by ardour5.
diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index ec37559..0000000
--- a/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/ardour-2.8.16.tar.bz2
diff --git a/0001-Add-boost-linking-to-tranzport-and-generic-midi-surf.patch b/0001-Add-boost-linking-to-tranzport-and-generic-midi-surf.patch
deleted file mode 100644
index 1c5ba07..0000000
--- a/0001-Add-boost-linking-to-tranzport-and-generic-midi-surf.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From ba7881d97f701960b9cea04f9911ba105857c3fa Mon Sep 17 00:00:00 2001
-From: David Henningsson <david.henningsson(a)canonical.com>
-Date: Thu, 3 Oct 2013 20:26:52 +0200
-Subject: [PATCH] Add boost linking to "tranzport" and "generic midi" surfaces
-
-This fixes the following scary errors, shown at startup:
-ardour: [ERROR]: ControlProtocolManager: cannot load module "/usr/lib/ardour2/surfaces//libardour_genericmidi.so" (/usr/lib/ardour2/surfaces//libardour_genericmidi.so: undefined symbol: _ZN5boost6system15system_categoryEv)
-ardour: [ERROR]: ControlProtocolManager: cannot load module "/usr/lib/ardour2/surfaces//libardour_tranzport.so" (/usr/lib/ardour2/surfaces//libardour_tranzport.so: undefined symbol: _ZN5boost6system15system_categoryEv)
-
-Signed-off-by: David Henningsson <david.henningsson(a)canonical.com>
----
- libs/surfaces/generic_midi/SConscript | 3 ++-
- libs/surfaces/tranzport/SConscript | 1 +
- 2 files changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/libs/surfaces/generic_midi/SConscript b/libs/surfaces/generic_midi/SConscript
-index 27f8865..ce37359 100644
---- a/libs/surfaces/generic_midi/SConscript
-+++ b/libs/surfaces/generic_midi/SConscript
-@@ -42,7 +42,8 @@ genericmidi.Merge ([
- libraries['usb'],
- libraries['xml'],
- libraries['glib2'],
-- libraries['glibmm2']
-+ libraries['glibmm2'],
-+ libraries['boost']
- ])
-
- libardour_genericmidi = genericmidi.SharedLibrary('ardour_genericmidi', genericmidi_files)
-diff --git a/libs/surfaces/tranzport/SConscript b/libs/surfaces/tranzport/SConscript
-index c2ab351..3ea0d4f 100644
---- a/libs/surfaces/tranzport/SConscript
-+++ b/libs/surfaces/tranzport/SConscript
-@@ -64,6 +64,7 @@ tranzport.Merge ([
- libraries['glib2'],
- libraries['glibmm2'],
- libraries['usb'],
-+ libraries['boost'],
- libraries['sndfile']
- ])
-
---
-1.8.3.2
-
diff --git a/0002-Add-boost-linking-to-wiimote.patch b/0002-Add-boost-linking-to-wiimote.patch
deleted file mode 100644
index 03beca5..0000000
--- a/0002-Add-boost-linking-to-wiimote.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- ardour-2.8.16/libs/surfaces/wiimote/SConscript~ 2009-10-01 07:56:53.000000000 -0700
-+++ ardour-2.8.16/libs/surfaces/wiimote/SConscript 2014-10-23 10:59:30.000000000 -0700
-@@ -42,7 +42,8 @@
- libraries['usb'],
- libraries['xml'],
- libraries['glib2'],
-- libraries['glibmm2']
-+ libraries['glibmm2'],
-+ libraries['boost']
- ])
-
- libardour_wiimote = wiimote.SharedLibrary('ardour_wiimote', wiimote_files)
diff --git a/ardour-2.5-HOST_NOT_FOUND.patch b/ardour-2.5-HOST_NOT_FOUND.patch
deleted file mode 100644
index 827743e..0000000
--- a/ardour-2.5-HOST_NOT_FOUND.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- gtk2_ardour/ardour_ui.h~ 2008-06-17 07:58:37.000000000 -0700
-+++ gtk2_ardour/ardour_ui.h 2008-09-21 08:19:26.000000000 -0700
-@@ -53,6 +53,9 @@
- #include <gtkmm/textbuffer.h>
- #include <gtkmm/adjustment.h>
- #include <gtkmm2ext/gtk_ui.h>
-+#ifdef HOST_NOT_FOUND
-+#undef HOST_NOT_FOUND
-+#endif
- #include <gtkmm2ext/click_box.h>
- #include <gtkmm2ext/stateful_button.h>
- #include <gtkmm2ext/bindable_button.h>
diff --git a/ardour-2.8.16-aubio04.patch b/ardour-2.8.16-aubio04.patch
deleted file mode 100644
index 308bdd6..0000000
--- a/ardour-2.8.16-aubio04.patch
+++ /dev/null
@@ -1,363 +0,0 @@
-From 799e4369f1850c36fae856477539cebd2d0c3ad0 Mon Sep 17 00:00:00 2001
-From: Robin Gareus <robin(a)gareus.org>
-Date: Sun, 12 Jan 2014 18:11:14 +0100
-Subject: [PATCH] aubio 3+4 compat
-
-plus relevant changes for scons
-(cherry picked from commit 1eaa30b7257f006878c9b2c88ecbaea5bc36b174)
----
- SConstruct | 2 +
- libs/vamp-plugins/Onset.cpp | 125 +++++++++++++++++++++++++++++++++++++++++---
- libs/vamp-plugins/Onset.h | 26 +++++++--
- 3 files changed, 142 insertions(+), 11 deletions(-)
-
-diff --git a/SConstruct b/SConstruct
-index 7ad8cdf..290bce1 100644
---- a/SConstruct
-+++ b/SConstruct
-@@ -514,6 +514,8 @@ if conf.CheckPKGExists ('fftw3'):
- if conf.CheckPKGExists ('aubio'):
- libraries['aubio'] = LibraryInfo()
- libraries['aubio'].ParseConfig('pkg-config --cflags --libs aubio')
-+ if conf.CheckPKGVersion ('aubio', '0.4.0'):
-+ env.Append (CCFLAGS="-DHAVE_AUBIO4")
-
- env = conf.Finish ()
-
-diff --git a/libs/vamp-plugins/Onset.cpp b/libs/vamp-plugins/Onset.cpp
-index d475b11..64f197c 100644
---- a/libs/vamp-plugins/Onset.cpp
-+++ b/libs/vamp-plugins/Onset.cpp
-@@ -22,29 +22,51 @@ using std::vector;
- using std::cerr;
- using std::endl;
-
-+#ifdef HAVE_AUBIO4
-+const char *getAubioNameForOnsetType(OnsetType t)
-+{
-+ // In the same order as the enum elements in the header
-+ static const char *const names[] = {
-+ "energy", "specdiff", "hfc", "complex", "phase", "kl", "mkl", "specflux"
-+ };
-+ return names[(int)t];
-+}
-+#endif
-+
- Onset::Onset(float inputSampleRate) :
- Plugin(inputSampleRate),
- m_ibuf(0),
-- m_fftgrain(0),
- m_onset(0),
-+#ifdef HAVE_AUBIO4
-+ m_onsetdet(0),
-+ m_onsettype(OnsetComplex),
-+ m_minioi(4),
-+ m_silence(-70),
-+#else
-+ m_fftgrain(0),
- m_pv(0),
- m_peakpick(0),
- m_onsetdet(0),
- m_onsettype(aubio_onset_complex),
-- m_threshold(0.3),
-+ m_channelCount(1),
- m_silence(-90),
-- m_channelCount(1)
-+#endif
-+ m_threshold(0.3)
- {
- }
-
- Onset::~Onset()
- {
-+#ifdef HAVE_AUBIO4
-+ if (m_onsetdet) del_aubio_onset(m_onsetdet);
-+#else
- if (m_onsetdet) aubio_onsetdetection_free(m_onsetdet);
-- if (m_ibuf) del_fvec(m_ibuf);
-- if (m_onset) del_fvec(m_onset);
- if (m_fftgrain) del_cvec(m_fftgrain);
- if (m_pv) del_aubio_pvoc(m_pv);
- if (m_peakpick) del_aubio_peakpicker(m_peakpick);
-+#endif
-+ if (m_ibuf) del_fvec(m_ibuf);
-+ if (m_onset) del_fvec(m_onset);
- }
-
- string
-@@ -74,7 +96,11 @@ Onset::getMaker() const
- int
- Onset::getPluginVersion() const
- {
-+#ifdef HAVE_AUBIO4
-+ return 2;
-+#else
- return 1;
-+#endif
- }
-
- string
-@@ -86,10 +112,20 @@ Onset::getCopyright() const
- bool
- Onset::initialise(size_t channels, size_t stepSize, size_t blockSize)
- {
-- m_channelCount = channels;
- m_stepSize = stepSize;
- m_blockSize = blockSize;
-
-+#ifdef HAVE_AUBIO4
-+ if (channels != 1) {
-+ std::cerr << "Onset::initialise: channels must be 1" << std::endl;
-+ return false;
-+ }
-+ m_ibuf = new_fvec(stepSize);
-+ m_onset = new_fvec(1);
-+ reset();
-+#else
-+ m_channelCount = channels;
-+
- m_ibuf = new_fvec(stepSize, channels);
- m_onset = new_fvec(1, channels);
- m_fftgrain = new_cvec(blockSize, channels);
-@@ -103,13 +139,32 @@ Onset::initialise(size_t channels, size_t stepSize, size_t blockSize)
-
- m_lastOnset = Vamp::RealTime::zeroTime - m_delay - m_delay;
-
-+#endif
- return true;
- }
-
-+#ifdef HAVE_AUBIO4
- void
- Onset::reset()
- {
-+ if (m_onsetdet) del_aubio_onset(m_onsetdet);
-+
-+ m_onsetdet = new_aubio_onset
-+ (const_cast<char *>(getAubioNameForOnsetType(m_onsettype)),
-+ m_blockSize,
-+ m_stepSize,
-+ lrintf(m_inputSampleRate));
-+
-+ aubio_onset_set_threshold(m_onsetdet, m_threshold);
-+ aubio_onset_set_silence(m_onsetdet, m_silence);
-+ aubio_onset_set_minioi(m_onsetdet, m_minioi);
-+
-+ m_delay = Vamp::RealTime::frame2RealTime(4 * m_stepSize,
-+ lrintf(m_inputSampleRate));
-+
-+ m_lastOnset = Vamp::RealTime::zeroTime - m_delay - m_delay;
- }
-+#endif
-
- size_t
- Onset::getPreferredStepSize() const
-@@ -132,8 +187,13 @@ Onset::getParameterDescriptors() const
- desc.identifier = "onsettype";
- desc.name = "Onset Detection Function Type";
- desc.minValue = 0;
-+#ifdef HAVE_AUBIO4
-+ desc.maxValue = 7;
-+ desc.defaultValue = (int)OnsetComplex;
-+#else
- desc.maxValue = 6;
- desc.defaultValue = (int)aubio_onset_complex;
-+#endif
- desc.isQuantized = true;
- desc.quantizeStep = 1;
- desc.valueNames.push_back("Energy Based");
-@@ -143,6 +203,9 @@ Onset::getParameterDescriptors() const
- desc.valueNames.push_back("Phase Deviation");
- desc.valueNames.push_back("Kullback-Liebler");
- desc.valueNames.push_back("Modified Kullback-Liebler");
-+#ifdef HAVE_AUBIO4
-+ desc.valueNames.push_back("Spectral Flux");
-+#endif
- list.push_back(desc);
-
- desc = ParameterDescriptor();
-@@ -159,11 +222,27 @@ Onset::getParameterDescriptors() const
- desc.name = "Silence Threshold";
- desc.minValue = -120;
- desc.maxValue = 0;
-+#ifdef HAVE_AUBIO4
-+ desc.defaultValue = -70;
-+#else
- desc.defaultValue = -90;
-+#endif
- desc.unit = "dB";
- desc.isQuantized = false;
- list.push_back(desc);
-
-+#ifdef HAVE_AUBIO4
-+ desc = ParameterDescriptor();
-+ desc.identifier = "minioi";
-+ desc.name = "Minimum Inter-Onset Interval";
-+ desc.minValue = 0;
-+ desc.maxValue = 40;
-+ desc.defaultValue = 4;
-+ desc.unit = "ms";
-+ desc.isQuantized = true;
-+ desc.quantizeStep = 1;
-+ list.push_back(desc);
-+#endif
- return list;
- }
-
-@@ -176,6 +255,10 @@ Onset::getParameter(std::string param) const
- return m_threshold;
- } else if (param == "silencethreshold") {
- return m_silence;
-+#ifdef HAVE_AUBIO4
-+ } else if (param == "minioi") {
-+ return m_minioi;
-+#endif
- } else {
- return 0.0;
- }
-@@ -186,6 +269,16 @@ Onset::setParameter(std::string param, float value)
- {
- if (param == "onsettype") {
- switch (lrintf(value)) {
-+#ifdef HAVE_AUBIO4
-+ case 0: m_onsettype = OnsetEnergy; break;
-+ case 1: m_onsettype = OnsetSpecDiff; break;
-+ case 2: m_onsettype = OnsetHFC; break;
-+ case 3: m_onsettype = OnsetComplex; break;
-+ case 4: m_onsettype = OnsetPhase; break;
-+ case 5: m_onsettype = OnsetKL; break;
-+ case 6: m_onsettype = OnsetMKL; break;
-+ case 7: m_onsettype = OnsetSpecFlux; break;
-+#else
- case 0: m_onsettype = aubio_onset_energy; break;
- case 1: m_onsettype = aubio_onset_specdiff; break;
- case 2: m_onsettype = aubio_onset_hfc; break;
-@@ -193,11 +286,16 @@ Onset::setParameter(std::string param, float value)
- case 4: m_onsettype = aubio_onset_phase; break;
- case 5: m_onsettype = aubio_onset_kl; break;
- case 6: m_onsettype = aubio_onset_mkl; break;
-+#endif
- }
- } else if (param == "peakpickthreshold") {
- m_threshold = value;
- } else if (param == "silencethreshold") {
- m_silence = value;
-+#ifdef HAVE_AUBIO4
-+ } else if (param == "minioi") {
-+ m_minioi = value;
-+#endif
- }
- }
-
-@@ -216,6 +314,7 @@ Onset::getOutputDescriptors() const
- d.sampleRate = 0;
- list.push_back(d);
-
-+#ifndef HAVE_AUBIO4
- d = OutputDescriptor();
- d.identifier = "detectionfunction";
- d.name = "Onset Detection Function";
-@@ -226,7 +325,7 @@ Onset::getOutputDescriptors() const
- d.isQuantized = false;
- d.sampleType = OutputDescriptor::OneSamplePerStep;
- list.push_back(d);
--
-+#endif
- return list;
- }
-
-@@ -234,6 +333,15 @@ Onset::FeatureSet
- Onset::process(const float *const *inputBuffers,
- Vamp::RealTime timestamp)
- {
-+#ifdef HAVE_AUBIO4
-+ for (size_t i = 0; i < m_stepSize; ++i) {
-+ fvec_set_sample(m_ibuf, inputBuffers[0][i], i);
-+ }
-+
-+ aubio_onset_do(m_onsetdet, m_ibuf, m_onset);
-+
-+ bool isonset = m_onset->data[0];
-+#else
- for (size_t i = 0; i < m_stepSize; ++i) {
- for (size_t j = 0; j < m_channelCount; ++j) {
- fvec_write_sample(m_ibuf, inputBuffers[j][i], j, i);
-@@ -250,6 +358,7 @@ Onset::process(const float *const *inputBuffers,
- isonset = false;
- }
- }
-+#endif
-
- FeatureSet returnFeatures;
-
-@@ -263,11 +372,13 @@ Onset::process(const float *const *inputBuffers,
- m_lastOnset = timestamp;
- }
- }
-+#ifndef HAVE_AUBIO4
- Feature feature;
- for (size_t j = 0; j < m_channelCount; ++j) {
- feature.values.push_back(m_onset->data[j][0]);
- }
- returnFeatures[1].push_back(feature);
-+#endif
-
- return returnFeatures;
- }
-diff --git a/libs/vamp-plugins/Onset.h b/libs/vamp-plugins/Onset.h
-index 314e107..bba95e0 100644
---- a/libs/vamp-plugins/Onset.h
-+++ b/libs/vamp-plugins/Onset.h
-@@ -20,6 +20,19 @@
- #include <vamp-sdk/Plugin.h>
- #include <aubio/aubio.h>
-
-+#ifdef HAVE_AUBIO4
-+enum OnsetType {
-+ OnsetEnergy,
-+ OnsetSpecDiff,
-+ OnsetHFC,
-+ OnsetComplex,
-+ OnsetPhase,
-+ OnsetKL,
-+ OnsetMKL,
-+ OnsetSpecFlux // new in 0.4!
-+};
-+#endif
-+
- class Onset : public Vamp::Plugin
- {
- public:
-@@ -54,20 +67,25 @@ public:
-
- protected:
- fvec_t *m_ibuf;
-- cvec_t *m_fftgrain;
- fvec_t *m_onset;
-+#ifdef HAVE_AUBIO4
-+ aubio_onset_t *m_onsetdet;
-+ OnsetType m_onsettype;
-+ float m_minioi;
-+#else
-+ cvec_t *m_fftgrain;
- aubio_pvoc_t *m_pv;
- aubio_pickpeak_t *m_peakpick;
- aubio_onsetdetection_t *m_onsetdet;
- aubio_onsetdetection_type m_onsettype;
-- float m_threshold;
-+ size_t m_channelCount;
-+#endif
- float m_silence;
-+ float m_threshold;
- size_t m_stepSize;
- size_t m_blockSize;
-- size_t m_channelCount;
- Vamp::RealTime m_delay;
- Vamp::RealTime m_lastOnset;
- };
-
--
- #endif
---
-2.6.3
-
diff --git a/ardour-2.8.16-c++11-bool-from-pointer.patch b/ardour-2.8.16-c++11-bool-from-pointer.patch
deleted file mode 100644
index b91a9d3..0000000
--- a/ardour-2.8.16-c++11-bool-from-pointer.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From de79d5107f0d4e47199ac9b733be2d0783791605 Mon Sep 17 00:00:00 2001
-From: Nils Philippsen <nils(a)tiptoe.de>
-Date: Fri, 27 Nov 2015 20:31:20 +0100
-Subject: [PATCH] C++11: don't cast pointer into bool
-
----
- gtk2_ardour/editor_region_list.cc | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/gtk2_ardour/editor_region_list.cc b/gtk2_ardour/editor_region_list.cc
-index 054ef04..0e7cd53 100644
---- a/gtk2_ardour/editor_region_list.cc
-+++ b/gtk2_ardour/editor_region_list.cc
-@@ -94,7 +94,7 @@ Editor::add_audio_region_to_region_display (boost::shared_ptr<AudioRegion> regio
- Gdk::Color c;
- bool missing_source;
-
-- missing_source = boost::dynamic_pointer_cast<SilentFileSource>(region->source());
-+ missing_source = boost::dynamic_pointer_cast<SilentFileSource>(region->source()) != NULL;
-
- if (!show_automatic_regions_in_region_list && region->automatic()) {
- return;
---
-2.6.3
-
diff --git a/ardour-2.8.16-c++11-namespaces.patch b/ardour-2.8.16-c++11-namespaces.patch
deleted file mode 100644
index 87283bc..0000000
--- a/ardour-2.8.16-c++11-namespaces.patch
+++ /dev/null
@@ -1,2782 +0,0 @@
-From c40bff17c7c5ebe13f1a00f49f92c3ddb1179cf9 Mon Sep 17 00:00:00 2001
-From: Nils Philippsen <nils(a)tiptoe.de>
-Date: Sat, 28 Nov 2015 23:59:50 +0100
-Subject: [PATCH] C++11: use explicit namespaces for clashing symbol names
-
----
- gtk2_ardour/ardour_ui2.cc | 36 ++--
- gtk2_ardour/ardour_ui_ed.cc | 234 ++++++++++++------------
- gtk2_ardour/audio_clock.cc | 202 ++++++++++----------
- gtk2_ardour/audio_region_editor.cc | 4 +-
- gtk2_ardour/automation_line.cc | 2 +-
- gtk2_ardour/crossfade_edit.cc | 14 +-
- gtk2_ardour/editor.cc | 204 ++++++++++-----------
- gtk2_ardour/editor_audio_import.cc | 4 +-
- gtk2_ardour/editor_canvas.cc | 16 +-
- gtk2_ardour/editor_markers.cc | 16 +-
- gtk2_ardour/editor_ops.cc | 14 +-
- gtk2_ardour/editor_selection.cc | 2 +-
- gtk2_ardour/generic_pluginui.cc | 40 ++--
- gtk2_ardour/io_selector.cc | 16 +-
- gtk2_ardour/level_meter.cc | 4 +-
- gtk2_ardour/mixer_strip.cc | 18 +-
- gtk2_ardour/mixer_ui.cc | 24 +--
- gtk2_ardour/option_editor.cc | 24 +--
- gtk2_ardour/plugin_ui.cc | 4 +-
- gtk2_ardour/route_time_axis.cc | 36 ++--
- gtk2_ardour/time_axis_view_item.cc | 2 +-
- libs/ardour/automation_event.cc | 4 +-
- libs/ardour/session.cc | 88 ++++-----
- libs/gtkmm2ext/gtk_ui.cc | 6 +-
- libs/surfaces/mackie/mackie_control_protocol.cc | 4 +-
- libs/surfaces/mackie/mackie_jog_wheel.cc | 3 +-
- 26 files changed, 510 insertions(+), 511 deletions(-)
-
-diff --git a/gtk2_ardour/ardour_ui2.cc b/gtk2_ardour/ardour_ui2.cc
-index 7107b64..aa4ee8a 100644
---- a/gtk2_ardour/ardour_ui2.cc
-+++ b/gtk2_ardour/ardour_ui2.cc
-@@ -76,7 +76,7 @@ ARDOUR_UI::setup_windows ()
- setup_transport();
- build_menu_bar ();
-
-- theme_manager->signal_unmap().connect (bind (sigc::ptr_fun(&ActionManager::uncheck_toggleaction), X_("<Actions>/Common/ToggleThemeManager")));
-+ theme_manager->signal_unmap().connect (sigc::bind (sigc::ptr_fun(&ActionManager::uncheck_toggleaction), X_("<Actions>/Common/ToggleThemeManager")));
-
- #ifdef TOP_MENUBAR
- HBox* status_bar_packer = manage (new HBox);
-@@ -156,7 +156,7 @@ ARDOUR_UI::setup_transport ()
- {
- transport_tearoff = manage (new TearOff (transport_tearoff_hbox));
- transport_tearoff->set_name ("TransportBase");
-- transport_tearoff->tearoff_window().signal_key_press_event().connect (bind (sigc::ptr_fun (relay_key_press), &transport_tearoff->tearoff_window()));
-+ transport_tearoff->tearoff_window().signal_key_press_event().connect (sigc::bind (sigc::ptr_fun (relay_key_press), &transport_tearoff->tearoff_window()));
-
- if (Profile->get_sae()) {
- transport_tearoff->set_can_be_torn_off (false);
-@@ -171,13 +171,13 @@ ARDOUR_UI::setup_transport ()
- transport_frame.set_name ("BaseFrame");
- transport_frame.add (transport_base);
-
-- transport_tearoff->Detach.connect (bind (mem_fun(*this, &ARDOUR_UI::detach_tearoff), static_cast<Box*>(&top_packer),
-+ transport_tearoff->Detach.connect (sigc::bind (mem_fun(*this, &ARDOUR_UI::detach_tearoff), static_cast<Box*>(&top_packer),
- static_cast<Widget*>(&transport_frame)));
-- transport_tearoff->Attach.connect (bind (mem_fun(*this, &ARDOUR_UI::reattach_tearoff), static_cast<Box*> (&top_packer),
-+ transport_tearoff->Attach.connect (sigc::bind (mem_fun(*this, &ARDOUR_UI::reattach_tearoff), static_cast<Box*> (&top_packer),
- static_cast<Widget*> (&transport_frame), 1));
-- transport_tearoff->Hidden.connect (bind (mem_fun(*this, &ARDOUR_UI::detach_tearoff), static_cast<Box*>(&top_packer),
-+ transport_tearoff->Hidden.connect (sigc::bind (mem_fun(*this, &ARDOUR_UI::detach_tearoff), static_cast<Box*>(&top_packer),
- static_cast<Widget*>(&transport_frame)));
-- transport_tearoff->Visible.connect (bind (mem_fun(*this, &ARDOUR_UI::reattach_tearoff), static_cast<Box*> (&top_packer),
-+ transport_tearoff->Visible.connect (sigc::bind (mem_fun(*this, &ARDOUR_UI::reattach_tearoff), static_cast<Box*> (&top_packer),
- static_cast<Widget*> (&transport_frame), 1));
-
- shuttle_box.set_name ("TransportButton");
-@@ -282,8 +282,8 @@ ARDOUR_UI::setup_transport ()
-
- /* clocks, etc. */
-
-- ARDOUR_UI::Clock.connect (bind (mem_fun (primary_clock, &AudioClock::set), 1));
-- ARDOUR_UI::Clock.connect (bind (mem_fun (secondary_clock, &AudioClock::set), 2));
-+ ARDOUR_UI::Clock.connect (sigc::bind (mem_fun (primary_clock, &AudioClock::set), 1));
-+ ARDOUR_UI::Clock.connect (sigc::bind (mem_fun (secondary_clock, &AudioClock::set), 2));
-
- primary_clock.ValueChanged.connect (mem_fun(*this, &ARDOUR_UI::primary_clock_value_changed));
- secondary_clock.ValueChanged.connect (mem_fun(*this, &ARDOUR_UI::secondary_clock_value_changed));
-@@ -433,9 +433,9 @@ ARDOUR_UI::setup_transport ()
- void
- ARDOUR_UI::manage_window (Window& win)
- {
-- win.signal_delete_event().connect (bind (sigc::ptr_fun (just_hide_it), &win));
-- win.signal_enter_notify_event().connect (bind (mem_fun (Keyboard::the_keyboard(), &Keyboard::enter_window), &win));
-- win.signal_leave_notify_event().connect (bind (mem_fun (Keyboard::the_keyboard(), &Keyboard::leave_window), &win));
-+ win.signal_delete_event().connect (sigc::bind (sigc::ptr_fun (just_hide_it), &win));
-+ win.signal_enter_notify_event().connect (sigc::bind (mem_fun (Keyboard::the_keyboard(), &Keyboard::enter_window), &win));
-+ win.signal_leave_notify_event().connect (sigc::bind (mem_fun (Keyboard::the_keyboard(), &Keyboard::leave_window), &win));
- }
-
- void
-@@ -472,7 +472,7 @@ ARDOUR_UI::_auditioning_changed (bool onoff)
- void
- ARDOUR_UI::auditioning_changed (bool onoff)
- {
-- UI::instance()->call_slot(bind (mem_fun(*this, &ARDOUR_UI::_auditioning_changed), onoff));
-+ UI::instance()->call_slot(sigc::bind (mem_fun(*this, &ARDOUR_UI::_auditioning_changed), onoff));
- }
-
- void
-@@ -542,27 +542,27 @@ ARDOUR_UI::build_shuttle_context_menu ()
-
- RadioMenuItem::Group group;
-
-- speed_items.push_back (RadioMenuElem (group, "8", bind (mem_fun (*this, &ARDOUR_UI::set_shuttle_max_speed), 8.0f)));
-+ speed_items.push_back (RadioMenuElem (group, "8", sigc::bind (mem_fun (*this, &ARDOUR_UI::set_shuttle_max_speed), 8.0f)));
- if (shuttle_max_speed == 8.0) {
- static_cast<RadioMenuItem*>(&speed_items.back())->set_active ();
- }
-- speed_items.push_back (RadioMenuElem (group, "6", bind (mem_fun (*this, &ARDOUR_UI::set_shuttle_max_speed), 6.0f)));
-+ speed_items.push_back (RadioMenuElem (group, "6", sigc::bind (mem_fun (*this, &ARDOUR_UI::set_shuttle_max_speed), 6.0f)));
- if (shuttle_max_speed == 6.0) {
- static_cast<RadioMenuItem*>(&speed_items.back())->set_active ();
- }
-- speed_items.push_back (RadioMenuElem (group, "4", bind (mem_fun (*this, &ARDOUR_UI::set_shuttle_max_speed), 4.0f)));
-+ speed_items.push_back (RadioMenuElem (group, "4", sigc::bind (mem_fun (*this, &ARDOUR_UI::set_shuttle_max_speed), 4.0f)));
- if (shuttle_max_speed == 4.0) {
- static_cast<RadioMenuItem*>(&speed_items.back())->set_active ();
- }
-- speed_items.push_back (RadioMenuElem (group, "3", bind (mem_fun (*this, &ARDOUR_UI::set_shuttle_max_speed), 3.0f)));
-+ speed_items.push_back (RadioMenuElem (group, "3", sigc::bind (mem_fun (*this, &ARDOUR_UI::set_shuttle_max_speed), 3.0f)));
- if (shuttle_max_speed == 3.0) {
- static_cast<RadioMenuItem*>(&speed_items.back())->set_active ();
- }
-- speed_items.push_back (RadioMenuElem (group, "2", bind (mem_fun (*this, &ARDOUR_UI::set_shuttle_max_speed), 2.0f)));
-+ speed_items.push_back (RadioMenuElem (group, "2", sigc::bind (mem_fun (*this, &ARDOUR_UI::set_shuttle_max_speed), 2.0f)));
- if (shuttle_max_speed == 2.0) {
- static_cast<RadioMenuItem*>(&speed_items.back())->set_active ();
- }
-- speed_items.push_back (RadioMenuElem (group, "1.5", bind (mem_fun (*this, &ARDOUR_UI::set_shuttle_max_speed), 1.5f)));
-+ speed_items.push_back (RadioMenuElem (group, "1.5", sigc::bind (mem_fun (*this, &ARDOUR_UI::set_shuttle_max_speed), 1.5f)));
- if (shuttle_max_speed == 1.5) {
- static_cast<RadioMenuItem*>(&speed_items.back())->set_active ();
- }
-diff --git a/gtk2_ardour/ardour_ui_ed.cc b/gtk2_ardour/ardour_ui_ed.cc
-index 9ae5a71..47a3a8f 100644
---- a/gtk2_ardour/ardour_ui_ed.cc
-+++ b/gtk2_ardour/ardour_ui_ed.cc
-@@ -108,7 +108,7 @@ ARDOUR_UI::install_actions ()
-
- /* the real actions */
-
-- act = ActionManager::register_action (main_actions, X_("New"), _("New"), hide_return (bind (mem_fun(*this, &ARDOUR_UI::get_session_parameters), true, true)));
-+ act = ActionManager::register_action (main_actions, X_("New"), _("New"), hide_return (sigc::bind (mem_fun(*this, &ARDOUR_UI::get_session_parameters), true, true)));
-
- ActionManager::register_action (main_actions, X_("Open"), _("Open"), mem_fun(*this, &ARDOUR_UI::open_session));
- ActionManager::register_action (main_actions, X_("Recent"), _("Recent"), mem_fun(*this, &ARDOUR_UI::open_recent_session));
-@@ -116,7 +116,7 @@ ARDOUR_UI::install_actions ()
- ActionManager::session_sensitive_actions.push_back (act);
-
- act = ActionManager::register_action (main_actions, X_("AddTrackBus"), _("Add Track/Bus"),
-- bind (mem_fun(*this, &ARDOUR_UI::add_route), (Gtk::Window*) 0));
-+ sigc::bind (mem_fun(*this, &ARDOUR_UI::add_route), (Gtk::Window*) 0));
- ActionManager::session_sensitive_actions.push_back (act);
- ActionManager::write_sensitive_actions.push_back (act);
-
-@@ -135,11 +135,11 @@ ARDOUR_UI::install_actions ()
-
- /* </CMT Additions> */
-
-- act = ActionManager::register_action (main_actions, X_("Snapshot"), _("Snapshot"), bind (mem_fun(*this, &ARDOUR_UI::snapshot_session), false));
-+ act = ActionManager::register_action (main_actions, X_("Snapshot"), _("Snapshot"), sigc::bind (mem_fun(*this, &ARDOUR_UI::snapshot_session), false));
- ActionManager::session_sensitive_actions.push_back (act);
- ActionManager::write_sensitive_actions.push_back (act);
-
-- act = ActionManager::register_action (main_actions, X_("Save As"), _("Save As"), bind (mem_fun(*this, &ARDOUR_UI::snapshot_session), true));
-+ act = ActionManager::register_action (main_actions, X_("Save As"), _("Save As"), sigc::bind (mem_fun(*this, &ARDOUR_UI::snapshot_session), true));
- ActionManager::session_sensitive_actions.push_back (act);
- ActionManager::write_sensitive_actions.push_back (act);
-
-@@ -181,23 +181,23 @@ ARDOUR_UI::install_actions ()
-
- RadioAction::Group jack_latency_group;
-
-- act = ActionManager::register_radio_action (jack_actions, jack_latency_group, X_("JACKLatency32"), X_("32"), bind (mem_fun(*this, &ARDOUR_UI::set_jack_buffer_size), (nframes_t) 32));
-+ act = ActionManager::register_radio_action (jack_actions, jack_latency_group, X_("JACKLatency32"), X_("32"), sigc::bind (mem_fun(*this, &ARDOUR_UI::set_jack_buffer_size), (nframes_t) 32));
- ActionManager::jack_sensitive_actions.push_back (act);
-- act = ActionManager::register_radio_action (jack_actions, jack_latency_group, X_("JACKLatency64"), X_("64"), bind (mem_fun(*this, &ARDOUR_UI::set_jack_buffer_size), (nframes_t) 64));
-+ act = ActionManager::register_radio_action (jack_actions, jack_latency_group, X_("JACKLatency64"), X_("64"), sigc::bind (mem_fun(*this, &ARDOUR_UI::set_jack_buffer_size), (nframes_t) 64));
- ActionManager::jack_sensitive_actions.push_back (act);
-- act = ActionManager::register_radio_action (jack_actions, jack_latency_group, X_("JACKLatency128"), X_("128"), bind (mem_fun(*this, &ARDOUR_UI::set_jack_buffer_size), (nframes_t) 128));
-+ act = ActionManager::register_radio_action (jack_actions, jack_latency_group, X_("JACKLatency128"), X_("128"), sigc::bind (mem_fun(*this, &ARDOUR_UI::set_jack_buffer_size), (nframes_t) 128));
- ActionManager::jack_sensitive_actions.push_back (act);
-- act = ActionManager::register_radio_action (jack_actions, jack_latency_group, X_("JACKLatency256"), X_("256"), bind (mem_fun(*this, &ARDOUR_UI::set_jack_buffer_size), (nframes_t) 256));
-+ act = ActionManager::register_radio_action (jack_actions, jack_latency_group, X_("JACKLatency256"), X_("256"), sigc::bind (mem_fun(*this, &ARDOUR_UI::set_jack_buffer_size), (nframes_t) 256));
- ActionManager::jack_sensitive_actions.push_back (act);
-- act = ActionManager::register_radio_action (jack_actions, jack_latency_group, X_("JACKLatency512"), X_("512"), bind (mem_fun(*this, &ARDOUR_UI::set_jack_buffer_size), (nframes_t) 512));
-+ act = ActionManager::register_radio_action (jack_actions, jack_latency_group, X_("JACKLatency512"), X_("512"), sigc::bind (mem_fun(*this, &ARDOUR_UI::set_jack_buffer_size), (nframes_t) 512));
- ActionManager::jack_sensitive_actions.push_back (act);
-- act = ActionManager::register_radio_action (jack_actions, jack_latency_group, X_("JACKLatency1024"), X_("1024"), bind (mem_fun(*this, &ARDOUR_UI::set_jack_buffer_size), (nframes_t) 1024));
-+ act = ActionManager::register_radio_action (jack_actions, jack_latency_group, X_("JACKLatency1024"), X_("1024"), sigc::bind (mem_fun(*this, &ARDOUR_UI::set_jack_buffer_size), (nframes_t) 1024));
- ActionManager::jack_sensitive_actions.push_back (act);
-- act = ActionManager::register_radio_action (jack_actions, jack_latency_group, X_("JACKLatency2048"), X_("2048"), bind (mem_fun(*this, &ARDOUR_UI::set_jack_buffer_size), (nframes_t) 2048));
-+ act = ActionManager::register_radio_action (jack_actions, jack_latency_group, X_("JACKLatency2048"), X_("2048"), sigc::bind (mem_fun(*this, &ARDOUR_UI::set_jack_buffer_size), (nframes_t) 2048));
- ActionManager::jack_sensitive_actions.push_back (act);
-- act = ActionManager::register_radio_action (jack_actions, jack_latency_group, X_("JACKLatency4096"), X_("4096"), bind (mem_fun(*this, &ARDOUR_UI::set_jack_buffer_size), (nframes_t) 4096));
-+ act = ActionManager::register_radio_action (jack_actions, jack_latency_group, X_("JACKLatency4096"), X_("4096"), sigc::bind (mem_fun(*this, &ARDOUR_UI::set_jack_buffer_size), (nframes_t) 4096));
- ActionManager::jack_sensitive_actions.push_back (act);
-- act = ActionManager::register_radio_action (jack_actions, jack_latency_group, X_("JACKLatency8192"), X_("8192"), bind (mem_fun(*this, &ARDOUR_UI::set_jack_buffer_size), (nframes_t) 8192));
-+ act = ActionManager::register_radio_action (jack_actions, jack_latency_group, X_("JACKLatency8192"), X_("8192"), sigc::bind (mem_fun(*this, &ARDOUR_UI::set_jack_buffer_size), (nframes_t) 8192));
- ActionManager::jack_sensitive_actions.push_back (act);
-
- /* these actions are intended to be shared across all windows */
-@@ -230,11 +230,11 @@ ARDOUR_UI::install_actions ()
- ActionManager::register_toggle_action (common_actions, X_("ToggleThemeManager"), _("Theme Manager"), mem_fun(*this, &ARDOUR_UI::toggle_theme_manager));
- ActionManager::register_toggle_action (common_actions, X_("ToggleKeyEditor"), _("Keybindings"), mem_fun(*this, &ARDOUR_UI::toggle_key_editor));
-
-- act = ActionManager::register_action (common_actions, X_("AddAudioTrack"), _("Add Audio Track"), bind (mem_fun(*this, &ARDOUR_UI::session_add_audio_track), 1, 1, ARDOUR::Normal, 1));
-+ act = ActionManager::register_action (common_actions, X_("AddAudioTrack"), _("Add Audio Track"), sigc::bind (mem_fun(*this, &ARDOUR_UI::session_add_audio_track), 1, 1, ARDOUR::Normal, 1));
- ActionManager::session_sensitive_actions.push_back (act);
-- act = ActionManager::register_action (common_actions, X_("AddAudioBus"), _("Add Audio Bus"), bind (mem_fun(*this, &ARDOUR_UI::session_add_audio_bus), 1, 1, 1));
-+ act = ActionManager::register_action (common_actions, X_("AddAudioBus"), _("Add Audio Bus"), sigc::bind (mem_fun(*this, &ARDOUR_UI::session_add_audio_bus), 1, 1, 1));
- ActionManager::session_sensitive_actions.push_back (act);
-- act = ActionManager::register_action (common_actions, X_("Save"), _("Save"), bind (mem_fun(*this, &ARDOUR_UI::save_state), string(""), false));
-+ act = ActionManager::register_action (common_actions, X_("Save"), _("Save"), sigc::bind (mem_fun(*this, &ARDOUR_UI::save_state), string(""), false));
- ActionManager::session_sensitive_actions.push_back (act);
- ActionManager::write_sensitive_actions.push_back (act);
- act = ActionManager::register_action (common_actions, X_("RemoveLastCapture"), _("Remove Last Capture"), mem_fun(*this, &ARDOUR_UI::remove_last_capture));
-@@ -257,13 +257,13 @@ ARDOUR_UI::install_actions ()
- ActionManager::session_sensitive_actions.push_back (act);
- ActionManager::transport_sensitive_actions.push_back (act);
-
-- act = ActionManager::register_action (transport_actions, X_("ToggleRoll"), _("Start/Stop"), bind (mem_fun (*this, &ARDOUR_UI::toggle_roll), false, false));
-+ act = ActionManager::register_action (transport_actions, X_("ToggleRoll"), _("Start/Stop"), sigc::bind (mem_fun (*this, &ARDOUR_UI::toggle_roll), false, false));
- ActionManager::session_sensitive_actions.push_back (act);
- ActionManager::transport_sensitive_actions.push_back (act);
-- act = ActionManager::register_action (transport_actions, X_("ToggleRollMaybe"), _("Start/Continue/Stop"), bind (mem_fun (*this, &ARDOUR_UI::toggle_roll), false, true));
-+ act = ActionManager::register_action (transport_actions, X_("ToggleRollMaybe"), _("Start/Continue/Stop"), sigc::bind (mem_fun (*this, &ARDOUR_UI::toggle_roll), false, true));
- ActionManager::session_sensitive_actions.push_back (act);
- ActionManager::transport_sensitive_actions.push_back (act);
-- act = ActionManager::register_action (transport_actions, X_("ToggleRollForgetCapture"), _("Stop + Forget Capture"), bind (mem_fun(*this, &ARDOUR_UI::toggle_roll), true, false));
-+ act = ActionManager::register_action (transport_actions, X_("ToggleRollForgetCapture"), _("Stop + Forget Capture"), sigc::bind (mem_fun(*this, &ARDOUR_UI::toggle_roll), true, false));
- ActionManager::session_sensitive_actions.push_back (act);
- ActionManager::transport_sensitive_actions.push_back (act);
-
-@@ -273,11 +273,11 @@ ARDOUR_UI::install_actions ()
- - otherwise do nothing
- */
-
-- act = ActionManager::register_action (transport_actions, X_("TransitionToRoll"), _("Transition To Roll"), bind (mem_fun (*editor, &PublicEditor::transition_to_rolling), true));
-+ act = ActionManager::register_action (transport_actions, X_("TransitionToRoll"), _("Transition To Roll"), sigc::bind (mem_fun (*editor, &PublicEditor::transition_to_rolling), true));
- ActionManager::session_sensitive_actions.push_back (act);
- ActionManager::transport_sensitive_actions.push_back (act);
-
-- act = ActionManager::register_action (transport_actions, X_("TransitionToReverse"), _("Transition To Reverse"), bind (mem_fun (*editor, &PublicEditor::transition_to_rolling), false));
-+ act = ActionManager::register_action (transport_actions, X_("TransitionToReverse"), _("Transition To Reverse"), sigc::bind (mem_fun (*editor, &PublicEditor::transition_to_rolling), false));
- ActionManager::session_sensitive_actions.push_back (act);
- ActionManager::transport_sensitive_actions.push_back (act);
-
-@@ -289,29 +289,29 @@ ARDOUR_UI::install_actions ()
- ActionManager::session_sensitive_actions.push_back (act);
- ActionManager::transport_sensitive_actions.push_back (act);
-
-- act = ActionManager::register_action (transport_actions, X_("Record"), _("Enable Record"), bind (mem_fun(*this, &ARDOUR_UI::transport_record), false));
-+ act = ActionManager::register_action (transport_actions, X_("Record"), _("Enable Record"), sigc::bind (mem_fun(*this, &ARDOUR_UI::transport_record), false));
- ActionManager::session_sensitive_actions.push_back (act);
- ActionManager::write_sensitive_actions.push_back (act);
-- act = ActionManager::register_action (transport_actions, X_("record-roll"), _("Start Recording"), bind (mem_fun(*this, &ARDOUR_UI::transport_record), true));
-+ act = ActionManager::register_action (transport_actions, X_("record-roll"), _("Start Recording"), sigc::bind (mem_fun(*this, &ARDOUR_UI::transport_record), true));
- ActionManager::session_sensitive_actions.push_back (act);
- ActionManager::write_sensitive_actions.push_back (act);
- ActionManager::transport_sensitive_actions.push_back (act);
-- act = ActionManager::register_action (transport_actions, X_("Rewind"), _("Rewind"), bind (mem_fun(*this, &ARDOUR_UI::transport_rewind), 0));
-+ act = ActionManager::register_action (transport_actions, X_("Rewind"), _("Rewind"), sigc::bind (mem_fun(*this, &ARDOUR_UI::transport_rewind), 0));
- ActionManager::session_sensitive_actions.push_back (act);
- ActionManager::transport_sensitive_actions.push_back (act);
-- act = ActionManager::register_action (transport_actions, X_("RewindSlow"), _("Rewind (Slow)"), bind (mem_fun(*this, &ARDOUR_UI::transport_rewind), -1));
-+ act = ActionManager::register_action (transport_actions, X_("RewindSlow"), _("Rewind (Slow)"), sigc::bind (mem_fun(*this, &ARDOUR_UI::transport_rewind), -1));
- ActionManager::session_sensitive_actions.push_back (act);
- ActionManager::transport_sensitive_actions.push_back (act);
-- act = ActionManager::register_action (transport_actions, X_("RewindFast"), _("Rewind (Fast)"), bind (mem_fun(*this, &ARDOUR_UI::transport_rewind), 1));
-+ act = ActionManager::register_action (transport_actions, X_("RewindFast"), _("Rewind (Fast)"), sigc::bind (mem_fun(*this, &ARDOUR_UI::transport_rewind), 1));
- ActionManager::session_sensitive_actions.push_back (act);
- ActionManager::transport_sensitive_actions.push_back (act);
-- act = ActionManager::register_action (transport_actions, X_("Forward"), _("Forward"), bind (mem_fun(*this, &ARDOUR_UI::transport_forward), 0));
-+ act = ActionManager::register_action (transport_actions, X_("Forward"), _("Forward"), sigc::bind (mem_fun(*this, &ARDOUR_UI::transport_forward), 0));
- ActionManager::session_sensitive_actions.push_back (act);
- ActionManager::transport_sensitive_actions.push_back (act);
-- act = ActionManager::register_action (transport_actions, X_("ForwardSlow"), _("Forward (Slow)"), bind (mem_fun(*this, &ARDOUR_UI::transport_forward), -1));
-+ act = ActionManager::register_action (transport_actions, X_("ForwardSlow"), _("Forward (Slow)"), sigc::bind (mem_fun(*this, &ARDOUR_UI::transport_forward), -1));
- ActionManager::session_sensitive_actions.push_back (act);
- ActionManager::transport_sensitive_actions.push_back (act);
-- act = ActionManager::register_action (transport_actions, X_("ForwardFast"), _("Forward (Fast)"), bind (mem_fun(*this, &ARDOUR_UI::transport_forward), 1));
-+ act = ActionManager::register_action (transport_actions, X_("ForwardFast"), _("Forward (Fast)"), sigc::bind (mem_fun(*this, &ARDOUR_UI::transport_forward), 1));
- ActionManager::session_sensitive_actions.push_back (act);
- ActionManager::transport_sensitive_actions.push_back (act);
- act = ActionManager::register_action (transport_actions, X_("GotoZero"), _("Goto Zero"), mem_fun(*this, &ARDOUR_UI::transport_goto_zero));
-@@ -331,22 +331,22 @@ ARDOUR_UI::install_actions ()
- ActionManager::session_sensitive_actions.push_back (act);
- ActionManager::transport_sensitive_actions.push_back (act);
-
-- act = ActionManager::register_action (transport_actions, X_("primary-clock-bbt"), _("Bars & Beats"), bind (mem_fun(primary_clock, &AudioClock::set_mode), AudioClock::BBT));
-+ act = ActionManager::register_action (transport_actions, X_("primary-clock-bbt"), _("Bars & Beats"), sigc::bind (mem_fun(primary_clock, &AudioClock::set_mode), AudioClock::BBT));
- ActionManager::session_sensitive_actions.push_back (act);
-- act = ActionManager::register_action (transport_actions, X_("primary-clock-minsec"), _("Minutes & Seconds"), bind (mem_fun(primary_clock, &AudioClock::set_mode), AudioClock::MinSec));
-+ act = ActionManager::register_action (transport_actions, X_("primary-clock-minsec"), _("Minutes & Seconds"), sigc::bind (mem_fun(primary_clock, &AudioClock::set_mode), AudioClock::MinSec));
- ActionManager::session_sensitive_actions.push_back (act);
-- act = ActionManager::register_action (transport_actions, X_("primary-clock-samples"), _("Samples"), bind (mem_fun(primary_clock, &AudioClock::set_mode), AudioClock::Frames));
-+ act = ActionManager::register_action (transport_actions, X_("primary-clock-samples"), _("Samples"), sigc::bind (mem_fun(primary_clock, &AudioClock::set_mode), AudioClock::Frames));
- ActionManager::session_sensitive_actions.push_back (act);
-- act = ActionManager::register_action (transport_actions, X_("primary-clock-off"), _("Off"), bind (mem_fun(primary_clock, &AudioClock::set_mode), AudioClock::Off));
-+ act = ActionManager::register_action (transport_actions, X_("primary-clock-off"), _("Off"), sigc::bind (mem_fun(primary_clock, &AudioClock::set_mode), AudioClock::Off));
- ActionManager::session_sensitive_actions.push_back (act);
-
-- act = ActionManager::register_action (transport_actions, X_("secondary-clock-bbt"), _("Bars & Beats"), bind (mem_fun(secondary_clock, &AudioClock::set_mode), AudioClock::BBT));
-+ act = ActionManager::register_action (transport_actions, X_("secondary-clock-bbt"), _("Bars & Beats"), sigc::bind (mem_fun(secondary_clock, &AudioClock::set_mode), AudioClock::BBT));
- ActionManager::session_sensitive_actions.push_back (act);
-- act = ActionManager::register_action (transport_actions, X_("secondary-clock-minsec"), _("Minutes & Seconds"), bind (mem_fun(secondary_clock, &AudioClock::set_mode), AudioClock::MinSec));
-+ act = ActionManager::register_action (transport_actions, X_("secondary-clock-minsec"), _("Minutes & Seconds"), sigc::bind (mem_fun(secondary_clock, &AudioClock::set_mode), AudioClock::MinSec));
- ActionManager::session_sensitive_actions.push_back (act);
-- act = ActionManager::register_action (transport_actions, X_("secondary-clock-samples"), _("Samples"), bind (mem_fun(secondary_clock, &AudioClock::set_mode), AudioClock::Frames));
-+ act = ActionManager::register_action (transport_actions, X_("secondary-clock-samples"), _("Samples"), sigc::bind (mem_fun(secondary_clock, &AudioClock::set_mode), AudioClock::Frames));
- ActionManager::session_sensitive_actions.push_back (act);
-- act = ActionManager::register_action (transport_actions, X_("secondary-clock-off"), _("Off"), bind (mem_fun(secondary_clock, &AudioClock::set_mode), AudioClock::Off));
-+ act = ActionManager::register_action (transport_actions, X_("secondary-clock-off"), _("Off"), sigc::bind (mem_fun(secondary_clock, &AudioClock::set_mode), AudioClock::Off));
- ActionManager::session_sensitive_actions.push_back (act);
-
- act = ActionManager::register_toggle_action (transport_actions, X_("TogglePunchIn"), _("Punch In"), mem_fun(*this, &ARDOUR_UI::toggle_punch_in));
-@@ -375,75 +375,75 @@ ARDOUR_UI::install_actions ()
- act = ActionManager::register_toggle_action (transport_actions, X_("ToggleTimeMaster"), _("Time master"), mem_fun(*this, &ARDOUR_UI::toggle_time_master));
- ActionManager::session_sensitive_actions.push_back (act);
-
-- act = ActionManager::register_action (common_actions, X_("ToggleRecordEnableTrack1"), _("Toggle Record Enable Track1"), bind (mem_fun(*this, &ARDOUR_UI::toggle_record_enable), 0U));
-+ act = ActionManager::register_action (common_actions, X_("ToggleRecordEnableTrack1"), _("Toggle Record Enable Track1"), sigc::bind (mem_fun(*this, &ARDOUR_UI::toggle_record_enable), 0U));
- ActionManager::session_sensitive_actions.push_back (act);
-- act = ActionManager::register_action (common_actions, X_("ToggleRecordEnableTrack2"), _("Toggle Record Enable Track2"), bind (mem_fun(*this, &ARDOUR_UI::toggle_record_enable), 1U));
-+ act = ActionManager::register_action (common_actions, X_("ToggleRecordEnableTrack2"), _("Toggle Record Enable Track2"), sigc::bind (mem_fun(*this, &ARDOUR_UI::toggle_record_enable), 1U));
- ActionManager::session_sensitive_actions.push_back (act);
-- act = ActionManager::register_action (common_actions, X_("ToggleRecordEnableTrack3"), _("Toggle Record Enable Track3"), bind (mem_fun(*this, &ARDOUR_UI::toggle_record_enable), 2U));
-+ act = ActionManager::register_action (common_actions, X_("ToggleRecordEnableTrack3"), _("Toggle Record Enable Track3"), sigc::bind (mem_fun(*this, &ARDOUR_UI::toggle_record_enable), 2U));
- ActionManager::session_sensitive_actions.push_back (act);
-- act = ActionManager::register_action (common_actions, X_("ToggleRecordEnableTrack4"), _("Toggle Record Enable Track4"), bind (mem_fun(*this, &ARDOUR_UI::toggle_record_enable), 3U));
-+ act = ActionManager::register_action (common_actions, X_("ToggleRecordEnableTrack4"), _("Toggle Record Enable Track4"), sigc::bind (mem_fun(*this, &ARDOUR_UI::toggle_record_enable), 3U));
- ActionManager::session_sensitive_actions.push_back (act);
-- act = ActionManager::register_action (common_actions, X_("ToggleRecordEnableTrack5"), _("Toggle Record Enable Track5"), bind (mem_fun(*this, &ARDOUR_UI::toggle_record_enable), 4U));
-+ act = ActionManager::register_action (common_actions, X_("ToggleRecordEnableTrack5"), _("Toggle Record Enable Track5"), sigc::bind (mem_fun(*this, &ARDOUR_UI::toggle_record_enable), 4U));
- ActionManager::session_sensitive_actions.push_back (act);
-- act = ActionManager::register_action (common_actions, X_("ToggleRecordEnableTrack6"), _("Toggle Record Enable Track6"), bind (mem_fun(*this, &ARDOUR_UI::toggle_record_enable), 5U));
-+ act = ActionManager::register_action (common_actions, X_("ToggleRecordEnableTrack6"), _("Toggle Record Enable Track6"), sigc::bind (mem_fun(*this, &ARDOUR_UI::toggle_record_enable), 5U));
- ActionManager::session_sensitive_actions.push_back (act);
-- act = ActionManager::register_action (common_actions, X_("ToggleRecordEnableTrack7"), _("Toggle Record Enable Track7"), bind (mem_fun(*this, &ARDOUR_UI::toggle_record_enable), 6U));
-+ act = ActionManager::register_action (common_actions, X_("ToggleRecordEnableTrack7"), _("Toggle Record Enable Track7"), sigc::bind (mem_fun(*this, &ARDOUR_UI::toggle_record_enable), 6U));
- ActionManager::session_sensitive_actions.push_back (act);
-- act = ActionManager::register_action (common_actions, X_("ToggleRecordEnableTrack8"), _("Toggle Record Enable Track8"), bind (mem_fun(*this, &ARDOUR_UI::toggle_record_enable), 7U));
-+ act = ActionManager::register_action (common_actions, X_("ToggleRecordEnableTrack8"), _("Toggle Record Enable Track8"), sigc::bind (mem_fun(*this, &ARDOUR_UI::toggle_record_enable), 7U));
- ActionManager::session_sensitive_actions.push_back (act);
-- act = ActionManager::register_action (common_actions, X_("ToggleRecordEnableTrack9"), _("Toggle Record Enable Track9"), bind (mem_fun(*this, &ARDOUR_UI::toggle_record_enable), 8U));
-+ act = ActionManager::register_action (common_actions, X_("ToggleRecordEnableTrack9"), _("Toggle Record Enable Track9"), sigc::bind (mem_fun(*this, &ARDOUR_UI::toggle_record_enable), 8U));
- ActionManager::session_sensitive_actions.push_back (act);
-- act = ActionManager::register_action (common_actions, X_("ToggleRecordEnableTrack10"), _("Toggle Record Enable Track10"), bind (mem_fun(*this, &ARDOUR_UI::toggle_record_enable), 9U));
-+ act = ActionManager::register_action (common_actions, X_("ToggleRecordEnableTrack10"), _("Toggle Record Enable Track10"), sigc::bind (mem_fun(*this, &ARDOUR_UI::toggle_record_enable), 9U));
- ActionManager::session_sensitive_actions.push_back (act);
-- act = ActionManager::register_action (common_actions, X_("ToggleRecordEnableTrack11"), _("Toggle Record Enable Track11"), bind (mem_fun(*this, &ARDOUR_UI::toggle_record_enable), 10U));
-+ act = ActionManager::register_action (common_actions, X_("ToggleRecordEnableTrack11"), _("Toggle Record Enable Track11"), sigc::bind (mem_fun(*this, &ARDOUR_UI::toggle_record_enable), 10U));
- ActionManager::session_sensitive_actions.push_back (act);
-- act = ActionManager::register_action (common_actions, X_("ToggleRecordEnableTrack12"), _("Toggle Record Enable Track12"), bind (mem_fun(*this, &ARDOUR_UI::toggle_record_enable), 11U));
-+ act = ActionManager::register_action (common_actions, X_("ToggleRecordEnableTrack12"), _("Toggle Record Enable Track12"), sigc::bind (mem_fun(*this, &ARDOUR_UI::toggle_record_enable), 11U));
- ActionManager::session_sensitive_actions.push_back (act);
-- act = ActionManager::register_action (common_actions, X_("ToggleRecordEnableTrack13"), _("Toggle Record Enable Track13"), bind (mem_fun(*this, &ARDOUR_UI::toggle_record_enable), 12U));
-+ act = ActionManager::register_action (common_actions, X_("ToggleRecordEnableTrack13"), _("Toggle Record Enable Track13"), sigc::bind (mem_fun(*this, &ARDOUR_UI::toggle_record_enable), 12U));
- ActionManager::session_sensitive_actions.push_back (act);
-- act = ActionManager::register_action (common_actions, X_("ToggleRecordEnableTrack14"), _("Toggle Record Enable Track14"), bind (mem_fun(*this, &ARDOUR_UI::toggle_record_enable), 13U));
-+ act = ActionManager::register_action (common_actions, X_("ToggleRecordEnableTrack14"), _("Toggle Record Enable Track14"), sigc::bind (mem_fun(*this, &ARDOUR_UI::toggle_record_enable), 13U));
- ActionManager::session_sensitive_actions.push_back (act);
-- act = ActionManager::register_action (common_actions, X_("ToggleRecordEnableTrack15"), _("Toggle Record Enable Track15"), bind (mem_fun(*this, &ARDOUR_UI::toggle_record_enable), 14U));
-+ act = ActionManager::register_action (common_actions, X_("ToggleRecordEnableTrack15"), _("Toggle Record Enable Track15"), sigc::bind (mem_fun(*this, &ARDOUR_UI::toggle_record_enable), 14U));
- ActionManager::session_sensitive_actions.push_back (act);
-- act = ActionManager::register_action (common_actions, X_("ToggleRecordEnableTrack16"), _("Toggle Record Enable Track16"), bind (mem_fun(*this, &ARDOUR_UI::toggle_record_enable), 15U));
-+ act = ActionManager::register_action (common_actions, X_("ToggleRecordEnableTrack16"), _("Toggle Record Enable Track16"), sigc::bind (mem_fun(*this, &ARDOUR_UI::toggle_record_enable), 15U));
- ActionManager::session_sensitive_actions.push_back (act);
-- act = ActionManager::register_action (common_actions, X_("ToggleRecordEnableTrack17"), _("Toggle Record Enable Track17"), bind (mem_fun(*this, &ARDOUR_UI::toggle_record_enable), 16U));
-+ act = ActionManager::register_action (common_actions, X_("ToggleRecordEnableTrack17"), _("Toggle Record Enable Track17"), sigc::bind (mem_fun(*this, &ARDOUR_UI::toggle_record_enable), 16U));
- ActionManager::session_sensitive_actions.push_back (act);
-- act = ActionManager::register_action (common_actions, X_("ToggleRecordEnableTrack18"), _("Toggle Record Enable Track18"), bind (mem_fun(*this, &ARDOUR_UI::toggle_record_enable), 17U));
-+ act = ActionManager::register_action (common_actions, X_("ToggleRecordEnableTrack18"), _("Toggle Record Enable Track18"), sigc::bind (mem_fun(*this, &ARDOUR_UI::toggle_record_enable), 17U));
- ActionManager::session_sensitive_actions.push_back (act);
-- act = ActionManager::register_action (common_actions, X_("ToggleRecordEnableTrack19"), _("Toggle Record Enable Track19"), bind (mem_fun(*this, &ARDOUR_UI::toggle_record_enable), 18U));
-+ act = ActionManager::register_action (common_actions, X_("ToggleRecordEnableTrack19"), _("Toggle Record Enable Track19"), sigc::bind (mem_fun(*this, &ARDOUR_UI::toggle_record_enable), 18U));
- ActionManager::session_sensitive_actions.push_back (act);
-- act = ActionManager::register_action (common_actions, X_("ToggleRecordEnableTrack20"), _("Toggle Record Enable Track20"), bind (mem_fun(*this, &ARDOUR_UI::toggle_record_enable), 19U));
-+ act = ActionManager::register_action (common_actions, X_("ToggleRecordEnableTrack20"), _("Toggle Record Enable Track20"), sigc::bind (mem_fun(*this, &ARDOUR_UI::toggle_record_enable), 19U));
- ActionManager::session_sensitive_actions.push_back (act);
-- act = ActionManager::register_action (common_actions, X_("ToggleRecordEnableTrack21"), _("Toggle Record Enable Track21"), bind (mem_fun(*this, &ARDOUR_UI::toggle_record_enable), 20U));
-+ act = ActionManager::register_action (common_actions, X_("ToggleRecordEnableTrack21"), _("Toggle Record Enable Track21"), sigc::bind (mem_fun(*this, &ARDOUR_UI::toggle_record_enable), 20U));
- ActionManager::session_sensitive_actions.push_back (act);
-- act = ActionManager::register_action (common_actions, X_("ToggleRecordEnableTrack22"), _("Toggle Record Enable Track22"), bind (mem_fun(*this, &ARDOUR_UI::toggle_record_enable), 21U));
-+ act = ActionManager::register_action (common_actions, X_("ToggleRecordEnableTrack22"), _("Toggle Record Enable Track22"), sigc::bind (mem_fun(*this, &ARDOUR_UI::toggle_record_enable), 21U));
- ActionManager::session_sensitive_actions.push_back (act);
-- act = ActionManager::register_action (common_actions, X_("ToggleRecordEnableTrack23"), _("Toggle Record Enable Track23"), bind (mem_fun(*this, &ARDOUR_UI::toggle_record_enable), 22U));
-+ act = ActionManager::register_action (common_actions, X_("ToggleRecordEnableTrack23"), _("Toggle Record Enable Track23"), sigc::bind (mem_fun(*this, &ARDOUR_UI::toggle_record_enable), 22U));
- ActionManager::session_sensitive_actions.push_back (act);
-- act = ActionManager::register_action (common_actions, X_("ToggleRecordEnableTrack24"), _("Toggle Record Enable Track24"), bind (mem_fun(*this, &ARDOUR_UI::toggle_record_enable), 23U));
-+ act = ActionManager::register_action (common_actions, X_("ToggleRecordEnableTrack24"), _("Toggle Record Enable Track24"), sigc::bind (mem_fun(*this, &ARDOUR_UI::toggle_record_enable), 23U));
- ActionManager::session_sensitive_actions.push_back (act);
-- act = ActionManager::register_action (common_actions, X_("ToggleRecordEnableTrack25"), _("Toggle Record Enable Track25"), bind (mem_fun(*this, &ARDOUR_UI::toggle_record_enable), 24U));
-+ act = ActionManager::register_action (common_actions, X_("ToggleRecordEnableTrack25"), _("Toggle Record Enable Track25"), sigc::bind (mem_fun(*this, &ARDOUR_UI::toggle_record_enable), 24U));
- ActionManager::session_sensitive_actions.push_back (act);
-- act = ActionManager::register_action (common_actions, X_("ToggleRecordEnableTrack26"), _("Toggle Record Enable Track26"), bind (mem_fun(*this, &ARDOUR_UI::toggle_record_enable), 25U));
-+ act = ActionManager::register_action (common_actions, X_("ToggleRecordEnableTrack26"), _("Toggle Record Enable Track26"), sigc::bind (mem_fun(*this, &ARDOUR_UI::toggle_record_enable), 25U));
- ActionManager::session_sensitive_actions.push_back (act);
-- act = ActionManager::register_action (common_actions, X_("ToggleRecordEnableTrack27"), _("Toggle Record Enable Track27"), bind (mem_fun(*this, &ARDOUR_UI::toggle_record_enable), 26U));
-+ act = ActionManager::register_action (common_actions, X_("ToggleRecordEnableTrack27"), _("Toggle Record Enable Track27"), sigc::bind (mem_fun(*this, &ARDOUR_UI::toggle_record_enable), 26U));
- ActionManager::session_sensitive_actions.push_back (act);
-- act = ActionManager::register_action (common_actions, X_("ToggleRecordEnableTrack28"), _("Toggle Record Enable Track28"), bind (mem_fun(*this, &ARDOUR_UI::toggle_record_enable), 27U));
-+ act = ActionManager::register_action (common_actions, X_("ToggleRecordEnableTrack28"), _("Toggle Record Enable Track28"), sigc::bind (mem_fun(*this, &ARDOUR_UI::toggle_record_enable), 27U));
- ActionManager::session_sensitive_actions.push_back (act);
-- act = ActionManager::register_action (common_actions, X_("ToggleRecordEnableTrack29"), _("Toggle Record Enable Track29"), bind (mem_fun(*this, &ARDOUR_UI::toggle_record_enable), 28U));
-+ act = ActionManager::register_action (common_actions, X_("ToggleRecordEnableTrack29"), _("Toggle Record Enable Track29"), sigc::bind (mem_fun(*this, &ARDOUR_UI::toggle_record_enable), 28U));
- ActionManager::session_sensitive_actions.push_back (act);
-- act = ActionManager::register_action (common_actions, X_("ToggleRecordEnableTrack30"), _("Toggle Record Enable Track30"), bind (mem_fun(*this, &ARDOUR_UI::toggle_record_enable), 29U));
-+ act = ActionManager::register_action (common_actions, X_("ToggleRecordEnableTrack30"), _("Toggle Record Enable Track30"), sigc::bind (mem_fun(*this, &ARDOUR_UI::toggle_record_enable), 29U));
- ActionManager::session_sensitive_actions.push_back (act);
-- act = ActionManager::register_action (common_actions, X_("ToggleRecordEnableTrack31"), _("Toggle Record Enable Track31"), bind (mem_fun(*this, &ARDOUR_UI::toggle_record_enable), 30U));
-+ act = ActionManager::register_action (common_actions, X_("ToggleRecordEnableTrack31"), _("Toggle Record Enable Track31"), sigc::bind (mem_fun(*this, &ARDOUR_UI::toggle_record_enable), 30U));
- ActionManager::session_sensitive_actions.push_back (act);
-- act = ActionManager::register_action (common_actions, X_("ToggleRecordEnableTrack32"), _("Toggle Record Enable Track32"), bind (mem_fun(*this, &ARDOUR_UI::toggle_record_enable), 31U));
-+ act = ActionManager::register_action (common_actions, X_("ToggleRecordEnableTrack32"), _("Toggle Record Enable Track32"), sigc::bind (mem_fun(*this, &ARDOUR_UI::toggle_record_enable), 31U));
- ActionManager::session_sensitive_actions.push_back (act);
-
- Glib::RefPtr<ActionGroup> shuttle_actions = ActionGroup::create ("ShuttleActions");
-
-- shuttle_actions->add (Action::create (X_("SetShuttleUnitsPercentage"), _("Percentage")), hide_return (bind (mem_fun (*Config, &Configuration::set_shuttle_units), Percentage)));
-- shuttle_actions->add (Action::create (X_("SetShuttleUnitsSemitones"), _("Semitones")), hide_return (bind (mem_fun (*Config, &Configuration::set_shuttle_units), Semitones)));
-+ shuttle_actions->add (Action::create (X_("SetShuttleUnitsPercentage"), _("Percentage")), hide_return (sigc::bind (mem_fun (*Config, &Configuration::set_shuttle_units), Percentage)));
-+ shuttle_actions->add (Action::create (X_("SetShuttleUnitsSemitones"), _("Semitones")), hide_return (sigc::bind (mem_fun (*Config, &Configuration::set_shuttle_units), Semitones)));
-
- Glib::RefPtr<ActionGroup> option_actions = ActionGroup::create ("options");
-
-@@ -490,7 +490,7 @@ ARDOUR_UI::install_actions ()
-
- ActionManager::register_toggle_action (option_actions, X_("DenormalProtection"), _("Use DC bias"), mem_fun (*this, &ARDOUR_UI::toggle_denormal_protection));
-
-- ActionManager::register_radio_action (option_actions, denormal_group, X_("DenormalNone"), _("No processor handling"), bind (mem_fun (*this, &ARDOUR_UI::set_denormal_model), DenormalNone));
-+ ActionManager::register_radio_action (option_actions, denormal_group, X_("DenormalNone"), _("No processor handling"), sigc::bind (mem_fun (*this, &ARDOUR_UI::set_denormal_model), DenormalNone));
-
- // as of September 10th 2007, Valgrind cannot handle various FPU flag setting instructions
- // so avoid them
-@@ -499,28 +499,28 @@ ARDOUR_UI::install_actions ()
-
- /* we still need these actions to exist, but make them all insensitive */
-
-- act = ActionManager::register_radio_action (option_actions, denormal_group, X_("DenormalFTZ"), _("Use FlushToZero"), bind (mem_fun (*this, &ARDOUR_UI::set_denormal_model), DenormalFTZ));
-+ act = ActionManager::register_radio_action (option_actions, denormal_group, X_("DenormalFTZ"), _("Use FlushToZero"), sigc::bind (mem_fun (*this, &ARDOUR_UI::set_denormal_model), DenormalFTZ));
- act->set_sensitive (false);
-- act = ActionManager::register_radio_action (option_actions, denormal_group, X_("DenormalDAZ"), _("Use DenormalsAreZero"), bind (mem_fun (*this, &ARDOUR_UI::set_denormal_model), DenormalDAZ));
-+ act = ActionManager::register_radio_action (option_actions, denormal_group, X_("DenormalDAZ"), _("Use DenormalsAreZero"), sigc::bind (mem_fun (*this, &ARDOUR_UI::set_denormal_model), DenormalDAZ));
- act->set_sensitive (false);
-- act = ActionManager::register_radio_action (option_actions, denormal_group, X_("DenormalFTZDAZ"), _("Use FlushToZero & DenormalsAreZero"), bind (mem_fun (*this, &ARDOUR_UI::set_denormal_model), DenormalFTZDAZ));
-+ act = ActionManager::register_radio_action (option_actions, denormal_group, X_("DenormalFTZDAZ"), _("Use FlushToZero & DenormalsAreZero"), sigc::bind (mem_fun (*this, &ARDOUR_UI::set_denormal_model), DenormalFTZDAZ));
- act->set_sensitive (false);
-
- } else {
-
- FPU fpu;
-
-- act = ActionManager::register_radio_action (option_actions, denormal_group, X_("DenormalFTZ"), _("Use FlushToZero"), bind (mem_fun (*this, &ARDOUR_UI::set_denormal_model), DenormalFTZ));
-+ act = ActionManager::register_radio_action (option_actions, denormal_group, X_("DenormalFTZ"), _("Use FlushToZero"), sigc::bind (mem_fun (*this, &ARDOUR_UI::set_denormal_model), DenormalFTZ));
- if (!fpu.has_flush_to_zero()) {
- act->set_sensitive (false);
- }
-
-- act = ActionManager::register_radio_action (option_actions, denormal_group, X_("DenormalDAZ"), _("Use DenormalsAreZero"), bind (mem_fun (*this, &ARDOUR_UI::set_denormal_model), DenormalDAZ));
-+ act = ActionManager::register_radio_action (option_actions, denormal_group, X_("DenormalDAZ"), _("Use DenormalsAreZero"), sigc::bind (mem_fun (*this, &ARDOUR_UI::set_denormal_model), DenormalDAZ));
- if (!fpu.has_denormals_are_zero()) {
- act->set_sensitive (false);
- }
-
-- act = ActionManager::register_radio_action (option_actions, denormal_group, X_("DenormalFTZDAZ"), _("Use FlushToZero & DenormalsAreZero"), bind (mem_fun (*this, &ARDOUR_UI::set_denormal_model), DenormalFTZDAZ));
-+ act = ActionManager::register_radio_action (option_actions, denormal_group, X_("DenormalFTZDAZ"), _("Use FlushToZero & DenormalsAreZero"), sigc::bind (mem_fun (*this, &ARDOUR_UI::set_denormal_model), DenormalFTZDAZ));
- if (!fpu.has_flush_to_zero() || !fpu.has_denormals_are_zero()) {
- act->set_sensitive (false);
- }
-@@ -540,34 +540,34 @@ ARDOUR_UI::install_actions ()
- RadioAction::Group meter_falloff_group;
- RadioAction::Group meter_hold_group;
-
-- ActionManager::register_radio_action (option_actions, meter_falloff_group, X_("MeterFalloffOff"), _("Off"), bind (mem_fun (*this, &ARDOUR_UI::set_meter_falloff), MeterFalloffOff));
-- ActionManager::register_radio_action (option_actions, meter_falloff_group, X_("MeterFalloffSlowest"), _("Slowest"), bind (mem_fun (*this, &ARDOUR_UI::set_meter_falloff), MeterFalloffSlowest));
-- ActionManager::register_radio_action (option_actions, meter_falloff_group, X_("MeterFalloffSlow"), _("Slow"), bind (mem_fun (*this, &ARDOUR_UI::set_meter_falloff), MeterFalloffSlow));
-- ActionManager::register_radio_action (option_actions, meter_falloff_group, X_("MeterFalloffMedium"), _("Medium"), bind (mem_fun (*this, &ARDOUR_UI::set_meter_falloff), MeterFalloffMedium));
-- ActionManager::register_radio_action (option_actions, meter_falloff_group, X_("MeterFalloffFast"), _("Fast"), bind (mem_fun (*this, &ARDOUR_UI::set_meter_falloff), MeterFalloffFast));
-- ActionManager::register_radio_action (option_actions, meter_falloff_group, X_("MeterFalloffFaster"), _("Faster"), bind (mem_fun (*this, &ARDOUR_UI::set_meter_falloff), MeterFalloffFaster));
-- ActionManager::register_radio_action (option_actions, meter_falloff_group, X_("MeterFalloffFastest"), _("Fastest"), bind (mem_fun (*this, &ARDOUR_UI::set_meter_falloff), MeterFalloffFastest));
-+ ActionManager::register_radio_action (option_actions, meter_falloff_group, X_("MeterFalloffOff"), _("Off"), sigc::bind (mem_fun (*this, &ARDOUR_UI::set_meter_falloff), MeterFalloffOff));
-+ ActionManager::register_radio_action (option_actions, meter_falloff_group, X_("MeterFalloffSlowest"), _("Slowest"), sigc::bind (mem_fun (*this, &ARDOUR_UI::set_meter_falloff), MeterFalloffSlowest));
-+ ActionManager::register_radio_action (option_actions, meter_falloff_group, X_("MeterFalloffSlow"), _("Slow"), sigc::bind (mem_fun (*this, &ARDOUR_UI::set_meter_falloff), MeterFalloffSlow));
-+ ActionManager::register_radio_action (option_actions, meter_falloff_group, X_("MeterFalloffMedium"), _("Medium"), sigc::bind (mem_fun (*this, &ARDOUR_UI::set_meter_falloff), MeterFalloffMedium));
-+ ActionManager::register_radio_action (option_actions, meter_falloff_group, X_("MeterFalloffFast"), _("Fast"), sigc::bind (mem_fun (*this, &ARDOUR_UI::set_meter_falloff), MeterFalloffFast));
-+ ActionManager::register_radio_action (option_actions, meter_falloff_group, X_("MeterFalloffFaster"), _("Faster"), sigc::bind (mem_fun (*this, &ARDOUR_UI::set_meter_falloff), MeterFalloffFaster));
-+ ActionManager::register_radio_action (option_actions, meter_falloff_group, X_("MeterFalloffFastest"), _("Fastest"), sigc::bind (mem_fun (*this, &ARDOUR_UI::set_meter_falloff), MeterFalloffFastest));
-
-- ActionManager::register_radio_action (option_actions, meter_hold_group, X_("MeterHoldOff"), _("Off"), bind (mem_fun (*this, &ARDOUR_UI::set_meter_hold), MeterHoldOff));
-- ActionManager::register_radio_action (option_actions, meter_hold_group, X_("MeterHoldShort"), _("Short"), bind (mem_fun (*this, &ARDOUR_UI::set_meter_hold), MeterHoldShort));
-- ActionManager::register_radio_action (option_actions, meter_hold_group, X_("MeterHoldMedium"), _("Medium"), bind (mem_fun (*this, &ARDOUR_UI::set_meter_hold), MeterHoldMedium));
-- ActionManager::register_radio_action (option_actions, meter_hold_group, X_("MeterHoldLong"), _("Long"), bind (mem_fun (*this, &ARDOUR_UI::set_meter_hold), MeterHoldLong));
-+ ActionManager::register_radio_action (option_actions, meter_hold_group, X_("MeterHoldOff"), _("Off"), sigc::bind (mem_fun (*this, &ARDOUR_UI::set_meter_hold), MeterHoldOff));
-+ ActionManager::register_radio_action (option_actions, meter_hold_group, X_("MeterHoldShort"), _("Short"), sigc::bind (mem_fun (*this, &ARDOUR_UI::set_meter_hold), MeterHoldShort));
-+ ActionManager::register_radio_action (option_actions, meter_hold_group, X_("MeterHoldMedium"), _("Medium"), sigc::bind (mem_fun (*this, &ARDOUR_UI::set_meter_hold), MeterHoldMedium));
-+ ActionManager::register_radio_action (option_actions, meter_hold_group, X_("MeterHoldLong"), _("Long"), sigc::bind (mem_fun (*this, &ARDOUR_UI::set_meter_hold), MeterHoldLong));
-
- RadioAction::Group file_header_group;
-
-- act = ActionManager::register_radio_action (option_actions, file_header_group, X_("FileHeaderFormatBWF"), X_("Broadcast WAVE"), bind (mem_fun (*this, &ARDOUR_UI::set_native_file_header_format), ARDOUR::BWF));
-- act = ActionManager::register_radio_action (option_actions, file_header_group, X_("FileHeaderFormatWAVE"), X_("WAVE"), bind (mem_fun (*this, &ARDOUR_UI::set_native_file_header_format), ARDOUR::WAVE));
-- act = ActionManager::register_radio_action (option_actions, file_header_group, X_("FileHeaderFormatWAVE64"), X_("WAVE-64"), bind (mem_fun (*this, &ARDOUR_UI::set_native_file_header_format), ARDOUR::WAVE64));
-- // act = ActionManager::register_radio_action (option_actions, file_header_group, X_("FileHeaderFormatiXML"), X_("iXML"), bind (mem_fun (*this, &ARDOUR_UI::set_native_file_header_format), ARDOUR::iXML));
-- // act = ActionManager::register_radio_action (option_actions, file_header_group, X_("FileHeaderFormatRF64"), X_("RF64"), bind (mem_fun (*this, &ARDOUR_UI::set_native_file_header_format), ARDOUR::RF64));
-- act = ActionManager::register_radio_action (option_actions, file_header_group, X_("FileHeaderFormatCAF"), X_("CAF"), bind (mem_fun (*this, &ARDOUR_UI::set_native_file_header_format), ARDOUR::CAF));
-+ act = ActionManager::register_radio_action (option_actions, file_header_group, X_("FileHeaderFormatBWF"), X_("Broadcast WAVE"), sigc::bind (mem_fun (*this, &ARDOUR_UI::set_native_file_header_format), ARDOUR::BWF));
-+ act = ActionManager::register_radio_action (option_actions, file_header_group, X_("FileHeaderFormatWAVE"), X_("WAVE"), sigc::bind (mem_fun (*this, &ARDOUR_UI::set_native_file_header_format), ARDOUR::WAVE));
-+ act = ActionManager::register_radio_action (option_actions, file_header_group, X_("FileHeaderFormatWAVE64"), X_("WAVE-64"), sigc::bind (mem_fun (*this, &ARDOUR_UI::set_native_file_header_format), ARDOUR::WAVE64));
-+ // act = ActionManager::register_radio_action (option_actions, file_header_group, X_("FileHeaderFormatiXML"), X_("iXML"), sigc::bind (mem_fun (*this, &ARDOUR_UI::set_native_file_header_format), ARDOUR::iXML));
-+ // act = ActionManager::register_radio_action (option_actions, file_header_group, X_("FileHeaderFormatRF64"), X_("RF64"), sigc::bind (mem_fun (*this, &ARDOUR_UI::set_native_file_header_format), ARDOUR::RF64));
-+ act = ActionManager::register_radio_action (option_actions, file_header_group, X_("FileHeaderFormatCAF"), X_("CAF"), sigc::bind (mem_fun (*this, &ARDOUR_UI::set_native_file_header_format), ARDOUR::CAF));
-
- RadioAction::Group file_data_group;
-
-
-- act = ActionManager::register_radio_action (option_actions, file_data_group, X_("FileDataFormatFloat"), X_("32-bit floating point"), bind (mem_fun (*this, &ARDOUR_UI::set_native_file_data_format), ARDOUR::FormatFloat));
-- act = ActionManager::register_radio_action (option_actions, file_data_group, X_("FileDataFormat24bit"), X_("24-bit integer"), bind (mem_fun (*this, &ARDOUR_UI::set_native_file_data_format), ARDOUR::FormatInt24));
-- act = ActionManager::register_radio_action (option_actions, file_data_group, X_("FileDataFormat16bit"), X_("16-bit integer"), bind (mem_fun (*this, &ARDOUR_UI::set_native_file_data_format), ARDOUR::FormatInt16));
-+ act = ActionManager::register_radio_action (option_actions, file_data_group, X_("FileDataFormatFloat"), X_("32-bit floating point"), sigc::bind (mem_fun (*this, &ARDOUR_UI::set_native_file_data_format), ARDOUR::FormatFloat));
-+ act = ActionManager::register_radio_action (option_actions, file_data_group, X_("FileDataFormat24bit"), X_("24-bit integer"), sigc::bind (mem_fun (*this, &ARDOUR_UI::set_native_file_data_format), ARDOUR::FormatInt24));
-+ act = ActionManager::register_radio_action (option_actions, file_data_group, X_("FileDataFormat16bit"), X_("16-bit integer"), sigc::bind (mem_fun (*this, &ARDOUR_UI::set_native_file_data_format), ARDOUR::FormatInt16));
-
- RadioAction::Group monitoring_group;
-
-@@ -578,44 +578,44 @@ ARDOUR_UI::install_actions ()
-
- #ifndef __APPLE__
- /* JACK has no monitoring capabilities with the CoreAudio backend */
-- act = ActionManager::register_radio_action (option_actions, monitoring_group, X_("UseHardwareMonitoring"), _("JACK does monitoring"), bind (mem_fun (*this, &ARDOUR_UI::set_monitor_model), HardwareMonitoring));
-+ act = ActionManager::register_radio_action (option_actions, monitoring_group, X_("UseHardwareMonitoring"), _("JACK does monitoring"), sigc::bind (mem_fun (*this, &ARDOUR_UI::set_monitor_model), HardwareMonitoring));
- if (!engine->can_request_hardware_monitoring()) {
- act->set_sensitive (false);
- }
- #endif
-- act = ActionManager::register_radio_action (option_actions, monitoring_group, X_("UseSoftwareMonitoring"), string_compose (_("%1 does monitoring"), PROGRAM_NAME).c_str(), bind (mem_fun (*this, &ARDOUR_UI::set_monitor_model), SoftwareMonitoring));
-- act = ActionManager::register_radio_action (option_actions, monitoring_group, X_("UseExternalMonitoring"), _("Audio Hardware does monitoring"), bind (mem_fun (*this, &ARDOUR_UI::set_monitor_model), ExternalMonitoring));
-+ act = ActionManager::register_radio_action (option_actions, monitoring_group, X_("UseSoftwareMonitoring"), string_compose (_("%1 does monitoring"), PROGRAM_NAME).c_str(), sigc::bind (mem_fun (*this, &ARDOUR_UI::set_monitor_model), SoftwareMonitoring));
-+ act = ActionManager::register_radio_action (option_actions, monitoring_group, X_("UseExternalMonitoring"), _("Audio Hardware does monitoring"), sigc::bind (mem_fun (*this, &ARDOUR_UI::set_monitor_model), ExternalMonitoring));
-
- RadioAction::Group solo_group;
-
-- act = ActionManager::register_radio_action (option_actions, solo_group, X_("SoloInPlace"), _("Solo in-place"), hide_return (bind (mem_fun (*this, &ARDOUR_UI::set_solo_model), InverseMute)));
-+ act = ActionManager::register_radio_action (option_actions, solo_group, X_("SoloInPlace"), _("Solo in-place"), hide_return (sigc::bind (mem_fun (*this, &ARDOUR_UI::set_solo_model), InverseMute)));
- ActionManager::session_sensitive_actions.push_back (act);
-- act = ActionManager::register_radio_action (option_actions, solo_group, X_("SoloViaBus"), _("Solo via bus"), hide_return (bind (mem_fun (*this, &ARDOUR_UI::set_solo_model), SoloBus)));
-+ act = ActionManager::register_radio_action (option_actions, solo_group, X_("SoloViaBus"), _("Solo via bus"), hide_return (sigc::bind (mem_fun (*this, &ARDOUR_UI::set_solo_model), SoloBus)));
- ActionManager::session_sensitive_actions.push_back (act);
-
- RadioAction::Group input_auto_connect_group;
-
-- act = ActionManager::register_radio_action (option_actions, input_auto_connect_group, X_("InputAutoConnectPhysical"), _("Auto-connect inputs to physical inputs"), hide_return (bind (mem_fun (*this, &ARDOUR_UI::set_input_auto_connect), AutoConnectPhysical)));
-+ act = ActionManager::register_radio_action (option_actions, input_auto_connect_group, X_("InputAutoConnectPhysical"), _("Auto-connect inputs to physical inputs"), hide_return (sigc::bind (mem_fun (*this, &ARDOUR_UI::set_input_auto_connect), AutoConnectPhysical)));
- ActionManager::session_sensitive_actions.push_back (act);
-- act = ActionManager::register_radio_action (option_actions, input_auto_connect_group, X_("InputAutoConnectManual"), _("Manually connect inputs"), hide_return (bind (mem_fun (*this, &ARDOUR_UI::set_input_auto_connect), (AutoConnectOption) 0)));
-+ act = ActionManager::register_radio_action (option_actions, input_auto_connect_group, X_("InputAutoConnectManual"), _("Manually connect inputs"), hide_return (sigc::bind (mem_fun (*this, &ARDOUR_UI::set_input_auto_connect), (AutoConnectOption) 0)));
- ActionManager::session_sensitive_actions.push_back (act);
-
- RadioAction::Group output_auto_connect_group;
-
-- act = ActionManager::register_radio_action (option_actions, output_auto_connect_group, X_("OutputAutoConnectPhysical"), _("Auto-connect outputs to physical outs"), hide_return (bind (mem_fun (*this, &ARDOUR_UI::set_output_auto_connect), AutoConnectPhysical)));
-+ act = ActionManager::register_radio_action (option_actions, output_auto_connect_group, X_("OutputAutoConnectPhysical"), _("Auto-connect outputs to physical outs"), hide_return (sigc::bind (mem_fun (*this, &ARDOUR_UI::set_output_auto_connect), AutoConnectPhysical)));
- ActionManager::session_sensitive_actions.push_back (act);
-- act = ActionManager::register_radio_action (option_actions, output_auto_connect_group, X_("OutputAutoConnectMaster"), _("Auto-connect outputs to master bus"), hide_return (bind (mem_fun (*this, &ARDOUR_UI::set_output_auto_connect), AutoConnectMaster)));
-+ act = ActionManager::register_radio_action (option_actions, output_auto_connect_group, X_("OutputAutoConnectMaster"), _("Auto-connect outputs to master bus"), hide_return (sigc::bind (mem_fun (*this, &ARDOUR_UI::set_output_auto_connect), AutoConnectMaster)));
- ActionManager::session_sensitive_actions.push_back (act);
-- act = ActionManager::register_radio_action (option_actions, output_auto_connect_group, X_("OutputAutoConnectManual"), _("Manually connect outputs"), hide_return (bind (mem_fun (*this, &ARDOUR_UI::set_output_auto_connect), (AutoConnectOption) 0)));
-+ act = ActionManager::register_radio_action (option_actions, output_auto_connect_group, X_("OutputAutoConnectManual"), _("Manually connect outputs"), hide_return (sigc::bind (mem_fun (*this, &ARDOUR_UI::set_output_auto_connect), (AutoConnectOption) 0)));
- ActionManager::session_sensitive_actions.push_back (act);
-
- RadioAction::Group remote_group;
-
-- act = ActionManager::register_radio_action (option_actions, remote_group, X_("RemoteUserDefined"), _("Remote ID assigned by User"), hide_return (bind (mem_fun (*this, &ARDOUR_UI::set_remote_model), UserOrdered)));
-+ act = ActionManager::register_radio_action (option_actions, remote_group, X_("RemoteUserDefined"), _("Remote ID assigned by User"), hide_return (sigc::bind (mem_fun (*this, &ARDOUR_UI::set_remote_model), UserOrdered)));
- ActionManager::session_sensitive_actions.push_back (act);
-- act = ActionManager::register_radio_action (option_actions, remote_group, X_("RemoteMixerDefined"), _("Remote ID follows order of Mixer"), hide_return (bind (mem_fun (*this, &ARDOUR_UI::set_remote_model), MixerOrdered)));
-+ act = ActionManager::register_radio_action (option_actions, remote_group, X_("RemoteMixerDefined"), _("Remote ID follows order of Mixer"), hide_return (sigc::bind (mem_fun (*this, &ARDOUR_UI::set_remote_model), MixerOrdered)));
- ActionManager::session_sensitive_actions.push_back (act);
-- act = ActionManager::register_radio_action (option_actions, remote_group, X_("RemoteEditorDefined"), _("Remote ID follows order of Editor"), hide_return (bind (mem_fun (*this, &ARDOUR_UI::set_remote_model), EditorOrdered)));
-+ act = ActionManager::register_radio_action (option_actions, remote_group, X_("RemoteEditorDefined"), _("Remote ID follows order of Editor"), hide_return (sigc::bind (mem_fun (*this, &ARDOUR_UI::set_remote_model), EditorOrdered)));
- ActionManager::session_sensitive_actions.push_back (act);
-
- act = ActionManager::register_toggle_action (option_actions, X_("AutoRebinding"), _("Auto Rebind Controls"), mem_fun (*(this->mixer), &Mixer_UI::toggle_auto_rebinding));
-@@ -809,7 +809,7 @@ ARDOUR_UI::build_control_surface_menu ()
- string action_label = (*i)->name;
-
- Glib::RefPtr<Action> act = ActionManager::register_toggle_action (editor->editor_actions, action_name.c_str(), action_label.c_str(),
-- (bind (mem_fun (*this, &ARDOUR_UI::toggle_control_protocol), *i)));
-+ (sigc::bind (mem_fun (*this, &ARDOUR_UI::toggle_control_protocol), *i)));
-
- Glib::RefPtr<ToggleAction> tact = Glib::RefPtr<ToggleAction>::cast_dynamic (act);
-
-@@ -834,7 +834,7 @@ ARDOUR_UI::build_control_surface_menu ()
- action_name += "Feedback";
-
- Glib::RefPtr<Action> act = ActionManager::register_toggle_action (editor->editor_actions, action_name.c_str(), _("Feedback"),
-- (bind (mem_fun (*this, &ARDOUR_UI::toggle_control_protocol_feedback),
-+ (sigc::bind (mem_fun (*this, &ARDOUR_UI::toggle_control_protocol_feedback),
- *i,
- "Editor",
- action_name)));
-@@ -946,19 +946,19 @@ ARDOUR_UI::use_menubar_as_top_menubar ()
- void
- ARDOUR_UI::setup_clock ()
- {
-- ARDOUR_UI::Clock.connect (bind (mem_fun (big_clock, &AudioClock::set), false));
-+ ARDOUR_UI::Clock.connect (sigc::bind (mem_fun (big_clock, &AudioClock::set), false));
-
- big_clock_window = new Window (WINDOW_TOPLEVEL);
-
- big_clock_window->set_keep_above (true);
- big_clock_window->set_border_width (0);
- big_clock_window->add (big_clock);
-- big_clock_window->signal_key_press_event().connect (bind (sigc::ptr_fun (relay_key_press), big_clock_window));
-+ big_clock_window->signal_key_press_event().connect (sigc::bind (sigc::ptr_fun (relay_key_press), big_clock_window));
-
- big_clock_window->set_title (_("Clock"));
- big_clock_window->set_type_hint (Gdk::WINDOW_TYPE_HINT_UTILITY);
-- big_clock_window->signal_realize().connect (bind (sigc::ptr_fun (set_decoration), big_clock_window, (Gdk::DECOR_BORDER|Gdk::DECOR_RESIZEH)));
-- big_clock_window->signal_unmap().connect (bind (sigc::ptr_fun(&ActionManager::uncheck_toggleaction), X_("<Actions>/Common/ToggleBigClock")));
-+ big_clock_window->signal_realize().connect (sigc::bind (sigc::ptr_fun (set_decoration), big_clock_window, (Gdk::DECOR_BORDER|Gdk::DECOR_RESIZEH)));
-+ big_clock_window->signal_unmap().connect (sigc::bind (sigc::ptr_fun(&ActionManager::uncheck_toggleaction), X_("<Actions>/Common/ToggleBigClock")));
-
- manage_window (*big_clock_window);
- }
-diff --git a/gtk2_ardour/audio_clock.cc b/gtk2_ardour/audio_clock.cc
-index 518bd1c..1ee26fc 100644
---- a/gtk2_ardour/audio_clock.cc
-+++ b/gtk2_ardour/audio_clock.cc
-@@ -209,7 +209,7 @@ AudioClock::AudioClock (std::string clock_name, bool transient, std::string widg
- */
-
- clock_base.add_events (Gdk::BUTTON_PRESS_MASK|Gdk::BUTTON_RELEASE_MASK|Gdk::SCROLL_MASK);
-- clock_base.signal_button_release_event().connect (bind (mem_fun (*this, &AudioClock::field_button_release_event), SMPTE_Hours));
-+ clock_base.signal_button_release_event().connect (sigc::bind (mem_fun (*this, &AudioClock::field_button_release_event), SMPTE_Hours));
-
- Session::SMPTEOffsetChanged.connect (mem_fun (*this, &AudioClock::smpte_offset_changed));
-
-@@ -294,101 +294,101 @@ AudioClock::setup_events ()
- ms_minutes_ebox.set_flags (Gtk::CAN_FOCUS);
- ms_seconds_ebox.set_flags (Gtk::CAN_FOCUS);
-
-- hours_ebox.signal_motion_notify_event().connect (bind (mem_fun(*this, &AudioClock::field_motion_notify_event), SMPTE_Hours));
-- minutes_ebox.signal_motion_notify_event().connect (bind (mem_fun(*this, &AudioClock::field_motion_notify_event), SMPTE_Minutes));
-- seconds_ebox.signal_motion_notify_event().connect (bind (mem_fun(*this, &AudioClock::field_motion_notify_event), SMPTE_Seconds));
-- frames_ebox.signal_motion_notify_event().connect (bind (mem_fun(*this, &AudioClock::field_motion_notify_event), SMPTE_Frames));
-- audio_frames_ebox.signal_motion_notify_event().connect (bind (mem_fun(*this, &AudioClock::field_motion_notify_event), AudioFrames));
-- bars_ebox.signal_motion_notify_event().connect (bind (mem_fun(*this, &AudioClock::field_motion_notify_event), Bars));
-- beats_ebox.signal_motion_notify_event().connect (bind (mem_fun(*this, &AudioClock::field_motion_notify_event), Beats));
-- ticks_ebox.signal_motion_notify_event().connect (bind (mem_fun(*this, &AudioClock::field_motion_notify_event), Ticks));
-- ms_hours_ebox.signal_motion_notify_event().connect (bind (mem_fun(*this, &AudioClock::field_motion_notify_event), MS_Hours));
-- ms_minutes_ebox.signal_motion_notify_event().connect (bind (mem_fun(*this, &AudioClock::field_motion_notify_event), MS_Minutes));
-- ms_seconds_ebox.signal_motion_notify_event().connect (bind (mem_fun(*this, &AudioClock::field_motion_notify_event), MS_Seconds));
--
-- hours_ebox.signal_button_press_event().connect (bind (mem_fun(*this, &AudioClock::field_button_press_event), SMPTE_Hours));
-- minutes_ebox.signal_button_press_event().connect (bind (mem_fun(*this, &AudioClock::field_button_press_event), SMPTE_Minutes));
-- seconds_ebox.signal_button_press_event().connect (bind (mem_fun(*this, &AudioClock::field_button_press_event), SMPTE_Seconds));
-- frames_ebox.signal_button_press_event().connect (bind (mem_fun(*this, &AudioClock::field_button_press_event), SMPTE_Frames));
-- audio_frames_ebox.signal_button_press_event().connect (bind (mem_fun(*this, &AudioClock::field_button_press_event), AudioFrames));
-- bars_ebox.signal_button_press_event().connect (bind (mem_fun(*this, &AudioClock::field_button_press_event), Bars));
-- beats_ebox.signal_button_press_event().connect (bind (mem_fun(*this, &AudioClock::field_button_press_event), Beats));
-- ticks_ebox.signal_button_press_event().connect (bind (mem_fun(*this, &AudioClock::field_button_press_event), Ticks));
-- ms_hours_ebox.signal_button_press_event().connect (bind (mem_fun(*this, &AudioClock::field_button_press_event), MS_Hours));
-- ms_minutes_ebox.signal_button_press_event().connect (bind (mem_fun(*this, &AudioClock::field_button_press_event), MS_Minutes));
-- ms_seconds_ebox.signal_button_press_event().connect (bind (mem_fun(*this, &AudioClock::field_button_press_event), MS_Seconds));
--
-- hours_ebox.signal_button_release_event().connect (bind (mem_fun(*this, &AudioClock::field_button_release_event), SMPTE_Hours));
-- minutes_ebox.signal_button_release_event().connect (bind (mem_fun(*this, &AudioClock::field_button_release_event), SMPTE_Minutes));
-- seconds_ebox.signal_button_release_event().connect (bind (mem_fun(*this, &AudioClock::field_button_release_event), SMPTE_Seconds));
-- frames_ebox.signal_button_release_event().connect (bind (mem_fun(*this, &AudioClock::field_button_release_event), SMPTE_Frames));
-- audio_frames_ebox.signal_button_release_event().connect (bind (mem_fun(*this, &AudioClock::field_button_release_event), AudioFrames));
-- bars_ebox.signal_button_release_event().connect (bind (mem_fun(*this, &AudioClock::field_button_release_event), Bars));
-- beats_ebox.signal_button_release_event().connect (bind (mem_fun(*this, &AudioClock::field_button_release_event), Beats));
-- ticks_ebox.signal_button_release_event().connect (bind (mem_fun(*this, &AudioClock::field_button_release_event), Ticks));
-- ms_hours_ebox.signal_button_release_event().connect (bind (mem_fun(*this, &AudioClock::field_button_release_event), MS_Hours));
-- ms_minutes_ebox.signal_button_release_event().connect (bind (mem_fun(*this, &AudioClock::field_button_release_event), MS_Minutes));
-- ms_seconds_ebox.signal_button_release_event().connect (bind (mem_fun(*this, &AudioClock::field_button_release_event), MS_Seconds));
--
-- hours_ebox.signal_scroll_event().connect (bind (mem_fun(*this, &AudioClock::field_button_scroll_event), SMPTE_Hours));
-- minutes_ebox.signal_scroll_event().connect (bind (mem_fun(*this, &AudioClock::field_button_scroll_event), SMPTE_Minutes));
-- seconds_ebox.signal_scroll_event().connect (bind (mem_fun(*this, &AudioClock::field_button_scroll_event), SMPTE_Seconds));
-- frames_ebox.signal_scroll_event().connect (bind (mem_fun(*this, &AudioClock::field_button_scroll_event), SMPTE_Frames));
-- audio_frames_ebox.signal_scroll_event().connect (bind (mem_fun(*this, &AudioClock::field_button_scroll_event), AudioFrames));
-- bars_ebox.signal_scroll_event().connect (bind (mem_fun(*this, &AudioClock::field_button_scroll_event), Bars));
-- beats_ebox.signal_scroll_event().connect (bind (mem_fun(*this, &AudioClock::field_button_scroll_event), Beats));
-- ticks_ebox.signal_scroll_event().connect (bind (mem_fun(*this, &AudioClock::field_button_scroll_event), Ticks));
-- ms_hours_ebox.signal_scroll_event().connect (bind (mem_fun(*this, &AudioClock::field_button_scroll_event), MS_Hours));
-- ms_minutes_ebox.signal_scroll_event().connect (bind (mem_fun(*this, &AudioClock::field_button_scroll_event), MS_Minutes));
-- ms_seconds_ebox.signal_scroll_event().connect (bind (mem_fun(*this, &AudioClock::field_button_scroll_event), MS_Seconds));
--
-- hours_ebox.signal_key_press_event().connect (bind (mem_fun(*this, &AudioClock::field_key_press_event), SMPTE_Hours));
-- minutes_ebox.signal_key_press_event().connect (bind (mem_fun(*this, &AudioClock::field_key_press_event), SMPTE_Minutes));
-- seconds_ebox.signal_key_press_event().connect (bind (mem_fun(*this, &AudioClock::field_key_press_event), SMPTE_Seconds));
-- frames_ebox.signal_key_press_event().connect (bind (mem_fun(*this, &AudioClock::field_key_press_event), SMPTE_Frames));
-- audio_frames_ebox.signal_key_press_event().connect (bind (mem_fun(*this, &AudioClock::field_key_press_event), AudioFrames));
-- bars_ebox.signal_key_press_event().connect (bind (mem_fun(*this, &AudioClock::field_key_press_event), Bars));
-- beats_ebox.signal_key_press_event().connect (bind (mem_fun(*this, &AudioClock::field_key_press_event), Beats));
-- ticks_ebox.signal_key_press_event().connect (bind (mem_fun(*this, &AudioClock::field_key_press_event), Ticks));
-- ms_hours_ebox.signal_key_press_event().connect (bind (mem_fun(*this, &AudioClock::field_key_press_event), MS_Hours));
-- ms_minutes_ebox.signal_key_press_event().connect (bind (mem_fun(*this, &AudioClock::field_key_press_event), MS_Minutes));
-- ms_seconds_ebox.signal_key_press_event().connect (bind (mem_fun(*this, &AudioClock::field_key_press_event), MS_Seconds));
--
-- hours_ebox.signal_key_release_event().connect (bind (mem_fun(*this, &AudioClock::field_key_release_event), SMPTE_Hours));
-- minutes_ebox.signal_key_release_event().connect (bind (mem_fun(*this, &AudioClock::field_key_release_event), SMPTE_Minutes));
-- seconds_ebox.signal_key_release_event().connect (bind (mem_fun(*this, &AudioClock::field_key_release_event), SMPTE_Seconds));
-- frames_ebox.signal_key_release_event().connect (bind (mem_fun(*this, &AudioClock::field_key_release_event), SMPTE_Frames));
-- audio_frames_ebox.signal_key_release_event().connect (bind (mem_fun(*this, &AudioClock::field_key_release_event), AudioFrames));
-- bars_ebox.signal_key_release_event().connect (bind (mem_fun(*this, &AudioClock::field_key_release_event), Bars));
-- beats_ebox.signal_key_release_event().connect (bind (mem_fun(*this, &AudioClock::field_key_release_event), Beats));
-- ticks_ebox.signal_key_release_event().connect (bind (mem_fun(*this, &AudioClock::field_key_release_event), Ticks));
-- ms_hours_ebox.signal_key_release_event().connect (bind (mem_fun(*this, &AudioClock::field_key_release_event), MS_Hours));
-- ms_minutes_ebox.signal_key_release_event().connect (bind (mem_fun(*this, &AudioClock::field_key_release_event), MS_Minutes));
-- ms_seconds_ebox.signal_key_release_event().connect (bind (mem_fun(*this, &AudioClock::field_key_release_event), MS_Seconds));
--
-- hours_ebox.signal_focus_in_event().connect (bind (mem_fun(*this, &AudioClock::field_focus_in_event), SMPTE_Hours));
-- minutes_ebox.signal_focus_in_event().connect (bind (mem_fun(*this, &AudioClock::field_focus_in_event), SMPTE_Minutes));
-- seconds_ebox.signal_focus_in_event().connect (bind (mem_fun(*this, &AudioClock::field_focus_in_event), SMPTE_Seconds));
-- frames_ebox.signal_focus_in_event().connect (bind (mem_fun(*this, &AudioClock::field_focus_in_event), SMPTE_Frames));
-- audio_frames_ebox.signal_focus_in_event().connect (bind (mem_fun(*this, &AudioClock::field_focus_in_event), AudioFrames));
-- bars_ebox.signal_focus_in_event().connect (bind (mem_fun(*this, &AudioClock::field_focus_in_event), Bars));
-- beats_ebox.signal_focus_in_event().connect (bind (mem_fun(*this, &AudioClock::field_focus_in_event), Beats));
-- ticks_ebox.signal_focus_in_event().connect (bind (mem_fun(*this, &AudioClock::field_focus_in_event), Ticks));
-- ms_hours_ebox.signal_focus_in_event().connect (bind (mem_fun(*this, &AudioClock::field_focus_in_event), MS_Hours));
-- ms_minutes_ebox.signal_focus_in_event().connect (bind (mem_fun(*this, &AudioClock::field_focus_in_event), MS_Minutes));
-- ms_seconds_ebox.signal_focus_in_event().connect (bind (mem_fun(*this, &AudioClock::field_focus_in_event), MS_Seconds));
--
-- hours_ebox.signal_focus_out_event().connect (bind (mem_fun(*this, &AudioClock::field_focus_out_event), SMPTE_Hours));
-- minutes_ebox.signal_focus_out_event().connect (bind (mem_fun(*this, &AudioClock::field_focus_out_event), SMPTE_Minutes));
-- seconds_ebox.signal_focus_out_event().connect (bind (mem_fun(*this, &AudioClock::field_focus_out_event), SMPTE_Seconds));
-- frames_ebox.signal_focus_out_event().connect (bind (mem_fun(*this, &AudioClock::field_focus_out_event), SMPTE_Frames));
-- audio_frames_ebox.signal_focus_out_event().connect (bind (mem_fun(*this, &AudioClock::field_focus_out_event), AudioFrames));
-- bars_ebox.signal_focus_out_event().connect (bind (mem_fun(*this, &AudioClock::field_focus_out_event), Bars));
-- beats_ebox.signal_focus_out_event().connect (bind (mem_fun(*this, &AudioClock::field_focus_out_event), Beats));
-- ticks_ebox.signal_focus_out_event().connect (bind (mem_fun(*this, &AudioClock::field_focus_out_event), Ticks));
-- ms_hours_ebox.signal_focus_out_event().connect (bind (mem_fun(*this, &AudioClock::field_focus_out_event), MS_Hours));
-- ms_minutes_ebox.signal_focus_out_event().connect (bind (mem_fun(*this, &AudioClock::field_focus_out_event), MS_Minutes));
-- ms_seconds_ebox.signal_focus_out_event().connect (bind (mem_fun(*this, &AudioClock::field_focus_out_event), MS_Seconds));
-+ hours_ebox.signal_motion_notify_event().connect (sigc::bind (mem_fun(*this, &AudioClock::field_motion_notify_event), SMPTE_Hours));
-+ minutes_ebox.signal_motion_notify_event().connect (sigc::bind (mem_fun(*this, &AudioClock::field_motion_notify_event), SMPTE_Minutes));
-+ seconds_ebox.signal_motion_notify_event().connect (sigc::bind (mem_fun(*this, &AudioClock::field_motion_notify_event), SMPTE_Seconds));
-+ frames_ebox.signal_motion_notify_event().connect (sigc::bind (mem_fun(*this, &AudioClock::field_motion_notify_event), SMPTE_Frames));
-+ audio_frames_ebox.signal_motion_notify_event().connect (sigc::bind (mem_fun(*this, &AudioClock::field_motion_notify_event), AudioFrames));
-+ bars_ebox.signal_motion_notify_event().connect (sigc::bind (mem_fun(*this, &AudioClock::field_motion_notify_event), Bars));
-+ beats_ebox.signal_motion_notify_event().connect (sigc::bind (mem_fun(*this, &AudioClock::field_motion_notify_event), Beats));
-+ ticks_ebox.signal_motion_notify_event().connect (sigc::bind (mem_fun(*this, &AudioClock::field_motion_notify_event), Ticks));
-+ ms_hours_ebox.signal_motion_notify_event().connect (sigc::bind (mem_fun(*this, &AudioClock::field_motion_notify_event), MS_Hours));
-+ ms_minutes_ebox.signal_motion_notify_event().connect (sigc::bind (mem_fun(*this, &AudioClock::field_motion_notify_event), MS_Minutes));
-+ ms_seconds_ebox.signal_motion_notify_event().connect (sigc::bind (mem_fun(*this, &AudioClock::field_motion_notify_event), MS_Seconds));
-+
-+ hours_ebox.signal_button_press_event().connect (sigc::bind (mem_fun(*this, &AudioClock::field_button_press_event), SMPTE_Hours));
-+ minutes_ebox.signal_button_press_event().connect (sigc::bind (mem_fun(*this, &AudioClock::field_button_press_event), SMPTE_Minutes));
-+ seconds_ebox.signal_button_press_event().connect (sigc::bind (mem_fun(*this, &AudioClock::field_button_press_event), SMPTE_Seconds));
-+ frames_ebox.signal_button_press_event().connect (sigc::bind (mem_fun(*this, &AudioClock::field_button_press_event), SMPTE_Frames));
-+ audio_frames_ebox.signal_button_press_event().connect (sigc::bind (mem_fun(*this, &AudioClock::field_button_press_event), AudioFrames));
-+ bars_ebox.signal_button_press_event().connect (sigc::bind (mem_fun(*this, &AudioClock::field_button_press_event), Bars));
-+ beats_ebox.signal_button_press_event().connect (sigc::bind (mem_fun(*this, &AudioClock::field_button_press_event), Beats));
-+ ticks_ebox.signal_button_press_event().connect (sigc::bind (mem_fun(*this, &AudioClock::field_button_press_event), Ticks));
-+ ms_hours_ebox.signal_button_press_event().connect (sigc::bind (mem_fun(*this, &AudioClock::field_button_press_event), MS_Hours));
-+ ms_minutes_ebox.signal_button_press_event().connect (sigc::bind (mem_fun(*this, &AudioClock::field_button_press_event), MS_Minutes));
-+ ms_seconds_ebox.signal_button_press_event().connect (sigc::bind (mem_fun(*this, &AudioClock::field_button_press_event), MS_Seconds));
-+
-+ hours_ebox.signal_button_release_event().connect (sigc::bind (mem_fun(*this, &AudioClock::field_button_release_event), SMPTE_Hours));
-+ minutes_ebox.signal_button_release_event().connect (sigc::bind (mem_fun(*this, &AudioClock::field_button_release_event), SMPTE_Minutes));
-+ seconds_ebox.signal_button_release_event().connect (sigc::bind (mem_fun(*this, &AudioClock::field_button_release_event), SMPTE_Seconds));
-+ frames_ebox.signal_button_release_event().connect (sigc::bind (mem_fun(*this, &AudioClock::field_button_release_event), SMPTE_Frames));
-+ audio_frames_ebox.signal_button_release_event().connect (sigc::bind (mem_fun(*this, &AudioClock::field_button_release_event), AudioFrames));
-+ bars_ebox.signal_button_release_event().connect (sigc::bind (mem_fun(*this, &AudioClock::field_button_release_event), Bars));
-+ beats_ebox.signal_button_release_event().connect (sigc::bind (mem_fun(*this, &AudioClock::field_button_release_event), Beats));
-+ ticks_ebox.signal_button_release_event().connect (sigc::bind (mem_fun(*this, &AudioClock::field_button_release_event), Ticks));
-+ ms_hours_ebox.signal_button_release_event().connect (sigc::bind (mem_fun(*this, &AudioClock::field_button_release_event), MS_Hours));
-+ ms_minutes_ebox.signal_button_release_event().connect (sigc::bind (mem_fun(*this, &AudioClock::field_button_release_event), MS_Minutes));
-+ ms_seconds_ebox.signal_button_release_event().connect (sigc::bind (mem_fun(*this, &AudioClock::field_button_release_event), MS_Seconds));
-+
-+ hours_ebox.signal_scroll_event().connect (sigc::bind (mem_fun(*this, &AudioClock::field_button_scroll_event), SMPTE_Hours));
-+ minutes_ebox.signal_scroll_event().connect (sigc::bind (mem_fun(*this, &AudioClock::field_button_scroll_event), SMPTE_Minutes));
-+ seconds_ebox.signal_scroll_event().connect (sigc::bind (mem_fun(*this, &AudioClock::field_button_scroll_event), SMPTE_Seconds));
-+ frames_ebox.signal_scroll_event().connect (sigc::bind (mem_fun(*this, &AudioClock::field_button_scroll_event), SMPTE_Frames));
-+ audio_frames_ebox.signal_scroll_event().connect (sigc::bind (mem_fun(*this, &AudioClock::field_button_scroll_event), AudioFrames));
-+ bars_ebox.signal_scroll_event().connect (sigc::bind (mem_fun(*this, &AudioClock::field_button_scroll_event), Bars));
-+ beats_ebox.signal_scroll_event().connect (sigc::bind (mem_fun(*this, &AudioClock::field_button_scroll_event), Beats));
-+ ticks_ebox.signal_scroll_event().connect (sigc::bind (mem_fun(*this, &AudioClock::field_button_scroll_event), Ticks));
-+ ms_hours_ebox.signal_scroll_event().connect (sigc::bind (mem_fun(*this, &AudioClock::field_button_scroll_event), MS_Hours));
-+ ms_minutes_ebox.signal_scroll_event().connect (sigc::bind (mem_fun(*this, &AudioClock::field_button_scroll_event), MS_Minutes));
-+ ms_seconds_ebox.signal_scroll_event().connect (sigc::bind (mem_fun(*this, &AudioClock::field_button_scroll_event), MS_Seconds));
-+
-+ hours_ebox.signal_key_press_event().connect (sigc::bind (mem_fun(*this, &AudioClock::field_key_press_event), SMPTE_Hours));
-+ minutes_ebox.signal_key_press_event().connect (sigc::bind (mem_fun(*this, &AudioClock::field_key_press_event), SMPTE_Minutes));
-+ seconds_ebox.signal_key_press_event().connect (sigc::bind (mem_fun(*this, &AudioClock::field_key_press_event), SMPTE_Seconds));
-+ frames_ebox.signal_key_press_event().connect (sigc::bind (mem_fun(*this, &AudioClock::field_key_press_event), SMPTE_Frames));
-+ audio_frames_ebox.signal_key_press_event().connect (sigc::bind (mem_fun(*this, &AudioClock::field_key_press_event), AudioFrames));
-+ bars_ebox.signal_key_press_event().connect (sigc::bind (mem_fun(*this, &AudioClock::field_key_press_event), Bars));
-+ beats_ebox.signal_key_press_event().connect (sigc::bind (mem_fun(*this, &AudioClock::field_key_press_event), Beats));
-+ ticks_ebox.signal_key_press_event().connect (sigc::bind (mem_fun(*this, &AudioClock::field_key_press_event), Ticks));
-+ ms_hours_ebox.signal_key_press_event().connect (sigc::bind (mem_fun(*this, &AudioClock::field_key_press_event), MS_Hours));
-+ ms_minutes_ebox.signal_key_press_event().connect (sigc::bind (mem_fun(*this, &AudioClock::field_key_press_event), MS_Minutes));
-+ ms_seconds_ebox.signal_key_press_event().connect (sigc::bind (mem_fun(*this, &AudioClock::field_key_press_event), MS_Seconds));
-+
-+ hours_ebox.signal_key_release_event().connect (sigc::bind (mem_fun(*this, &AudioClock::field_key_release_event), SMPTE_Hours));
-+ minutes_ebox.signal_key_release_event().connect (sigc::bind (mem_fun(*this, &AudioClock::field_key_release_event), SMPTE_Minutes));
-+ seconds_ebox.signal_key_release_event().connect (sigc::bind (mem_fun(*this, &AudioClock::field_key_release_event), SMPTE_Seconds));
-+ frames_ebox.signal_key_release_event().connect (sigc::bind (mem_fun(*this, &AudioClock::field_key_release_event), SMPTE_Frames));
-+ audio_frames_ebox.signal_key_release_event().connect (sigc::bind (mem_fun(*this, &AudioClock::field_key_release_event), AudioFrames));
-+ bars_ebox.signal_key_release_event().connect (sigc::bind (mem_fun(*this, &AudioClock::field_key_release_event), Bars));
-+ beats_ebox.signal_key_release_event().connect (sigc::bind (mem_fun(*this, &AudioClock::field_key_release_event), Beats));
-+ ticks_ebox.signal_key_release_event().connect (sigc::bind (mem_fun(*this, &AudioClock::field_key_release_event), Ticks));
-+ ms_hours_ebox.signal_key_release_event().connect (sigc::bind (mem_fun(*this, &AudioClock::field_key_release_event), MS_Hours));
-+ ms_minutes_ebox.signal_key_release_event().connect (sigc::bind (mem_fun(*this, &AudioClock::field_key_release_event), MS_Minutes));
-+ ms_seconds_ebox.signal_key_release_event().connect (sigc::bind (mem_fun(*this, &AudioClock::field_key_release_event), MS_Seconds));
-+
-+ hours_ebox.signal_focus_in_event().connect (sigc::bind (mem_fun(*this, &AudioClock::field_focus_in_event), SMPTE_Hours));
-+ minutes_ebox.signal_focus_in_event().connect (sigc::bind (mem_fun(*this, &AudioClock::field_focus_in_event), SMPTE_Minutes));
-+ seconds_ebox.signal_focus_in_event().connect (sigc::bind (mem_fun(*this, &AudioClock::field_focus_in_event), SMPTE_Seconds));
-+ frames_ebox.signal_focus_in_event().connect (sigc::bind (mem_fun(*this, &AudioClock::field_focus_in_event), SMPTE_Frames));
-+ audio_frames_ebox.signal_focus_in_event().connect (sigc::bind (mem_fun(*this, &AudioClock::field_focus_in_event), AudioFrames));
-+ bars_ebox.signal_focus_in_event().connect (sigc::bind (mem_fun(*this, &AudioClock::field_focus_in_event), Bars));
-+ beats_ebox.signal_focus_in_event().connect (sigc::bind (mem_fun(*this, &AudioClock::field_focus_in_event), Beats));
-+ ticks_ebox.signal_focus_in_event().connect (sigc::bind (mem_fun(*this, &AudioClock::field_focus_in_event), Ticks));
-+ ms_hours_ebox.signal_focus_in_event().connect (sigc::bind (mem_fun(*this, &AudioClock::field_focus_in_event), MS_Hours));
-+ ms_minutes_ebox.signal_focus_in_event().connect (sigc::bind (mem_fun(*this, &AudioClock::field_focus_in_event), MS_Minutes));
-+ ms_seconds_ebox.signal_focus_in_event().connect (sigc::bind (mem_fun(*this, &AudioClock::field_focus_in_event), MS_Seconds));
-+
-+ hours_ebox.signal_focus_out_event().connect (sigc::bind (mem_fun(*this, &AudioClock::field_focus_out_event), SMPTE_Hours));
-+ minutes_ebox.signal_focus_out_event().connect (sigc::bind (mem_fun(*this, &AudioClock::field_focus_out_event), SMPTE_Minutes));
-+ seconds_ebox.signal_focus_out_event().connect (sigc::bind (mem_fun(*this, &AudioClock::field_focus_out_event), SMPTE_Seconds));
-+ frames_ebox.signal_focus_out_event().connect (sigc::bind (mem_fun(*this, &AudioClock::field_focus_out_event), SMPTE_Frames));
-+ audio_frames_ebox.signal_focus_out_event().connect (sigc::bind (mem_fun(*this, &AudioClock::field_focus_out_event), AudioFrames));
-+ bars_ebox.signal_focus_out_event().connect (sigc::bind (mem_fun(*this, &AudioClock::field_focus_out_event), Bars));
-+ beats_ebox.signal_focus_out_event().connect (sigc::bind (mem_fun(*this, &AudioClock::field_focus_out_event), Beats));
-+ ticks_ebox.signal_focus_out_event().connect (sigc::bind (mem_fun(*this, &AudioClock::field_focus_out_event), Ticks));
-+ ms_hours_ebox.signal_focus_out_event().connect (sigc::bind (mem_fun(*this, &AudioClock::field_focus_out_event), MS_Hours));
-+ ms_minutes_ebox.signal_focus_out_event().connect (sigc::bind (mem_fun(*this, &AudioClock::field_focus_out_event), MS_Minutes));
-+ ms_seconds_ebox.signal_focus_out_event().connect (sigc::bind (mem_fun(*this, &AudioClock::field_focus_out_event), MS_Seconds));
-
- clock_base.signal_focus_in_event().connect (mem_fun (*this, &AudioClock::drop_focus_handler));
- }
-@@ -1945,12 +1945,12 @@ AudioClock::build_ops_menu ()
- ops_menu->set_name ("ArdourContextMenu");
-
- if (!Profile->get_sae()) {
-- ops_items.push_back (MenuElem (_("Timecode"), bind (mem_fun(*this, &AudioClock::set_mode), SMPTE)));
-+ ops_items.push_back (MenuElem (_("Timecode"), sigc::bind (mem_fun(*this, &AudioClock::set_mode), SMPTE)));
- }
-- ops_items.push_back (MenuElem (_("Bars:Beats"), bind (mem_fun(*this, &AudioClock::set_mode), BBT)));
-- ops_items.push_back (MenuElem (_("Minutes:Seconds"), bind (mem_fun(*this, &AudioClock::set_mode), MinSec)));
-- ops_items.push_back (MenuElem (_("Samples"), bind (mem_fun(*this, &AudioClock::set_mode), Frames)));
-- ops_items.push_back (MenuElem (_("Off"), bind (mem_fun(*this, &AudioClock::set_mode), Off)));
-+ ops_items.push_back (MenuElem (_("Bars:Beats"), sigc::bind (mem_fun(*this, &AudioClock::set_mode), BBT)));
-+ ops_items.push_back (MenuElem (_("Minutes:Seconds"), sigc::bind (mem_fun(*this, &AudioClock::set_mode), MinSec)));
-+ ops_items.push_back (MenuElem (_("Samples"), sigc::bind (mem_fun(*this, &AudioClock::set_mode), Frames)));
-+ ops_items.push_back (MenuElem (_("Off"), sigc::bind (mem_fun(*this, &AudioClock::set_mode), Off)));
- }
-
- void
-diff --git a/gtk2_ardour/audio_region_editor.cc b/gtk2_ardour/audio_region_editor.cc
-index b30b462..c4a600c 100644
---- a/gtk2_ardour/audio_region_editor.cc
-+++ b/gtk2_ardour/audio_region_editor.cc
-@@ -143,7 +143,7 @@ AudioRegionEditor::AudioRegionEditor (Session& s, boost::shared_ptr<AudioRegion>
- set_name ("AudioRegionEditorWindow");
- add_events (Gdk::KEY_PRESS_MASK|Gdk::KEY_RELEASE_MASK);
-
-- signal_delete_event().connect (bind (sigc::ptr_fun (just_hide_it), static_cast<Window *> (this)));
-+ signal_delete_event().connect (sigc::bind (sigc::ptr_fun (just_hide_it), static_cast<Window *> (this)));
-
- set_title (string_compose (_("Region %1"), _region->name()));
-
-@@ -361,7 +361,7 @@ AudioRegionEditor::name_entry_changed ()
- void
- AudioRegionEditor::audition_state_changed (bool yn)
- {
-- ENSURE_GUI_THREAD (bind (mem_fun(*this, &AudioRegionEditor::audition_state_changed), yn));
-+ ENSURE_GUI_THREAD (sigc::bind (mem_fun(*this, &AudioRegionEditor::audition_state_changed), yn));
-
- if (!yn) {
- audition_button.set_active (false);
-diff --git a/gtk2_ardour/automation_line.cc b/gtk2_ardour/automation_line.cc
-index ded54a5..2fcf221 100644
---- a/gtk2_ardour/automation_line.cc
-+++ b/gtk2_ardour/automation_line.cc
-@@ -606,7 +606,7 @@ AutomationLine::determine_visible_control_points (ALPoints& points)
- double tx = points[pi].x;
- double ty = points[pi].y;
-
-- if (isnan (tx) || isnan (ty)) {
-+ if (std::isnan (tx) || std::isnan (ty)) {
- warning << string_compose (_("Ignoring illegal points on AutomationLine \"%1\""),
- _name) << endmsg;
- continue;
-diff --git a/gtk2_ardour/crossfade_edit.cc b/gtk2_ardour/crossfade_edit.cc
-index 918c4a5..97aa569 100644
---- a/gtk2_ardour/crossfade_edit.cc
-+++ b/gtk2_ardour/crossfade_edit.cc
-@@ -156,8 +156,8 @@ CrossfadeEditor::CrossfadeEditor (Session& s, boost::shared_ptr<Crossfade> xf, d
- select_in_button.set_name (X_("CrossfadeEditCurveButton"));
- select_out_button.set_name (X_("CrossfadeEditCurveButton"));
-
-- select_in_button.signal_clicked().connect (bind (mem_fun (*this, &CrossfadeEditor::curve_select_clicked), In));
-- select_out_button.signal_clicked().connect (bind (mem_fun (*this, &CrossfadeEditor::curve_select_clicked), Out));
-+ select_in_button.signal_clicked().connect (sigc::bind (mem_fun (*this, &CrossfadeEditor::curve_select_clicked), In));
-+ select_out_button.signal_clicked().connect (sigc::bind (mem_fun (*this, &CrossfadeEditor::curve_select_clicked), Out));
-
- HBox* acbox = manage (new HBox);
-
-@@ -198,7 +198,7 @@ CrossfadeEditor::CrossfadeEditor (Session& s, boost::shared_ptr<Crossfade> xf, d
- pbutton = manage (new Button);
- pbutton->add (*pxmap);
- pbutton->set_name ("CrossfadeEditButton");
-- pbutton->signal_clicked().connect (bind (mem_fun(*this, &CrossfadeEditor::apply_preset), *i));
-+ pbutton->signal_clicked().connect (sigc::bind (mem_fun(*this, &CrossfadeEditor::apply_preset), *i));
- ARDOUR_UI::instance()->set_tip (pbutton, (*i)->name, "");
- fade_in_table.attach (*pbutton, col, col+1, row, row+1);
- fade_in_buttons.push_back (pbutton);
-@@ -220,7 +220,7 @@ CrossfadeEditor::CrossfadeEditor (Session& s, boost::shared_ptr<Crossfade> xf, d
- pbutton = manage (new Button);
- pbutton->add (*pxmap);
- pbutton->set_name ("CrossfadeEditButton");
-- pbutton->signal_clicked().connect (bind (mem_fun(*this, &CrossfadeEditor::apply_preset), *i));
-+ pbutton->signal_clicked().connect (sigc::bind (mem_fun(*this, &CrossfadeEditor::apply_preset), *i));
- ARDOUR_UI::instance()->set_tip (pbutton, (*i)->name, "");
- fade_out_table.attach (*pbutton, col, col+1, row, row+1);
- fade_out_buttons.push_back (pbutton);
-@@ -318,7 +318,7 @@ CrossfadeEditor::dump ()
- void
- CrossfadeEditor::audition_state_changed (bool yn)
- {
-- ENSURE_GUI_THREAD (bind (mem_fun(*this, &CrossfadeEditor::audition_state_changed), yn));
-+ ENSURE_GUI_THREAD (sigc::bind (mem_fun(*this, &CrossfadeEditor::audition_state_changed), yn));
-
- if (!yn) {
- audition_both_button.set_active (false);
-@@ -464,7 +464,7 @@ CrossfadeEditor::make_point ()
-
- p->curve = fade[current].line;
-
-- p->box->signal_event().connect (bind (mem_fun (*this, &CrossfadeEditor::point_event), p));
-+ p->box->signal_event().connect (sigc::bind (mem_fun (*this, &CrossfadeEditor::point_event), p));
-
- return p;
- }
-@@ -1140,7 +1140,7 @@ CrossfadeEditor::make_waves (boost::shared_ptr<AudioRegion> region, WhichFade wh
-
- gdouble yoff = n * ht;
-
-- if (region->source(n)->peaks_ready (bind (mem_fun(*this, &CrossfadeEditor::peaks_ready), region, which), peaks_ready_connection)) {
-+ if (region->source(n)->peaks_ready (sigc::bind (mem_fun(*this, &CrossfadeEditor::peaks_ready), region, which), peaks_ready_connection)) {
-
- WaveView* waveview = new WaveView (*(canvas->root()));
-
-diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc
-index 81d5ce1..d2bd781 100644
---- a/gtk2_ardour/editor.cc
-+++ b/gtk2_ardour/editor.cc
-@@ -677,7 +677,7 @@ Editor::Editor ()
- region_list_display.signal_button_press_event().connect (mem_fun(*this, &Editor::region_list_display_button_press), false);
- region_list_display.signal_button_release_event().connect (mem_fun(*this, &Editor::region_list_display_button_release));
- region_list_display.get_selection()->signal_changed().connect (mem_fun(*this, &Editor::region_list_selection_changed));
-- // region_list_display.signal_popup_menu().connect (bind (mem_fun (*this, &Editor::show_region_list_display_context_menu), 1, 0));
-+ // region_list_display.signal_popup_menu().connect (sigc::bind (mem_fun (*this, &Editor::show_region_list_display_context_menu), 1, 0));
-
- named_selection_scroller.add (named_selection_display);
- named_selection_scroller.set_policy (POLICY_NEVER, POLICY_AUTOMATIC);
-@@ -741,10 +741,10 @@ Editor::Editor ()
- edit_pane.pack1 (edit_packer, true, true);
- edit_pane.pack2 (the_notebook, false, true);
-
-- edit_pane.signal_size_allocate().connect (bind (mem_fun(*this, &Editor::pane_allocation_handler), static_cast<Paned*> (&edit_pane)));
-+ edit_pane.signal_size_allocate().connect (sigc::bind (mem_fun(*this, &Editor::pane_allocation_handler), static_cast<Paned*> (&edit_pane)));
-
- Glib::PropertyProxy<int> proxy = edit_pane.property_position();
-- proxy.signal_changed().connect (bind (sigc::ptr_fun (pane_size_watcher), static_cast<Paned*> (&edit_pane)));
-+ proxy.signal_changed().connect (sigc::bind (sigc::ptr_fun (pane_size_watcher), static_cast<Paned*> (&edit_pane)));
-
- top_hbox.pack_start (toolbar_frame, true, true);
-
-@@ -778,7 +778,7 @@ Editor::Editor ()
- set_state (*node);
-
- _playlist_selector = new PlaylistSelector();
-- _playlist_selector->signal_delete_event().connect (bind (sigc::ptr_fun (just_hide_it), static_cast<Window *> (_playlist_selector)));
-+ _playlist_selector->signal_delete_event().connect (sigc::bind (sigc::ptr_fun (just_hide_it), static_cast<Window *> (_playlist_selector)));
-
- RegionView::RegionViewGoingAway.connect (mem_fun(*this, &Editor::catch_vanishing_regionview));
-
-@@ -831,8 +831,8 @@ Editor::Editor ()
- /* allow external control surfaces/protocols to do various things */
-
- ControlProtocol::ZoomToSession.connect (mem_fun (*this, &Editor::temporal_zoom_session));
-- ControlProtocol::ZoomIn.connect (bind (mem_fun (*this, &Editor::temporal_zoom_step), false));
-- ControlProtocol::ZoomOut.connect (bind (mem_fun (*this, &Editor::temporal_zoom_step), true));
-+ ControlProtocol::ZoomIn.connect (sigc::bind (mem_fun (*this, &Editor::temporal_zoom_step), false));
-+ ControlProtocol::ZoomOut.connect (sigc::bind (mem_fun (*this, &Editor::temporal_zoom_step), true));
- ControlProtocol::ScrollTimeline.connect (mem_fun (*this, &Editor::control_scroll));
- BasicUI::AccessAction.connect (mem_fun (*this, &Editor::access_action));
-
-@@ -997,7 +997,7 @@ Editor::zoom_adjustment_changed ()
- void
- Editor::control_scroll (float fraction)
- {
-- ENSURE_GUI_THREAD(bind (mem_fun (*this, &Editor::control_scroll), fraction));
-+ ENSURE_GUI_THREAD(sigc::bind (mem_fun (*this, &Editor::control_scroll), fraction));
-
- if (!session) {
- return;
-@@ -1053,7 +1053,7 @@ Editor::control_scroll (float fraction)
-
- /* add the next timeout */
-
-- control_scroll_connection = Glib::signal_timeout().connect (bind (mem_fun (*this, &Editor::deferred_control_scroll), *_control_scroll_target), 250);
-+ control_scroll_connection = Glib::signal_timeout().connect (sigc::bind (mem_fun (*this, &Editor::deferred_control_scroll), *_control_scroll_target), 250);
- }
-
- bool
-@@ -1073,7 +1073,7 @@ Editor::access_action (std::string action_group, std::string action_item)
- return;
- }
-
-- ENSURE_GUI_THREAD (bind (mem_fun (*this, &Editor::access_action), action_group, action_item));
-+ ENSURE_GUI_THREAD (sigc::bind (mem_fun (*this, &Editor::access_action), action_group, action_item));
-
- RefPtr<Action> act;
- act = ActionManager::get_action( action_group.c_str(), action_item.c_str() );
-@@ -1109,7 +1109,7 @@ Editor::stop_scrolling ()
- void
- Editor::map_position_change (nframes64_t frame)
- {
-- ENSURE_GUI_THREAD (bind (mem_fun(*this, &Editor::map_position_change), frame));
-+ ENSURE_GUI_THREAD (sigc::bind (mem_fun(*this, &Editor::map_position_change), frame));
-
- if (session == 0 || !_follow_playhead) {
- return;
-@@ -1169,7 +1169,7 @@ Editor::handle_new_duration ()
- void
- Editor::update_title_s (const string & snap_name)
- {
-- ENSURE_GUI_THREAD(bind (mem_fun(*this, &Editor::update_title_s), snap_name));
-+ ENSURE_GUI_THREAD(sigc::bind (mem_fun(*this, &Editor::update_title_s), snap_name));
-
- update_title ();
- }
-@@ -1454,44 +1454,44 @@ Editor::popup_fade_context_menu (int button, int32_t time, ArdourCanvas::Item* i
- case FadeInItem:
- case FadeInHandleItem:
- if (arv->audio_region()->fade_in_active()) {
-- items.push_back (MenuElem (_("Deactivate"), bind (mem_fun (*this, &Editor::set_fade_in_active), false)));
-+ items.push_back (MenuElem (_("Deactivate"), sigc::bind (mem_fun (*this, &Editor::set_fade_in_active), false)));
- } else {
-- items.push_back (MenuElem (_("Activate"), bind (mem_fun (*this, &Editor::set_fade_in_active), true)));
-+ items.push_back (MenuElem (_("Activate"), sigc::bind (mem_fun (*this, &Editor::set_fade_in_active), true)));
- }
-
- items.push_back (SeparatorElem());
-
- if (Profile->get_sae()) {
-- items.push_back (MenuElem (_("Linear"), bind (mem_fun (*this, &Editor::set_fade_in_shape), AudioRegion::Linear)));
-- items.push_back (MenuElem (_("Slowest"), bind (mem_fun (*this, &Editor::set_fade_in_shape), AudioRegion::Fast)));
-+ items.push_back (MenuElem (_("Linear"), sigc::bind (mem_fun (*this, &Editor::set_fade_in_shape), AudioRegion::Linear)));
-+ items.push_back (MenuElem (_("Slowest"), sigc::bind (mem_fun (*this, &Editor::set_fade_in_shape), AudioRegion::Fast)));
- } else {
-- items.push_back (MenuElem (_("Linear"), bind (mem_fun (*this, &Editor::set_fade_in_shape), AudioRegion::Linear)));
-- items.push_back (MenuElem (_("Slowest"), bind (mem_fun (*this, &Editor::set_fade_in_shape), AudioRegion::Fast)));
-- items.push_back (MenuElem (_("Slow"), bind (mem_fun (*this, &Editor::set_fade_in_shape), AudioRegion::LogB)));
-- items.push_back (MenuElem (_("Fast"), bind (mem_fun (*this, &Editor::set_fade_in_shape), AudioRegion::LogA)));
-- items.push_back (MenuElem (_("Fastest"), bind (mem_fun (*this, &Editor::set_fade_in_shape), AudioRegion::Slow)));
-+ items.push_back (MenuElem (_("Linear"), sigc::bind (mem_fun (*this, &Editor::set_fade_in_shape), AudioRegion::Linear)));
-+ items.push_back (MenuElem (_("Slowest"), sigc::bind (mem_fun (*this, &Editor::set_fade_in_shape), AudioRegion::Fast)));
-+ items.push_back (MenuElem (_("Slow"), sigc::bind (mem_fun (*this, &Editor::set_fade_in_shape), AudioRegion::LogB)));
-+ items.push_back (MenuElem (_("Fast"), sigc::bind (mem_fun (*this, &Editor::set_fade_in_shape), AudioRegion::LogA)));
-+ items.push_back (MenuElem (_("Fastest"), sigc::bind (mem_fun (*this, &Editor::set_fade_in_shape), AudioRegion::Slow)));
- }
- break;
-
- case FadeOutItem:
- case FadeOutHandleItem:
- if (arv->audio_region()->fade_out_active()) {
-- items.push_back (MenuElem (_("Deactivate"), bind (mem_fun (*this, &Editor::set_fade_out_active), false)));
-+ items.push_back (MenuElem (_("Deactivate"), sigc::bind (mem_fun (*this, &Editor::set_fade_out_active), false)));
- } else {
-- items.push_back (MenuElem (_("Activate"), bind (mem_fun (*this, &Editor::set_fade_out_active), true)));
-+ items.push_back (MenuElem (_("Activate"), sigc::bind (mem_fun (*this, &Editor::set_fade_out_active), true)));
- }
-
- items.push_back (SeparatorElem());
-
- if (Profile->get_sae()) {
-- items.push_back (MenuElem (_("Linear"), bind (mem_fun (*this, &Editor::set_fade_out_shape), AudioRegion::Linear)));
-- items.push_back (MenuElem (_("Slowest"), bind (mem_fun (*this, &Editor::set_fade_out_shape), AudioRegion::Slow)));
-+ items.push_back (MenuElem (_("Linear"), sigc::bind (mem_fun (*this, &Editor::set_fade_out_shape), AudioRegion::Linear)));
-+ items.push_back (MenuElem (_("Slowest"), sigc::bind (mem_fun (*this, &Editor::set_fade_out_shape), AudioRegion::Slow)));
- } else {
-- items.push_back (MenuElem (_("Linear"), bind (mem_fun (*this, &Editor::set_fade_out_shape), AudioRegion::Linear)));
-- items.push_back (MenuElem (_("Slowest"), bind (mem_fun (*this, &Editor::set_fade_out_shape), AudioRegion::Slow)));
-- items.push_back (MenuElem (_("Slow"), bind (mem_fun (*this, &Editor::set_fade_out_shape), AudioRegion::LogA)));
-- items.push_back (MenuElem (_("Fast"), bind (mem_fun (*this, &Editor::set_fade_out_shape), AudioRegion::LogB)));
-- items.push_back (MenuElem (_("Fastest"), bind (mem_fun (*this, &Editor::set_fade_out_shape), AudioRegion::Fast)));
-+ items.push_back (MenuElem (_("Linear"), sigc::bind (mem_fun (*this, &Editor::set_fade_out_shape), AudioRegion::Linear)));
-+ items.push_back (MenuElem (_("Slowest"), sigc::bind (mem_fun (*this, &Editor::set_fade_out_shape), AudioRegion::Slow)));
-+ items.push_back (MenuElem (_("Slow"), sigc::bind (mem_fun (*this, &Editor::set_fade_out_shape), AudioRegion::LogA)));
-+ items.push_back (MenuElem (_("Fast"), sigc::bind (mem_fun (*this, &Editor::set_fade_out_shape), AudioRegion::LogB)));
-+ items.push_back (MenuElem (_("Fastest"), sigc::bind (mem_fun (*this, &Editor::set_fade_out_shape), AudioRegion::Fast)));
- }
- break;
-
-@@ -1798,8 +1798,8 @@ Editor::add_crossfade_context_items (AudioStreamView* view, boost::shared_ptr<Cr
- str = _("Unmute");
- }
-
-- items.push_back (MenuElem (str, bind (mem_fun(*this, &Editor::toggle_xfade_active), boost::weak_ptr<Crossfade> (xfade))));
-- items.push_back (MenuElem (_("Edit"), bind (mem_fun(*this, &Editor::edit_xfade), boost::weak_ptr<Crossfade> (xfade))));
-+ items.push_back (MenuElem (str, sigc::bind (mem_fun(*this, &Editor::toggle_xfade_active), boost::weak_ptr<Crossfade> (xfade))));
-+ items.push_back (MenuElem (_("Edit"), sigc::bind (mem_fun(*this, &Editor::edit_xfade), boost::weak_ptr<Crossfade> (xfade))));
-
- if (xfade->can_follow_overlap()) {
-
-@@ -1809,7 +1809,7 @@ Editor::add_crossfade_context_items (AudioStreamView* view, boost::shared_ptr<Cr
- str = _("Convert to full");
- }
-
-- items.push_back (MenuElem (str, bind (mem_fun(*this, &Editor::toggle_xfade_length), xfade)));
-+ items.push_back (MenuElem (str, sigc::bind (mem_fun(*this, &Editor::toggle_xfade_length), xfade)));
- }
-
- if (many) {
-@@ -1860,7 +1860,7 @@ Editor::add_region_context_items (AudioStreamView* sv, boost::shared_ptr<Region>
- */
-
- region_menu->signal_map_event().connect (
-- bind (
-+ sigc::bind (
- mem_fun(*this, &Editor::set_selected_regionview_from_map_event),
- sv,
- boost::weak_ptr<Region>(region)
-@@ -1919,7 +1919,7 @@ Editor::add_region_context_items (AudioStreamView* sv, boost::shared_ptr<Region>
- break;
- }
-
-- bbt_glue_item->signal_activate().connect (bind (mem_fun (*this, &Editor::set_region_lock_style), Region::MusicTime));
-+ bbt_glue_item->signal_activate().connect (sigc::bind (mem_fun (*this, &Editor::set_region_lock_style), Region::MusicTime));
-
- items.push_back (CheckMenuElem (_("Mute")));
- CheckMenuItem* region_mute_item = static_cast<CheckMenuItem*>(&items.back());
-@@ -2007,8 +2007,8 @@ Editor::add_region_context_items (AudioStreamView* sv, boost::shared_ptr<Region>
- MenuList& nudge_items = nudge_menu->items();
- nudge_menu->set_name ("ArdourContextMenu");
-
-- nudge_items.push_back (MenuElem (_("Nudge fwd"), (bind (mem_fun(*this, &Editor::nudge_forward), false, false))));
-- nudge_items.push_back (MenuElem (_("Nudge bwd"), (bind (mem_fun(*this, &Editor::nudge_backward), false, false))));
-+ nudge_items.push_back (MenuElem (_("Nudge fwd"), (sigc::bind (mem_fun(*this, &Editor::nudge_forward), false, false))));
-+ nudge_items.push_back (MenuElem (_("Nudge bwd"), (sigc::bind (mem_fun(*this, &Editor::nudge_backward), false, false))));
- nudge_items.push_back (MenuElem (_("Nudge fwd by capture offset"), (mem_fun(*this, &Editor::nudge_forward_capture_offset))));
- nudge_items.push_back (MenuElem (_("Nudge bwd by capture offset"), (mem_fun(*this, &Editor::nudge_backward_capture_offset))));
-
-@@ -2045,8 +2045,8 @@ Editor::add_region_context_items (AudioStreamView* sv, boost::shared_ptr<Region>
- items.push_back (MenuElem (_("Make mono regions"), (mem_fun(*this, &Editor::split_multichannel_region))));
- region_edit_menu_split_multichannel_item = &items.back();
-
-- items.push_back (MenuElem (_("Duplicate"), (bind (mem_fun(*this, &Editor::duplicate_dialog), false))));
-- items.push_back (MenuElem (_("Multi-Duplicate"), (bind (mem_fun(*this, &Editor::duplicate_dialog), true))));
-+ items.push_back (MenuElem (_("Duplicate"), (sigc::bind (mem_fun(*this, &Editor::duplicate_dialog), false))));
-+ items.push_back (MenuElem (_("Multi-Duplicate"), (sigc::bind (mem_fun(*this, &Editor::duplicate_dialog), true))));
- items.push_back (MenuElem (_("Fill Track"), (mem_fun(*this, &Editor::region_fill_track))));
- items.push_back (SeparatorElem());
- items.push_back (MenuElem (_("Remove"), mem_fun(*this, &Editor::remove_region)));
-@@ -2069,7 +2069,7 @@ Editor::add_region_context_items (AudioStreamView* sv, boost::shared_ptr<Region>
-
- edit_items.push_back (MenuElem (menu_item_name, *region_menu));
- if (multiple_region_at_position && (layering_order_editor == 0 || !layering_order_editor->is_visible ())) {
-- edit_items.push_back (MenuElem (_("Choose top region"), (bind (mem_fun(*this, &Editor::change_region_layering_order), position))));
-+ edit_items.push_back (MenuElem (_("Choose top region"), (sigc::bind (mem_fun(*this, &Editor::change_region_layering_order), position))));
- }
- edit_items.push_back (SeparatorElem());
- }
-@@ -2080,10 +2080,10 @@ Editor::add_selection_context_items (Menu_Helpers::MenuList& items)
- using namespace Menu_Helpers;
-
- items.push_back (MenuElem (_("Play range"), mem_fun(*this, &Editor::play_selection)));
-- items.push_back (MenuElem (_("Loop range"), bind (mem_fun(*this, &Editor::set_loop_from_selection), true)));
-+ items.push_back (MenuElem (_("Loop range"), sigc::bind (mem_fun(*this, &Editor::set_loop_from_selection), true)));
-
- items.push_back (SeparatorElem());
-- items.push_back (MenuElem (_("Set loop from selection"), bind (mem_fun(*this, &Editor::set_loop_from_selection), false)));
-+ items.push_back (MenuElem (_("Set loop from selection"), sigc::bind (mem_fun(*this, &Editor::set_loop_from_selection), false)));
- items.push_back (MenuElem (_("Set punch from selection"), mem_fun(*this, &Editor::set_punch_from_selection)));
-
- #ifdef FFT_ANALYSIS
-@@ -2092,8 +2092,8 @@ Editor::add_selection_context_items (Menu_Helpers::MenuList& items)
- #endif
-
- items.push_back (SeparatorElem());
-- items.push_back (MenuElem (_("Extend Range to End of Region"), bind (mem_fun(*this, &Editor::extend_selection_to_end_of_region), false)));
-- items.push_back (MenuElem (_("Extend Range to Start of Region"), bind (mem_fun(*this, &Editor::extend_selection_to_start_of_region), false)));
-+ items.push_back (MenuElem (_("Extend Range to End of Region"), sigc::bind (mem_fun(*this, &Editor::extend_selection_to_end_of_region), false)));
-+ items.push_back (MenuElem (_("Extend Range to Start of Region"), sigc::bind (mem_fun(*this, &Editor::extend_selection_to_start_of_region), false)));
-
- items.push_back (SeparatorElem());
- items.push_back (MenuElem (_("Convert to region in-place"), mem_fun(*this, &Editor::separate_region_from_selection)));
-@@ -2107,13 +2107,13 @@ Editor::add_selection_context_items (Menu_Helpers::MenuList& items)
- items.push_back (SeparatorElem());
- items.push_back (MenuElem (_("Crop region to range"), mem_fun(*this, &Editor::crop_region_to_selection)));
- items.push_back (MenuElem (_("Fill range with region"), mem_fun(*this, &Editor::region_fill_selection)));
-- items.push_back (MenuElem (_("Duplicate range"), bind (mem_fun(*this, &Editor::duplicate_dialog), false)));
-+ items.push_back (MenuElem (_("Duplicate range"), sigc::bind (mem_fun(*this, &Editor::duplicate_dialog), false)));
- items.push_back (MenuElem (_("Create chunk from range"), mem_fun(*this, &Editor::create_named_selection)));
- items.push_back (SeparatorElem());
-- items.push_back (MenuElem (_("Consolidate range"), bind (mem_fun(*this, &Editor::bounce_range_selection), true, false)));
-- items.push_back (MenuElem (_("Consolidate range with processing"), bind (mem_fun(*this, &Editor::bounce_range_selection), true, true)));
-- items.push_back (MenuElem (_("Bounce range to region list"), bind (mem_fun(*this, &Editor::bounce_range_selection), false, false)));
-- items.push_back (MenuElem (_("Bounce range to region list with processing"), bind (mem_fun(*this, &Editor::bounce_range_selection), false, true)));
-+ items.push_back (MenuElem (_("Consolidate range"), sigc::bind (mem_fun(*this, &Editor::bounce_range_selection), true, false)));
-+ items.push_back (MenuElem (_("Consolidate range with processing"), sigc::bind (mem_fun(*this, &Editor::bounce_range_selection), true, true)));
-+ items.push_back (MenuElem (_("Bounce range to region list"), sigc::bind (mem_fun(*this, &Editor::bounce_range_selection), false, false)));
-+ items.push_back (MenuElem (_("Bounce range to region list with processing"), sigc::bind (mem_fun(*this, &Editor::bounce_range_selection), false, true)));
- items.push_back (MenuElem (_("Export range"), mem_fun(*this, &Editor::export_selection)));
- }
-
-@@ -2142,20 +2142,20 @@ Editor::add_dstream_context_items (Menu_Helpers::MenuList& edit_items)
- MenuList& select_items = select_menu->items();
- select_menu->set_name ("ArdourContextMenu");
-
-- select_items.push_back (MenuElem (_("Select All in track"), bind (mem_fun(*this, &Editor::select_all_in_track), Selection::Set)));
-- select_items.push_back (MenuElem (_("Select All"), bind (mem_fun(*this, &Editor::select_all), Selection::Set)));
-+ select_items.push_back (MenuElem (_("Select All in track"), sigc::bind (mem_fun(*this, &Editor::select_all_in_track), Selection::Set)));
-+ select_items.push_back (MenuElem (_("Select All"), sigc::bind (mem_fun(*this, &Editor::select_all), Selection::Set)));
- select_items.push_back (MenuElem (_("Invert selection in track"), mem_fun(*this, &Editor::invert_selection_in_track)));
- select_items.push_back (MenuElem (_("Invert selection"), mem_fun(*this, &Editor::invert_selection)));
- select_items.push_back (SeparatorElem());
- select_items.push_back (MenuElem (_("Set range to loop range"), mem_fun(*this, &Editor::set_selection_from_loop)));
- select_items.push_back (MenuElem (_("Set range to punch range"), mem_fun(*this, &Editor::set_selection_from_punch)));
- select_items.push_back (SeparatorElem());
-- select_items.push_back (MenuElem (_("Select All After Edit Point"), bind (mem_fun(*this, &Editor::select_all_selectables_using_edit), true)));
-- select_items.push_back (MenuElem (_("Select All Before Edit Point"), bind (mem_fun(*this, &Editor::select_all_selectables_using_edit), false)));
-- select_items.push_back (MenuElem (_("Select All After Playhead"), bind (mem_fun(*this, &Editor::select_all_selectables_using_cursor), playhead_cursor, true)));
-- select_items.push_back (MenuElem (_("Select All Before Playhead"), bind (mem_fun(*this, &Editor::select_all_selectables_using_cursor), playhead_cursor, false)));
-- select_items.push_back (MenuElem (_("Select All Between Playhead & Edit Point"), bind (mem_fun(*this, &Editor::select_all_selectables_between), false)));
-- select_items.push_back (MenuElem (_("Select All Within Playhead & Edit Point"), bind (mem_fun(*this, &Editor::select_all_selectables_between), true)));
-+ select_items.push_back (MenuElem (_("Select All After Edit Point"), sigc::bind (mem_fun(*this, &Editor::select_all_selectables_using_edit), true)));
-+ select_items.push_back (MenuElem (_("Select All Before Edit Point"), sigc::bind (mem_fun(*this, &Editor::select_all_selectables_using_edit), false)));
-+ select_items.push_back (MenuElem (_("Select All After Playhead"), sigc::bind (mem_fun(*this, &Editor::select_all_selectables_using_cursor), playhead_cursor, true)));
-+ select_items.push_back (MenuElem (_("Select All Before Playhead"), sigc::bind (mem_fun(*this, &Editor::select_all_selectables_using_cursor), playhead_cursor, false)));
-+ select_items.push_back (MenuElem (_("Select All Between Playhead & Edit Point"), sigc::bind (mem_fun(*this, &Editor::select_all_selectables_between), false)));
-+ select_items.push_back (MenuElem (_("Select All Within Playhead & Edit Point"), sigc::bind (mem_fun(*this, &Editor::select_all_selectables_between), true)));
- select_items.push_back (MenuElem (_("Select Range Between Playhead & Edit Point"), mem_fun(*this, &Editor::select_range_between)));
-
- select_items.push_back (SeparatorElem());
-@@ -2170,24 +2170,24 @@ Editor::add_dstream_context_items (Menu_Helpers::MenuList& edit_items)
-
- cutnpaste_items.push_back (MenuElem (_("Cut"), mem_fun(*this, &Editor::cut)));
- cutnpaste_items.push_back (MenuElem (_("Copy"), mem_fun(*this, &Editor::copy)));
-- cutnpaste_items.push_back (MenuElem (_("Paste"), bind (mem_fun(*this, &Editor::paste), 1.0f)));
-+ cutnpaste_items.push_back (MenuElem (_("Paste"), sigc::bind (mem_fun(*this, &Editor::paste), 1.0f)));
-
- cutnpaste_items.push_back (SeparatorElem());
-
-- cutnpaste_items.push_back (MenuElem (_("Align"), bind (mem_fun(*this, &Editor::align), ARDOUR::SyncPoint)));
-- cutnpaste_items.push_back (MenuElem (_("Align Relative"), bind (mem_fun(*this, &Editor::align_relative), ARDOUR::SyncPoint)));
-+ cutnpaste_items.push_back (MenuElem (_("Align"), sigc::bind (mem_fun(*this, &Editor::align), ARDOUR::SyncPoint)));
-+ cutnpaste_items.push_back (MenuElem (_("Align Relative"), sigc::bind (mem_fun(*this, &Editor::align_relative), ARDOUR::SyncPoint)));
-
- cutnpaste_items.push_back (SeparatorElem());
-
-- cutnpaste_items.push_back (MenuElem (_("Insert chunk"), bind (mem_fun(*this, &Editor::paste_named_selection), 1.0f)));
-+ cutnpaste_items.push_back (MenuElem (_("Insert chunk"), sigc::bind (mem_fun(*this, &Editor::paste_named_selection), 1.0f)));
-
- edit_items.push_back (MenuElem (_("Edit"), *cutnpaste_menu));
-
- /* Adding new material */
-
- edit_items.push_back (SeparatorElem());
-- edit_items.push_back (MenuElem (_("Insert Selected Region"), bind (mem_fun(*this, &Editor::insert_region_list_selection), 1.0f)));
-- edit_items.push_back (MenuElem (_("Insert Existing Audio"), bind (mem_fun(*this, &Editor::add_external_audio_action), ImportToTrack)));
-+ edit_items.push_back (MenuElem (_("Insert Selected Region"), sigc::bind (mem_fun(*this, &Editor::insert_region_list_selection), 1.0f)));
-+ edit_items.push_back (MenuElem (_("Insert Existing Audio"), sigc::bind (mem_fun(*this, &Editor::add_external_audio_action), ImportToTrack)));
-
- /* Nudge track */
-
-@@ -2196,10 +2196,10 @@ Editor::add_dstream_context_items (Menu_Helpers::MenuList& edit_items)
- nudge_menu->set_name ("ArdourContextMenu");
-
- edit_items.push_back (SeparatorElem());
-- nudge_items.push_back (MenuElem (_("Nudge entire track fwd"), (bind (mem_fun(*this, &Editor::nudge_track), false, true))));
-- nudge_items.push_back (MenuElem (_("Nudge track after edit point fwd"), (bind (mem_fun(*this, &Editor::nudge_track), true, true))));
-- nudge_items.push_back (MenuElem (_("Nudge entire track bwd"), (bind (mem_fun(*this, &Editor::nudge_track), false, false))));
-- nudge_items.push_back (MenuElem (_("Nudge track after edit point bwd"), (bind (mem_fun(*this, &Editor::nudge_track), true, false))));
-+ nudge_items.push_back (MenuElem (_("Nudge entire track fwd"), (sigc::bind (mem_fun(*this, &Editor::nudge_track), false, true))));
-+ nudge_items.push_back (MenuElem (_("Nudge track after edit point fwd"), (sigc::bind (mem_fun(*this, &Editor::nudge_track), true, true))));
-+ nudge_items.push_back (MenuElem (_("Nudge entire track bwd"), (sigc::bind (mem_fun(*this, &Editor::nudge_track), false, false))));
-+ nudge_items.push_back (MenuElem (_("Nudge track after edit point bwd"), (sigc::bind (mem_fun(*this, &Editor::nudge_track), true, false))));
-
- edit_items.push_back (MenuElem (_("Nudge"), *nudge_menu));
- }
-@@ -2225,15 +2225,15 @@ Editor::add_bus_context_items (Menu_Helpers::MenuList& edit_items)
- MenuList& select_items = select_menu->items();
- select_menu->set_name ("ArdourContextMenu");
-
-- select_items.push_back (MenuElem (_("Select All in track"), bind (mem_fun(*this, &Editor::select_all_in_track), Selection::Set)));
-- select_items.push_back (MenuElem (_("Select All"), bind (mem_fun(*this, &Editor::select_all), Selection::Set)));
-+ select_items.push_back (MenuElem (_("Select All in track"), sigc::bind (mem_fun(*this, &Editor::select_all_in_track), Selection::Set)));
-+ select_items.push_back (MenuElem (_("Select All"), sigc::bind (mem_fun(*this, &Editor::select_all), Selection::Set)));
- select_items.push_back (MenuElem (_("Invert selection in track"), mem_fun(*this, &Editor::invert_selection_in_track)));
- select_items.push_back (MenuElem (_("Invert selection"), mem_fun(*this, &Editor::invert_selection)));
- select_items.push_back (SeparatorElem());
-- select_items.push_back (MenuElem (_("Select all after edit point"), bind (mem_fun(*this, &Editor::select_all_selectables_using_edit), true)));
-- select_items.push_back (MenuElem (_("Select all before edit point"), bind (mem_fun(*this, &Editor::select_all_selectables_using_edit), false)));
-- select_items.push_back (MenuElem (_("Select all after playhead"), bind (mem_fun(*this, &Editor::select_all_selectables_using_cursor), playhead_cursor, true)));
-- select_items.push_back (MenuElem (_("Select all before playhead"), bind (mem_fun(*this, &Editor::select_all_selectables_using_cursor), playhead_cursor, false)));
-+ select_items.push_back (MenuElem (_("Select all after edit point"), sigc::bind (mem_fun(*this, &Editor::select_all_selectables_using_edit), true)));
-+ select_items.push_back (MenuElem (_("Select all before edit point"), sigc::bind (mem_fun(*this, &Editor::select_all_selectables_using_edit), false)));
-+ select_items.push_back (MenuElem (_("Select all after playhead"), sigc::bind (mem_fun(*this, &Editor::select_all_selectables_using_cursor), playhead_cursor, true)));
-+ select_items.push_back (MenuElem (_("Select all before playhead"), sigc::bind (mem_fun(*this, &Editor::select_all_selectables_using_cursor), playhead_cursor, false)));
-
- edit_items.push_back (MenuElem (_("Select"), *select_menu));
-
-@@ -2245,17 +2245,17 @@ Editor::add_bus_context_items (Menu_Helpers::MenuList& edit_items)
-
- cutnpaste_items.push_back (MenuElem (_("Cut"), mem_fun(*this, &Editor::cut)));
- cutnpaste_items.push_back (MenuElem (_("Copy"), mem_fun(*this, &Editor::copy)));
-- cutnpaste_items.push_back (MenuElem (_("Paste"), bind (mem_fun(*this, &Editor::paste), 1.0f)));
-+ cutnpaste_items.push_back (MenuElem (_("Paste"), sigc::bind (mem_fun(*this, &Editor::paste), 1.0f)));
-
- Menu *nudge_menu = manage (new Menu());
- MenuList& nudge_items = nudge_menu->items();
- nudge_menu->set_name ("ArdourContextMenu");
-
- edit_items.push_back (SeparatorElem());
-- nudge_items.push_back (MenuElem (_("Nudge entire track fwd"), (bind (mem_fun(*this, &Editor::nudge_track), false, true))));
-- nudge_items.push_back (MenuElem (_("Nudge track after edit point fwd"), (bind (mem_fun(*this, &Editor::nudge_track), true, true))));
-- nudge_items.push_back (MenuElem (_("Nudge entire track bwd"), (bind (mem_fun(*this, &Editor::nudge_track), false, false))));
-- nudge_items.push_back (MenuElem (_("Nudge track after edit point bwd"), (bind (mem_fun(*this, &Editor::nudge_track), true, false))));
-+ nudge_items.push_back (MenuElem (_("Nudge entire track fwd"), (sigc::bind (mem_fun(*this, &Editor::nudge_track), false, true))));
-+ nudge_items.push_back (MenuElem (_("Nudge track after edit point fwd"), (sigc::bind (mem_fun(*this, &Editor::nudge_track), true, true))));
-+ nudge_items.push_back (MenuElem (_("Nudge entire track bwd"), (sigc::bind (mem_fun(*this, &Editor::nudge_track), false, false))));
-+ nudge_items.push_back (MenuElem (_("Nudge track after edit point bwd"), (sigc::bind (mem_fun(*this, &Editor::nudge_track), true, false))));
-
- edit_items.push_back (MenuElem (_("Nudge"), *nudge_menu));
- }
-@@ -2972,19 +2972,19 @@ Editor::setup_toolbar ()
-
- mouse_mode_tearoff = manage (new TearOff (*mode_box));
- mouse_mode_tearoff->set_name ("MouseModeBase");
-- mouse_mode_tearoff->tearoff_window().signal_key_press_event().connect (bind (sigc::ptr_fun (relay_key_press), &mouse_mode_tearoff->tearoff_window()));
-+ mouse_mode_tearoff->tearoff_window().signal_key_press_event().connect (sigc::bind (sigc::ptr_fun (relay_key_press), &mouse_mode_tearoff->tearoff_window()));
-
- if (Profile->get_sae()) {
- mouse_mode_tearoff->set_can_be_torn_off (false);
- }
-
-- mouse_mode_tearoff->Detach.connect (bind (mem_fun(*this, &Editor::detach_tearoff), static_cast<Box*>(&toolbar_hbox),
-+ mouse_mode_tearoff->Detach.connect (sigc::bind (mem_fun(*this, &Editor::detach_tearoff), static_cast<Box*>(&toolbar_hbox),
- &mouse_mode_tearoff->tearoff_window()));
-- mouse_mode_tearoff->Attach.connect (bind (mem_fun(*this, &Editor::reattach_tearoff), static_cast<Box*> (&toolbar_hbox),
-+ mouse_mode_tearoff->Attach.connect (sigc::bind (mem_fun(*this, &Editor::reattach_tearoff), static_cast<Box*> (&toolbar_hbox),
- &mouse_mode_tearoff->tearoff_window(), 1));
-- mouse_mode_tearoff->Hidden.connect (bind (mem_fun(*this, &Editor::detach_tearoff), static_cast<Box*>(&toolbar_hbox),
-+ mouse_mode_tearoff->Hidden.connect (sigc::bind (mem_fun(*this, &Editor::detach_tearoff), static_cast<Box*>(&toolbar_hbox),
- &mouse_mode_tearoff->tearoff_window()));
-- mouse_mode_tearoff->Visible.connect (bind (mem_fun(*this, &Editor::reattach_tearoff), static_cast<Box*> (&toolbar_hbox),
-+ mouse_mode_tearoff->Visible.connect (sigc::bind (mem_fun(*this, &Editor::reattach_tearoff), static_cast<Box*> (&toolbar_hbox),
- &mouse_mode_tearoff->tearoff_window(), 1));
-
- mouse_move_button.set_name ("MouseModeButton");
-@@ -3008,14 +3008,14 @@ Editor::setup_toolbar ()
- mouse_timefx_button.unset_flags (CAN_FOCUS);
- mouse_audition_button.unset_flags (CAN_FOCUS);
-
-- mouse_select_button.signal_toggled().connect (bind (mem_fun(*this, &Editor::mouse_mode_toggled), Editing::MouseRange));
-+ mouse_select_button.signal_toggled().connect (sigc::bind (mem_fun(*this, &Editor::mouse_mode_toggled), Editing::MouseRange));
- mouse_select_button.signal_button_release_event().connect (mem_fun(*this, &Editor::mouse_select_button_release));
-
-- mouse_move_button.signal_toggled().connect (bind (mem_fun(*this, &Editor::mouse_mode_toggled), Editing::MouseObject));
-- mouse_gain_button.signal_toggled().connect (bind (mem_fun(*this, &Editor::mouse_mode_toggled), Editing::MouseGain));
-- mouse_zoom_button.signal_toggled().connect (bind (mem_fun(*this, &Editor::mouse_mode_toggled), Editing::MouseZoom));
-- mouse_timefx_button.signal_toggled().connect (bind (mem_fun(*this, &Editor::mouse_mode_toggled), Editing::MouseTimeFX));
-- mouse_audition_button.signal_toggled().connect (bind (mem_fun(*this, &Editor::mouse_mode_toggled), Editing::MouseAudition));
-+ mouse_move_button.signal_toggled().connect (sigc::bind (mem_fun(*this, &Editor::mouse_mode_toggled), Editing::MouseObject));
-+ mouse_gain_button.signal_toggled().connect (sigc::bind (mem_fun(*this, &Editor::mouse_mode_toggled), Editing::MouseGain));
-+ mouse_zoom_button.signal_toggled().connect (sigc::bind (mem_fun(*this, &Editor::mouse_mode_toggled), Editing::MouseZoom));
-+ mouse_timefx_button.signal_toggled().connect (sigc::bind (mem_fun(*this, &Editor::mouse_mode_toggled), Editing::MouseTimeFX));
-+ mouse_audition_button.signal_toggled().connect (sigc::bind (mem_fun(*this, &Editor::mouse_mode_toggled), Editing::MouseAudition));
-
- // mouse_move_button.set_active (true);
-
-@@ -3028,13 +3028,13 @@ Editor::setup_toolbar ()
- zoom_in_button.set_name ("EditorTimeButton");
- zoom_in_button.set_size_request(-1,16);
- zoom_in_button.add (*(manage (new Image (::get_icon("zoom_in")))));
-- zoom_in_button.signal_clicked().connect (bind (mem_fun(*this, &Editor::temporal_zoom_step), false));
-+ zoom_in_button.signal_clicked().connect (sigc::bind (mem_fun(*this, &Editor::temporal_zoom_step), false));
- ARDOUR_UI::instance()->tooltips().set_tip (zoom_in_button, _("Zoom In"));
-
- zoom_out_button.set_name ("EditorTimeButton");
- zoom_out_button.set_size_request(-1,16);
- zoom_out_button.add (*(manage (new Image (::get_icon("zoom_out")))));
-- zoom_out_button.signal_clicked().connect (bind (mem_fun(*this, &Editor::temporal_zoom_step), true));
-+ zoom_out_button.signal_clicked().connect (sigc::bind (mem_fun(*this, &Editor::temporal_zoom_step), true));
- ARDOUR_UI::instance()->tooltips().set_tip (zoom_out_button, _("Zoom Out"));
-
- zoom_out_full_button.set_name ("EditorTimeButton");
-@@ -3099,19 +3099,19 @@ Editor::setup_toolbar ()
-
- tools_tearoff = new TearOff (*hbox);
- tools_tearoff->set_name ("MouseModeBase");
-- tools_tearoff->tearoff_window().signal_key_press_event().connect (bind (sigc::ptr_fun (relay_key_press), &tools_tearoff->tearoff_window()));
-+ tools_tearoff->tearoff_window().signal_key_press_event().connect (sigc::bind (sigc::ptr_fun (relay_key_press), &tools_tearoff->tearoff_window()));
-
- if (Profile->get_sae()) {
- tools_tearoff->set_can_be_torn_off (false);
- }
-
-- tools_tearoff->Detach.connect (bind (mem_fun(*this, &Editor::detach_tearoff), static_cast<Box*>(&toolbar_hbox),
-+ tools_tearoff->Detach.connect (sigc::bind (mem_fun(*this, &Editor::detach_tearoff), static_cast<Box*>(&toolbar_hbox),
- &tools_tearoff->tearoff_window()));
-- tools_tearoff->Attach.connect (bind (mem_fun(*this, &Editor::reattach_tearoff), static_cast<Box*> (&toolbar_hbox),
-+ tools_tearoff->Attach.connect (sigc::bind (mem_fun(*this, &Editor::reattach_tearoff), static_cast<Box*> (&toolbar_hbox),
- &tools_tearoff->tearoff_window(), 0));
-- tools_tearoff->Hidden.connect (bind (mem_fun(*this, &Editor::detach_tearoff), static_cast<Box*>(&toolbar_hbox),
-+ tools_tearoff->Hidden.connect (sigc::bind (mem_fun(*this, &Editor::detach_tearoff), static_cast<Box*>(&toolbar_hbox),
- &tools_tearoff->tearoff_window()));
-- tools_tearoff->Visible.connect (bind (mem_fun(*this, &Editor::reattach_tearoff), static_cast<Box*> (&toolbar_hbox),
-+ tools_tearoff->Visible.connect (sigc::bind (mem_fun(*this, &Editor::reattach_tearoff), static_cast<Box*> (&toolbar_hbox),
- &tools_tearoff->tearoff_window(), 0));
-
- toolbar_hbox.set_spacing (10);
-@@ -3283,7 +3283,7 @@ Editor::get_memento () const
- State *state = new State;
-
- store_state (*state);
-- return bind (mem_fun (*(const_cast<Editor*>(this)), &Editor::restore_state), state);
-+ return sigc::bind (mem_fun (*(const_cast<Editor*>(this)), &Editor::restore_state), state);
- }
-
- void
-@@ -3960,7 +3960,7 @@ Editor::get_nudge_distance (nframes64_t pos, nframes64_t& next)
- void
- Editor::end_location_changed (Location* location)
- {
-- ENSURE_GUI_THREAD (bind (mem_fun(*this, &Editor::end_location_changed), location));
-+ ENSURE_GUI_THREAD (sigc::bind (mem_fun(*this, &Editor::end_location_changed), location));
- //reset_scrolling_region ();
- nframes64_t session_span = location->start() + (nframes64_t) floorf (current_page_frames() * 0.10f);
- horizontal_adjustment.set_upper (session_span / frames_per_unit);
-@@ -4137,12 +4137,12 @@ Editor::popup_snapshot_context_menu (int button, int32_t time, string snapshot_n
-
- const bool modification_allowed = (session->snap_name() != snapshot_name && session->name() != snapshot_name);
-
-- items.push_back (MenuElem (_("Remove"), bind (mem_fun (*this, &Editor::remove_snapshot), snapshot_name)));
-+ items.push_back (MenuElem (_("Remove"), sigc::bind (mem_fun (*this, &Editor::remove_snapshot), snapshot_name)));
- if (!modification_allowed) {
- items.back().set_sensitive (false);
- }
-
-- items.push_back (MenuElem (_("Rename"), bind (mem_fun (*this, &Editor::rename_snapshot), snapshot_name)));
-+ items.push_back (MenuElem (_("Rename"), sigc::bind (mem_fun (*this, &Editor::rename_snapshot), snapshot_name)));
- if (!modification_allowed) {
- items.back().set_sensitive (false);
- }
-@@ -4230,7 +4230,7 @@ Editor::redisplay_snapshots ()
- void
- Editor::session_state_saved (string snap_name)
- {
-- ENSURE_GUI_THREAD (bind (mem_fun(*this, &Editor::session_state_saved), snap_name));
-+ ENSURE_GUI_THREAD (sigc::bind (mem_fun(*this, &Editor::session_state_saved), snap_name));
- redisplay_snapshots ();
- }
-
-@@ -4289,7 +4289,7 @@ Editor::new_playlists (TimeAxisView* v)
- begin_reversible_command (_("new playlists"));
- vector<boost::shared_ptr<ARDOUR::Playlist> > playlists;
- session->get_playlists(playlists);
-- mapover_audio_tracks ( bind(mem_fun (*this, &Editor::mapped_use_new_playlist), playlists), v );
-+ mapover_audio_tracks ( sigc::bind(mem_fun (*this, &Editor::mapped_use_new_playlist), playlists), v );
- commit_reversible_command ();
- }
-
-@@ -4306,7 +4306,7 @@ Editor::copy_playlists (TimeAxisView* v)
- begin_reversible_command (_("copy playlists"));
- vector<boost::shared_ptr<ARDOUR::Playlist> > playlists;
- session->get_playlists(playlists);
-- mapover_audio_tracks ( bind(mem_fun (*this, &Editor::mapped_use_copy_playlist), playlists), v );
-+ mapover_audio_tracks ( sigc::bind(mem_fun (*this, &Editor::mapped_use_copy_playlist), playlists), v );
- commit_reversible_command ();
- }
-
-diff --git a/gtk2_ardour/editor_audio_import.cc b/gtk2_ardour/editor_audio_import.cc
-index 05e31e8..08c6373 100644
---- a/gtk2_ardour/editor_audio_import.cc
-+++ b/gtk2_ardour/editor_audio_import.cc
-@@ -498,7 +498,7 @@ Editor::import_sndfiles (vector<string> paths, ImportMode mode, SrcQuality quali
- import_status.track = track;
- import_status.replace = replace;
- interthread_progress_connection = Glib::signal_timeout().connect
-- (bind (mem_fun(*this, &Editor::import_progress_timeout), (gpointer) 0), 500);
-+ (sigc::bind (mem_fun(*this, &Editor::import_progress_timeout), (gpointer) 0), 500);
-
- track_canvas->get_window()->set_cursor (Gdk::Cursor (Gdk::WATCH));
- gdk_flush ();
-@@ -944,7 +944,7 @@ Editor::import_progress_timeout (void *arg)
-
- interthread_progress_connection.disconnect ();
- interthread_progress_connection = Glib::signal_timeout().connect
-- (bind (mem_fun(*this, &Editor::import_progress_timeout), (gpointer) 0), 100);
-+ (sigc::bind (mem_fun(*this, &Editor::import_progress_timeout), (gpointer) 0), 100);
- return false;
- } else {
- return !(import_status.done || import_status.cancel);
-diff --git a/gtk2_ardour/editor_canvas.cc b/gtk2_ardour/editor_canvas.cc
-index 878e2cd..f384fe7 100644
---- a/gtk2_ardour/editor_canvas.cc
-+++ b/gtk2_ardour/editor_canvas.cc
-@@ -268,7 +268,7 @@ Editor::initialize_canvas ()
- zoom_rect->property_outline_pixels() = 1;
- zoom_rect->hide();
-
-- zoom_rect->signal_event().connect (bind (mem_fun (*this, &Editor::canvas_zoom_rect_event), (ArdourCanvas::Item*) 0));
-+ zoom_rect->signal_event().connect (sigc::bind (mem_fun (*this, &Editor::canvas_zoom_rect_event), (ArdourCanvas::Item*) 0));
-
- // used as rubberband rect
- rubberband_rect = new ArdourCanvas::SimpleRect (*_trackview_group, 0.0, 0.0, 0.0, 0.0);
-@@ -276,12 +276,12 @@ Editor::initialize_canvas ()
- rubberband_rect->property_outline_pixels() = 1;
- rubberband_rect->hide();
-
-- tempo_bar->signal_event().connect (bind (mem_fun (*this, &Editor::canvas_tempo_bar_event), tempo_bar));
-- meter_bar->signal_event().connect (bind (mem_fun (*this, &Editor::canvas_meter_bar_event), meter_bar));
-- marker_bar->signal_event().connect (bind (mem_fun (*this, &Editor::canvas_marker_bar_event), marker_bar));
-- cd_marker_bar->signal_event().connect (bind (mem_fun (*this, &Editor::canvas_cd_marker_bar_event), cd_marker_bar));
-- range_marker_bar->signal_event().connect (bind (mem_fun (*this, &Editor::canvas_range_marker_bar_event), range_marker_bar));
-- transport_marker_bar->signal_event().connect (bind (mem_fun (*this, &Editor::canvas_transport_marker_bar_event), transport_marker_bar));
-+ tempo_bar->signal_event().connect (sigc::bind (mem_fun (*this, &Editor::canvas_tempo_bar_event), tempo_bar));
-+ meter_bar->signal_event().connect (sigc::bind (mem_fun (*this, &Editor::canvas_meter_bar_event), meter_bar));
-+ marker_bar->signal_event().connect (sigc::bind (mem_fun (*this, &Editor::canvas_marker_bar_event), marker_bar));
-+ cd_marker_bar->signal_event().connect (sigc::bind (mem_fun (*this, &Editor::canvas_cd_marker_bar_event), cd_marker_bar));
-+ range_marker_bar->signal_event().connect (sigc::bind (mem_fun (*this, &Editor::canvas_range_marker_bar_event), range_marker_bar));
-+ transport_marker_bar->signal_event().connect (sigc::bind (mem_fun (*this, &Editor::canvas_transport_marker_bar_event), transport_marker_bar));
-
- playhead_cursor = new Cursor (*this, &Editor::canvas_playhead_cursor_event);
-
-@@ -518,7 +518,7 @@ Editor::drop_paths (const RefPtr<Gdk::DragContext>& context,
- the main event loop with GTK/Quartz. Since import/embed wants
- to push up a progress dialog, defer all this till we go idle.
- */
-- Glib::signal_idle().connect (bind (mem_fun (*this, &Editor::idle_drop_paths), paths, frame, cy));
-+ Glib::signal_idle().connect (sigc::bind (mem_fun (*this, &Editor::idle_drop_paths), paths, frame, cy));
- #else
- drop_paths_part_two (paths, frame, cy);
- #endif
-diff --git a/gtk2_ardour/editor_markers.cc b/gtk2_ardour/editor_markers.cc
-index 80c8b34..b47a3d3 100644
---- a/gtk2_ardour/editor_markers.cc
-+++ b/gtk2_ardour/editor_markers.cc
-@@ -59,7 +59,7 @@ Editor::clear_marker_display ()
- void
- Editor::add_new_location (Location *location)
- {
-- ENSURE_GUI_THREAD (bind (mem_fun(*this, &Editor::add_new_location), location));
-+ ENSURE_GUI_THREAD (sigc::bind (mem_fun(*this, &Editor::add_new_location), location));
-
- LocationMarkers *lam = new LocationMarkers;
- uint32_t color;
-@@ -145,7 +145,7 @@ Editor::add_new_location (Location *location)
- void
- Editor::location_changed (Location *location)
- {
-- ENSURE_GUI_THREAD (bind (mem_fun(*this, &Editor::location_changed), location));
-+ ENSURE_GUI_THREAD (sigc::bind (mem_fun(*this, &Editor::location_changed), location));
-
- LocationMarkers *lam = find_location_markers (location);
-
-@@ -167,7 +167,7 @@ Editor::location_changed (Location *location)
- void
- Editor::location_flags_changed (Location *location, void *src)
- {
-- ENSURE_GUI_THREAD(bind (mem_fun(*this, &Editor::location_flags_changed), location, src));
-+ ENSURE_GUI_THREAD(sigc::bind (mem_fun(*this, &Editor::location_flags_changed), location, src));
-
- LocationMarkers *lam = find_location_markers (location);
-
-@@ -345,7 +345,7 @@ Editor::refresh_location_display ()
- void
- Editor::refresh_location_display_s (Change ignored)
- {
-- ENSURE_GUI_THREAD(bind (mem_fun(*this, &Editor::refresh_location_display_s), ignored));
-+ ENSURE_GUI_THREAD(sigc::bind (mem_fun(*this, &Editor::refresh_location_display_s), ignored));
-
- if (session) {
- session->locations()->apply (*this, &Editor::refresh_location_display_internal);
-@@ -442,7 +442,7 @@ Editor::remove_marker (ArdourCanvas::Item& item, GdkEvent* event)
- Location* loc = find_location_from_marker (marker, is_start);
-
- if (session && loc) {
-- Glib::signal_idle().connect (bind (mem_fun(*this, &Editor::really_remove_marker), loc));
-+ Glib::signal_idle().connect (sigc::bind (mem_fun(*this, &Editor::really_remove_marker), loc));
- }
- }
-
-@@ -461,7 +461,7 @@ Editor::really_remove_marker (Location* loc)
- void
- Editor::location_gone (Location *location)
- {
-- ENSURE_GUI_THREAD(bind (mem_fun(*this, &Editor::location_gone), location));
-+ ENSURE_GUI_THREAD(sigc::bind (mem_fun(*this, &Editor::location_gone), location));
-
- LocationMarkerMap::iterator i;
-
-@@ -601,8 +601,8 @@ Editor::build_marker_menu (bool start_or_end)
- items.push_back (MenuElem (_("Hide"), mem_fun(*this, &Editor::marker_menu_hide)));
- if (start_or_end) return;
- items.push_back (MenuElem (_("Rename"), mem_fun(*this, &Editor::marker_menu_rename)));
-- items.push_back (MenuElem (_("Lock"), bind (mem_fun(*this, &Editor::marker_menu_lock), true)));
-- items.push_back (MenuElem (_("Unlock"), bind (mem_fun(*this, &Editor::marker_menu_lock), false)));
-+ items.push_back (MenuElem (_("Lock"), sigc::bind (mem_fun(*this, &Editor::marker_menu_lock), true)));
-+ items.push_back (MenuElem (_("Unlock"), sigc::bind (mem_fun(*this, &Editor::marker_menu_lock), false)));
-
- items.push_back (SeparatorElem());
-
-diff --git a/gtk2_ardour/editor_ops.cc b/gtk2_ardour/editor_ops.cc
-index 9fc77dd..3a470ab 100644
---- a/gtk2_ardour/editor_ops.cc
-+++ b/gtk2_ardour/editor_ops.cc
-@@ -1580,7 +1580,7 @@ Editor::scroll_tracks_up_line ()
- void
- Editor::temporal_zoom_step (bool coarser)
- {
-- ENSURE_GUI_THREAD (bind (mem_fun (*this, &Editor::temporal_zoom_step), coarser));
-+ ENSURE_GUI_THREAD (sigc::bind (mem_fun (*this, &Editor::temporal_zoom_step), coarser));
-
- double nfpu;
-
-@@ -1890,8 +1890,8 @@ Editor::temporal_zoom_to_frame (bool coarser, nframes64_t frame)
- new_leftmost = 0;
- }
- // begin_reversible_command (_("zoom to frame"));
--// session->add_undo (bind (mem_fun(*this, &Editor::reposition_and_zoom), leftmost_frame, frames_per_unit));
--// session->add_redo (bind (mem_fun(*this, &Editor::reposition_and_zoom), new_leftmost, new_fpu));
-+// session->add_undo (sigc::bind (mem_fun(*this, &Editor::reposition_and_zoom), leftmost_frame, frames_per_unit));
-+// session->add_redo (sigc::bind (mem_fun(*this, &Editor::reposition_and_zoom), new_leftmost, new_fpu));
- // commit_reversible_command ();
-
- reposition_and_zoom (new_leftmost, new_fpu);
-@@ -2536,7 +2536,7 @@ Editor::rename_region()
- entry.set_text (rs.front()->region()->name());
- entry.select_region (0, -1);
-
-- entry.signal_activate().connect (bind (mem_fun (d, &Dialog::response), RESPONSE_OK));
-+ entry.signal_activate().connect (sigc::bind (mem_fun (d, &Dialog::response), RESPONSE_OK));
-
- d.show_all ();
-
-@@ -2851,7 +2851,7 @@ Editor::separate_regions_between (const TimeSelection& ts)
-
- got_some = true;
-
-- atv->view()->foreach_regionview (bind (sigc::ptr_fun (add_if_covered), &(*t), &new_selection));
-+ atv->view()->foreach_regionview (sigc::bind (sigc::ptr_fun (add_if_covered), &(*t), &new_selection));
-
- if (!in_command) {
- begin_reversible_command (_("separate"));
-@@ -3578,7 +3578,7 @@ Editor::freeze_route ()
- current_interthread_info = &itt;
-
- interthread_progress_connection =
-- Glib::signal_timeout().connect (bind (mem_fun(*this, &Editor::freeze_progress_timeout), (gpointer) 0), 100);
-+ Glib::signal_timeout().connect (sigc::bind (mem_fun(*this, &Editor::freeze_progress_timeout), (gpointer) 0), 100);
-
- itt.done = false;
- itt.cancel = false;
-@@ -3710,7 +3710,7 @@ Editor::cut_copy (CutCopyOp op)
- Location* loc = find_location_from_marker (entered_marker, ignored);
-
- if (session && loc) {
-- Glib::signal_idle().connect (bind (mem_fun(*this, &Editor::really_remove_marker), loc));
-+ Glib::signal_idle().connect (sigc::bind (mem_fun(*this, &Editor::really_remove_marker), loc));
- }
-
- break_drag ();
-diff --git a/gtk2_ardour/editor_selection.cc b/gtk2_ardour/editor_selection.cc
-index 1c0469c..45e19c1 100644
---- a/gtk2_ardour/editor_selection.cc
-+++ b/gtk2_ardour/editor_selection.cc
-@@ -440,7 +440,7 @@ Editor::mapped_get_equivalent_regions (RouteTimeAxisView& tv, uint32_t ignored,
- void
- Editor::get_equivalent_regions (RegionView* basis, vector<RegionView*>& equivalent_regions)
- {
-- mapover_audio_tracks (bind (mem_fun (*this, &Editor::mapped_get_equivalent_regions), basis, &equivalent_regions), &basis->get_trackview());
-+ mapover_audio_tracks (sigc::bind (mem_fun (*this, &Editor::mapped_get_equivalent_regions), basis, &equivalent_regions), &basis->get_trackview());
-
- /* add clicked regionview since we skipped all other regions in the same track as the one it was in */
-
-diff --git a/gtk2_ardour/generic_pluginui.cc b/gtk2_ardour/generic_pluginui.cc
-index 8642d1f..9b5d998 100644
---- a/gtk2_ardour/generic_pluginui.cc
-+++ b/gtk2_ardour/generic_pluginui.cc
-@@ -404,8 +404,8 @@ GenericPluginUI::build_control_ui (guint32 port_index, PBD::Controllable* mcontr
- control_ui->combo = new Gtk::ComboBoxText;
- //control_ui->combo->set_value_in_list(true, false);
- set_popdown_strings (*control_ui->combo, setup_scale_values(port_index, control_ui));
-- control_ui->combo->signal_changed().connect (bind (mem_fun(*this, &GenericPluginUI::control_combo_changed), control_ui));
-- plugin->ParameterChanged.connect (bind (mem_fun (*this, &GenericPluginUI::parameter_changed), control_ui));
-+ control_ui->combo->signal_changed().connect (sigc::bind (mem_fun(*this, &GenericPluginUI::control_combo_changed), control_ui));
-+ plugin->ParameterChanged.connect (sigc::bind (mem_fun (*this, &GenericPluginUI::parameter_changed), control_ui));
- control_ui->pack_start(control_ui->label, true, true);
- control_ui->pack_start(*control_ui->combo, false, true);
-
-@@ -425,8 +425,8 @@ GenericPluginUI::build_control_ui (guint32 port_index, PBD::Controllable* mcontr
- control_ui->combo = new Gtk::ComboBoxText;
- //control_ui->combo->set_value_in_list(true, false);
- set_popdown_strings (*control_ui->combo, setup_scale_values(port_index, control_ui));
-- control_ui->combo->signal_changed().connect (bind (mem_fun(*this, &GenericPluginUI::control_combo_changed), control_ui));
-- plugin->ParameterChanged.connect (bind (mem_fun (*this, &GenericPluginUI::parameter_changed), control_ui));
-+ control_ui->combo->signal_changed().connect (sigc::bind (mem_fun(*this, &GenericPluginUI::control_combo_changed), control_ui));
-+ plugin->ParameterChanged.connect (sigc::bind (mem_fun (*this, &GenericPluginUI::parameter_changed), control_ui));
- control_ui->pack_start(control_ui->label, true, true);
- control_ui->pack_start(*control_ui->combo, false, true);
-
-@@ -454,14 +454,14 @@ GenericPluginUI::build_control_ui (guint32 port_index, PBD::Controllable* mcontr
- control_ui->button->set_active(true);
- }
-
-- control_ui->button->signal_clicked().connect (bind (mem_fun(*this, &GenericPluginUI::control_port_toggled), control_ui));
-+ control_ui->button->signal_clicked().connect (sigc::bind (mem_fun(*this, &GenericPluginUI::control_port_toggled), control_ui));
-
-- plugin->ParameterChanged.connect (bind (mem_fun(*this, &GenericPluginUI::toggle_parameter_changed), control_ui));
-+ plugin->ParameterChanged.connect (sigc::bind (mem_fun(*this, &GenericPluginUI::toggle_parameter_changed), control_ui));
-
-- control_ui->automate_button.signal_clicked().connect (bind (mem_fun(*this, &GenericPluginUI::astate_clicked), control_ui, (uint32_t) port_index));
-+ control_ui->automate_button.signal_clicked().connect (sigc::bind (mem_fun(*this, &GenericPluginUI::astate_clicked), control_ui, (uint32_t) port_index));
- automation_state_changed (control_ui);
- insert->automation_list (port_index).automation_state_changed.connect
-- (bind (mem_fun(*this, &GenericPluginUI::automation_state_changed), control_ui));
-+ (sigc::bind (mem_fun(*this, &GenericPluginUI::automation_state_changed), control_ui));
-
- return control_ui;
- }
-@@ -501,8 +501,8 @@ GenericPluginUI::build_control_ui (guint32 port_index, PBD::Controllable* mcontr
- control_ui->control->set_use_parent (true);
- control_ui->control->set_logarithmic (control_ui->logarithmic);
-
-- control_ui->control->StartGesture.connect (bind (mem_fun(*this, &GenericPluginUI::start_touch), control_ui));
-- control_ui->control->StopGesture.connect (bind (mem_fun(*this, &GenericPluginUI::stop_touch), control_ui));
-+ control_ui->control->StartGesture.connect (sigc::bind (mem_fun(*this, &GenericPluginUI::start_touch), control_ui));
-+ control_ui->control->StopGesture.connect (sigc::bind (mem_fun(*this, &GenericPluginUI::stop_touch), control_ui));
-
- }
-
-@@ -525,14 +525,14 @@ GenericPluginUI::build_control_ui (guint32 port_index, PBD::Controllable* mcontr
- }
-
- control_ui->pack_start (control_ui->automate_button, false, false);
-- control_ui->adjustment->signal_value_changed().connect (bind (mem_fun(*this, &GenericPluginUI::control_adjustment_changed), control_ui));
-- control_ui->automate_button.signal_clicked().connect (bind (mem_fun(*this, &GenericPluginUI::astate_clicked), control_ui, (uint32_t) port_index));
-+ control_ui->adjustment->signal_value_changed().connect (sigc::bind (mem_fun(*this, &GenericPluginUI::control_adjustment_changed), control_ui));
-+ control_ui->automate_button.signal_clicked().connect (sigc::bind (mem_fun(*this, &GenericPluginUI::astate_clicked), control_ui, (uint32_t) port_index));
-
- automation_state_changed (control_ui);
-
-- plugin->ParameterChanged.connect (bind (mem_fun(*this, &GenericPluginUI::parameter_changed), control_ui));
-+ plugin->ParameterChanged.connect (sigc::bind (mem_fun(*this, &GenericPluginUI::parameter_changed), control_ui));
- insert->automation_list (port_index).automation_state_changed.connect
-- (bind (mem_fun(*this, &GenericPluginUI::automation_state_changed), control_ui));
-+ (sigc::bind (mem_fun(*this, &GenericPluginUI::automation_state_changed), control_ui));
-
- } else if (plugin->parameter_is_output (port_index)) {
-
-@@ -580,7 +580,7 @@ GenericPluginUI::build_control_ui (guint32 port_index, PBD::Controllable* mcontr
-
- output_controls.push_back (control_ui);
-
-- plugin->ParameterChanged.connect (bind (mem_fun(*this, &GenericPluginUI::parameter_changed), control_ui));
-+ plugin->ParameterChanged.connect (sigc::bind (mem_fun(*this, &GenericPluginUI::parameter_changed), control_ui));
- }
-
- return control_ui;
-@@ -627,13 +627,13 @@ GenericPluginUI::astate_clicked (ControlUI* cui, uint32_t port)
-
- items.clear ();
- items.push_back (MenuElem (_("Manual"),
-- bind (mem_fun(*this, &GenericPluginUI::set_automation_state), (AutoState) Auto_Off, cui)));
-+ sigc::bind (mem_fun(*this, &GenericPluginUI::set_automation_state), (AutoState) Auto_Off, cui)));
- items.push_back (MenuElem (_("Play"),
-- bind (mem_fun(*this, &GenericPluginUI::set_automation_state), (AutoState) Auto_Play, cui)));
-+ sigc::bind (mem_fun(*this, &GenericPluginUI::set_automation_state), (AutoState) Auto_Play, cui)));
- items.push_back (MenuElem (_("Write"),
-- bind (mem_fun(*this, &GenericPluginUI::set_automation_state), (AutoState) Auto_Write, cui)));
-+ sigc::bind (mem_fun(*this, &GenericPluginUI::set_automation_state), (AutoState) Auto_Write, cui)));
- items.push_back (MenuElem (_("Touch"),
-- bind (mem_fun(*this, &GenericPluginUI::set_automation_state), (AutoState) Auto_Touch, cui)));
-+ sigc::bind (mem_fun(*this, &GenericPluginUI::set_automation_state), (AutoState) Auto_Touch, cui)));
-
- automation_menu->popup (1, gtk_get_current_event_time());
- }
-@@ -678,7 +678,7 @@ GenericPluginUI::parameter_changed (uint32_t abs_port_id, float val, ControlUI*
- if (cui->port_index == abs_port_id) {
- if (!cui->update_pending) {
- cui->update_pending = true;
-- Gtkmm2ext::UI::instance()->call_slot (bind (mem_fun(*this, &GenericPluginUI::update_control_display), cui));
-+ Gtkmm2ext::UI::instance()->call_slot (sigc::bind (mem_fun(*this, &GenericPluginUI::update_control_display), cui));
- }
- }
- }
-diff --git a/gtk2_ardour/io_selector.cc b/gtk2_ardour/io_selector.cc
-index ecb91e0..77dd219 100644
---- a/gtk2_ardour/io_selector.cc
-+++ b/gtk2_ardour/io_selector.cc
-@@ -97,7 +97,7 @@ IOSelectorWindow::IOSelectorWindow (Session& sess, boost::shared_ptr<IO> ior, bo
- set_title (title);
- set_position (WIN_POS_MOUSE);
-
-- signal_delete_event().connect (bind (sigc::ptr_fun (just_hide_it), reinterpret_cast<Window *> (this)));
-+ signal_delete_event().connect (sigc::bind (sigc::ptr_fun (just_hide_it), reinterpret_cast<Window *> (this)));
- }
-
- IOSelectorWindow::~IOSelectorWindow()
-@@ -263,7 +263,7 @@ IOSelector::set_button_sensitivity ()
- void
- IOSelector::name_changed (void* src)
- {
-- ENSURE_GUI_THREAD(bind (mem_fun(*this, &IOSelector::name_changed), src));
-+ ENSURE_GUI_THREAD(sigc::bind (mem_fun(*this, &IOSelector::name_changed), src));
-
- display_ports ();
- }
-@@ -352,7 +352,7 @@ IOSelector::rescan ()
- row[port_display_columns.full_name] = s->second;
- }
-
-- display->signal_button_release_event().connect (bind (mem_fun(*this, &IOSelector::port_selection_changed), display));
-+ display->signal_button_release_event().connect (sigc::bind (mem_fun(*this, &IOSelector::port_selection_changed), display));
- Label *tab_label = manage (new Label);
-
- tab_label->set_name ("IOSelectorNotebookTab");
-@@ -367,7 +367,7 @@ IOSelector::rescan ()
- }
-
- notebook.set_current_page (current_page);
-- page_selection_connection = notebook.signal_show().connect (bind (mem_fun (notebook, &Notebook::set_current_page), current_page));
-+ page_selection_connection = notebook.signal_show().connect (sigc::bind (mem_fun (notebook, &Notebook::set_current_page), current_page));
- selector_box.show_all ();
- }
-
-@@ -475,10 +475,10 @@ IOSelector::display_ports ()
- col->set_clickable (true);
-
- /* handle button events on the column header ... */
-- col->signal_clicked().connect (bind (mem_fun(*this, &IOSelector::select_treeview), tview));
-+ col->signal_clicked().connect (sigc::bind (mem_fun(*this, &IOSelector::select_treeview), tview));
-
- /* ... and within the treeview itself */
-- tview->signal_button_release_event().connect (bind (mem_fun(*this, &IOSelector::connection_button_release), tview));
-+ tview->signal_button_release_event().connect (sigc::bind (mem_fun(*this, &IOSelector::connection_button_release), tview));
- }
-
- port_box.show_all ();
-@@ -529,7 +529,7 @@ IOSelector::port_selection_changed (GdkEventButton *ev, TreeView* treeview)
- void
- IOSelector::ports_changed (IOChange change, void *src)
- {
-- ENSURE_GUI_THREAD(bind (mem_fun(*this, &IOSelector::ports_changed), change, src));
-+ ENSURE_GUI_THREAD(sigc::bind (mem_fun(*this, &IOSelector::ports_changed), change, src));
-
- display_ports ();
- }
-@@ -866,7 +866,7 @@ PortInsertWindow::PortInsertWindow (Session& sess, boost::shared_ptr<PortInsert>
- cancel_button.signal_clicked().connect (mem_fun(*this, &PortInsertWindow::cancel));
- rescan_button.signal_clicked().connect (mem_fun(*this, &PortInsertWindow::rescan));
-
-- signal_delete_event().connect (bind (sigc::ptr_fun (just_hide_it), reinterpret_cast<Window *> (this)));
-+ signal_delete_event().connect (sigc::bind (sigc::ptr_fun (just_hide_it), reinterpret_cast<Window *> (this)));
-
- going_away_connection = pi->GoingAway.connect (mem_fun(*this, &PortInsertWindow::plugin_going_away));
- }
-diff --git a/gtk2_ardour/level_meter.cc b/gtk2_ardour/level_meter.cc
-index f6680db..a3b7210 100644
---- a/gtk2_ardour/level_meter.cc
-+++ b/gtk2_ardour/level_meter.cc
-@@ -114,7 +114,7 @@ LevelMeter::parameter_changed(const char* parameter_name)
- {
- #define PARAM_IS(x) (!strcmp (parameter_name, (x)))
-
-- ENSURE_GUI_THREAD (bind (mem_fun(*this, &LevelMeter::parameter_changed), parameter_name));
-+ ENSURE_GUI_THREAD (sigc::bind (mem_fun(*this, &LevelMeter::parameter_changed), parameter_name));
-
- if (PARAM_IS ("meter-hold")) {
-
-@@ -205,7 +205,7 @@ LevelMeter::setup_meters (int len, int initial_width)
- meters[n].width = width;
- meters[n].length = len;
- meters[n].meter->add_events (Gdk::BUTTON_RELEASE_MASK);
-- meters[n].meter->signal_button_release_event().connect (bind (mem_fun(*this, &LevelMeter::meter_button_release), n));
-+ meters[n].meter->signal_button_release_event().connect (sigc::bind (mem_fun(*this, &LevelMeter::meter_button_release), n));
- }
-
- pack_end (*meters[n].meter, false, false);
-diff --git a/gtk2_ardour/mixer_strip.cc b/gtk2_ardour/mixer_strip.cc
-index ac8ebfd..7265e64 100644
---- a/gtk2_ardour/mixer_strip.cc
-+++ b/gtk2_ardour/mixer_strip.cc
-@@ -712,7 +712,7 @@ MixerStrip::add_connection_to_input_menu (ARDOUR::Connection* c)
-
- if (c->nports() == _route->n_inputs()) {
-
-- citems.push_back (CheckMenuElem (c->name(), bind (mem_fun(*this, &MixerStrip::connection_input_chosen), c)));
-+ citems.push_back (CheckMenuElem (c->name(), sigc::bind (mem_fun(*this, &MixerStrip::connection_input_chosen), c)));
-
- ARDOUR::Connection *current = _route->input_connection();
-
-@@ -736,7 +736,7 @@ MixerStrip::add_connection_to_output_menu (ARDOUR::Connection* c)
- if (c->nports() == _route->n_outputs()) {
-
- MenuList& citems = output_menu.items();
-- citems.push_back (CheckMenuElem (c->name(), bind (mem_fun(*this, &MixerStrip::connection_output_chosen), c)));
-+ citems.push_back (CheckMenuElem (c->name(), sigc::bind (mem_fun(*this, &MixerStrip::connection_output_chosen), c)));
-
- ARDOUR::Connection *current = _route->output_connection();
-
-@@ -1129,7 +1129,7 @@ MixerStrip::setup_comment_editor ()
- void
- MixerStrip::comment_changed (void *src)
- {
-- ENSURE_GUI_THREAD(bind (mem_fun(*this, &MixerStrip::comment_changed), src));
-+ ENSURE_GUI_THREAD(sigc::bind (mem_fun(*this, &MixerStrip::comment_changed), src));
-
- if (src != this) {
- ignore_comment_edit = true;
-@@ -1153,7 +1153,7 @@ MixerStrip::add_mix_group_to_menu (RouteGroup *rg, RadioMenuItem::Group* group)
-
- MenuList& items = group_menu->items();
-
-- items.push_back (RadioMenuElem (*group, rg->name(), bind (mem_fun(*this, &MixerStrip::set_mix_group), rg)));
-+ items.push_back (RadioMenuElem (*group, rg->name(), sigc::bind (mem_fun(*this, &MixerStrip::set_mix_group), rg)));
-
- if (_route->mix_group() == rg) {
- static_cast<RadioMenuItem*>(&items.back())->set_active ();
-@@ -1176,9 +1176,9 @@ MixerStrip::select_mix_group (GdkEventButton *ev)
- case 1:
-
- items.clear ();
-- items.push_back (RadioMenuElem (group, _("No group"), bind (mem_fun(*this, &MixerStrip::set_mix_group), (RouteGroup *) 0)));
-+ items.push_back (RadioMenuElem (group, _("No group"), sigc::bind (mem_fun(*this, &MixerStrip::set_mix_group), (RouteGroup *) 0)));
-
-- _session.foreach_mix_group (bind (mem_fun (*this, &MixerStrip::add_mix_group_to_menu), &group));
-+ _session.foreach_mix_group (sigc::bind (mem_fun (*this, &MixerStrip::add_mix_group_to_menu), &group));
-
- group_menu->popup (1, ev->time);
- break;
-@@ -1193,7 +1193,7 @@ MixerStrip::select_mix_group (GdkEventButton *ev)
- void
- MixerStrip::mix_group_changed (void *ignored)
- {
-- ENSURE_GUI_THREAD(bind (mem_fun(*this, &MixerStrip::mix_group_changed), ignored));
-+ ENSURE_GUI_THREAD(sigc::bind (mem_fun(*this, &MixerStrip::mix_group_changed), ignored));
-
- RouteGroup *rg = _route->mix_group();
-
-@@ -1215,7 +1215,7 @@ MixerStrip::mix_group_changed (void *ignored)
- void
- MixerStrip::route_gui_changed (string what_changed, void* ignored)
- {
-- ENSURE_GUI_THREAD(bind (mem_fun(*this, &MixerStrip::route_gui_changed), what_changed, ignored));
-+ ENSURE_GUI_THREAD(sigc::bind (mem_fun(*this, &MixerStrip::route_gui_changed), what_changed, ignored));
-
- if (what_changed == "color") {
- if (set_color_from_route () == 0) {
-@@ -1483,7 +1483,7 @@ void
- MixerStrip::meter_changed (void *src)
- {
-
-- ENSURE_GUI_THREAD (bind (mem_fun(*this, &MixerStrip::meter_changed), src));
-+ ENSURE_GUI_THREAD (sigc::bind (mem_fun(*this, &MixerStrip::meter_changed), src));
-
- switch (_route->meter_point()) {
- case MeterInput:
-diff --git a/gtk2_ardour/mixer_ui.cc b/gtk2_ardour/mixer_ui.cc
-index d283d80..cc4acf7 100644
---- a/gtk2_ardour/mixer_ui.cc
-+++ b/gtk2_ardour/mixer_ui.cc
-@@ -233,13 +233,13 @@ Mixer_UI::Mixer_UI ()
- list_hpane.add1(list_vpacker);
- list_hpane.add2(global_hpacker);
-
-- rhs_pane1.signal_size_allocate().connect (bind (mem_fun(*this, &Mixer_UI::pane_allocation_handler),
-+ rhs_pane1.signal_size_allocate().connect (sigc::bind (mem_fun(*this, &Mixer_UI::pane_allocation_handler),
- static_cast<Gtk::Paned*> (&rhs_pane1)));
-- list_hpane.signal_size_allocate().connect (bind (mem_fun(*this, &Mixer_UI::pane_allocation_handler),
-+ list_hpane.signal_size_allocate().connect (sigc::bind (mem_fun(*this, &Mixer_UI::pane_allocation_handler),
- static_cast<Gtk::Paned*> (&list_hpane)));
-
- Glib::PropertyProxy<int> proxy = list_hpane.property_position();
-- proxy.signal_changed().connect (bind (sigc::ptr_fun (pane_size_watcher), static_cast<Paned*> (&list_hpane)));
-+ proxy.signal_changed().connect (sigc::bind (sigc::ptr_fun (pane_size_watcher), static_cast<Paned*> (&list_hpane)));
-
-
- global_vpacker.pack_start (list_hpane, true, true);
-@@ -311,7 +311,7 @@ Mixer_UI::hide_window (GdkEventAny *ev)
- void
- Mixer_UI::add_strip (Session::RouteList& routes)
- {
-- ENSURE_GUI_THREAD(bind (mem_fun(*this, &Mixer_UI::add_strip), routes));
-+ ENSURE_GUI_THREAD(sigc::bind (mem_fun(*this, &Mixer_UI::add_strip), routes));
-
- MixerStrip* strip;
-
-@@ -346,13 +346,13 @@ Mixer_UI::add_strip (Session::RouteList& routes)
- route->set_order_key (N_("signal"), track_model->children().size()-1);
- }
-
-- route->name_changed.connect (bind (mem_fun(*this, &Mixer_UI::strip_name_changed), strip));
-+ route->name_changed.connect (sigc::bind (mem_fun(*this, &Mixer_UI::strip_name_changed), strip));
-
-- strip->GoingAway.connect (bind (mem_fun(*this, &Mixer_UI::remove_strip), strip));
-+ strip->GoingAway.connect (sigc::bind (mem_fun(*this, &Mixer_UI::remove_strip), strip));
- #ifdef GTKOSX
- strip->WidthChanged.connect (mem_fun(*this, &Mixer_UI::queue_draw_all_strips));
- #endif
-- strip->signal_button_release_event().connect (bind (mem_fun(*this, &Mixer_UI::strip_button_release_event), strip));
-+ strip->signal_button_release_event().connect (sigc::bind (mem_fun(*this, &Mixer_UI::strip_button_release_event), strip));
- }
-
- no_track_list_redisplay = false;
-@@ -365,7 +365,7 @@ Mixer_UI::add_strip (Session::RouteList& routes)
- void
- Mixer_UI::remove_strip (MixerStrip* strip)
- {
-- ENSURE_GUI_THREAD(bind (mem_fun(*this, &Mixer_UI::remove_strip), strip));
-+ ENSURE_GUI_THREAD(sigc::bind (mem_fun(*this, &Mixer_UI::remove_strip), strip));
-
- TreeModel::Children rows = track_model->children();
- TreeModel::Children::iterator ri;
-@@ -1012,7 +1012,7 @@ Mixer_UI::build_track_menu ()
- void
- Mixer_UI::strip_name_changed (void* src, MixerStrip* mx)
- {
-- ENSURE_GUI_THREAD(bind (mem_fun(*this, &Mixer_UI::strip_name_changed), src, mx));
-+ ENSURE_GUI_THREAD(sigc::bind (mem_fun(*this, &Mixer_UI::strip_name_changed), src, mx));
-
- TreeModel::Children rows = track_model->children();
- TreeModel::Children::iterator i;
-@@ -1203,7 +1203,7 @@ Mixer_UI::group_flags_changed (void* src, RouteGroup* group)
- return;
- }
-
-- ENSURE_GUI_THREAD(bind (mem_fun(*this, &Mixer_UI::group_flags_changed), src, group));
-+ ENSURE_GUI_THREAD(sigc::bind (mem_fun(*this, &Mixer_UI::group_flags_changed), src, group));
-
- /* force an update of any mixer strips that are using this group,
- otherwise mix group names don't change in mixer strips
-@@ -1293,7 +1293,7 @@ void
- Mixer_UI::add_mix_group (RouteGroup* group)
-
- {
-- ENSURE_GUI_THREAD(bind (mem_fun(*this, &Mixer_UI::add_mix_group), group));
-+ ENSURE_GUI_THREAD(sigc::bind (mem_fun(*this, &Mixer_UI::add_mix_group), group));
- bool focus = false;
-
- in_group_row_change = true;
-@@ -1320,7 +1320,7 @@ Mixer_UI::add_mix_group (RouteGroup* group)
- focus = true;
- }
-
-- group->FlagsChanged.connect (bind (mem_fun(*this, &Mixer_UI::group_flags_changed), group));
-+ group->FlagsChanged.connect (sigc::bind (mem_fun(*this, &Mixer_UI::group_flags_changed), group));
-
- if (focus) {
- TreeViewColumn* col = group_display.get_column (GROUP_DISPLAY_GROUP_COLUMN);
-diff --git a/gtk2_ardour/option_editor.cc b/gtk2_ardour/option_editor.cc
-index 7b5ecd5..6b66d57 100644
---- a/gtk2_ardour/option_editor.cc
-+++ b/gtk2_ardour/option_editor.cc
-@@ -282,7 +282,7 @@ OptionEditor::setup_misc_options ()
- label->set_name ("OptionsLabel");
-
- dpi_range->set_update_policy (Gtk::UPDATE_DISCONTINUOUS);
-- dpi_adj->signal_value_changed().connect (bind (sigc::ptr_fun (font_scale_changed), dpi_adj));
-+ dpi_adj->signal_value_changed().connect (sigc::bind (sigc::ptr_fun (font_scale_changed), dpi_adj));
-
- hbox = manage (new HBox);
- hbox->set_border_width (5);
-@@ -629,7 +629,7 @@ OptionEditor::redisplay_midi_ports ()
- bb->show ();
- midi_port_table_widgets.push_back (bb);
- midi_port_table.attach (*bb, 9, 10, n+2, n+3, FILL|EXPAND, FILL);
-- bb->signal_clicked().connect (bind (mem_fun(*this, &OptionEditor::remove_midi_port), i->second));
-+ bb->signal_clicked().connect (sigc::bind (mem_fun(*this, &OptionEditor::remove_midi_port), i->second));
- bb->set_sensitive (port_removable (i->second));
-
- label = (manage (new Label (i->first)));
-@@ -652,8 +652,8 @@ OptionEditor::redisplay_midi_ports ()
-
- if (i->second->input()) {
- tb->set_active (!i->second->input()->offline());
-- tb->signal_toggled().connect (bind (mem_fun(*this, &OptionEditor::port_online_toggled), i->second, tb));
-- i->second->input()->OfflineStatusChanged.connect (bind (mem_fun(*this, &OptionEditor::map_port_online), (*i).second, tb));
-+ tb->signal_toggled().connect (sigc::bind (mem_fun(*this, &OptionEditor::port_online_toggled), i->second, tb));
-+ i->second->input()->OfflineStatusChanged.connect (sigc::bind (mem_fun(*this, &OptionEditor::map_port_online), (*i).second, tb));
- }
- tb->show ();
- midi_port_table_widgets.push_back (tb);
-@@ -661,7 +661,7 @@ OptionEditor::redisplay_midi_ports ()
-
- tb = manage (new ToggleButton ());
- tb->set_name ("OptionEditorToggleButton");
-- tb->signal_toggled().connect (bind (mem_fun(*this, &OptionEditor::port_trace_in_toggled), (*i).second, tb));
-+ tb->signal_toggled().connect (sigc::bind (mem_fun(*this, &OptionEditor::port_trace_in_toggled), (*i).second, tb));
- tb->set_size_request (10, 10);
- tb->show ();
- midi_port_table_widgets.push_back (tb);
-@@ -669,7 +669,7 @@ OptionEditor::redisplay_midi_ports ()
-
- tb = manage (new ToggleButton ());
- tb->set_name ("OptionEditorToggleButton");
-- tb->signal_toggled().connect (bind (mem_fun(*this, &OptionEditor::port_trace_out_toggled), (*i).second, tb));
-+ tb->signal_toggled().connect (sigc::bind (mem_fun(*this, &OptionEditor::port_trace_out_toggled), (*i).second, tb));
- tb->set_size_request (10, 10);
- tb->show ();
- midi_port_table_widgets.push_back (tb);
-@@ -686,7 +686,7 @@ OptionEditor::redisplay_midi_ports ()
- rb->show ();
- midi_port_table_widgets.push_back (rb);
- midi_port_table.attach (*rb, 4, 5, n+2, n+3, FILL|EXPAND, FILL);
-- rb->signal_toggled().connect (bind (mem_fun(*this, &OptionEditor::mtc_port_chosen), (*i).second, rb, bb));
-+ rb->signal_toggled().connect (sigc::bind (mem_fun(*this, &OptionEditor::mtc_port_chosen), (*i).second, rb, bb));
-
- if (session && i->second == session->mtc_port()) {
- rb->set_active (true);
-@@ -702,7 +702,7 @@ OptionEditor::redisplay_midi_ports ()
- rb->show ();
- midi_port_table_widgets.push_back (rb);
- midi_port_table.attach (*rb, 6, 7, n+2, n+3, FILL|EXPAND, FILL);
-- rb->signal_toggled().connect (bind (mem_fun(*this, &OptionEditor::mmc_port_chosen), (*i).second, rb, bb));
-+ rb->signal_toggled().connect (sigc::bind (mem_fun(*this, &OptionEditor::mmc_port_chosen), (*i).second, rb, bb));
-
- if (session && i->second == session->mmc_port()) {
- rb->set_active (true);
-@@ -718,7 +718,7 @@ OptionEditor::redisplay_midi_ports ()
- rb->show ();
- midi_port_table_widgets.push_back (rb);
- midi_port_table.attach (*rb, 8, 9, n+2, n+3, FILL|EXPAND, FILL);
-- rb->signal_toggled().connect (bind (mem_fun(*this, &OptionEditor::midi_port_chosen), (*i).second, rb, bb));
-+ rb->signal_toggled().connect (sigc::bind (mem_fun(*this, &OptionEditor::midi_port_chosen), (*i).second, rb, bb));
-
- if (session && i->second == session->midi_port()) {
- rb->set_active (true);
-@@ -1039,8 +1039,8 @@ OptionEditor::setup_click_editor ()
- click_path_entry.signal_activate().connect (mem_fun(*this, &OptionEditor::click_sound_changed));
- click_emphasis_path_entry.signal_activate().connect (mem_fun(*this, &OptionEditor::click_emphasis_sound_changed));
-
-- click_path_entry.signal_focus_out_event().connect (bind (mem_fun(*this, &OptionEditor::focus_out_event_handler), &OptionEditor::click_sound_changed));
-- click_emphasis_path_entry.signal_focus_out_event().connect (bind (mem_fun(*this, &OptionEditor::focus_out_event_handler), &OptionEditor::click_emphasis_sound_changed));
-+ click_path_entry.signal_focus_out_event().connect (sigc::bind (mem_fun(*this, &OptionEditor::focus_out_event_handler), &OptionEditor::click_sound_changed));
-+ click_emphasis_path_entry.signal_focus_out_event().connect (sigc::bind (mem_fun(*this, &OptionEditor::focus_out_event_handler), &OptionEditor::click_emphasis_sound_changed));
-
- click_browse_button.set_name ("EditorGTKButton");
- click_emphasis_browse_button.set_name ("EditorGTKButton");
-@@ -1355,7 +1355,7 @@ OptionEditor::edit_button_changed ()
- void
- OptionEditor::parameter_changed (const char* parameter_name)
- {
-- ENSURE_GUI_THREAD (bind (mem_fun (*this, &OptionEditor::parameter_changed), parameter_name));
-+ ENSURE_GUI_THREAD (sigc::bind (mem_fun (*this, &OptionEditor::parameter_changed), parameter_name));
-
- #define PARAM_IS(x) (!strcmp (parameter_name, (x)))
-
-diff --git a/gtk2_ardour/plugin_ui.cc b/gtk2_ardour/plugin_ui.cc
-index c4c42d9..45f3241 100644
---- a/gtk2_ardour/plugin_ui.cc
-+++ b/gtk2_ardour/plugin_ui.cc
-@@ -127,7 +127,7 @@ PluginUIWindow::PluginUIWindow (Gtk::Window* win, boost::shared_ptr<PluginInsert
- set_name ("PluginEditor");
- add_events (Gdk::KEY_PRESS_MASK|Gdk::KEY_RELEASE_MASK|Gdk::BUTTON_PRESS_MASK|Gdk::BUTTON_RELEASE_MASK);
-
-- signal_delete_event().connect (bind (sigc::ptr_fun (just_hide_it), reinterpret_cast<Window*> (this)), false);
-+ signal_delete_event().connect (sigc::bind (sigc::ptr_fun (just_hide_it), reinterpret_cast<Window*> (this)), false);
- death_connection = insert->GoingAway.connect (mem_fun(*this, &PluginUIWindow::plugin_going_away));
-
- gint h = _pluginui->get_preferred_height ();
-@@ -445,7 +445,7 @@ PlugUIBase::plugin_going_away ()
- void
- PlugUIBase::redirect_active_changed (Redirect* r, void* src)
- {
-- ENSURE_GUI_THREAD(bind (mem_fun(*this, &PlugUIBase::redirect_active_changed), r, src));
-+ ENSURE_GUI_THREAD(sigc::bind (mem_fun(*this, &PlugUIBase::redirect_active_changed), r, src));
- bypass_button.set_active (!r->active());
- }
-
-diff --git a/gtk2_ardour/route_time_axis.cc b/gtk2_ardour/route_time_axis.cc
-index 8ed0f97..8980e88 100644
---- a/gtk2_ardour/route_time_axis.cc
-+++ b/gtk2_ardour/route_time_axis.cc
-@@ -306,13 +306,13 @@ RouteTimeAxisView::edit_click (GdkEventButton *ev)
-
- items.clear ();
- items.push_back (RadioMenuElem (group, _("No group"),
-- bind (mem_fun(*this, &RouteTimeAxisView::set_edit_group_from_menu), (RouteGroup *) 0)));
-+ sigc::bind (mem_fun(*this, &RouteTimeAxisView::set_edit_group_from_menu), (RouteGroup *) 0)));
-
- if (_route->edit_group() == 0) {
- static_cast<RadioMenuItem*>(&items.back())->set_active ();
- }
-
-- _session.foreach_edit_group (bind (mem_fun (*this, &RouteTimeAxisView::add_edit_group_menu_item), &group));
-+ _session.foreach_edit_group (sigc::bind (mem_fun (*this, &RouteTimeAxisView::add_edit_group_menu_item), &group));
- edit_group_menu.popup (ev->button, ev->time);
-
- return FALSE;
-@@ -325,7 +325,7 @@ RouteTimeAxisView::add_edit_group_menu_item (RouteGroup *eg, RadioMenuItem::Grou
-
- MenuList &items = edit_group_menu.items();
-
-- items.push_back (RadioMenuElem (*group, eg->name(), bind (mem_fun(*this, &RouteTimeAxisView::set_edit_group_from_menu), eg)));
-+ items.push_back (RadioMenuElem (*group, eg->name(), sigc::bind (mem_fun(*this, &RouteTimeAxisView::set_edit_group_from_menu), eg)));
- if (_route->edit_group() == eg) {
- static_cast<RadioMenuItem*>(&items.back())->set_active ();
- }
-@@ -468,13 +468,13 @@ RouteTimeAxisView::build_display_menu ()
- RadioMenuItem::Group align_group;
-
- alignment_items.push_back (RadioMenuElem (align_group, _("Align with existing material"),
-- bind (mem_fun(*this, &RouteTimeAxisView::set_align_style), ExistingMaterial)));
-+ sigc::bind (mem_fun(*this, &RouteTimeAxisView::set_align_style), ExistingMaterial)));
- align_existing_item = dynamic_cast<RadioMenuItem*>(&alignment_items.back());
- if (get_diskstream()->alignment_style() == ExistingMaterial)
- align_existing_item->set_active();
-
- alignment_items.push_back (RadioMenuElem (align_group, _("Align with capture time"),
-- bind (mem_fun(*this, &RouteTimeAxisView::set_align_style), CaptureTime)));
-+ sigc::bind (mem_fun(*this, &RouteTimeAxisView::set_align_style), CaptureTime)));
- align_capture_item = dynamic_cast<RadioMenuItem*>(&alignment_items.back());
- if (get_diskstream()->alignment_style() == CaptureTime)
- align_capture_item->set_active();
-@@ -485,10 +485,10 @@ RouteTimeAxisView::build_display_menu ()
-
- RadioMenuItem::Group mode_group;
- items.push_back (RadioMenuElem (mode_group, _("Normal mode"),
-- bind (mem_fun (*this, &RouteTimeAxisView::set_track_mode), ARDOUR::Normal)));
-+ sigc::bind (mem_fun (*this, &RouteTimeAxisView::set_track_mode), ARDOUR::Normal)));
- normal_track_mode_item = dynamic_cast<RadioMenuItem*>(&items.back());
- items.push_back (RadioMenuElem (mode_group, _("Tape mode"),
-- bind (mem_fun (*this, &RouteTimeAxisView::set_track_mode), ARDOUR::Destructive)));
-+ sigc::bind (mem_fun (*this, &RouteTimeAxisView::set_track_mode), ARDOUR::Destructive)));
- destructive_track_mode_item = dynamic_cast<RadioMenuItem*>(&items.back());
-
- switch (track()->mode()) {
-@@ -559,7 +559,7 @@ RouteTimeAxisView::_set_track_mode (boost::shared_ptr<Track> track, TrackMode mo
-
- if (!needs_bounce) {
- /* cannot be done */
-- Glib::signal_idle().connect (bind (sigc::ptr_fun (__reset_item), reset_item));
-+ Glib::signal_idle().connect (sigc::bind (sigc::ptr_fun (__reset_item), reset_item));
- return;
- } else {
- cerr << "would bounce this one\n";
-@@ -1399,7 +1399,7 @@ RouteTimeAxisView::build_playlist_menu (Gtk::Menu * menu)
- playlist_items.push_back (RadioMenuElem (playlist_group, (*i)->name()));
- RadioMenuItem *item = static_cast<RadioMenuItem*>(&playlist_items.back());
-
-- item->signal_toggled().connect(bind (mem_fun (*this, &RouteTimeAxisView::use_playlist), item, boost::weak_ptr<Playlist> (*i)));
-+ item->signal_toggled().connect(sigc::bind (mem_fun (*this, &RouteTimeAxisView::use_playlist), item, boost::weak_ptr<Playlist> (*i)));
-
- if (ds->playlist()->id() == (*i)->id()) {
- item->set_active();
-@@ -1411,16 +1411,16 @@ RouteTimeAxisView::build_playlist_menu (Gtk::Menu * menu)
- playlist_items.push_back (SeparatorElem());
-
- if (!edit_group() || !edit_group()->is_active()) {
-- playlist_items.push_back (MenuElem (_("New"), bind(mem_fun(editor, &PublicEditor::new_playlists), this)));
-- playlist_items.push_back (MenuElem (_("New Copy"), bind(mem_fun(editor, &PublicEditor::copy_playlists), this)));
-+ playlist_items.push_back (MenuElem (_("New"), sigc::bind(mem_fun(editor, &PublicEditor::new_playlists), this)));
-+ playlist_items.push_back (MenuElem (_("New Copy"), sigc::bind(mem_fun(editor, &PublicEditor::copy_playlists), this)));
- } else {
- // Use a label which tells the user what is happening
-- playlist_items.push_back (MenuElem (_("New Take"), bind(mem_fun(editor, &PublicEditor::new_playlists), this)));
-- playlist_items.push_back (MenuElem (_("Copy Take"), bind(mem_fun(editor, &PublicEditor::copy_playlists), this)));
-+ playlist_items.push_back (MenuElem (_("New Take"), sigc::bind(mem_fun(editor, &PublicEditor::new_playlists), this)));
-+ playlist_items.push_back (MenuElem (_("Copy Take"), sigc::bind(mem_fun(editor, &PublicEditor::copy_playlists), this)));
- }
-
- playlist_items.push_back (SeparatorElem());
-- playlist_items.push_back (MenuElem (_("Clear Current"), bind(mem_fun(editor, &PublicEditor::clear_playlists), this)));
-+ playlist_items.push_back (MenuElem (_("Clear Current"), sigc::bind(mem_fun(editor, &PublicEditor::clear_playlists), this)));
- playlist_items.push_back (SeparatorElem());
- playlist_items.push_back (MenuElem(_("Select from all ..."), mem_fun(*this, &RouteTimeAxisView::show_playlist_selector)));
- }
-@@ -1705,7 +1705,7 @@ RouteTimeAxisView::add_redirect_automation_curve (boost::shared_ptr<Redirect> re
-
- ran->view->add_line (*ral);
-
-- ran->view->Hiding.connect (bind (mem_fun(*this, &RouteTimeAxisView::redirect_automation_track_hidden), ran, redirect));
-+ ran->view->Hiding.connect (sigc::bind (mem_fun(*this, &RouteTimeAxisView::redirect_automation_track_hidden), ran, redirect));
-
- if (!ran->view->marked_for_display()) {
- ran->view->hide ();
-@@ -1716,7 +1716,7 @@ RouteTimeAxisView::add_redirect_automation_curve (boost::shared_ptr<Redirect> re
- add_child (ran->view);
-
- if (_view) {
-- _view->foreach_regionview (bind (mem_fun(*this, &RouteTimeAxisView::add_ghost_to_redirect), ran->view));
-+ _view->foreach_regionview (sigc::bind (mem_fun(*this, &RouteTimeAxisView::add_ghost_to_redirect), ran->view));
- }
-
- redirect->mark_automation_visible (what, true);
-@@ -1823,7 +1823,7 @@ RouteTimeAxisView::add_redirect_to_subplugin_menu (boost::shared_ptr<Redirect> r
-
- }
-
-- mitem->signal_toggled().connect (bind (mem_fun(*this, &RouteTimeAxisView::redirect_menu_item_toggled), rai, ran));
-+ mitem->signal_toggled().connect (sigc::bind (mem_fun(*this, &RouteTimeAxisView::redirect_menu_item_toggled), rai, ran));
- }
-
- /* add the menu for this redirect, because the subplugin
-@@ -1978,7 +1978,7 @@ RouteTimeAxisView::clear_meter ()
- void
- RouteTimeAxisView::meter_changed (void *src)
- {
-- ENSURE_GUI_THREAD (bind (mem_fun(*this, &RouteTimeAxisView::meter_changed), src));
-+ ENSURE_GUI_THREAD (sigc::bind (mem_fun(*this, &RouteTimeAxisView::meter_changed), src));
- reset_meter();
- }
-
-diff --git a/gtk2_ardour/time_axis_view_item.cc b/gtk2_ardour/time_axis_view_item.cc
-index b9753f4..83ac972 100644
---- a/gtk2_ardour/time_axis_view_item.cc
-+++ b/gtk2_ardour/time_axis_view_item.cc
-@@ -957,7 +957,7 @@ TimeAxisViewItem::remove_this_item(void* src)
- defer to idle loop, otherwise we'll delete this object
- while we're still inside this function ...
- */
-- Glib::signal_idle().connect(bind (sigc::ptr_fun (&TimeAxisViewItem::idle_remove_this_item), this, src));
-+ Glib::signal_idle().connect(sigc::bind (sigc::ptr_fun (&TimeAxisViewItem::idle_remove_this_item), this, src));
- }
-
- /**
-diff --git a/libs/ardour/automation_event.cc b/libs/ardour/automation_event.cc
-index ed23ad7..0f0606d 100644
---- a/libs/ardour/automation_event.cc
-+++ b/libs/ardour/automation_event.cc
-@@ -663,7 +663,7 @@ AutomationList::move_range (iterator start, iterator end, double xdelta, double
- while (start != end) {
- (*start)->when += xdelta;
- (*start)->value += ydelta;
-- if (isnan ((*start)->value)) {
-+ if (std::isnan ((*start)->value)) {
- abort ();
- }
- ++start;
-@@ -714,7 +714,7 @@ AutomationList::modify (iterator iter, double when, double val)
- (*iter)->when = when;
- (*iter)->value = val;
-
-- if (isnan (val)) {
-+ if (std::isnan (val)) {
- abort ();
- }
-
-diff --git a/libs/ardour/session.cc b/libs/ardour/session.cc
-index 86e07f2..5f5231a 100644
---- a/libs/ardour/session.cc
-+++ b/libs/ardour/session.cc
-@@ -399,14 +399,14 @@ Session::Session (AudioEngine &eng,
- int control_id = 1;
-
- if (control_out_channels) {
-- shared_ptr<Route> r (new Route (*this, _("monitor"), -1, control_out_channels, -1, control_out_channels, Route::ControlOut));
-+ boost::shared_ptr<Route> r (new Route (*this, _("monitor"), -1, control_out_channels, -1, control_out_channels, Route::ControlOut));
- r->set_remote_control_id (control_id++);
-
- rl.push_back (r);
- }
-
- if (master_out_channels) {
-- shared_ptr<Route> r (new Route (*this, _("master"), -1, master_out_channels, -1, master_out_channels, Route::MasterOut));
-+ boost::shared_ptr<Route> r (new Route (*this, _("master"), -1, master_out_channels, -1, master_out_channels, Route::MasterOut));
- r->set_remote_control_id (control_id);
-
- rl.push_back (r);
-@@ -984,8 +984,8 @@ Session::hookup_io ()
- boost::shared_ptr<Session::RouteList>
- Session::get_routes_with_regions_at (nframes64_t const p) const
- {
-- shared_ptr<RouteList> r = routes.reader ();
-- shared_ptr<RouteList> rl (new RouteList);
-+ boost::shared_ptr<RouteList> r = routes.reader ();
-+ boost::shared_ptr<RouteList> rl (new RouteList);
-
- for (RouteList::iterator i = r->begin(); i != r->end(); ++i) {
- boost::shared_ptr<Track> tr = boost::dynamic_pointer_cast<Track> (*i);
-@@ -1590,9 +1590,9 @@ struct RouteSorter {
- };
-
- static void
--trace_terminal (shared_ptr<Route> r1, shared_ptr<Route> rbase)
-+trace_terminal (boost::shared_ptr<Route> r1, boost::shared_ptr<Route> rbase)
- {
-- shared_ptr<Route> r2;
-+ boost::shared_ptr<Route> r2;
-
- if ((r1->fed_by.find (rbase) != r1->fed_by.end()) && (rbase->fed_by.find (r1) != rbase->fed_by.end())) {
- info << string_compose(_("feedback loop setup between %1 and %2"), r1->name(), rbase->name()) << endmsg;
-@@ -1601,13 +1601,13 @@ trace_terminal (shared_ptr<Route> r1, shared_ptr<Route> rbase)
-
- /* make a copy of the existing list of routes that feed r1 */
-
-- set<shared_ptr<Route> > existing = r1->fed_by;
-+ set<boost::shared_ptr<Route> > existing = r1->fed_by;
-
- /* for each route that feeds r1, recurse, marking it as feeding
- rbase as well.
- */
-
-- for (set<shared_ptr<Route> >::iterator i = existing.begin(); i != existing.end(); ++i) {
-+ for (set<boost::shared_ptr<Route> >::iterator i = existing.begin(); i != existing.end(); ++i) {
- r2 =* i;
-
- /* r2 is a route that feeds r1 which somehow feeds base. mark
-@@ -1651,14 +1651,14 @@ Session::resort_routes ()
- {
-
- RCUWriter<RouteList> writer (routes);
-- shared_ptr<RouteList> r = writer.get_copy ();
-+ boost::shared_ptr<RouteList> r = writer.get_copy ();
- resort_routes_using (r);
- /* writer goes out of scope and forces update */
- }
- }
-
- void
--Session::resort_routes_using (shared_ptr<RouteList> r)
-+Session::resort_routes_using (boost::shared_ptr<RouteList> r)
- {
- RouteList::iterator i, j;
-
-@@ -1723,7 +1723,7 @@ Session::new_audio_track (int input_channels, int output_channels, TrackMode mod
- /* count existing audio tracks */
-
- {
-- shared_ptr<RouteList> r = routes.reader ();
-+ boost::shared_ptr<RouteList> r = routes.reader ();
-
- for (RouteList::iterator i = r->begin(); i != r->end(); ++i) {
- if (dynamic_cast<AudioTrack*>((*i).get()) != 0) {
-@@ -1776,7 +1776,7 @@ Session::new_audio_track (int input_channels, int output_channels, TrackMode mod
- nphysical_out = 0;
- }
-
-- shared_ptr<AudioTrack> track;
-+ boost::shared_ptr<AudioTrack> track;
-
- try {
- track = boost::shared_ptr<AudioTrack>((new AudioTrack (*this, track_name, Route::Flag (0), mode)));
-@@ -1884,7 +1884,7 @@ Session::set_remote_control_ids ()
- {
- RemoteModel m = Config->get_remote_model();
-
-- shared_ptr<RouteList> r = routes.reader ();
-+ boost::shared_ptr<RouteList> r = routes.reader ();
-
- for (RouteList::iterator i = r->begin(); i != r->end(); ++i) {
- if ( MixerOrdered == m) {
-@@ -1913,7 +1913,7 @@ Session::new_audio_route (int input_channels, int output_channels, uint32_t how_
- /* count existing audio busses */
-
- {
-- shared_ptr<RouteList> r = routes.reader ();
-+ boost::shared_ptr<RouteList> r = routes.reader ();
-
- for (RouteList::iterator i = r->begin(); i != r->end(); ++i) {
- if (dynamic_cast<AudioTrack*>((*i).get()) == 0) {
-@@ -1945,7 +1945,7 @@ Session::new_audio_route (int input_channels, int output_channels, uint32_t how_
- } while (bus_id < (UINT_MAX-1));
-
- try {
-- shared_ptr<Route> bus (new Route (*this, bus_name, -1, -1, -1, -1, Route::Flag(0), DataType::AUDIO));
-+ boost::shared_ptr<Route> bus (new Route (*this, bus_name, -1, -1, -1, -1, Route::Flag(0), DataType::AUDIO));
-
- if (bus->ensure_io (input_channels, output_channels, false, this)) {
- error << string_compose (_("cannot configure %1 in/%2 out configuration for new audio track"),
-@@ -2060,7 +2060,7 @@ Session::new_route_from_template (uint32_t how_many, const std::string& template
- Track::zero_diskstream_id_in_xml (node_copy);
-
- try {
-- shared_ptr<Route> route (XMLRouteFactory (node_copy));
-+ boost::shared_ptr<Route> route (XMLRouteFactory (node_copy));
-
- if (route == 0) {
- error << _("Session: cannot create track/bus from template description") << endmsg;
-@@ -2107,7 +2107,7 @@ boost::shared_ptr<Route>
- Session::new_video_track (string name)
- {
- uint32_t control_id = ntracks() + nbusses() + 1;
-- shared_ptr<Route> new_route (
-+ boost::shared_ptr<Route> new_route (
- new Route ( *this, name, -1, -1, -1, -1, Route::Flag(0), ARDOUR::DataType::NIL));
- new_route->set_remote_control_id (control_id);
-
-@@ -2115,7 +2115,7 @@ Session::new_video_track (string name)
- rl.push_back (new_route);
- {
- RCUWriter<RouteList> writer (routes);
-- shared_ptr<RouteList> r = writer.get_copy ();
-+ boost::shared_ptr<RouteList> r = writer.get_copy ();
- r->insert (r->end(), rl.begin(), rl.end());
- resort_routes_using (r);
- }
-@@ -2127,7 +2127,7 @@ Session::add_routes (RouteList& new_routes, bool save)
- {
- {
- RCUWriter<RouteList> writer (routes);
-- shared_ptr<RouteList> r = writer.get_copy ();
-+ boost::shared_ptr<RouteList> r = writer.get_copy ();
- r->insert (r->end(), new_routes.begin(), new_routes.end());
- resort_routes_using (r);
- }
-@@ -2198,14 +2198,14 @@ Session::add_diskstream (boost::shared_ptr<Diskstream> dstream)
- }
-
- void
--Session::remove_route (shared_ptr<Route> route)
-+Session::remove_route (boost::shared_ptr<Route> route)
- {
- //clear solos before removing the route
- route->set_solo ( false, this);
-
- {
- RCUWriter<RouteList> writer (routes);
-- shared_ptr<RouteList> rs = writer.get_copy ();
-+ boost::shared_ptr<RouteList> rs = writer.get_copy ();
-
- rs->remove (route);
-
-@@ -2215,11 +2215,11 @@ Session::remove_route (shared_ptr<Route> route)
- */
-
- if (route == _master_out) {
-- _master_out = shared_ptr<Route> ();
-+ _master_out = boost::shared_ptr<Route> ();
- }
-
- if (route == _control_out) {
-- _control_out = shared_ptr<Route> ();
-+ _control_out = boost::shared_ptr<Route> ();
-
- /* cancel control outs for all routes */
-
-@@ -2308,7 +2308,7 @@ Session::route_solo_changed (void* src, boost::weak_ptr<Route> wpr)
-
- is_track = (boost::dynamic_pointer_cast<AudioTrack>(route) != 0);
-
-- shared_ptr<RouteList> r = routes.reader ();
-+ boost::shared_ptr<RouteList> r = routes.reader ();
-
- for (RouteList::iterator i = r->begin(); i != r->end(); ++i) {
-
-@@ -2404,7 +2404,7 @@ Session::update_route_solo_state ()
- the solo mute setting of each track.
- */
-
-- shared_ptr<RouteList> r = routes.reader ();
-+ boost::shared_ptr<RouteList> r = routes.reader ();
-
- for (RouteList::iterator i = r->begin(); i != r->end(); ++i) {
- if ((*i)->soloed()) {
-@@ -2446,7 +2446,7 @@ Session::update_route_solo_state ()
- void
- Session::modify_solo_mute (bool is_track, bool mute)
- {
-- shared_ptr<RouteList> r = routes.reader ();
-+ boost::shared_ptr<RouteList> r = routes.reader ();
-
- for (RouteList::iterator i = r->begin(); i != r->end(); ++i) {
-
-@@ -2511,7 +2511,7 @@ Session::catch_up_on_solo_mute_override ()
- /* this is called whenever the param solo-mute-override is
- changed.
- */
-- shared_ptr<RouteList> r = routes.reader ();
-+ boost::shared_ptr<RouteList> r = routes.reader ();
-
- for (RouteList::iterator i = r->begin(); i != r->end(); ++i) {
- (*i)->catch_up_on_solo_mute_override ();
-@@ -2521,7 +2521,7 @@ Session::catch_up_on_solo_mute_override ()
- bool
- Session::io_name_is_legal (const std::string& name)
- {
-- shared_ptr<RouteList> r = routes.reader ();
-+ boost::shared_ptr<RouteList> r = routes.reader ();
-
- for (RouteList::iterator i = r->begin(); i != r->end(); ++i) {
- if ((*i)->name() == name) {
-@@ -2536,10 +2536,10 @@ Session::io_name_is_legal (const std::string& name)
- return true;
- }
-
--shared_ptr<Route>
-+boost::shared_ptr<Route>
- Session::route_by_name (const std::string& name)
- {
-- shared_ptr<RouteList> r = routes.reader ();
-+ boost::shared_ptr<RouteList> r = routes.reader ();
-
- for (RouteList::iterator i = r->begin(); i != r->end(); ++i) {
- if ((*i)->name() == name) {
-@@ -2547,13 +2547,13 @@ Session::route_by_name (const std::string& name)
- }
- }
-
-- return shared_ptr<Route> ((Route*) 0);
-+ return boost::shared_ptr<Route> ((Route*) 0);
- }
-
--shared_ptr<Route>
-+boost::shared_ptr<Route>
- Session::route_by_id (PBD::ID id)
- {
-- shared_ptr<RouteList> r = routes.reader ();
-+ boost::shared_ptr<RouteList> r = routes.reader ();
-
- for (RouteList::iterator i = r->begin(); i != r->end(); ++i) {
- if ((*i)->id() == id) {
-@@ -2561,13 +2561,13 @@ Session::route_by_id (PBD::ID id)
- }
- }
-
-- return shared_ptr<Route> ((Route*) 0);
-+ return boost::shared_ptr<Route> ((Route*) 0);
- }
-
--shared_ptr<Route>
-+boost::shared_ptr<Route>
- Session::route_by_remote_id (uint32_t id)
- {
-- shared_ptr<RouteList> r = routes.reader ();
-+ boost::shared_ptr<RouteList> r = routes.reader ();
-
- for (RouteList::iterator i = r->begin(); i != r->end(); ++i) {
- if ((*i)->remote_control_id() == id) {
-@@ -2575,7 +2575,7 @@ Session::route_by_remote_id (uint32_t id)
- }
- }
-
-- return shared_ptr<Route> ((Route*) 0);
-+ return boost::shared_ptr<Route> ((Route*) 0);
- }
-
- void
-@@ -3595,7 +3595,7 @@ Session::is_auditioning () const
- void
- Session::set_all_solo (bool yn)
- {
-- shared_ptr<RouteList> r = routes.reader ();
-+ boost::shared_ptr<RouteList> r = routes.reader ();
-
- for (RouteList::iterator i = r->begin(); i != r->end(); ++i) {
- if (!(*i)->hidden()) {
-@@ -3609,7 +3609,7 @@ Session::set_all_solo (bool yn)
- void
- Session::set_all_mute (bool yn)
- {
-- shared_ptr<RouteList> r = routes.reader ();
-+ boost::shared_ptr<RouteList> r = routes.reader ();
-
- for (RouteList::iterator i = r->begin(); i != r->end(); ++i) {
- if (!(*i)->hidden()) {
-@@ -3680,7 +3680,7 @@ Session::record_enable_all ()
- void
- Session::record_enable_change_all (bool yn)
- {
-- shared_ptr<RouteList> r = routes.reader ();
-+ boost::shared_ptr<RouteList> r = routes.reader ();
-
- for (RouteList::iterator i = r->begin(); i != r->end(); ++i) {
- AudioTrack* at;
-@@ -4071,7 +4071,7 @@ Session::reset_native_file_format ()
- bool
- Session::route_name_unique (string n) const
- {
-- shared_ptr<RouteList> r = routes.reader ();
-+ boost::shared_ptr<RouteList> r = routes.reader ();
-
- for (RouteList::const_iterator i = r->begin(); i != r->end(); ++i) {
- if ((*i)->name() == n) {
-@@ -4117,7 +4117,7 @@ Session::allocate_pan_automation_buffers (nframes_t nframes, uint32_t howmany, b
- int
- Session::freeze (InterThreadInfo& itt)
- {
-- shared_ptr<RouteList> r = routes.reader ();
-+ boost::shared_ptr<RouteList> r = routes.reader ();
-
- for (RouteList::iterator i = r->begin(); i != r->end(); ++i) {
-
-@@ -4355,7 +4355,7 @@ uint32_t
- Session::ntracks () const
- {
- uint32_t n = 0;
-- shared_ptr<RouteList> r = routes.reader ();
-+ boost::shared_ptr<RouteList> r = routes.reader ();
-
- for (RouteList::const_iterator i = r->begin(); i != r->end(); ++i) {
- if (dynamic_cast<AudioTrack*> ((*i).get())) {
-@@ -4370,7 +4370,7 @@ uint32_t
- Session::nbusses () const
- {
- uint32_t n = 0;
-- shared_ptr<RouteList> r = routes.reader ();
-+ boost::shared_ptr<RouteList> r = routes.reader ();
-
- for (RouteList::const_iterator i = r->begin(); i != r->end(); ++i) {
- if (dynamic_cast<AudioTrack*> ((*i).get()) == 0) {
-diff --git a/libs/gtkmm2ext/gtk_ui.cc b/libs/gtkmm2ext/gtk_ui.cc
-index 291740c..48a03c5 100644
---- a/libs/gtkmm2ext/gtk_ui.cc
-+++ b/libs/gtkmm2ext/gtk_ui.cc
-@@ -100,7 +100,7 @@ UI::UI (string namestr, int *argc, char ***argv)
- errors->set_title (title.get_string());
-
- errors->dismiss_button().set_name ("ErrorLogCloseButton");
-- errors->signal_delete_event().connect (bind (sigc::ptr_fun (just_hide_it), (Window *) errors));
-+ errors->signal_delete_event().connect (sigc::bind (sigc::ptr_fun (just_hide_it), (Window *) errors));
- errors->set_type_hint (Gdk::WINDOW_TYPE_HINT_UTILITY);
-
- register_thread (pthread_self(), X_("GUI"));
-@@ -624,8 +624,8 @@ UI::get_color (const string& prompt, bool& picked, const Gdk::Color* initial)
- ColorSelectionDialog color_dialog (prompt);
-
- color_dialog.set_modal (true);
-- color_dialog.get_cancel_button()->signal_clicked().connect (bind (mem_fun (*this, &UI::color_selection_done), false));
-- color_dialog.get_ok_button()->signal_clicked().connect (bind (mem_fun (*this, &UI::color_selection_done), true));
-+ color_dialog.get_cancel_button()->signal_clicked().connect (sigc::bind (mem_fun (*this, &UI::color_selection_done), false));
-+ color_dialog.get_ok_button()->signal_clicked().connect (sigc::bind (mem_fun (*this, &UI::color_selection_done), true));
- color_dialog.signal_delete_event().connect (mem_fun (*this, &UI::color_selection_deleted));
-
- if (initial) {
-diff --git a/libs/surfaces/mackie/mackie_control_protocol.cc b/libs/surfaces/mackie/mackie_control_protocol.cc
-index 7cb017f..62eac81 100644
---- a/libs/surfaces/mackie/mackie_control_protocol.cc
-+++ b/libs/surfaces/mackie/mackie_control_protocol.cc
-@@ -200,7 +200,7 @@ MackieControlProtocol::port_for_id( uint32_t index )
- // predicate for sort call in get_sorted_routes
- struct RouteByRemoteId
- {
-- bool operator () ( const shared_ptr<Route> & a, const shared_ptr<Route> & b ) const {
-+ bool operator () ( const boost::shared_ptr<Route> & a, const boost::shared_ptr<Route> & b ) const {
- return a->remote_control_id() < b->remote_control_id();
- }
-
-@@ -680,7 +680,7 @@ MackieControlProtocol::create_ports()
- }
- }
-
--shared_ptr<Route>
-+boost::shared_ptr<Route>
- MackieControlProtocol::master_route()
- {
- boost::shared_ptr<IO> mo = session->master_out ();
-diff --git a/libs/surfaces/mackie/mackie_jog_wheel.cc b/libs/surfaces/mackie/mackie_jog_wheel.cc
-index d05eb23..b4372cf 100644
---- a/libs/surfaces/mackie/mackie_jog_wheel.cc
-+++ b/libs/surfaces/mackie/mackie_jog_wheel.cc
-@@ -10,7 +10,6 @@
- #include <algorithm>
-
- using namespace Mackie;
--using std::isnan;
-
- JogWheel::JogWheel( MackieControlProtocol & mcp )
- : _mcp( mcp )
-@@ -68,7 +67,7 @@ void JogWheel::jog_event( SurfacePort & port, Control & control, const ControlSt
- _transport_speed += _mcp.surface().scaled_delta( state, _mcp.get_session().transport_speed() );
-
- // make sure no weirdness gets to the session
-- if ( _transport_speed < 0 || isnan( _transport_speed ) )
-+ if ( _transport_speed < 0 || std::isnan( _transport_speed ) )
- {
- _transport_speed = 0.0;
- }
---
-2.6.3
-
diff --git a/ardour-2.8.16-c++11-xpm.patch b/ardour-2.8.16-c++11-xpm.patch
deleted file mode 100644
index 10345fd..0000000
--- a/ardour-2.8.16-c++11-xpm.patch
+++ /dev/null
@@ -1,216 +0,0 @@
-From d82af19ee11b6d0b240d89da276824ef4077bbff Mon Sep 17 00:00:00 2001
-From: Nils Philippsen <nils(a)tiptoe.de>
-Date: Fri, 27 Nov 2015 14:56:45 +0100
-Subject: [PATCH] C++11: use explicit unsigned types for XPM data...
-
-...then cast back to 'const char *' for libgdkmm's Bitmap::create()
----
- gtk2_ardour/editor.cc | 14 +++++++-------
- gtk2_ardour/editor_tempodisplay.cc | 10 +++++-----
- gtk2_ardour/editor_xpms | 24 ++++++++++++------------
- 3 files changed, 24 insertions(+), 24 deletions(-)
-
-diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc
-index d2bd781..c3122a9 100644
---- a/gtk2_ardour/editor.cc
-+++ b/gtk2_ardour/editor.cc
-@@ -1388,8 +1388,8 @@ Editor::build_cursors ()
-
- {
- RefPtr<Bitmap> source, mask;
-- source = Bitmap::create (mag_bits, mag_width, mag_height);
-- mask = Bitmap::create (magmask_bits, mag_width, mag_height);
-+ source = Bitmap::create ((const char *)mag_bits, mag_width, mag_height);
-+ mask = Bitmap::create ((const char *)magmask_bits, mag_width, mag_height);
- zoom_cursor = new Gdk::Cursor (source, mask, mfg, mbg, mag_x_hot, mag_y_hot);
- }
-
-@@ -1399,22 +1399,22 @@ Editor::build_cursors ()
- {
- RefPtr<Bitmap> source, mask;
-
-- source = Bitmap::create (fader_cursor_bits, fader_cursor_width, fader_cursor_height);
-- mask = Bitmap::create (fader_cursor_mask_bits, fader_cursor_width, fader_cursor_height);
-+ source = Bitmap::create ((const char *)fader_cursor_bits, fader_cursor_width, fader_cursor_height);
-+ mask = Bitmap::create ((const char *)fader_cursor_mask_bits, fader_cursor_width, fader_cursor_height);
- fader_cursor = new Gdk::Cursor (source, mask, ffg, fbg, fader_cursor_x_hot, fader_cursor_y_hot);
- }
-
- {
- RefPtr<Bitmap> source, mask;
-- source = Bitmap::create (speaker_cursor_bits, speaker_cursor_width, speaker_cursor_height);
-- mask = Bitmap::create (speaker_cursor_mask_bits, speaker_cursor_width, speaker_cursor_height);
-+ source = Bitmap::create ((const char *)speaker_cursor_bits, speaker_cursor_width, speaker_cursor_height);
-+ mask = Bitmap::create ((const char *)speaker_cursor_mask_bits, speaker_cursor_width, speaker_cursor_height);
- speaker_cursor = new Gdk::Cursor (source, mask, ffg, fbg, speaker_cursor_x_hot, speaker_cursor_y_hot);
- }
-
- {
- RefPtr<Bitmap> bits;
- char pix[4] = { 0, 0, 0, 0 };
-- bits = Bitmap::create (pix, 2, 2);
-+ bits = Bitmap::create ((const char *)pix, 2, 2);
- Gdk::Color c;
- transparent_cursor = new Gdk::Cursor (bits, bits, c, c, 0, 0);
- }
-diff --git a/gtk2_ardour/editor_tempodisplay.cc b/gtk2_ardour/editor_tempodisplay.cc
-index d30981b..95a64a9 100644
---- a/gtk2_ardour/editor_tempodisplay.cc
-+++ b/gtk2_ardour/editor_tempodisplay.cc
-@@ -101,7 +101,7 @@ Editor::tempo_map_changed (Change ignored)
- return;
- }
-
-- ENSURE_GUI_THREAD(bind (mem_fun (*this, &Editor::tempo_map_changed), ignored));
-+ ENSURE_GUI_THREAD(sigc::bind (mem_fun (*this, &Editor::tempo_map_changed), ignored));
-
- if (tempo_lines) {
- tempo_lines->tempo_map_changed();
-@@ -215,7 +215,7 @@ Editor::mouse_add_new_tempo_event (nframes64_t frame)
-
- tempo_dialog.set_position (Gtk::WIN_POS_MOUSE);
- //this causes compiz to display no border.
-- //tempo_dialog.signal_realize().connect (bind (sigc::ptr_fun (set_decoration), &tempo_dialog, Gdk::WMDecoration (Gdk::DECOR_BORDER|Gdk::DECOR_RESIZEH)));
-+ //tempo_dialog.signal_realize().connect (sigc::bind (sigc::ptr_fun (set_decoration), &tempo_dialog, Gdk::WMDecoration (Gdk::DECOR_BORDER|Gdk::DECOR_RESIZEH)));
-
- ensure_float (tempo_dialog);
-
-@@ -259,7 +259,7 @@ Editor::mouse_add_new_meter_event (nframes64_t frame)
- meter_dialog.set_position (Gtk::WIN_POS_MOUSE);
-
- //this causes compiz to display no border..
-- //meter_dialog.signal_realize().connect (bind (sigc::ptr_fun (set_decoration), &meter_dialog, Gdk::WMDecoration (Gdk::DECOR_BORDER|Gdk::DECOR_RESIZEH)));
-+ //meter_dialog.signal_realize().connect (sigc::bind (sigc::ptr_fun (set_decoration), &meter_dialog, Gdk::WMDecoration (Gdk::DECOR_BORDER|Gdk::DECOR_RESIZEH)));
-
- ensure_float (meter_dialog);
-
-@@ -304,7 +304,7 @@ Editor::remove_tempo_marker (ArdourCanvas::Item* item)
- }
-
- if (tempo_marker->tempo().movable()) {
-- Glib::signal_idle().connect (bind (mem_fun(*this, &Editor::real_remove_tempo_marker), &tempo_marker->tempo()));
-+ Glib::signal_idle().connect (sigc::bind (mem_fun(*this, &Editor::real_remove_tempo_marker), &tempo_marker->tempo()));
- }
- }
-
-@@ -440,7 +440,7 @@ Editor::remove_meter_marker (ArdourCanvas::Item* item)
- }
-
- if (meter_marker->meter().movable()) {
-- Glib::signal_idle().connect (bind (mem_fun(*this, &Editor::real_remove_meter_marker), &meter_marker->meter()));
-+ Glib::signal_idle().connect (sigc::bind (mem_fun(*this, &Editor::real_remove_meter_marker), &meter_marker->meter()));
- }
- }
-
-diff --git a/gtk2_ardour/editor_xpms b/gtk2_ardour/editor_xpms
-index 95a51a8..deea1fb 100644
---- a/gtk2_ardour/editor_xpms
-+++ b/gtk2_ardour/editor_xpms
-@@ -3,12 +3,12 @@
- #define mag_height 16
- #define mag_x_hot 9
- #define mag_y_hot 5
--static const gchar mag_bits[] = {
-+static const guchar mag_bits[] = {
- 0x7f, 0xe0, 0x3f, 0xc0, 0x1f, 0x8f, 0x8f, 0x9f, 0xcf, 0x3f, 0xcf, 0x3f,
- 0xcf, 0x3f, 0xcf, 0x3f, 0x8f, 0x1f, 0x1f, 0x8f, 0x0f, 0xc0, 0x47, 0xe0,
- 0xe3, 0xff, 0xf1, 0xff, 0xf8, 0xff, 0xfc, 0xff };
-
--static const gchar magmask_bits[] = {
-+static const guchar magmask_bits[] = {
- 0x80, 0x1f, 0xc0, 0x3f, 0xe0, 0x70, 0x70, 0x66, 0x30, 0xc6, 0xb0, 0xdf,
- 0xb0, 0xdf, 0x30, 0xc6, 0x70, 0xe6, 0xe0, 0x70, 0xf0, 0x3f, 0xb8, 0x1f,
- 0x1c, 0x00, 0x0e, 0x00, 0x07, 0x00, 0x03, 0x00 };
-@@ -18,7 +18,7 @@ static const gchar magmask_bits[] = {
- #define fader_cursor_height 25
- #define fader_cursor_x_hot 3
- #define fader_cursor_y_hot 21
--static const gchar fader_cursor_bits[] = {
-+static const guchar fader_cursor_bits[] = {
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x30, 0x00, 0x00, 0x00, 0x30, 0x00,
- 0x00, 0x00, 0x30, 0x00, 0x00, 0x00, 0xfe, 0x01, 0x00, 0x00, 0x02, 0x01,
- 0x00, 0x00, 0x02, 0x01, 0x00, 0x00, 0x02, 0x01, 0x00, 0x00, 0x02, 0x01,
-@@ -30,7 +30,7 @@ static const gchar fader_cursor_bits[] = {
- 0x00, 0x00, 0x00, 0x00 };
-
- /* Created with The GIMP */
--static const gchar fader_cursor_mask_bits[] = {
-+static const guchar fader_cursor_mask_bits[] = {
- 0x00, 0x00, 0x30, 0x00, 0x00, 0x00, 0x78, 0x00, 0x00, 0x00, 0x78, 0x00,
- 0x00, 0x00, 0x78, 0x00, 0x00, 0x00, 0xfe, 0x01, 0x00, 0x00, 0xfe, 0x01,
- 0x00, 0x00, 0xfe, 0x01, 0x00, 0x00, 0xfe, 0x01, 0x00, 0x00, 0xfe, 0x01,
-@@ -46,7 +46,7 @@ static const gchar fader_cursor_mask_bits[] = {
- #define speaker_cursor_height 26
- #define speaker_cursor_x_hot 0
- #define speaker_cursor_y_hot 0
--static const gchar speaker_cursor_bits[] = {
-+static const guchar speaker_cursor_bits[] = {
- 0x00, 0xc0, 0x00, 0xc0, 0x00, 0xf0, 0x00, 0xf0, 0x00, 0xcc, 0x00, 0xcc,
- 0xff, 0xc3, 0xff, 0xc3, 0x03, 0xc0, 0x03, 0xc0, 0xc3, 0xc0, 0xc3, 0xc0,
- 0xc3, 0xc0, 0xc3, 0xc0, 0xc3, 0xc0, 0xc3, 0xc0, 0x03, 0xc0, 0x03, 0xc0,
-@@ -57,7 +57,7 @@ static const gchar speaker_cursor_bits[] = {
- #define speaker_cursor_mask_height 26
- #define speaker_cursor_mask_x_hot 0
- #define speaker_cursor_mask_y_hot 0
--static const gchar speaker_cursor_mask_bits[] = {
-+static const guchar speaker_cursor_mask_bits[] = {
- 0x00, 0xc0, 0x00, 0xc0, 0x00, 0xf0, 0x00, 0xf0, 0x00, 0xfc, 0x00, 0xfc,
- 0xff, 0xff, 0xff, 0xff, 0x3f, 0xff, 0x3f, 0xff, 0xff, 0xff, 0xff, 0xff,
- 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x3f, 0xff, 0x3f, 0xff,
-@@ -68,7 +68,7 @@ static const gchar speaker_cursor_mask_bits[] = {
- #define cursor_audition_height 16
- #define cursor_audition_x_hot 0
- #define cursor_audition_y_hot 7
--static const short cursor_audition_bits[] = {
-+static const unsigned short cursor_audition_bits[] = {
- 0x1000, 0x1800, 0x1400, 0x1200, 0x11f0, 0x1110, 0x111f, 0x1111, 0x1112,
- 0x111e, 0x1110, 0x11f0, 0x1200, 0x1400, 0x1800, 0x1000 };
-
-@@ -76,7 +76,7 @@ static const short cursor_audition_bits[] = {
- #define cursor_audition_mask_height 16
- #define cursor_audition_mask_x_hot 0
- #define cursor_audition_mask_y_hot 7
--static const short cursor_audition_mask_bits[] = {
-+static const unsigned short cursor_audition_mask_bits[] = {
- 0x1000, 0x1800, 0x1c00, 0x1e00, 0x1ff0, 0x1ff0, 0x1fff, 0x1fff, 0x1ffe,
- 0x1ffe, 0x1ff0, 0x1ff0, 0x1e00, 0x1c00, 0x1800, 0x1000 };
-
-@@ -84,7 +84,7 @@ static const short cursor_audition_mask_bits[] = {
- #define cursor_timestretch_height 16
- #define cursor_timestretch_x_hot 7
- #define cursor_timestretch_y_hot 8
--static const short cursor_timestretch_bits[] = {
-+static const unsigned short cursor_timestretch_bits[] = {
- 0x01c0, 0x0140, 0x0140, 0x0140, 0x0540, 0x0d40, 0x1548, 0x274c, 0x417e,
- 0x274c, 0x1548, 0x0d40, 0x0540, 0x0140, 0x0140, 0x01c0 };
-
-@@ -92,7 +92,7 @@ static const short cursor_timestretch_bits[] = {
- #define cursor_timestretch_mask_height 16
- #define cursor_timestretch_mask_x_hot 7
- #define cursor_timestretch_mask_y_hot 8
--static const short cursor_timestretch_mask_bits[] = {
-+static const unsigned short cursor_timestretch_mask_bits[] = {
- 0x01c0, 0x01c0, 0x01c0, 0x01c0, 0x05d0, 0x0dd8, 0x1ddc, 0x3ffe, 0x7fff,
- 0x3ffe, 0x1ddc, 0x0dd8, 0x05d0, 0x01c0, 0x01c0, 0x01c0 };
-
-@@ -100,7 +100,7 @@ static const short cursor_timestretch_mask_bits[] = {
- #define cursor_zoom_height 16
- #define cursor_zoom_x_hot 6
- #define cursor_zoom_y_hot 6
--static const short cursor_zoom_bits[] = {
-+static const unsigned short cursor_zoom_bits[] = {
- 0x00e0, 0x0000, 0x03b8, 0x0000, 0x0604, 0x0000, 0x0806, 0x0000, 0x0842,
- 0x0000, 0x1843, 0x0000, 0x11f1, 0x0000, 0x1843, 0x0000, 0x0842, 0x0000,
- 0x1806, 0x0000, 0x2604, 0x0000, 0x4758, 0x0000, 0x88e0, 0x0000, 0x1000,
-@@ -110,7 +110,7 @@ static const short cursor_zoom_bits[] = {
- #define cursor_zoom_mask_height 16
- #define cursor_zoom_mask_x_hot 6
- #define cursor_zoom_mask_y_hot 6
--static const short cursor_zoom_mask_bits[] = {
-+static const unsigned short cursor_zoom_mask_bits[] = {
- 0x00e0, 0x0000, 0x03f8, 0x0000, 0x07fc, 0x0000, 0x0ffe, 0x0000, 0x0ffe,
- 0x0000, 0x1fff, 0x0000, 0x1fff, 0x0000, 0x1fff, 0x0000, 0x0ffe, 0x0000,
- 0x1ffe, 0x0000, 0x3ffc, 0x0000, 0x7ff8, 0x0000, 0xf8e0, 0x0000, 0xf000,
---
-2.6.3
-
diff --git a/ardour-2.8.16-free-dmalloc.patch b/ardour-2.8.16-free-dmalloc.patch
deleted file mode 100644
index 763d184..0000000
--- a/ardour-2.8.16-free-dmalloc.patch
+++ /dev/null
@@ -1,112 +0,0 @@
-diff -up ardour-2.8.16/libs/pbd/dmalloc.cc.old ardour-2.8.16/libs/pbd/dmalloc.cc
---- ardour-2.8.16/libs/pbd/dmalloc.cc.old 2009-02-24 06:38:16.000000000 -0600
-+++ ardour-2.8.16/libs/pbd/dmalloc.cc 2016-03-08 23:26:11.192874608 -0600
-@@ -1,27 +1,24 @@
- /*
-- * file that facilitates C++ program debugging.
-+ * File that facilitates C++ program debugging.
- *
-- * Copyright 1995 by Gray Watson
-+ * Copyright 2000 by Gray Watson
- *
- * This file is part of the dmalloc package.
- *
-- * Permission to use, copy, modify, and distribute this software for any
-- * NON-COMMERCIAL purpose and without fee is hereby granted, provided
-- * that the above copyright notice and this permission notice appear
-- * in all copies, and that the name of Gray Watson not be used in
-- * advertising or publicity pertaining to distribution of the document
-- * or software without specific, written prior permission.
-- *
-- * Please see the PERMISSIONS file or contact the author for information
-- * about commercial licenses.
-+ * Permission to use, copy, modify, and distribute this software for
-+ * any purpose and without fee is hereby granted, provided that the
-+ * above copyright notice and this permission notice appear in all
-+ * copies, and that the name of Gray Watson not be used in advertising
-+ * or publicity pertaining to distribution of the document or software
-+ * without specific, written prior permission.
- *
- * Gray Watson makes no representations about the suitability of the
- * software described herein for any purpose. It is provided "as is"
- * without express or implied warranty.
- *
-- * The author may be contacted via http://www.letters.com/~gray/
-+ * The author may be contacted via http://dmalloc.com/
- *
-- * $Id: dmalloc.cc 4 2005-05-13 20:47:18Z taybin $
-+ * $Id: dmallocc.cc,v 1.3 2003/05/15 20:08:46 gray Exp $
- */
-
- /*
-@@ -37,11 +34,14 @@
- */
-
- #ifdef DEBUG_MALLOC
--
-+
- extern "C" {
- #include <stdlib.h>
--#include <dmalloc.h>
--#include "/usr/local/src/dmalloc-4.1.2/return.h"
-+
-+#define DMALLOC_DISABLE
-+
-+#include "dmalloc.h"
-+#include "return.h"
- }
-
- /*
-@@ -52,12 +52,8 @@ operator new(size_t size)
- {
- char *file;
- GET_RET_ADDR(file);
--
-- /* handle correct C++ semantics for an alloc of size 0 */
--
-- if (size == 0) size = 1;
--
-- return _malloc_leap(file, 0, size);
-+ return dmalloc_malloc(file, 0, size, DMALLOC_FUNC_NEW,
-+ 0 /* no alignment */, 0 /* no xalloc messages */);
- }
-
- /*
-@@ -68,12 +64,8 @@ operator new[](size_t size)
- {
- char *file;
- GET_RET_ADDR(file);
--
-- /* handle correct C++ semantics for an alloc of size 0 */
--
-- if (size == 0) size = 1;
--
-- return _malloc_leap(file, 0, size);
-+ return dmalloc_malloc(file, 0, size, DMALLOC_FUNC_NEW_ARRAY,
-+ 0 /* no alignment */, 0 /* no xalloc messages */);
- }
-
- /*
-@@ -84,19 +76,18 @@ operator delete(void *pnt)
- {
- char *file;
- GET_RET_ADDR(file);
-- _free_leap(file, 0, pnt);
-+ dmalloc_free(file, 0, pnt, DMALLOC_FUNC_DELETE);
- }
-
- /*
-- * An overload function for the C++ delete[]. Thanks to Jens Krinke
-- * <j.krinke(a)gmx.de>
-+ * An overload function for the C++ delete[]. Thanks to Jens Krinke.
- */
- void
- operator delete[](void *pnt)
- {
- char *file;
- GET_RET_ADDR(file);
-- _free_leap(file, 0, pnt);
-+ dmalloc_free(file, 0, pnt, DMALLOC_FUNC_DELETE_ARRAY);
- }
-
- #endif
diff --git a/ardour-2.8.16-gcc6.patch b/ardour-2.8.16-gcc6.patch
deleted file mode 100644
index 849bbfe..0000000
--- a/ardour-2.8.16-gcc6.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff -up ardour-2.8.16/gtk2_ardour/gain_meter.cc.fix ardour-2.8.16/gtk2_ardour/gain_meter.cc
---- ardour-2.8.16/gtk2_ardour/gain_meter.cc.fix 2016-03-08 23:48:45.663150677 -0600
-+++ ardour-2.8.16/gtk2_ardour/gain_meter.cc 2016-03-08 23:49:04.970011796 -0600
-@@ -89,11 +89,11 @@ GainMeterBase::GainMeterBase (Session& s
- if (horizontal) {
- gain_slider = manage (new HSliderController (pix,
- &gain_adjustment,
-- false));
-+ (PBD::Controllable*) false));
- } else {
- gain_slider = manage (new VSliderController (pix,
- &gain_adjustment,
-- false));
-+ (PBD::Controllable*) false));
- }
-
- level_meter = new LevelMeter(_session);
diff --git a/ardour-2.8.16-gcc7.patch b/ardour-2.8.16-gcc7.patch
deleted file mode 100644
index 7582399..0000000
--- a/ardour-2.8.16-gcc7.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- ardour-2.8.16/gtk2_ardour/ardour_ui.cc.orig 2017-01-31 16:28:28.898346791 +0000
-+++ ardour-2.8.16/gtk2_ardour/ardour_ui.cc 2017-01-31 16:30:41.021026990 +0000
-@@ -1964,7 +1964,7 @@
-
- const char **connections = io.input(0)->get_connections();
-
-- if (connections == 0 || connections[0] == '\0') {
-+ if (connections == 0 || connections[0] == 0) {
- buf = _("off");
- } else {
- buf = connections[0];
-@@ -1983,7 +1983,7 @@
-
- const char **connections = io.output(0)->get_connections();
-
-- if (connections == 0 || connections[0] == '\0') {
-+ if (connections == 0 || connections[0] == 0) {
- buf = _("off");
- } else {
- buf = connections[0];
diff --git a/ardour-2.8.16-glibmm250.patch b/ardour-2.8.16-glibmm250.patch
deleted file mode 100644
index a2687c6..0000000
--- a/ardour-2.8.16-glibmm250.patch
+++ /dev/null
@@ -1,133 +0,0 @@
---- ardour-2.8.16/libs/gtkmm2ext/fastmeter.cc
-+++ ardour-2.8.16/libs/gtkmm2ext/fastmeter.cc
-@@ -475,7 +475,7 @@
-
- Glib::RefPtr<Gdk::Window> win;
-
-- if ((win = get_window()) == 0) {
-+ if (! (win = get_window())) {
- queue_draw ();
- return;
- }
---- ardour-2.8.16/gtk2_ardour/editor.cc
-+++ ardour-2.8.16/gtk2_ardour/editor.cc
-@@ -800,16 +800,16 @@
- list<Glib::RefPtr<Gdk::Pixbuf> > window_icons;
- Glib::RefPtr<Gdk::Pixbuf> 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()) {
---- ardour-2.8.16/gtk2_ardour/editor_keyboard.cc
-+++ ardour-2.8.16/gtk2_ardour/editor_keyboard.cc
-@@ -42,9 +42,9 @@
- Glib::RefPtr<Gdk::Window> evw = track_canvas->get_window()->get_pointer (x, y, mask);
- bool doit = false;
-
-- if (use_track_canvas && track_canvas_event_box.get_window()->get_pointer(x, y, mask) != 0) {
-+ if (use_track_canvas && track_canvas_event_box.get_window()->get_pointer(x, y, mask)) {
- doit = true;
-- } else if (use_time_canvas && time_canvas_event_box.get_window()->get_pointer(x, y, mask)!= 0) {
-+ } else if (use_time_canvas && time_canvas_event_box.get_window()->get_pointer(x, y, mask)) {
- doit = true;
- }
-
---- ardour-2.8.16/gtk2_ardour/gain_meter.cc
-+++ ardour-2.8.16/gtk2_ardour/gain_meter.cc
-@@ -63,7 +63,7 @@
- void
- GainMeter::setup_slider_pix ()
- {
-- if ((slider = ::get_icon ("fader_belt")) == 0) {
-+ if (! (slider = ::get_icon ("fader_belt"))) {
- throw failed_constructor();
- }
- }
---- ardour-2.8.16/gtk2_ardour/new_session_dialog.cc
-+++ ardour-2.8.16/gtk2_ardour/new_session_dialog.cc
-@@ -354,16 +354,16 @@
- list<Glib::RefPtr<Gdk::Pixbuf> > window_icons;
- Glib::RefPtr<Gdk::Pixbuf> 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()) {
---- ardour-2.8.16/gtk2_ardour/panner2d.cc
-+++ ardour-2.8.16/gtk2_ardour/panner2d.cc
-@@ -427,7 +427,7 @@
- gint x, y;
- float fx, fy;
-
-- if (layout == 0) {
-+ if (! layout) {
- layout = create_pango_layout ("");
- layout->set_font_description (get_style()->get_font());
- }
-@@ -579,7 +579,7 @@
- {
- using namespace Menu_Helpers;
-
-- if (context_menu == 0) {
-+ if (! context_menu) {
- context_menu = manage (new Menu);
- context_menu->set_name ("ArdourContextMenu");
- MenuList& items = context_menu->items();
---- ardour-2.8.16/gtk2_ardour/route_time_axis.cc
-+++ ardour-2.8.16/gtk2_ardour/route_time_axis.cc
-@@ -88,7 +88,7 @@
- void
- RouteTimeAxisView::setup_slider_pix ()
- {
-- if ((slider = ::get_icon ("fader_belt_h")) == 0) {
-+ if (! (slider = ::get_icon ("fader_belt_h"))) {
- throw failed_constructor ();
- }
- }
---- ardour-2.8.16/gtk2_ardour/fft_graph.cc
-+++ ardour-2.8.16/gtk2_ardour/fft_graph.cc
-@@ -190,7 +190,7 @@
-
-
-
-- if (graph_gc == 0) {
-+ if (! graph_gc) {
- graph_gc = GC::create( get_window() );
- }
-
-@@ -200,7 +200,7 @@
-
- graph_gc->set_rgb_fg_color( grey );
-
-- if (layout == 0) {
-+ if (! layout) {
- layout = create_pango_layout ("");
- layout->set_font_description (get_style()->get_font());
- }
diff --git a/ardour-2.8.16-libsigc++26.patch b/ardour-2.8.16-libsigc++26.patch
deleted file mode 100644
index d88ec19..0000000
--- a/ardour-2.8.16-libsigc++26.patch
+++ /dev/null
@@ -1,114 +0,0 @@
-From f7ae7643c2733403f742dcad0045551a26a8c2b7 Mon Sep 17 00:00:00 2001
-From: Nils Philippsen <nils(a)tiptoe.de>
-Date: Sun, 29 Nov 2015 00:16:18 +0100
-Subject: [PATCH] libsigc++-2.6.x: don't #include obsolete headers
-
----
- gtk2_ardour/editor_markers.cc | 1 -
- libs/ardour/audio_track.cc | 5 ++---
- libs/ardour/audioregion.cc | 1 -
- libs/ardour/region.cc | 1 -
- libs/ardour/session.cc | 3 +--
- libs/ardour/session_transport.cc | 3 +--
- libs/ardour/track.cc | 5 ++---
- 7 files changed, 6 insertions(+), 13 deletions(-)
-
-diff --git a/gtk2_ardour/editor_markers.cc b/gtk2_ardour/editor_markers.cc
-index b47a3d3..0809dea 100644
---- a/gtk2_ardour/editor_markers.cc
-+++ b/gtk2_ardour/editor_markers.cc
-@@ -17,7 +17,6 @@
-
- */
-
--#include <sigc++/retype.h>
- #include <cstdlib>
- #include <cmath>
-
-diff --git a/libs/ardour/audio_track.cc b/libs/ardour/audio_track.cc
-index 688030d..fa260d3 100644
---- a/libs/ardour/audio_track.cc
-+++ b/libs/ardour/audio_track.cc
-@@ -19,9 +19,8 @@
-
- #include <boost/scoped_array.hpp>
-
--#include <sigc++/retype.h>
--#include <sigc++/retype_return.h>
--#include <sigc++/bind.h>
-+#include <sigc++/adaptors/retype_return.h>
-+#include <sigc++/adaptors/bind.h>
-
- #include <pbd/error.h>
- #include <pbd/enumwriter.h>
-diff --git a/libs/ardour/audioregion.cc b/libs/ardour/audioregion.cc
-index 7eefd68..3245319 100644
---- a/libs/ardour/audioregion.cc
-+++ b/libs/ardour/audioregion.cc
-@@ -26,7 +26,6 @@
- #include <boost/scoped_array.hpp>
-
- #include <sigc++/bind.h>
--#include <sigc++/class_slot.h>
-
- #include <glibmm/thread.h>
-
-diff --git a/libs/ardour/region.cc b/libs/ardour/region.cc
-index a575700..0c1eb40 100644
---- a/libs/ardour/region.cc
-+++ b/libs/ardour/region.cc
-@@ -24,7 +24,6 @@
- #include <sstream>
-
- #include <sigc++/bind.h>
--#include <sigc++/class_slot.h>
-
- #include <glibmm/thread.h>
- #include <pbd/xml++.h>
-diff --git a/libs/ardour/session.cc b/libs/ardour/session.cc
-index 5f5231a..4463eb5 100644
---- a/libs/ardour/session.cc
-+++ b/libs/ardour/session.cc
-@@ -29,8 +29,7 @@
- #include <limits.h>
- #include <sys/time.h>
-
--#include <sigc++/bind.h>
--#include <sigc++/retype.h>
-+#include <sigc++/adaptors/bind.h>
-
- #include <glibmm/thread.h>
- #include <glibmm/miscutils.h>
-diff --git a/libs/ardour/session_transport.cc b/libs/ardour/session_transport.cc
-index c19c115..02129bc 100644
---- a/libs/ardour/session_transport.cc
-+++ b/libs/ardour/session_transport.cc
-@@ -21,8 +21,7 @@
- #include <cerrno>
- #include <unistd.h>
-
--#include <sigc++/bind.h>
--#include <sigc++/retype.h>
-+#include <sigc++/adaptors/bind.h>
-
- #include <pbd/undo.h>
- #include <pbd/error.h>
-diff --git a/libs/ardour/track.cc b/libs/ardour/track.cc
-index 63254a3..4706452 100644
---- a/libs/ardour/track.cc
-+++ b/libs/ardour/track.cc
-@@ -16,9 +16,8 @@
- Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
- #include <pbd/error.h>
--#include <sigc++/retype.h>
--#include <sigc++/retype_return.h>
--#include <sigc++/bind.h>
-+#include <sigc++/adaptors/retype_return.h>
-+#include <sigc++/adaptors/bind.h>
-
- #include <ardour/track.h>
- #include <ardour/diskstream.h>
---
-2.6.3
-
diff --git a/ardour-SConscript.patch b/ardour-SConscript.patch
deleted file mode 100644
index ce39fb1..0000000
--- a/ardour-SConscript.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -rupN ardour-2.8.3.old/libs/midi++2/SConscript ardour-2.8.3/libs/midi++2/SConscript
---- ardour-2.8.3.old/libs/midi++2/SConscript 2009-03-19 13:52:43.000000000 -0400
-+++ ardour-2.8.3/libs/midi++2/SConscript 2009-11-12 04:01:48.000000000 -0500
-@@ -42,7 +42,7 @@ if env['SYSMIDI'] == 'CoreMIDI':
- else:
- sysdep_src = [ 'alsa_sequencer_midiport.cc' ]
- midi2.Append (CCFLAGS="-DWITH_ALSA")
--
-+ midi2.Append (LIBS = "-lasound")
- midi2.Append(CCFLAGS="-D_REENTRANT -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE")
- midi2.Append(CCFLAGS="-DLIBSIGC_DISABLE_DEPRECATED")
-
-diff -rupN ardour-2.8.3.old/libs/vamp-sdk/SConscript ardour-2.8.3/libs/vamp-sdk/SConscript
---- ardour-2.8.3.old/libs/vamp-sdk/SConscript 2009-03-26 11:20:21.000000000 -0400
-+++ ardour-2.8.3/libs/vamp-sdk/SConscript 2009-11-12 04:04:32.000000000 -0500
-@@ -27,7 +27,7 @@ vampsdk.Merge ([libraries['fftw3'], libr
- # HAVE_FFTW3 is used to help improve some performance aspects of VAMP's InputDomainAdapter
-
- vampsdk.Append (CPPATH='#libs/vamp-sdk/vamp', CXXFLAGS="-Ilibs/vamp-sdk -DHAVE_FFTW3")
--
-+vampsdk.Append (LIBS = "-ldl")
- libvampsdk = vampsdk.SharedLibrary('vampsdk', vampsdk_files)
- libvamphostsdk = vampsdk.SharedLibrary('vamphostsdk', vamphostsdk_files)
-
diff --git a/ardour-fix-mm-includes.patch b/ardour-fix-mm-includes.patch
deleted file mode 100644
index a0978a1..0000000
--- a/ardour-fix-mm-includes.patch
+++ /dev/null
@@ -1,1915 +0,0 @@
-gtkmm is sensitive to headers not being included in the right order, esp.
-to glibmm.h and gdkmm.h not being included first. This causes compile errors
-with gcc >= 4.8
-
-Switch to simply including gtkmm.h, rather then specific headers, as that does
-the right thing for us.
-diff -up ardour-2.8.16/libs/gtkmm2ext/application.cc~ ardour-2.8.16/libs/gtkmm2ext/application.cc
---- ardour-2.8.16/libs/gtkmm2ext/application.cc~ 2010-04-16 16:43:29.000000000 +0200
-+++ ardour-2.8.16/libs/gtkmm2ext/application.cc 2013-05-10 12:34:45.890929703 +0200
-@@ -21,8 +21,7 @@
- * Boston, MA 02111-1307, USA.
- */
-
--#include <gtkmm/menushell.h>
--#include <gtkmm/menuitem.h>
-+#include <gtkmm.h>
-
- #include "gtkmm2ext/application.h"
- #include "gtkmm2ext/gtkapplication.h"
-diff -up ardour-2.8.16/libs/gtkmm2ext/choice.cc~ ardour-2.8.16/libs/gtkmm2ext/choice.cc
---- ardour-2.8.16/libs/gtkmm2ext/choice.cc~ 2009-02-24 13:37:45.000000000 +0100
-+++ ardour-2.8.16/libs/gtkmm2ext/choice.cc 2013-05-10 12:36:27.538937570 +0200
-@@ -18,7 +18,7 @@
- $Id: choice.cc 461 2006-04-20 20:41:05Z nickm $
- */
-
--#include <gtkmm/label.h>
-+#include <gtkmm.h>
- #include <gtkmm2ext/choice.h>
-
- using namespace std;
-diff -up ardour-2.8.16/libs/gtkmm2ext/fastmeter.cc~ ardour-2.8.16/libs/gtkmm2ext/fastmeter.cc
---- ardour-2.8.16/libs/gtkmm2ext/fastmeter.cc~ 2009-02-24 13:37:45.000000000 +0100
-+++ ardour-2.8.16/libs/gtkmm2ext/fastmeter.cc 2013-05-10 12:35:45.250934297 +0200
-@@ -21,10 +21,9 @@
- #include <iostream>
- #include <cmath>
- #include <algorithm>
--#include <gdkmm/rectangle.h>
-+#include <gtkmm.h>
- #include <gtkmm2ext/fastmeter.h>
- #include <gtkmm2ext/utils.h>
--#include <gtkmm/style.h>
- #include <cstring>
-
- #define UINT_TO_RGB(u,r,g,b) { (*(r)) = ((u)>>16)&0xff; (*(g)) = ((u)>>8)&0xff; (*(b)) = (u)&0xff; }
-diff -up ardour-2.8.16/libs/gtkmm2ext/gtkmm2ext/barcontroller.h~ ardour-2.8.16/libs/gtkmm2ext/gtkmm2ext/barcontroller.h
---- ardour-2.8.16/libs/gtkmm2ext/gtkmm2ext/barcontroller.h~ 2009-07-09 20:29:31.000000000 +0200
-+++ ardour-2.8.16/libs/gtkmm2ext/gtkmm2ext/barcontroller.h 2013-05-10 12:38:14.145945821 +0200
-@@ -19,8 +19,7 @@
- #ifndef __gtkmm2ext_bar_controller_h__
- #define __gtkmm2ext_bar_controller_h__
-
--#include <gtkmm/frame.h>
--#include <gtkmm/drawingarea.h>
-+#include <gtkmm.h>
- #include <gtkmm2ext/binding_proxy.h>
-
- namespace ARDOUR {
-diff -up ardour-2.8.16/libs/gtkmm2ext/gtkmm2ext/choice.h~ ardour-2.8.16/libs/gtkmm2ext/gtkmm2ext/choice.h
---- ardour-2.8.16/libs/gtkmm2ext/gtkmm2ext/choice.h~ 2009-02-24 13:37:45.000000000 +0100
-+++ ardour-2.8.16/libs/gtkmm2ext/gtkmm2ext/choice.h 2013-05-10 12:38:51.009948674 +0200
-@@ -20,10 +20,7 @@
- #ifndef __pbd_gtkmm_choice_h__
- #define __pbd_gtkmm_choice_h__
-
--#include <gtkmm/dialog.h>
--#include <gtkmm/image.h>
--#include <gtkmm/stock.h>
--#include <gtkmm/box.h>
-+#include <gtkmm.h>
- #include <string>
- #include <vector>
-
-diff -up ardour-2.8.16/libs/gtkmm2ext/gtkmm2ext/dndtreeview.h~ ardour-2.8.16/libs/gtkmm2ext/gtkmm2ext/dndtreeview.h
---- ardour-2.8.16/libs/gtkmm2ext/gtkmm2ext/dndtreeview.h~ 2009-02-24 13:37:45.000000000 +0100
-+++ ardour-2.8.16/libs/gtkmm2ext/gtkmm2ext/dndtreeview.h 2013-05-10 12:39:11.089950228 +0200
-@@ -22,9 +22,7 @@
-
- #include <stdint.h>
- #include <string>
--#include <gtkmm/treeview.h>
--#include <gtkmm/treeselection.h>
--#include <gtkmm/selectiondata.h>
-+#include <gtkmm.h>
-
- namespace Gtkmm2ext {
-
-diff -up ardour-2.8.16/libs/gtkmm2ext/gtkmm2ext/fastmeter.h~ ardour-2.8.16/libs/gtkmm2ext/gtkmm2ext/fastmeter.h
---- ardour-2.8.16/libs/gtkmm2ext/gtkmm2ext/fastmeter.h~ 2009-02-24 13:37:45.000000000 +0100
-+++ ardour-2.8.16/libs/gtkmm2ext/gtkmm2ext/fastmeter.h 2013-05-10 12:38:40.721947878 +0200
-@@ -20,8 +20,7 @@
- #ifndef __gtkmm2ext_fastmeter_h__
- #define __gtkmm2ext_fastmeter_h__
-
--#include <gtkmm/drawingarea.h>
--#include <gdkmm/pixbuf.h>
-+#include <gtkmm.h>
-
- namespace Gtkmm2ext {
-
-diff -up ardour-2.8.16/libs/gtkmm2ext/gtkmm2ext/focus_entry.h~ ardour-2.8.16/libs/gtkmm2ext/gtkmm2ext/focus_entry.h
---- ardour-2.8.16/libs/gtkmm2ext/gtkmm2ext/focus_entry.h~ 2009-02-24 13:37:45.000000000 +0100
-+++ ardour-2.8.16/libs/gtkmm2ext/gtkmm2ext/focus_entry.h 2013-05-10 12:39:19.953950914 +0200
-@@ -20,7 +20,7 @@
- #ifndef __gtkmm2ext_focus_entry_h__
- #define __gtkmm2ext_focus_entry_h__
-
--#include <gtkmm/entry.h>
-+#include <gtkmm.h>
-
- namespace Gtkmm2ext {
-
-diff -up ardour-2.8.16/libs/gtkmm2ext/gtkmm2ext/gtk_ui.h~ ardour-2.8.16/libs/gtkmm2ext/gtkmm2ext/gtk_ui.h
---- ardour-2.8.16/libs/gtkmm2ext/gtkmm2ext/gtk_ui.h~ 2011-02-04 05:05:47.000000000 +0100
-+++ ardour-2.8.16/libs/gtkmm2ext/gtkmm2ext/gtk_ui.h 2013-05-10 12:37:56.737944474 +0200
-@@ -27,14 +27,7 @@
- #include <stdint.h>
- #include <setjmp.h>
- #include <pthread.h>
--#include <gtkmm/widget.h>
--#include <gtkmm/style.h>
--#ifndef GTK_NEW_TOOLTIP_API
--#include <gtkmm/tooltips.h>
--#endif
--#include <gtkmm/textbuffer.h>
--#include <gtkmm/main.h>
--#include <gdkmm/color.h>
-+#include <gtkmm.h>
- #include <pbd/abstract_ui.h>
- #include <pbd/ringbufferNPT.h>
-
-diff -up ardour-2.8.16/libs/gtkmm2ext/gtkmm2ext/idle_adjustment.h~ ardour-2.8.16/libs/gtkmm2ext/gtkmm2ext/idle_adjustment.h
---- ardour-2.8.16/libs/gtkmm2ext/gtkmm2ext/idle_adjustment.h~ 2009-02-24 13:37:45.000000000 +0100
-+++ ardour-2.8.16/libs/gtkmm2ext/gtkmm2ext/idle_adjustment.h 2013-05-10 12:39:33.585951969 +0200
-@@ -21,7 +21,7 @@
- #define __gtkmm2ext_idle_adjustment_h__
-
- #include <sys/time.h>
--#include <gtkmm/adjustment.h>
-+#include <gtkmm.h>
-
- namespace Gtkmm2ext {
-
-diff -up ardour-2.8.16/libs/gtkmm2ext/gtkmm2ext/pixfader.h~ ardour-2.8.16/libs/gtkmm2ext/gtkmm2ext/pixfader.h
---- ardour-2.8.16/libs/gtkmm2ext/gtkmm2ext/pixfader.h~ 2009-02-24 13:37:45.000000000 +0100
-+++ ardour-2.8.16/libs/gtkmm2ext/gtkmm2ext/pixfader.h 2013-05-10 12:38:34.865947425 +0200
-@@ -22,9 +22,7 @@
-
- #include <cmath>
-
--#include <gtkmm/drawingarea.h>
--#include <gtkmm/adjustment.h>
--#include <gdkmm/pixbuf.h>
-+#include <gtkmm.h>
-
- namespace Gtkmm2ext {
-
-diff -up ardour-2.8.16/libs/gtkmm2ext/gtkmm2ext/pixscroller.h~ ardour-2.8.16/libs/gtkmm2ext/gtkmm2ext/pixscroller.h
---- ardour-2.8.16/libs/gtkmm2ext/gtkmm2ext/pixscroller.h~ 2009-02-24 13:37:45.000000000 +0100
-+++ ardour-2.8.16/libs/gtkmm2ext/gtkmm2ext/pixscroller.h 2013-05-10 12:38:03.809945021 +0200
-@@ -20,9 +20,7 @@
- #ifndef __gtkmm2ext_pixscroller_h__
- #define __gtkmm2ext_pixscroller_h__
-
--#include <gtkmm/drawingarea.h>
--#include <gtkmm/adjustment.h>
--#include <gdkmm.h>
-+#include <gtkmm.h>
-
- namespace Gtkmm2ext {
-
-diff -up ardour-2.8.16/libs/gtkmm2ext/gtkmm2ext/prompter.h~ ardour-2.8.16/libs/gtkmm2ext/gtkmm2ext/prompter.h
---- ardour-2.8.16/libs/gtkmm2ext/gtkmm2ext/prompter.h~ 2009-02-24 13:37:45.000000000 +0100
-+++ ardour-2.8.16/libs/gtkmm2ext/gtkmm2ext/prompter.h 2013-05-10 12:38:22.945946502 +0200
-@@ -21,10 +21,7 @@
- #define __gtkmm2ext_prompter_h__
-
- #include <string>
--#include <gtkmm/box.h>
--#include <gtkmm/entry.h>
--#include <gtkmm/label.h>
--#include <gtkmm/dialog.h>
-+#include <gtkmm.h>
- #include <sigc++/sigc++.h>
-
- namespace Gtk {
-diff -up ardour-2.8.16/libs/gtkmm2ext/gtkmm2ext/stateful_button.h~ ardour-2.8.16/libs/gtkmm2ext/gtkmm2ext/stateful_button.h
---- ardour-2.8.16/libs/gtkmm2ext/gtkmm2ext/stateful_button.h~ 2009-02-24 13:37:45.000000000 +0100
-+++ ardour-2.8.16/libs/gtkmm2ext/gtkmm2ext/stateful_button.h 2013-05-10 12:39:25.793951366 +0200
-@@ -22,7 +22,7 @@
-
- #include <vector>
-
--#include <gtkmm/togglebutton.h>
-+#include <gtkmm.h>
-
- namespace Gtkmm2ext {
-
-diff -up ardour-2.8.16/libs/gtkmm2ext/gtkmm2ext/tearoff.h~ ardour-2.8.16/libs/gtkmm2ext/gtkmm2ext/tearoff.h
---- ardour-2.8.16/libs/gtkmm2ext/gtkmm2ext/tearoff.h~ 2009-02-24 13:37:45.000000000 +0100
-+++ ardour-2.8.16/libs/gtkmm2ext/gtkmm2ext/tearoff.h 2013-05-10 12:38:57.297949161 +0200
-@@ -20,10 +20,7 @@
- #ifndef __gtkmm2ext_tearoff_h__
- #define __gtkmm2ext_tearoff_h__
-
--#include <gtkmm/window.h>
--#include <gtkmm/arrow.h>
--#include <gtkmm/box.h>
--#include <gtkmm/eventbox.h>
-+#include <gtkmm.h>
-
- namespace Gtkmm2ext {
-
-diff -up ardour-2.8.16/libs/gtkmm2ext/gtkmm2ext/utils.h~ ardour-2.8.16/libs/gtkmm2ext/gtkmm2ext/utils.h
---- ardour-2.8.16/libs/gtkmm2ext/gtkmm2ext/utils.h~ 2009-03-13 13:42:40.000000000 +0100
-+++ ardour-2.8.16/libs/gtkmm2ext/gtkmm2ext/utils.h 2013-05-10 12:37:19.682941606 +0200
-@@ -23,8 +23,7 @@
- #include <vector>
- #include <string>
-
--#include <gtkmm/treeview.h>
--#include <gdkmm/window.h> /* for WMDecoration */
-+#include <gtkmm.h>
-
- namespace Gtk {
- class ComboBoxText;
-diff -up ardour-2.8.16/libs/gtkmm2ext/idle_adjustment.cc~ ardour-2.8.16/libs/gtkmm2ext/idle_adjustment.cc
---- ardour-2.8.16/libs/gtkmm2ext/idle_adjustment.cc~ 2009-02-24 13:37:45.000000000 +0100
-+++ ardour-2.8.16/libs/gtkmm2ext/idle_adjustment.cc 2013-05-10 12:34:33.891928774 +0200
-@@ -19,7 +19,7 @@
-
- #define _BSD_SOURCE
- #include <gtkmm2ext/idle_adjustment.h>
--#include <gtkmm/main.h>
-+#include <gtkmm.h>
- #include <iostream>
-
- using namespace Gtk;
-diff -up ardour-2.8.16/libs/gtkmm2ext/prompter.cc~ ardour-2.8.16/libs/gtkmm2ext/prompter.cc
---- ardour-2.8.16/libs/gtkmm2ext/prompter.cc~ 2009-02-24 13:37:45.000000000 +0100
-+++ ardour-2.8.16/libs/gtkmm2ext/prompter.cc 2013-05-10 12:36:11.906936360 +0200
-@@ -22,7 +22,7 @@
-
- #include <pbd/whitespace.h>
-
--#include <gtkmm/stock.h>
-+#include <gtkmm.h>
- #include <gtkmm2ext/prompter.h>
-
- #include "i18n.h"
-diff -up ardour-2.8.16/libs/gtkmm2ext/stateful_button.cc~ ardour-2.8.16/libs/gtkmm2ext/stateful_button.cc
---- ardour-2.8.16/libs/gtkmm2ext/stateful_button.cc~ 2010-03-19 20:04:50.000000000 +0100
-+++ ardour-2.8.16/libs/gtkmm2ext/stateful_button.cc 2013-05-10 12:36:18.834936896 +0200
-@@ -20,7 +20,7 @@
- #include <string>
- #include <iostream>
-
--#include <gtkmm/main.h>
-+#include <gtkmm.h>
-
- #include <gtkmm2ext/stateful_button.h>
-
-diff -up ardour-2.8.16/libs/gtkmm2ext/utils.cc~ ardour-2.8.16/libs/gtkmm2ext/utils.cc
---- ardour-2.8.16/libs/gtkmm2ext/utils.cc~ 2009-03-13 14:01:25.000000000 +0100
-+++ ardour-2.8.16/libs/gtkmm2ext/utils.cc 2013-05-10 12:35:09.746931549 +0200
-@@ -21,15 +21,10 @@
- #include <iostream>
- #include <map>
-
--#include <gtk/gtkpaned.h>
- #include <gtk/gtk.h>
-
- #include <gtkmm2ext/utils.h>
--#include <gtkmm/widget.h>
--#include <gtkmm/button.h>
--#include <gtkmm/window.h>
--#include <gtkmm/paned.h>
--#include <gtkmm/comboboxtext.h>
-+#include <gtkmm.h>
-
- #include "i18n.h"
-
-diff -up ardour-2.8.16/gtk2_ardour/actions.cc~ ardour-2.8.16/gtk2_ardour/actions.cc
---- ardour-2.8.16/gtk2_ardour/actions.cc~ 2013-05-10 12:55:41.612026892 +0200
-+++ ardour-2.8.16/gtk2_ardour/actions.cc 2013-05-10 12:48:09.470991898 +0200
-@@ -26,8 +26,8 @@
- #include <gtk/gtkuimanager.h>
- #include <gtk/gtkactiongroup.h>
-
-+#include <gtkmm.h>
- #include <gtkmm/accelmap.h>
--#include <gtkmm/uimanager.h>
-
- #include <pbd/error.h>
-
-diff -up ardour-2.8.16/gtk2_ardour/add_route_dialog.cc~ ardour-2.8.16/gtk2_ardour/add_route_dialog.cc
---- ardour-2.8.16/gtk2_ardour/add_route_dialog.cc~ 2011-09-12 21:22:34.000000000 +0200
-+++ ardour-2.8.16/gtk2_ardour/add_route_dialog.cc 2013-05-10 12:48:43.070994498 +0200
-@@ -21,8 +21,7 @@
- #include <cmath>
-
- #include <sigc++/bind.h>
--#include <gtkmm/stock.h>
--#include <gtkmm/separator.h>
-+#include <gtkmm.h>
- #include <pbd/error.h>
- #include <pbd/convert.h>
- #include <gtkmm2ext/utils.h>
-diff -up ardour-2.8.16/gtk2_ardour/analysis_window.cc~ ardour-2.8.16/gtk2_ardour/analysis_window.cc
---- ardour-2.8.16/gtk2_ardour/analysis_window.cc~ 2011-04-06 19:09:42.000000000 +0200
-+++ ardour-2.8.16/gtk2_ardour/analysis_window.cc 2013-05-10 12:48:51.997995189 +0200
-@@ -19,10 +19,7 @@
- */
-
- #include <gtkmm2ext/gtk_ui.h>
--#include <gtkmm/stock.h>
--#include <gtkmm/label.h>
--#include <gtkmm/treemodel.h>
--#include <gtkmm/treeiter.h>
-+#include <gtkmm.h>
-
- #include <ardour/audioregion.h>
- #include <ardour/audioplaylist.h>
-diff -up ardour-2.8.16/gtk2_ardour/ardour_ui.cc~ ardour-2.8.16/gtk2_ardour/ardour_ui.cc
---- ardour-2.8.16/gtk2_ardour/ardour_ui.cc~ 2012-07-20 17:24:56.000000000 +0200
-+++ ardour-2.8.16/gtk2_ardour/ardour_ui.cc 2013-05-10 12:48:58.814995717 +0200
-@@ -32,7 +32,7 @@
-
- #include <sys/resource.h>
-
--#include <gtkmm/messagedialog.h>
-+#include <gtkmm.h>
- #include <gtkmm/accelmap.h>
- #include <gtkmm2ext/application.h>
-
-diff -up ardour-2.8.16/gtk2_ardour/ardour_ui_ed.cc~ ardour-2.8.16/gtk2_ardour/ardour_ui_ed.cc
---- ardour-2.8.16/gtk2_ardour/ardour_ui_ed.cc~ 2012-10-17 00:35:38.000000000 +0200
-+++ ardour-2.8.16/gtk2_ardour/ardour_ui_ed.cc 2013-05-10 12:49:06.509996312 +0200
-@@ -26,7 +26,7 @@
- #include <pbd/pathscanner.h>
- #include <pbd/fpu.h>
-
--#include <glibmm/miscutils.h>
-+#include <glibmm.h>
-
- #include <gtkmm2ext/utils.h>
- #include <gtkmm2ext/window_title.h>
-diff -up ardour-2.8.16/gtk2_ardour/crossfade_edit.cc~ ardour-2.8.16/gtk2_ardour/crossfade_edit.cc
---- ardour-2.8.16/gtk2_ardour/crossfade_edit.cc~ 2010-03-26 17:39:18.000000000 +0100
-+++ ardour-2.8.16/gtk2_ardour/crossfade_edit.cc 2013-05-10 12:49:47.165999459 +0200
-@@ -21,11 +21,9 @@
-
- #include <sigc++/bind.h>
-
--#include <gtkmm/frame.h>
--#include <gtkmm/image.h>
--#include <gtkmm/scrolledwindow.h>
-+#include <gtkmm.h>
-
--#include <libgnomecanvasmm/line.h>
-+#include <libgnomecanvasmm.h>
-
- #include <ardour/automation_event.h>
- #include <ardour/curve.h>
-diff -up ardour-2.8.16/gtk2_ardour/editor.cc~ ardour-2.8.16/gtk2_ardour/editor.cc
---- ardour-2.8.16/gtk2_ardour/editor.cc~ 2012-03-16 15:33:28.000000000 +0100
-+++ ardour-2.8.16/gtk2_ardour/editor.cc 2013-05-10 12:50:02.782000668 +0200
-@@ -33,10 +33,7 @@
- #include <pbd/enumwriter.h>
- #include <pbd/memento_command.h>
-
--#include <glibmm/miscutils.h>
--#include <gtkmm/image.h>
--#include <gdkmm/color.h>
--#include <gdkmm/bitmap.h>
-+#include <gtkmm.h>
-
- #include <gtkmm2ext/grouped_buttons.h>
- #include <gtkmm2ext/gtk_ui.h>
-diff -up ardour-2.8.16/gtk2_ardour/editor_canvas.cc~ ardour-2.8.16/gtk2_ardour/editor_canvas.cc
---- ardour-2.8.16/gtk2_ardour/editor_canvas.cc~ 2012-03-16 15:33:28.000000000 +0100
-+++ ardour-2.8.16/gtk2_ardour/editor_canvas.cc 2013-05-10 12:50:09.534001190 +0200
-@@ -23,8 +23,7 @@
- #undef Rect
- #endif /* __APPLE__ */
-
--#include <libgnomecanvasmm/init.h>
--#include <libgnomecanvasmm/pixbuf.h>
-+#include <libgnomecanvasmm.h>
- #include <jack/types.h>
- #include <gtkmm2ext/utils.h>
-
-diff -up ardour-2.8.16/gtk2_ardour/editor_export_audio.cc~ ardour-2.8.16/gtk2_ardour/editor_export_audio.cc
---- ardour-2.8.16/gtk2_ardour/editor_export_audio.cc~ 2009-02-24 13:37:42.000000000 +0100
-+++ ardour-2.8.16/gtk2_ardour/editor_export_audio.cc 2013-05-10 12:50:13.918001530 +0200
-@@ -20,7 +20,7 @@
- #include <unistd.h>
- #include <climits>
-
--#include <gtkmm/messagedialog.h>
-+#include <gtkmm.h>
-
- #include "export_session_dialog.h"
- #include "export_region_dialog.h"
-diff -up ardour-2.8.16/gtk2_ardour/editor_keys.cc~ ardour-2.8.16/gtk2_ardour/editor_keys.cc
---- ardour-2.8.16/gtk2_ardour/editor_keys.cc~ 2009-02-24 13:37:42.000000000 +0100
-+++ ardour-2.8.16/gtk2_ardour/editor_keys.cc 2013-05-10 12:50:18.975001921 +0200
-@@ -25,7 +25,7 @@
-
- #include <ardour/session.h>
- #include <ardour/region.h>
--#include <gtkmm/treeview.h>
-+#include <gtkmm.h>
-
- #include "ardour_ui.h"
- #include "editor.h"
-diff -up ardour-2.8.16/gtk2_ardour/editor_mixer.cc~ ardour-2.8.16/gtk2_ardour/editor_mixer.cc
---- ardour-2.8.16/gtk2_ardour/editor_mixer.cc~ 2012-03-09 17:56:54.000000000 +0100
-+++ ardour-2.8.16/gtk2_ardour/editor_mixer.cc 2013-05-10 12:50:23.406002264 +0200
-@@ -17,7 +17,7 @@
-
- */
-
--#include <glibmm/miscutils.h>
-+#include <glibmm.h>
- #include <gtkmm2ext/utils.h>
- #include <gtkmm2ext/window_title.h>
-
-diff -up ardour-2.8.16/gtk2_ardour/engine_dialog.cc~ ardour-2.8.16/gtk2_ardour/engine_dialog.cc
---- ardour-2.8.16/gtk2_ardour/engine_dialog.cc~ 2012-12-02 01:37:37.000000000 +0100
-+++ ardour-2.8.16/gtk2_ardour/engine_dialog.cc 2013-05-10 12:50:36.878003307 +0200
-@@ -4,8 +4,7 @@
- #include <map>
-
- #include <boost/scoped_ptr.hpp>
--#include <glibmm.h>
--#include <gtkmm/messagedialog.h>
-+#include <gtkmm.h>
- #include <pbd/xml++.h>
- #include <pbd/epa.h>
-
-@@ -21,7 +20,6 @@
- #include <ardour/profile.h>
- #include <jack/jack.h>
-
--#include <gtkmm/stock.h>
- #include <gtkmm2ext/utils.h>
-
- #include <pbd/convert.h>
-diff -up ardour-2.8.16/gtk2_ardour/fft_graph.cc~ ardour-2.8.16/gtk2_ardour/fft_graph.cc
---- ardour-2.8.16/gtk2_ardour/fft_graph.cc~ 2009-02-24 13:37:42.000000000 +0100
-+++ ardour-2.8.16/gtk2_ardour/fft_graph.cc 2013-05-10 12:50:53.886004623 +0200
-@@ -19,15 +19,7 @@
-
- #include <iostream>
-
--#include <glibmm.h>
--#include <glibmm/refptr.h>
--
--#include <gdkmm/gc.h>
--
--#include <gtkmm/widget.h>
--#include <gtkmm/style.h>
--#include <gtkmm/treemodel.h>
--#include <gtkmm/treepath.h>
-+#include <gtkmm.h>
-
- #include <pbd/stl_delete.h>
-
-diff -up ardour-2.8.16/gtk2_ardour/imageframe_time_axis.cc~ ardour-2.8.16/gtk2_ardour/imageframe_time_axis.cc
---- ardour-2.8.16/gtk2_ardour/imageframe_time_axis.cc~ 2009-03-02 21:42:15.000000000 +0100
-+++ ardour-2.8.16/gtk2_ardour/imageframe_time_axis.cc 2013-05-10 12:51:13.341006129 +0200
-@@ -22,7 +22,7 @@
-
- #include <pbd/error.h>
-
--#include <gtkmm/menu.h>
-+#include <gtkmm.h>
-
- #include <gtkmm2ext/utils.h>
- #include <gtkmm2ext/gtk_ui.h>
-diff -up ardour-2.8.16/gtk2_ardour/io_selector.cc~ ardour-2.8.16/gtk2_ardour/io_selector.cc
---- ardour-2.8.16/gtk2_ardour/io_selector.cc~ 2011-09-12 21:22:34.000000000 +0200
-+++ ardour-2.8.16/gtk2_ardour/io_selector.cc 2013-05-10 12:51:24.205006970 +0200
-@@ -22,9 +22,7 @@
-
- #include <sigc++/bind.h>
-
--#include <gtkmm/messagedialog.h>
--
--#include <glibmm/thread.h>
-+#include <gtkmm.h>
-
- #include <ardour/io.h>
- #include <ardour/route.h>
-diff -up ardour-2.8.16/gtk2_ardour/keyboard.cc~ ardour-2.8.16/gtk2_ardour/keyboard.cc
---- ardour-2.8.16/gtk2_ardour/keyboard.cc~ 2012-04-19 16:35:13.000000000 +0200
-+++ ardour-2.8.16/gtk2_ardour/keyboard.cc 2013-05-10 12:51:29.773007401 +0200
-@@ -28,6 +28,7 @@
-
- #include <ctype.h>
-
-+#include <gtkmm.h>
- #include <gtkmm/accelmap.h>
-
- #include <gdk/gdkkeysyms.h>
-diff -up ardour-2.8.16/gtk2_ardour/keyeditor.cc~ ardour-2.8.16/gtk2_ardour/keyeditor.cc
---- ardour-2.8.16/gtk2_ardour/keyeditor.cc~ 2012-03-16 15:33:28.000000000 +0100
-+++ ardour-2.8.16/gtk2_ardour/keyeditor.cc 2013-05-10 12:51:37.821008023 +0200
-@@ -2,11 +2,8 @@
-
- #include <ardour/profile.h>
-
--#include <gtkmm/stock.h>
--#include <gtkmm/label.h>
--#include <gtkmm/accelkey.h>
-+#include <gtkmm.h>
- #include <gtkmm/accelmap.h>
--#include <gtkmm/uimanager.h>
-
- #include <pbd/strsplit.h>
- #include <pbd/replace_all.h>
-diff -up ardour-2.8.16/gtk2_ardour/main.cc~ ardour-2.8.16/gtk2_ardour/main.cc
---- ardour-2.8.16/gtk2_ardour/main.cc~ 2012-07-02 15:21:59.000000000 +0200
-+++ ardour-2.8.16/gtk2_ardour/main.cc 2013-05-10 12:51:47.421008766 +0200
-@@ -23,7 +23,7 @@
- #include <fstream>
-
- #include <sigc++/bind.h>
--#include <gtkmm/settings.h>
-+#include <gtkmm.h>
-
- #include <pbd/error.h>
- #include <pbd/textreceiver.h>
-@@ -38,8 +38,6 @@
- #include <ardour/ardour.h>
- #include <ardour/audioengine.h>
-
--#include <gtkmm/main.h>
--
- #include <gtkmm2ext/application.h>
- #include <gtkmm2ext/popup.h>
- #include <gtkmm2ext/utils.h>
-diff -up ardour-2.8.16/gtk2_ardour/marker_time_axis.cc~ ardour-2.8.16/gtk2_ardour/marker_time_axis.cc
---- ardour-2.8.16/gtk2_ardour/marker_time_axis.cc~ 2009-03-02 21:42:15.000000000 +0100
-+++ ardour-2.8.16/gtk2_ardour/marker_time_axis.cc 2013-05-10 12:51:52.333009147 +0200
-@@ -21,7 +21,7 @@
-
- #include <pbd/error.h>
-
--#include <gtkmm/menu.h>
-+#include <gtkmm.h>
-
- #include <gtkmm2ext/utils.h>
-
-diff -up ardour-2.8.16/gtk2_ardour/midi_port_dialog.cc~ ardour-2.8.16/gtk2_ardour/midi_port_dialog.cc
---- ardour-2.8.16/gtk2_ardour/midi_port_dialog.cc~ 2009-02-24 13:37:42.000000000 +0100
-+++ ardour-2.8.16/gtk2_ardour/midi_port_dialog.cc 2013-05-10 12:51:58.029009588 +0200
-@@ -1,6 +1,6 @@
- #include <string>
- #include <sigc++/bind.h>
--#include <gtkmm/stock.h>
-+#include <gtkmm.h>
-
- #include <pbd/convert.h>
- #include <gtkmm2ext/utils.h>
-diff -up ardour-2.8.16/gtk2_ardour/mixer_ui.cc~ ardour-2.8.16/gtk2_ardour/mixer_ui.cc
---- ardour-2.8.16/gtk2_ardour/mixer_ui.cc~ 2011-09-27 18:10:50.000000000 +0200
-+++ ardour-2.8.16/gtk2_ardour/mixer_ui.cc 2013-05-10 12:52:09.053010441 +0200
-@@ -20,11 +20,11 @@
- #include <algorithm>
- #include <sigc++/bind.h>
-
-+#include <gtkmm.h>
- #include <gtkmm/accelmap.h>
-
- #include <pbd/convert.h>
- #include <pbd/stacktrace.h>
--#include <glibmm/thread.h>
-
- #include <gtkmm2ext/gtk_ui.h>
- #include <gtkmm2ext/utils.h>
-diff -up ardour-2.8.16/gtk2_ardour/nag.cc~ ardour-2.8.16/gtk2_ardour/nag.cc
---- ardour-2.8.16/gtk2_ardour/nag.cc~ 2012-07-02 15:21:59.000000000 +0200
-+++ ardour-2.8.16/gtk2_ardour/nag.cc 2013-05-10 12:52:13.501010785 +0200
-@@ -1,6 +1,6 @@
- #include <boost/scoped_ptr.hpp>
- #include <fstream>
--#include <gtkmm/stock.h>
-+#include <gtkmm.h>
-
- #include <ardour/ardour.h>
- #include <pbd/epa.h>
-diff -up ardour-2.8.16/gtk2_ardour/new_session_dialog.cc~ ardour-2.8.16/gtk2_ardour/new_session_dialog.cc
---- ardour-2.8.16/gtk2_ardour/new_session_dialog.cc~ 2012-07-02 02:19:40.000000000 +0200
-+++ ardour-2.8.16/gtk2_ardour/new_session_dialog.cc 2013-05-10 12:52:22.126011453 +0200
-@@ -25,14 +25,7 @@
-
- #include "pbd/stacktrace.h"
-
--#include <gtkmm/entry.h>
--#include <gtkmm/filechooserbutton.h>
--#include <gtkmm/spinbutton.h>
--#include <gtkmm/checkbutton.h>
--#include <gtkmm/radiobutton.h>
--#include <gtkmm/filefilter.h>
--#include <gtkmm/stock.h>
--#include <gdkmm/cursor.h>
-+#include <gtkmm.h>
-
- #include <gtkmm2ext/window_title.h>
-
-diff -up ardour-2.8.16/gtk2_ardour/panner2d.cc~ ardour-2.8.16/gtk2_ardour/panner2d.cc
---- ardour-2.8.16/gtk2_ardour/panner2d.cc~ 2009-02-24 13:37:42.000000000 +0100
-+++ ardour-2.8.16/gtk2_ardour/panner2d.cc 2013-05-10 12:52:27.453011865 +0200
-@@ -21,8 +21,7 @@
- #include <climits>
- #include <cstring>
-
--#include <gtkmm/menu.h>
--#include <gtkmm/checkmenuitem.h>
-+#include <gtkmm.h>
-
- #include <pbd/error.h>
- #include <ardour/panner.h>
-diff -up ardour-2.8.16/gtk2_ardour/playlist_selector.cc~ ardour-2.8.16/gtk2_ardour/playlist_selector.cc
---- ardour-2.8.16/gtk2_ardour/playlist_selector.cc~ 2009-10-26 02:03:48.000000000 +0100
-+++ ardour-2.8.16/gtk2_ardour/playlist_selector.cc 2013-05-10 12:52:32.493012255 +0200
-@@ -18,7 +18,7 @@
-
- */
-
--#include <gtkmm/button.h>
-+#include <gtkmm.h>
-
- #include <ardour/session_playlist.h>
- #include <ardour/audio_diskstream.h>
-diff -up ardour-2.8.16/gtk2_ardour/plugin_selector.cc~ ardour-2.8.16/gtk2_ardour/plugin_selector.cc
---- ardour-2.8.16/gtk2_ardour/plugin_selector.cc~ 2011-09-12 21:22:34.000000000 +0200
-+++ ardour-2.8.16/gtk2_ardour/plugin_selector.cc 2013-05-10 12:52:39.037012761 +0200
-@@ -23,10 +23,7 @@
-
- #include <algorithm>
-
--#include <gtkmm/table.h>
--#include <gtkmm/stock.h>
--#include <gtkmm/button.h>
--#include <gtkmm/notebook.h>
-+#include <gtkmm.h>
-
- #include <gtkmm2ext/utils.h>
-
-diff -up ardour-2.8.16/gtk2_ardour/plugin_ui.cc~ ardour-2.8.16/gtk2_ardour/plugin_ui.cc
---- ardour-2.8.16/gtk2_ardour/plugin_ui.cc~ 2012-06-18 21:49:14.000000000 +0200
-+++ ardour-2.8.16/gtk2_ardour/plugin_ui.cc 2013-05-10 12:52:45.117013232 +0200
-@@ -26,7 +26,7 @@
- #include <pbd/xml++.h>
- #include <pbd/failed_constructor.h>
-
--#include <gtkmm/widget.h>
-+#include <gtkmm.h>
- #include <gtkmm2ext/click_box.h>
- #include <gtkmm2ext/fastmeter.h>
- #include <gtkmm2ext/barcontroller.h>
-diff -up ardour-2.8.16/gtk2_ardour/redirect_box.cc~ ardour-2.8.16/gtk2_ardour/redirect_box.cc
---- ardour-2.8.16/gtk2_ardour/redirect_box.cc~ 2010-03-16 19:30:09.000000000 +0100
-+++ ardour-2.8.16/gtk2_ardour/redirect_box.cc 2013-05-10 12:52:55.325014022 +0200
-@@ -24,9 +24,7 @@
-
- #include <pbd/convert.h>
-
--#include <glibmm/miscutils.h>
--
--#include <gtkmm/messagedialog.h>
-+#include <gtkmm.h>
-
- #include <gtkmm2ext/gtk_ui.h>
- #include <gtkmm2ext/utils.h>
-diff -up ardour-2.8.16/gtk2_ardour/region_layering_order_editor.cc~ ardour-2.8.16/gtk2_ardour/region_layering_order_editor.cc
---- ardour-2.8.16/gtk2_ardour/region_layering_order_editor.cc~ 2009-11-13 15:37:10.000000000 +0100
-+++ ardour-2.8.16/gtk2_ardour/region_layering_order_editor.cc 2013-05-10 12:53:02.061014543 +0200
-@@ -1,6 +1,4 @@
--#include <gtkmm/table.h>
--#include <gtkmm/stock.h>
--#include <gtkmm/alignment.h>
-+#include <gtkmm.h>
- #include <ardour/region.h>
-
- #include "i18n.h"
-diff -up ardour-2.8.16/gtk2_ardour/rhythm_ferret.cc~ ardour-2.8.16/gtk2_ardour/rhythm_ferret.cc
---- ardour-2.8.16/gtk2_ardour/rhythm_ferret.cc~ 2011-04-06 19:09:42.000000000 +0200
-+++ ardour-2.8.16/gtk2_ardour/rhythm_ferret.cc 2013-05-10 12:53:06.893014917 +0200
-@@ -1,4 +1,4 @@
--#include <gtkmm/stock.h>
-+#include <gtkmm.h>
- #include <gtkmm2ext/utils.h>
-
- #include <pbd/memento_command.h>
-diff -up ardour-2.8.16/gtk2_ardour/route_params_ui.cc~ ardour-2.8.16/gtk2_ardour/route_params_ui.cc
---- ardour-2.8.16/gtk2_ardour/route_params_ui.cc~ 2010-03-16 21:00:41.000000000 +0100
-+++ ardour-2.8.16/gtk2_ardour/route_params_ui.cc 2013-05-10 12:53:15.581015590 +0200
-@@ -19,7 +19,7 @@
-
- #include <algorithm>
-
--#include <glibmm/thread.h>
-+#include <glibmm.h>
- #include <gtkmm2ext/utils.h>
- #include <gtkmm2ext/stop_signal.h>
- #include <gtkmm2ext/window_title.h>
-diff -up ardour-2.8.16/gtk2_ardour/route_time_axis.cc~ ardour-2.8.16/gtk2_ardour/route_time_axis.cc
---- ardour-2.8.16/gtk2_ardour/route_time_axis.cc~ 2010-04-17 17:23:01.000000000 +0200
-+++ ardour-2.8.16/gtk2_ardour/route_time_axis.cc 2013-05-10 12:53:22.957016161 +0200
-@@ -31,8 +31,7 @@
- #include <pbd/whitespace.h>
- #include <pbd/memento_command.h>
-
--#include <gtkmm/menu.h>
--#include <gtkmm/menuitem.h>
-+#include <gtkmm.h>
- #include <gtkmm2ext/gtk_ui.h>
- #include <gtkmm2ext/selector.h>
- #include <gtkmm2ext/stop_signal.h>
-diff -up ardour-2.8.16/gtk2_ardour/sfdb_ui.cc~ ardour-2.8.16/gtk2_ardour/sfdb_ui.cc
---- ardour-2.8.16/gtk2_ardour/sfdb_ui.cc~ 2012-07-02 15:21:59.000000000 +0200
-+++ ardour-2.8.16/gtk2_ardour/sfdb_ui.cc 2013-05-10 12:53:31.197016799 +0200
-@@ -25,9 +25,7 @@
- #include <sys/stat.h>
- #include <sys/param.h>
-
--#include <gtkmm/box.h>
--#include <gtkmm/stock.h>
--#include <glibmm/fileutils.h>
-+#include <gtkmm.h>
-
- #include <pbd/convert.h>
- #include <pbd/tokenizer.h>
-diff -up ardour-2.8.16/gtk2_ardour/tempo_dialog.cc~ ardour-2.8.16/gtk2_ardour/tempo_dialog.cc
---- ardour-2.8.16/gtk2_ardour/tempo_dialog.cc~ 2009-09-17 00:13:32.000000000 +0200
-+++ ardour-2.8.16/gtk2_ardour/tempo_dialog.cc 2013-05-10 12:53:42.844017700 +0200
-@@ -19,7 +19,7 @@
-
- #include <cstdio> // for snprintf, grrr
-
--#include <gtkmm/stock.h>
-+#include <gtkmm.h>
- #include <gtkmm2ext/utils.h>
-
- #include "tempo_dialog.h"
-diff -up ardour-2.8.16/gtk2_ardour/tempo_lines.cc~ ardour-2.8.16/gtk2_ardour/tempo_lines.cc
---- ardour-2.8.16/gtk2_ardour/tempo_lines.cc~ 2009-02-24 13:37:42.000000000 +0100
-+++ ardour-2.8.16/gtk2_ardour/tempo_lines.cc 2013-05-10 12:53:49.100018184 +0200
-@@ -17,8 +17,7 @@
-
- */
-
--#include <libgnomecanvasmm/canvas.h>
--#include <libgnomecanvasmm/group.h>
-+#include <libgnomecanvasmm.h>
- #include "tempo_lines.h"
- #include "ardour_ui.h"
-
-diff -up ardour-2.8.16/gtk2_ardour/theme_manager.cc~ ardour-2.8.16/gtk2_ardour/theme_manager.cc
---- ardour-2.8.16/gtk2_ardour/theme_manager.cc~ 2010-03-16 19:30:09.000000000 +0100
-+++ ardour-2.8.16/gtk2_ardour/theme_manager.cc 2013-05-10 12:53:55.916018712 +0200
-@@ -22,9 +22,8 @@
- #include <fstream>
- #include <errno.h>
-
--#include <gtkmm/stock.h>
-+#include <gtkmm.h>
- #include <gtkmm2ext/gtk_ui.h>
--#include <gtkmm/settings.h>
-
- #include <ardour/profile.h>
-
-diff -up ardour-2.8.16/gtk2_ardour/time_axis_view.cc~ ardour-2.8.16/gtk2_ardour/time_axis_view.cc
---- ardour-2.8.16/gtk2_ardour/time_axis_view.cc~ 2010-06-02 17:55:17.000000000 +0200
-+++ ardour-2.8.16/gtk2_ardour/time_axis_view.cc 2013-05-10 12:54:02.060019187 +0200
-@@ -24,7 +24,6 @@
- #include <list>
-
- #include <libgnomecanvasmm.h>
--#include <libgnomecanvasmm/canvas.h>
- #include <libgnomecanvasmm/item.h>
-
- #include <pbd/error.h>
-diff -up ardour-2.8.16/gtk2_ardour/ui_config.cc~ ardour-2.8.16/gtk2_ardour/ui_config.cc
---- ardour-2.8.16/gtk2_ardour/ui_config.cc~ 2010-03-16 19:30:09.000000000 +0100
-+++ ardour-2.8.16/gtk2_ardour/ui_config.cc 2013-05-10 12:54:13.164020047 +0200
-@@ -20,7 +20,7 @@
- #include <unistd.h>
- #include <cstdio> /* for snprintf, grrr */
-
--#include <glibmm/miscutils.h>
-+#include <glibmm.h>
-
- #include <pbd/failed_constructor.h>
- #include <pbd/xml++.h>
-diff -up ardour-2.8.16/gtk2_ardour/utils.cc~ ardour-2.8.16/gtk2_ardour/utils.cc
---- ardour-2.8.16/gtk2_ardour/utils.cc~ 2012-07-27 04:36:07.000000000 +0200
-+++ ardour-2.8.16/gtk2_ardour/utils.cc 2013-05-10 12:54:38.989022045 +0200
-@@ -25,12 +25,8 @@
- #include <fstream>
- #include <sys/stat.h>
- #include <libart_lgpl/art_misc.h>
--#include <gtkmm/rc.h>
--#include <gtkmm/window.h>
--#include <gtkmm/combo.h>
--#include <gtkmm/label.h>
--#include <gtkmm/paned.h>
--#include <gtk/gtkpaned.h>
-+#include <gtk/gtk.h>
-+#include <gtkmm.h>
-
- #include <gtkmm2ext/utils.h>
- #include <ardour/ardour.h>
-diff -up ardour-2.8.16/gtk2_ardour/about.h~ ardour-2.8.16/gtk2_ardour/about.h
---- ardour-2.8.16/gtk2_ardour/about.h~ 2009-02-24 13:37:42.000000000 +0100
-+++ ardour-2.8.16/gtk2_ardour/about.h 2013-05-10 12:59:25.595044228 +0200
-@@ -20,7 +20,7 @@
- #ifndef __ardour_gtk_about_h__
- #define __ardour_gtk_about_h__
-
--#include <gtkmm/aboutdialog.h>
-+#include <gtkmm.h>
-
- class ARDOUR_UI;
-
-diff -up ardour-2.8.16/gtk2_ardour/actions.h~ ardour-2.8.16/gtk2_ardour/actions.h
---- ardour-2.8.16/gtk2_ardour/actions.h~ 2012-03-16 15:33:28.000000000 +0100
-+++ ardour-2.8.16/gtk2_ardour/actions.h 2013-05-10 12:59:33.883044870 +0200
-@@ -21,11 +21,7 @@
- #define __ardour_gtk_actions_h__
-
- #include <vector>
--#include <gtkmm/action.h>
--#include <gtkmm/radioaction.h>
--#include <gtkmm/toggleaction.h>
--#include <gtkmm/actiongroup.h>
--#include <gtkmm/accelkey.h>
-+#include <gtkmm.h>
-
- #include <ardour/configuration.h>
-
-diff -up ardour-2.8.16/gtk2_ardour/add_route_dialog.h~ ardour-2.8.16/gtk2_ardour/add_route_dialog.h
---- ardour-2.8.16/gtk2_ardour/add_route_dialog.h~ 2009-07-04 19:38:23.000000000 +0200
-+++ ardour-2.8.16/gtk2_ardour/add_route_dialog.h 2013-05-10 12:59:40.330045369 +0200
-@@ -22,14 +22,7 @@
-
- #include <string>
-
--#include <gtkmm/entry.h>
--#include <gtkmm/dialog.h>
--#include <gtkmm/frame.h>
--#include <gtkmm/radiobutton.h>
--#include <gtkmm/adjustment.h>
--#include <gtkmm/spinbutton.h>
--#include <gtkmm/button.h>
--#include <gtkmm/comboboxtext.h>
-+#include <gtkmm.h>
-
- #include <ardour/types.h>
- #include <ardour/session.h>
-diff -up ardour-2.8.16/gtk2_ardour/analysis_window.h~ ardour-2.8.16/gtk2_ardour/analysis_window.h
---- ardour-2.8.16/gtk2_ardour/analysis_window.h~ 2009-02-24 13:37:42.000000000 +0100
-+++ ardour-2.8.16/gtk2_ardour/analysis_window.h 2013-05-10 12:59:58.154046748 +0200
-@@ -20,24 +20,9 @@
- #ifndef __ardour_analysis_window_h__
- #define __ardour_analysis_window_h__
-
--#include <glibmm.h>
--#include <glibmm/refptr.h>
--
--#include <gtkmm/radiobutton.h>
--#include <gtkmm/dialog.h>
--#include <gtkmm/layout.h>
--#include <gtkmm/treeview.h>
--#include <gtkmm/notebook.h>
--#include <gtkmm/label.h>
--#include <gtkmm/liststore.h>
--#include <gtkmm/separator.h>
--#include <gtkmm/window.h>
--
-+#include <gtkmm.h>
- #include <gtkmm2ext/dndtreeview.h>
-
--#include <glibmm/thread.h>
--
--
- #include "ardour_dialog.h"
- #include "fft_graph.h"
- #include "fft_result.h"
-diff -up ardour-2.8.16/gtk2_ardour/ardour_dialog.h~ ardour-2.8.16/gtk2_ardour/ardour_dialog.h
---- ardour-2.8.16/gtk2_ardour/ardour_dialog.h~ 2009-02-24 13:37:42.000000000 +0100
-+++ ardour-2.8.16/gtk2_ardour/ardour_dialog.h 2013-05-10 13:00:04.043047204 +0200
-@@ -21,8 +21,7 @@
- #define __ardour_dialog_h__
-
- #include <ardour/ardour.h>
--#include <gtkmm/window.h>
--#include <gtkmm/dialog.h>
-+#include <gtkmm.h>
-
- namespace ARDOUR {
- class Session;
-diff -up ardour-2.8.16/gtk2_ardour/ardour_ui.h~ ardour-2.8.16/gtk2_ardour/ardour_ui.h
---- ardour-2.8.16/gtk2_ardour/ardour_ui.h~ 2013-05-10 12:44:45.000000000 +0200
-+++ ardour-2.8.16/gtk2_ardour/ardour_ui.h 2013-05-10 13:00:36.859049744 +0200
-@@ -35,24 +35,10 @@
- #include <list>
- #include <cmath>
-
--#include <libgnomecanvasmm/canvas.h>
-+#include <gtkmm.h>
-+#include <libgnomecanvasmm.h>
-
- #include <pbd/xml++.h>
--#include <gtkmm/box.h>
--#include <gtkmm/frame.h>
--#include <gtkmm/label.h>
--#include <gtkmm/table.h>
--#include <gtkmm/fixed.h>
--#include <gtkmm/drawingarea.h>
--#include <gtkmm/eventbox.h>
--#include <gtkmm/menu.h>
--#include <gtkmm/menuitem.h>
--#include <gtkmm/button.h>
--#include <gtkmm/togglebutton.h>
--#include <gtkmm/treeview.h>
--#include <gtkmm/menubar.h>
--#include <gtkmm/textbuffer.h>
--#include <gtkmm/adjustment.h>
- #include <gtkmm2ext/gtk_ui.h>
- #ifdef HOST_NOT_FOUND
- #undef HOST_NOT_FOUND
-diff -up ardour-2.8.16/gtk2_ardour/au_pluginui.h~ ardour-2.8.16/gtk2_ardour/au_pluginui.h
---- ardour-2.8.16/gtk2_ardour/au_pluginui.h~ 2012-07-02 15:21:59.000000000 +0200
-+++ ardour-2.8.16/gtk2_ardour/au_pluginui.h 2013-05-10 13:00:47.642050578 +0200
-@@ -20,10 +20,7 @@
- #undef require
- #undef verify
-
--#include <gtkmm/box.h>
--#include <gtkmm/combobox.h>
--#include <gtkmm/button.h>
--#include <gtkmm/label.h>
-+#include <gtkmm.h>
-
- #include "plugin_ui.h"
-
-diff -up ardour-2.8.16/gtk2_ardour/audio_clock.h~ ardour-2.8.16/gtk2_ardour/audio_clock.h
---- ardour-2.8.16/gtk2_ardour/audio_clock.h~ 2009-02-24 13:37:42.000000000 +0100
-+++ ardour-2.8.16/gtk2_ardour/audio_clock.h 2013-05-10 13:00:56.554051268 +0200
-@@ -20,11 +20,7 @@
- #ifndef __audio_clock_h__
- #define __audio_clock_h__
-
--#include <gtkmm/box.h>
--#include <gtkmm/menu.h>
--#include <gtkmm/eventbox.h>
--#include <gtkmm/label.h>
--#include <gtkmm/frame.h>
-+#include <gtkmm.h>
- #include <ardour/ardour.h>
-
- namespace ARDOUR {
-diff -up ardour-2.8.16/gtk2_ardour/audio_region_editor.h~ ardour-2.8.16/gtk2_ardour/audio_region_editor.h
---- ardour-2.8.16/gtk2_ardour/audio_region_editor.h~ 2009-10-28 19:59:09.000000000 +0100
-+++ ardour-2.8.16/gtk2_ardour/audio_region_editor.h 2013-05-10 13:01:47.417055205 +0200
-@@ -22,19 +22,7 @@
-
- #include <map>
-
--#include <gtkmm/label.h>
--#include <gtkmm/entry.h>
--#include <gtkmm/box.h>
--#include <gtkmm/togglebutton.h>
--#include <gtkmm/button.h>
--#include <gtkmm/arrow.h>
--#include <gtkmm/frame.h>
--#include <gtkmm/table.h>
--#include <gtkmm/alignment.h>
--#include <gtkmm/adjustment.h>
--#include <gtkmm/separator.h>
--#include <gtkmm/spinbutton.h>
--
-+#include <gtkmm.h>
- #include <libgnomecanvas/libgnomecanvas.h>
- #include <sigc++/signal.h>
-
-diff -up ardour-2.8.16/gtk2_ardour/audio_time_axis.h~ ardour-2.8.16/gtk2_ardour/audio_time_axis.h
---- ardour-2.8.16/gtk2_ardour/audio_time_axis.h~ 2009-08-21 15:47:47.000000000 +0200
-+++ ardour-2.8.16/gtk2_ardour/audio_time_axis.h 2013-05-10 13:02:02.969056408 +0200
-@@ -20,14 +20,7 @@
- #ifndef __ardour_audio_time_axis_h__
- #define __ardour_audio_time_axis_h__
-
--#include <gtkmm/table.h>
--#include <gtkmm/button.h>
--#include <gtkmm/box.h>
--#include <gtkmm/menu.h>
--#include <gtkmm/menuitem.h>
--#include <gtkmm/radiomenuitem.h>
--#include <gtkmm/checkmenuitem.h>
--
-+#include <gtkmm.h>
- #include <gtkmm2ext/selector.h>
- #include <list>
-
-diff -up ardour-2.8.16/gtk2_ardour/automation_line.h~ ardour-2.8.16/gtk2_ardour/automation_line.h
---- ardour-2.8.16/gtk2_ardour/automation_line.h~ 2010-04-21 17:09:47.000000000 +0200
-+++ ardour-2.8.16/gtk2_ardour/automation_line.h 2013-05-10 13:02:11.769057090 +0200
-@@ -25,7 +25,7 @@
- #include <string>
- #include <sys/types.h>
-
--#include <libgnomecanvasmm/line.h>
-+#include <libgnomecanvasmm.h>
- #include <sigc++/signal.h>
- #include "canvas.h"
- #include "simplerect.h"
-diff -up ardour-2.8.16/gtk2_ardour/axis_view.h~ ardour-2.8.16/gtk2_ardour/axis_view.h
---- ardour-2.8.16/gtk2_ardour/axis_view.h~ 2009-02-24 13:37:42.000000000 +0100
-+++ ardour-2.8.16/gtk2_ardour/axis_view.h 2013-05-10 13:02:19.225057667 +0200
-@@ -22,8 +22,7 @@
-
- #include <list>
-
--#include <gtkmm/label.h>
--#include <gdkmm/color.h>
-+#include <gtkmm.h>
-
- #include <pbd/xml++.h>
- #include "prompter.h"
-diff -up ardour-2.8.16/gtk2_ardour/canvas-noevent-text.h~ ardour-2.8.16/gtk2_ardour/canvas-noevent-text.h
---- ardour-2.8.16/gtk2_ardour/canvas-noevent-text.h~ 2011-09-12 21:22:34.000000000 +0200
-+++ ardour-2.8.16/gtk2_ardour/canvas-noevent-text.h 2013-05-10 13:02:26.601058237 +0200
-@@ -21,8 +21,7 @@
- #ifndef __gtk2_ardour_canvas_noevent_text_h__
- #define __gtk2_ardour_canvas_noevent_text_h__
-
--#include <libgnomecanvasmm/text.h>
--#include <libgnomecanvasmm/text.h>
-+#include <libgnomecanvasmm.h>
-
- namespace Gnome { namespace Canvas {
-
-diff -up ardour-2.8.16/gtk2_ardour/canvas_impl.h~ ardour-2.8.16/gtk2_ardour/canvas_impl.h
---- ardour-2.8.16/gtk2_ardour/canvas_impl.h~ 2009-02-24 13:37:42.000000000 +0100
-+++ ardour-2.8.16/gtk2_ardour/canvas_impl.h 2013-05-10 13:02:33.099058740 +0200
-@@ -22,11 +22,8 @@
-
- #include "canvas.h"
-
--#include <libgnomecanvasmm/canvas.h>
-+#include <libgnomecanvasmm.h>
- #include <libgnomecanvasmm/polygon.h>
--#include <libgnomecanvasmm/text.h>
--#include <libgnomecanvasmm/rect.h>
--#include <libgnomecanvasmm/line.h>
- #include <libgnomecanvasmm/item.h>
-
- using namespace ArdourCanvas;
-diff -up ardour-2.8.16/gtk2_ardour/connection_editor.h~ ardour-2.8.16/gtk2_ardour/connection_editor.h
---- ardour-2.8.16/gtk2_ardour/connection_editor.h~ 2011-09-12 21:22:34.000000000 +0200
-+++ ardour-2.8.16/gtk2_ardour/connection_editor.h 2013-05-10 13:02:47.865059883 +0200
-@@ -27,19 +27,10 @@ using __gnu_cxx::slist;
- #include <slist.h>
- #endif
-
--#include <gtkmm/box.h>
--#include <gtkmm/window.h>
--#include <gtkmm/scrolledwindow.h>
--#include <gtkmm/button.h>
--#include <gtkmm/frame.h>
--#include <gtkmm/notebook.h>
--#include <gtkmm/treeview.h>
--#include <gtkmm/liststore.h>
-+#include <gtkmm.h>
-
- #include "ardour_dialog.h"
-
--#include <glibmm/thread.h>
--
- namespace ARDOUR {
- class Session;
- class Connection;
-diff -up ardour-2.8.16/gtk2_ardour/crossfade_edit.h~ ardour-2.8.16/gtk2_ardour/crossfade_edit.h
---- ardour-2.8.16/gtk2_ardour/crossfade_edit.h~ 2009-02-24 13:37:42.000000000 +0100
-+++ ardour-2.8.16/gtk2_ardour/crossfade_edit.h 2013-05-10 13:02:53.865060348 +0200
-@@ -22,9 +22,7 @@
-
- #include <list>
-
--#include <gtkmm/box.h>
--#include <gtkmm/button.h>
--#include <gtkmm/radiobutton.h>
-+#include <gtkmm.h>
-
- #include <ardour/curve.h>
- #include "ardour_dialog.h"
-diff -up ardour-2.8.16/gtk2_ardour/editor.h~ ardour-2.8.16/gtk2_ardour/editor.h
---- ardour-2.8.16/gtk2_ardour/editor.h~ 2012-03-16 15:33:28.000000000 +0100
-+++ ardour-2.8.16/gtk2_ardour/editor.h 2013-05-10 13:03:13.241061847 +0200
-@@ -28,16 +28,11 @@
-
- #include <boost/optional.hpp>
-
--#include <libgnomecanvasmm/canvas.h>
--#include <libgnomecanvasmm/group.h>
--#include <libgnomecanvasmm/line.h>
--#include <libgnomecanvasmm/pixbuf.h>
-+#include <gtkmm.h>
-+#include <libgnomecanvasmm.h>
-
- #include <cmath>
-
--#include <gtkmm/layout.h>
--#include <gtkmm/comboboxtext.h>
--
- #include <gtkmm2ext/selector.h>
- #include <gtkmm2ext/click_box.h>
- #include <gtkmm2ext/dndtreeview.h>
-diff -up ardour-2.8.16/gtk2_ardour/engine_dialog.h~ ardour-2.8.16/gtk2_ardour/engine_dialog.h
---- ardour-2.8.16/gtk2_ardour/engine_dialog.h~ 2009-09-17 04:19:04.000000000 +0200
-+++ ardour-2.8.16/gtk2_ardour/engine_dialog.h 2013-05-10 13:03:22.281062547 +0200
-@@ -5,15 +5,7 @@
- #include <vector>
- #include <string>
-
--#include <gtkmm/checkbutton.h>
--#include <gtkmm/spinbutton.h>
--#include <gtkmm/notebook.h>
--#include <gtkmm/comboboxtext.h>
--#include <gtkmm/table.h>
--#include <gtkmm/expander.h>
--#include <gtkmm/box.h>
--#include <gtkmm/buttonbox.h>
--#include <gtkmm/button.h>
-+#include <gtkmm.h>
-
- class EngineControl : public Gtk::VBox {
- public:
-diff -up ardour-2.8.16/gtk2_ardour/fft_graph.h~ ardour-2.8.16/gtk2_ardour/fft_graph.h
---- ardour-2.8.16/gtk2_ardour/fft_graph.h~ 2009-02-24 13:37:42.000000000 +0100
-+++ ardour-2.8.16/gtk2_ardour/fft_graph.h 2013-05-10 13:03:30.601063191 +0200
-@@ -23,11 +23,7 @@
- #include <ardour/types.h>
- #include <fftw3.h>
-
--#include <gtkmm/drawingarea.h>
--#include <gtkmm/treemodel.h>
--#include <gdkmm/color.h>
--
--#include <glibmm/refptr.h>
-+#include <gtkmm.h>
-
- #include <string>
-
-diff -up ardour-2.8.16/gtk2_ardour/fft_result.h~ ardour-2.8.16/gtk2_ardour/fft_result.h
---- ardour-2.8.16/gtk2_ardour/fft_result.h~ 2009-02-24 13:37:42.000000000 +0100
-+++ ardour-2.8.16/gtk2_ardour/fft_result.h 2013-05-10 13:03:36.985063685 +0200
-@@ -24,7 +24,7 @@
- #include <ardour/types.h>
- #include <fftw3.h>
-
--#include <gdkmm/color.h>
-+#include <gtkmm.h>
-
- #include <string>
-
-diff -up ardour-2.8.16/gtk2_ardour/gain_meter.h~ ardour-2.8.16/gtk2_ardour/gain_meter.h
---- ardour-2.8.16/gtk2_ardour/gain_meter.h~ 2009-02-24 13:37:42.000000000 +0100
-+++ ardour-2.8.16/gtk2_ardour/gain_meter.h 2013-05-10 13:03:43.656064201 +0200
-@@ -23,13 +23,7 @@
- #include <vector>
- #include <map>
-
--#include <gtkmm/box.h>
--#include <gtkmm/adjustment.h>
--#include <gtkmm/frame.h>
--#include <gtkmm/eventbox.h>
--#include <gtkmm/button.h>
--#include <gtkmm/table.h>
--#include <gtkmm/drawingarea.h>
-+#include <gtkmm.h>
-
- #include <ardour/types.h>
-
-diff -up ardour-2.8.16/gtk2_ardour/imageframe.h~ ardour-2.8.16/gtk2_ardour/imageframe.h
---- ardour-2.8.16/gtk2_ardour/imageframe.h~ 2009-02-24 13:37:42.000000000 +0100
-+++ ardour-2.8.16/gtk2_ardour/imageframe.h 2013-05-10 13:03:49.352064642 +0200
-@@ -27,8 +27,8 @@
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-+#include <libgnomecanvasmm.h>
- #include <libgnomecanvasmm/item.h>
--#include <libgnomecanvasmm/group.h>
- #include <libgnomecanvasmm/shape.h>
- #include "canvas-imageframe.h"
-
-diff -up ardour-2.8.16/gtk2_ardour/imageframe_p.h~ ardour-2.8.16/gtk2_ardour/imageframe_p.h
---- ardour-2.8.16/gtk2_ardour/imageframe_p.h~ 2009-02-24 13:37:42.000000000 +0100
-+++ ardour-2.8.16/gtk2_ardour/imageframe_p.h 2013-05-10 13:03:53.977065000 +0200
-@@ -21,7 +21,7 @@
- #ifndef _LIBGNOMECANVASMM_IMAGEFRAME_P_H
- #define _LIBGNOMECANVASMM_IMAGEFRAME_P_H
-
--#include <glibmm/class.h>
-+#include <glibmm.h>
-
- namespace Gnome
- {
-diff -up ardour-2.8.16/gtk2_ardour/imageframe_time_axis_group.h~ ardour-2.8.16/gtk2_ardour/imageframe_time_axis_group.h
---- ardour-2.8.16/gtk2_ardour/imageframe_time_axis_group.h~ 2009-02-24 13:37:42.000000000 +0100
-+++ ardour-2.8.16/gtk2_ardour/imageframe_time_axis_group.h 2013-05-10 13:04:07.241066027 +0200
-@@ -23,7 +23,7 @@
- #include <list>
- #include <cmath>
-
--#include <gdkmm/color.h>
-+#include <gtkmm.h>
-
- #include <libgnomecanvas/libgnomecanvas.h>
- #include <jack/jack.h>
-diff -up ardour-2.8.16/gtk2_ardour/imageframe_time_axis_view.h~ ardour-2.8.16/gtk2_ardour/imageframe_time_axis_view.h
---- ardour-2.8.16/gtk2_ardour/imageframe_time_axis_view.h~ 2009-02-24 13:37:42.000000000 +0100
-+++ ardour-2.8.16/gtk2_ardour/imageframe_time_axis_view.h 2013-05-10 13:04:12.217066412 +0200
-@@ -23,7 +23,7 @@
- #include <list>
- #include <cmath>
-
--#include <gdkmm/color.h>
-+#include <gtkmm.h>
-
- #include <jack/jack.h>
-
-diff -up ardour-2.8.16/gtk2_ardour/imageframe_view.h~ ardour-2.8.16/gtk2_ardour/imageframe_view.h
---- ardour-2.8.16/gtk2_ardour/imageframe_view.h~ 2009-02-24 13:37:42.000000000 +0100
-+++ ardour-2.8.16/gtk2_ardour/imageframe_view.h 2013-05-10 13:04:44.872068939 +0200
-@@ -21,7 +21,7 @@
- #define __gtk_ardour_imageframe_view_h__
-
- #include <string>
--#include <gdkmm/color.h>
-+#include <gtkmm.h>
- #include <libgnomecanvas/libgnomecanvas.h>
- #include <sigc++/signal.h>
- #include <list>
-diff -up ardour-2.8.16/gtk2_ardour/io_selector.h~ ardour-2.8.16/gtk2_ardour/io_selector.h
---- ardour-2.8.16/gtk2_ardour/io_selector.h~ 2011-09-12 21:22:34.000000000 +0200
-+++ ardour-2.8.16/gtk2_ardour/io_selector.h 2013-05-10 13:04:54.472069682 +0200
-@@ -29,16 +29,7 @@ using __gnu_cxx::slist;
-
- #include <string>
-
--#include <glibmm/thread.h>
--
--#include <gtkmm/box.h>
--#include <gtkmm/frame.h>
--#include <gtkmm/button.h>
--#include <gtkmm/togglebutton.h>
--#include <gtkmm/scrolledwindow.h>
--#include <gtkmm/notebook.h>
--#include <gtkmm/treeview.h>
--#include <gtkmm/liststore.h>
-+#include <gtkmm.h>
-
- #include <ardour_dialog.h>
-
-diff -up ardour-2.8.16/gtk2_ardour/keyboard.h~ ardour-2.8.16/gtk2_ardour/keyboard.h
---- ardour-2.8.16/gtk2_ardour/keyboard.h~ 2009-02-24 13:37:42.000000000 +0100
-+++ ardour-2.8.16/gtk2_ardour/keyboard.h 2013-05-10 13:05:41.912073354 +0200
-@@ -26,8 +26,7 @@
-
- #include <sigc++/signal.h>
- #include <gtk/gtk.h>
--#include <gtkmm/window.h>
--#include <gtkmm/accelkey.h>
-+#include <gtkmm.h>
-
- #include <ardour/types.h>
- #include <pbd/stateful.h>
-diff -up ardour-2.8.16/gtk2_ardour/keyeditor.h~ ardour-2.8.16/gtk2_ardour/keyeditor.h
---- ardour-2.8.16/gtk2_ardour/keyeditor.h~ 2011-09-12 21:22:34.000000000 +0200
-+++ ardour-2.8.16/gtk2_ardour/keyeditor.h 2013-05-10 13:06:25.832076753 +0200
-@@ -3,10 +3,7 @@
-
- #include <string>
-
--#include <gtkmm/buttonbox.h>
--#include <gtkmm/treeview.h>
--#include <gtkmm/treestore.h>
--#include <gtkmm/scrolledwindow.h>
-+#include <gtkmm.h>
-
- #include "ardour_dialog.h"
-
-diff -up ardour-2.8.16/gtk2_ardour/level_meter.h~ ardour-2.8.16/gtk2_ardour/level_meter.h
---- ardour-2.8.16/gtk2_ardour/level_meter.h~ 2009-02-24 13:37:42.000000000 +0100
-+++ ardour-2.8.16/gtk2_ardour/level_meter.h 2013-05-10 13:06:33.047077312 +0200
-@@ -23,13 +23,7 @@
- #include <vector>
- #include <map>
-
--#include <gtkmm/box.h>
--#include <gtkmm/adjustment.h>
--#include <gtkmm/frame.h>
--#include <gtkmm/eventbox.h>
--#include <gtkmm/button.h>
--#include <gtkmm/table.h>
--#include <gtkmm/drawingarea.h>
-+#include <gtkmm.h>
-
- #include <ardour/types.h>
-
-diff -up ardour-2.8.16/gtk2_ardour/location_ui.h~ ardour-2.8.16/gtk2_ardour/location_ui.h
---- ardour-2.8.16/gtk2_ardour/location_ui.h~ 2009-02-24 13:37:42.000000000 +0100
-+++ ardour-2.8.16/gtk2_ardour/location_ui.h 2013-05-10 13:06:39.544077815 +0200
-@@ -20,12 +20,7 @@
- #ifndef __ardour_location_ui_h__
- #define __ardour_location_ui_h__
-
--#include <gtkmm/box.h>
--#include <gtkmm/checkbutton.h>
--#include <gtkmm/button.h>
--#include <gtkmm/table.h>
--#include <gtkmm/entry.h>
--#include <gtkmm/label.h>
-+#include <gtkmm.h>
-
- #include <ardour/location.h>
- #include <ardour/session.h>
-diff -up ardour-2.8.16/gtk2_ardour/lv2_plugin_ui.h~ ardour-2.8.16/gtk2_ardour/lv2_plugin_ui.h
---- ardour-2.8.16/gtk2_ardour/lv2_plugin_ui.h~ 2012-02-27 16:03:44.000000000 +0100
-+++ ardour-2.8.16/gtk2_ardour/lv2_plugin_ui.h 2013-05-10 13:06:45.000078237 +0200
-@@ -26,7 +26,7 @@
- #include <list>
-
- #include <sigc++/signal.h>
--#include <gtkmm/widget.h>
-+#include <gtkmm.h>
-
- #include <ardour_dialog.h>
- #include <ardour/types.h>
-diff -up ardour-2.8.16/gtk2_ardour/marker.h~ ardour-2.8.16/gtk2_ardour/marker.h
---- ardour-2.8.16/gtk2_ardour/marker.h~ 2010-06-02 17:55:17.000000000 +0200
-+++ ardour-2.8.16/gtk2_ardour/marker.h 2013-05-10 13:06:50.200078639 +0200
-@@ -25,7 +25,7 @@
- #include <ardour/ardour.h>
- #include <pbd/destructible.h>
-
--#include <libgnomecanvasmm/pixbuf.h>
-+#include <libgnomecanvasmm.h>
-
- #include "canvas.h"
-
-diff -up ardour-2.8.16/gtk2_ardour/marker_time_axis_view.h~ ardour-2.8.16/gtk2_ardour/marker_time_axis_view.h
---- ardour-2.8.16/gtk2_ardour/marker_time_axis_view.h~ 2009-02-24 13:37:42.000000000 +0100
-+++ ardour-2.8.16/gtk2_ardour/marker_time_axis_view.h 2013-05-10 13:06:59.879079389 +0200
-@@ -21,8 +21,8 @@
- #define __ardour_marker_time_axis_view_h__
-
- #include <list>
--#include <gdkmm/color.h>
--#include <libgnomecanvasmm/group.h>
-+#include <gtkmm.h>
-+#include <libgnomecanvasmm.h>
-
- #include <ardour/location.h>
- #include "simplerect.h"
-diff -up ardour-2.8.16/gtk2_ardour/midi_port_dialog.h~ ardour-2.8.16/gtk2_ardour/midi_port_dialog.h
---- ardour-2.8.16/gtk2_ardour/midi_port_dialog.h~ 2009-02-24 13:37:42.000000000 +0100
-+++ ardour-2.8.16/gtk2_ardour/midi_port_dialog.h 2013-05-10 13:07:06.503079901 +0200
-@@ -1,7 +1,4 @@
--#include <gtkmm/box.h>
--#include <gtkmm/label.h>
--#include <gtkmm/entry.h>
--#include <gtkmm/comboboxtext.h>
-+#include <gtkmm.h>
-
- #include "ardour_dialog.h"
-
-diff -up ardour-2.8.16/gtk2_ardour/mixer_strip.h~ ardour-2.8.16/gtk2_ardour/mixer_strip.h
---- ardour-2.8.16/gtk2_ardour/mixer_strip.h~ 2009-10-01 19:15:47.000000000 +0200
-+++ ardour-2.8.16/gtk2_ardour/mixer_strip.h 2013-05-10 13:07:16.120080646 +0200
-@@ -23,17 +23,7 @@
-
- #include <cmath>
-
--#include <gtkmm/eventbox.h>
--#include <gtkmm/button.h>
--#include <gtkmm/box.h>
--#include <gtkmm/frame.h>
--#include <gtkmm/button.h>
--#include <gtkmm/label.h>
--#include <gtkmm/togglebutton.h>
--#include <gtkmm/menu.h>
--#include <gtkmm/textview.h>
--#include <gtkmm/adjustment.h>
--
-+#include <gtkmm.h>
- #include <gtkmm2ext/auto_spin.h>
- #include <gtkmm2ext/click_box.h>
- #include <gtkmm2ext/slider_controller.h>
-diff -up ardour-2.8.16/gtk2_ardour/mixer_ui.h~ ardour-2.8.16/gtk2_ardour/mixer_ui.h
---- ardour-2.8.16/gtk2_ardour/mixer_ui.h~ 2011-09-12 21:22:34.000000000 +0200
-+++ ardour-2.8.16/gtk2_ardour/mixer_ui.h 2013-05-10 13:07:22.855081167 +0200
-@@ -22,15 +22,7 @@
-
- #include <list>
-
--#include <gtkmm/box.h>
--#include <gtkmm/scrolledwindow.h>
--#include <gtkmm/eventbox.h>
--#include <gtkmm/label.h>
--#include <gtkmm/button.h>
--#include <gtkmm/frame.h>
--#include <gtkmm/paned.h>
--#include <gtkmm/menu.h>
--#include <gtkmm/treeview.h>
-+#include <gtkmm.h>
-
- #include <pbd/stateful.h>
-
-diff -up ardour-2.8.16/gtk2_ardour/nag.h~ ardour-2.8.16/gtk2_ardour/nag.h
---- ardour-2.8.16/gtk2_ardour/nag.h~ 2009-06-04 16:36:00.000000000 +0200
-+++ ardour-2.8.16/gtk2_ardour/nag.h 2013-05-10 13:07:30.423081753 +0200
-@@ -3,9 +3,7 @@
-
- #include "ardour_dialog.h"
-
--#include <gtkmm/label.h>
--#include <gtkmm/radiobutton.h>
--#include <gtkmm/buttonbox.h>
-+#include <gtkmm.h>
-
- class NagScreen : public ArdourDialog
- {
-diff -up ardour-2.8.16/gtk2_ardour/new_session_dialog.h~ ardour-2.8.16/gtk2_ardour/new_session_dialog.h
---- ardour-2.8.16/gtk2_ardour/new_session_dialog.h~ 2011-09-12 21:22:34.000000000 +0200
-+++ ardour-2.8.16/gtk2_ardour/new_session_dialog.h 2013-05-10 13:07:56.743083790 +0200
-@@ -23,20 +23,10 @@
- #define NEW_SESSION_DIALOG_H
-
- #include <string>
--#include <gtkmm/treeview.h>
--#include <gtkmm/treestore.h>
--#include <gtkmm/treepath.h>
--#include <gtkmm/scrolledwindow.h>
--#include <gtkmm/notebook.h>
--#include <gtkmm/table.h>
--#include <gtkmm/alignment.h>
--#include <gtkmm/frame.h>
--#include <gtkmm/expander.h>
-+#include <gtkmm.h>
-
- #include <ardour/utils.h>
-
--#include <glibmm/refptr.h>
--
- #include "ardour_dialog.h"
- #include "engine_dialog.h"
-
-diff -up ardour-2.8.16/gtk2_ardour/option_editor.h~ ardour-2.8.16/gtk2_ardour/option_editor.h
---- ardour-2.8.16/gtk2_ardour/option_editor.h~ 2009-03-13 13:35:02.000000000 +0100
-+++ ardour-2.8.16/gtk2_ardour/option_editor.h 2013-05-10 13:08:04.135084362 +0200
-@@ -22,17 +22,7 @@
-
- #include <vector>
-
--#include <gtkmm/notebook.h>
--#include <gtkmm/checkbutton.h>
--#include <gtkmm/table.h>
--#include <gtkmm/entry.h>
--#include <gtkmm/box.h>
--#include <gtkmm/label.h>
--#include <gtkmm/adjustment.h>
--#include <gtkmm/scale.h>
--#include <gtkmm/spinbutton.h>
--#include <gtkmm/radiobutton.h>
--#include <gtkmm/comboboxtext.h>
-+#include <gtkmm.h>
-
- #include <ardour/session.h>
-
-diff -up ardour-2.8.16/gtk2_ardour/pan_automation_time_axis.h~ ardour-2.8.16/gtk2_ardour/pan_automation_time_axis.h
---- ardour-2.8.16/gtk2_ardour/pan_automation_time_axis.h~ 2009-02-24 13:37:42.000000000 +0100
-+++ ardour-2.8.16/gtk2_ardour/pan_automation_time_axis.h 2013-05-10 13:08:07.751084642 +0200
-@@ -23,7 +23,7 @@
- #include "canvas.h"
- #include "automation_time_axis.h"
-
--#include <gtkmm/comboboxtext.h>
-+#include <gtkmm.h>
-
- namespace ARDOUR {
- class Redirect;
-diff -up ardour-2.8.16/gtk2_ardour/panner2d.h~ ardour-2.8.16/gtk2_ardour/panner2d.h
---- ardour-2.8.16/gtk2_ardour/panner2d.h~ 2009-02-24 13:37:42.000000000 +0100
-+++ ardour-2.8.16/gtk2_ardour/panner2d.h 2013-05-10 13:08:14.919085196 +0200
-@@ -24,8 +24,7 @@
- #include <map>
- #include <string>
-
--#include <glibmm/refptr.h>
--#include <gtkmm/drawingarea.h>
-+#include <gtkmm.h>
-
- using std::map;
- using std::string;
-diff -up ardour-2.8.16/gtk2_ardour/panner_ui.h~ ardour-2.8.16/gtk2_ardour/panner_ui.h
---- ardour-2.8.16/gtk2_ardour/panner_ui.h~ 2009-04-29 15:53:50.000000000 +0200
-+++ ardour-2.8.16/gtk2_ardour/panner_ui.h 2013-05-10 13:08:21.623085715 +0200
-@@ -22,13 +22,7 @@
-
- #include <vector>
-
--#include <gtkmm/box.h>
--#include <gtkmm/adjustment.h>
--#include <gtkmm/viewport.h>
--#include <gtkmm/eventbox.h>
--#include <gtkmm/arrow.h>
--#include <gtkmm/togglebutton.h>
--#include <gtkmm/button.h>
-+#include <gtkmm.h>
-
- #include <gtkmm2ext/click_box.h>
- #include <gtkmm2ext/slider_controller.h>
-diff -up ardour-2.8.16/gtk2_ardour/playlist_selector.h~ ardour-2.8.16/gtk2_ardour/playlist_selector.h
---- ardour-2.8.16/gtk2_ardour/playlist_selector.h~ 2009-02-24 13:37:42.000000000 +0100
-+++ ardour-2.8.16/gtk2_ardour/playlist_selector.h 2013-05-10 13:08:27.767086191 +0200
-@@ -22,10 +22,7 @@
-
- #include <boost/shared_ptr.hpp>
-
--#include <gtkmm/box.h>
--#include <gtkmm/scrolledwindow.h>
--#include <gtkmm/button.h>
--#include <gtkmm/treeview.h>
-+#include <gtkmm.h>
- #include <gtkmm2ext/selector.h>
-
- #include <ardour_dialog.h>
-diff -up ardour-2.8.16/gtk2_ardour/plugin_selector.h~ ardour-2.8.16/gtk2_ardour/plugin_selector.h
---- ardour-2.8.16/gtk2_ardour/plugin_selector.h~ 2011-09-12 21:22:34.000000000 +0200
-+++ ardour-2.8.16/gtk2_ardour/plugin_selector.h 2013-05-10 13:08:36.743086886 +0200
-@@ -20,9 +20,7 @@
- #ifndef __ardour_plugin_selector_h__
- #define __ardour_plugin_selector_h__
-
--#include <gtkmm/dialog.h>
--#include <gtkmm/notebook.h>
--#include <gtkmm/treeview.h>
-+#include <gtkmm.h>
- #include <gtkmm2ext/selector.h>
-
- #include <ardour/plugin.h>
-diff -up ardour-2.8.16/gtk2_ardour/plugin_ui.h~ ardour-2.8.16/gtk2_ardour/plugin_ui.h
---- ardour-2.8.16/gtk2_ardour/plugin_ui.h~ 2012-06-18 21:49:14.000000000 +0200
-+++ ardour-2.8.16/gtk2_ardour/plugin_ui.h 2013-05-10 13:08:49.831087899 +0200
-@@ -26,22 +26,7 @@
-
- #include <sigc++/signal.h>
-
--#include <gtkmm/button.h>
--#include <gtkmm/box.h>
--#include <gtkmm/table.h>
--#include <gtkmm/eventbox.h>
--#include <gtkmm/viewport.h>
--#include <gtkmm/scrolledwindow.h>
--#include <gtkmm/label.h>
--#include <gtkmm/menu.h>
--#include <gtkmm/image.h>
--#include <gtkmm/adjustment.h>
--#include <gtkmm/togglebutton.h>
--#include <gtkmm/socket.h>
--#include <gtkmm/combobox.h>
--#include <gtkmm/liststore.h>
--#include <gtkmm/comboboxtext.h>
--#include <gtkmm/socket.h>
-+#include <gtkmm.h>
-
- #include <ardour_dialog.h>
- #include <ardour/types.h>
-diff -up ardour-2.8.16/gtk2_ardour/public_editor.h~ ardour-2.8.16/gtk2_ardour/public_editor.h
---- ardour-2.8.16/gtk2_ardour/public_editor.h~ 2012-03-16 15:33:28.000000000 +0100
-+++ ardour-2.8.16/gtk2_ardour/public_editor.h 2013-05-10 13:09:04.791089056 +0200
-@@ -25,9 +25,7 @@
- #include <string>
- #include <glib.h>
- #include <gdk/gdktypes.h>
--#include <gtkmm/window.h>
--#include <gtkmm/box.h>
--#include <gtkmm/actiongroup.h>
-+#include <gtkmm.h>
- #include <jack/types.h>
- #include <sigc++/signal.h>
-
-diff -up ardour-2.8.16/gtk2_ardour/redirect_box.h~ ardour-2.8.16/gtk2_ardour/redirect_box.h
---- ardour-2.8.16/gtk2_ardour/redirect_box.h~ 2009-03-07 14:28:24.000000000 +0100
-+++ ardour-2.8.16/gtk2_ardour/redirect_box.h 2013-05-10 13:09:16.439089958 +0200
-@@ -23,10 +23,7 @@
- #include <vector>
-
- #include <cmath>
--#include <gtkmm/box.h>
--#include <gtkmm/eventbox.h>
--#include <gtkmm/menu.h>
--#include <gtkmm/scrolledwindow.h>
-+#include <gtkmm.h>
- #include <gtkmm2ext/dndtreeview.h>
- #include <gtkmm2ext/auto_spin.h>
- #include <gtkmm2ext/click_box.h>
-diff -up ardour-2.8.16/gtk2_ardour/region_layering_order_editor.h~ ardour-2.8.16/gtk2_ardour/region_layering_order_editor.h
---- ardour-2.8.16/gtk2_ardour/region_layering_order_editor.h~ 2009-11-13 15:30:20.000000000 +0100
-+++ ardour-2.8.16/gtk2_ardour/region_layering_order_editor.h 2013-05-10 13:09:23.383090495 +0200
-@@ -1,10 +1,7 @@
- #ifndef __gtk2_ardour_region_layering_order_editor_h__
- #define __gtk2_ardour_region_layering_order_editor_h__
-
--#include <gtkmm/dialog.h>
--#include <gtkmm/liststore.h>
--#include <gtkmm/treeview.h>
--#include <gtkmm/scrolledwindow.h>
-+#include <gtkmm.h>
-
- #include <ardour/region.h>
- #include <ardour/playlist.h>
-diff -up ardour-2.8.16/gtk2_ardour/rhythm_ferret.h~ ardour-2.8.16/gtk2_ardour/rhythm_ferret.h
---- ardour-2.8.16/gtk2_ardour/rhythm_ferret.h~ 2009-02-24 13:37:42.000000000 +0100
-+++ ardour-2.8.16/gtk2_ardour/rhythm_ferret.h 2013-05-10 13:09:34.678091370 +0200
-@@ -1,16 +1,7 @@
- #ifndef __gtk2_ardour_rhythm_ferret_h__
- #define __gtk2_ardour_rhythm_ferret_h__
-
--#include <gtkmm/box.h>
--#include <gtkmm/scale.h>
--#include <gtkmm/spinbutton.h>
--#include <gtkmm/radiobutton.h>
--#include <gtkmm/radiobuttongroup.h>
--#include <gtkmm/frame.h>
--#include <gtkmm/image.h>
--#include <gtkmm/comboboxtext.h>
--#include <gtkmm/button.h>
--#include <gtkmm/label.h>
-+#include <gtkmm.h>
-
- #include "ardour_dialog.h"
-
-diff -up ardour-2.8.16/gtk2_ardour/route_params_ui.h~ ardour-2.8.16/gtk2_ardour/route_params_ui.h
---- ardour-2.8.16/gtk2_ardour/route_params_ui.h~ 2011-09-12 21:22:34.000000000 +0200
-+++ ardour-2.8.16/gtk2_ardour/route_params_ui.h 2013-05-10 13:09:41.350091886 +0200
-@@ -22,15 +22,7 @@
-
- #include <list>
-
--#include <gtkmm/box.h>
--#include <gtkmm/button.h>
--#include <gtkmm/eventbox.h>
--#include <gtkmm/frame.h>
--#include <gtkmm/label.h>
--#include <gtkmm/paned.h>
--#include <gtkmm/scrolledwindow.h>
--#include <gtkmm/togglebutton.h>
--#include <gtkmm/treeview.h>
-+#include <gtkmm.h>
-
- #include <pbd/stateful.h>
-
-diff -up ardour-2.8.16/gtk2_ardour/route_time_axis.h~ ardour-2.8.16/gtk2_ardour/route_time_axis.h
---- ardour-2.8.16/gtk2_ardour/route_time_axis.h~ 2009-06-26 19:00:42.000000000 +0200
-+++ ardour-2.8.16/gtk2_ardour/route_time_axis.h 2013-05-10 13:09:50.150092567 +0200
-@@ -20,15 +20,7 @@
- #ifndef __ardour_route_time_axis_h__
- #define __ardour_route_time_axis_h__
-
--#include <gtkmm/table.h>
--#include <gtkmm/button.h>
--#include <gtkmm/box.h>
--#include <gtkmm/menu.h>
--#include <gtkmm/menuitem.h>
--#include <gtkmm/radiomenuitem.h>
--#include <gtkmm/checkmenuitem.h>
--#include <gtkmm/adjustment.h>
--
-+#include <gtkmm.h>
- #include <gtkmm2ext/selector.h>
- #include <gtkmm2ext/slider_controller.h>
- #include <list>
-diff -up ardour-2.8.16/gtk2_ardour/sfdb_freesound_mootcher.h~ ardour-2.8.16/gtk2_ardour/sfdb_freesound_mootcher.h
---- ardour-2.8.16/gtk2_ardour/sfdb_freesound_mootcher.h~ 2012-07-02 15:21:59.000000000 +0200
-+++ ardour-2.8.16/gtk2_ardour/sfdb_freesound_mootcher.h 2013-05-10 13:09:55.862093009 +0200
-@@ -20,7 +20,7 @@
- #include <string>
- #include <sstream>
- #include <vector>
--#include <gtkmm/progressbar.h>
-+#include <gtkmm.h>
- //#include <ctime>
-
- #include "sfdb_ui.h"
-diff -up ardour-2.8.16/gtk2_ardour/sfdb_ui.h~ ardour-2.8.16/gtk2_ardour/sfdb_ui.h
---- ardour-2.8.16/gtk2_ardour/sfdb_ui.h~ 2012-07-02 15:21:59.000000000 +0200
-+++ ardour-2.8.16/gtk2_ardour/sfdb_ui.h 2013-05-10 13:10:02.406093516 +0200
-@@ -26,20 +26,7 @@
-
- #include <sigc++/signal.h>
-
--#include <gtkmm/box.h>
--#include <gtkmm/button.h>
--#include <gtkmm/checkbutton.h>
--#include <gtkmm/comboboxtext.h>
--#include <gtkmm/dialog.h>
--#include <gtkmm/entry.h>
--#include <gtkmm/filechooserwidget.h>
--#include <gtkmm/frame.h>
--#include <gtkmm/label.h>
--#include <gtkmm/table.h>
--#include <gtkmm/liststore.h>
--#include <gtkmm/textview.h>
--#include <gtkmm/spinbutton.h>
--#include <gtkmm/notebook.h>
-+#include <gtkmm.h>
-
- #include <ardour/session.h>
- #include <ardour/audiofilesource.h>
-diff -up ardour-2.8.16/gtk2_ardour/simpleline.h~ ardour-2.8.16/gtk2_ardour/simpleline.h
---- ardour-2.8.16/gtk2_ardour/simpleline.h~ 2009-02-24 13:37:42.000000000 +0100
-+++ ardour-2.8.16/gtk2_ardour/simpleline.h 2013-05-10 13:10:12.934094331 +0200
-@@ -27,6 +27,7 @@
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-+#include <libgnomecanvasmm.h>
- #include <libgnomecanvasmm/item.h>
- #include <libgnomecanvas/gnome-canvas-util.h>
- #include <libgnomecanvas/libgnomecanvas.h>
-diff -up ardour-2.8.16/gtk2_ardour/simpleline_p.h~ ardour-2.8.16/gtk2_ardour/simpleline_p.h
---- ardour-2.8.16/gtk2_ardour/simpleline_p.h~ 2009-02-24 13:37:42.000000000 +0100
-+++ ardour-2.8.16/gtk2_ardour/simpleline_p.h 2013-05-10 13:10:21.750095013 +0200
-@@ -22,7 +22,7 @@
- #define _LIBGNOMECANVASMM_SIMPLELINE_P_H
- #include <libgnomecanvasmm/private/item_p.h>
-
--#include <glibmm/class.h>
-+#include <glibmm.h>
-
- namespace Gnome
- {
-diff -up ardour-2.8.16/gtk2_ardour/simplerect.h~ ardour-2.8.16/gtk2_ardour/simplerect.h
---- ardour-2.8.16/gtk2_ardour/simplerect.h~ 2009-02-24 13:37:42.000000000 +0100
-+++ ardour-2.8.16/gtk2_ardour/simplerect.h 2013-05-10 13:10:29.190095589 +0200
-@@ -27,9 +27,8 @@
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-+#include <libgnomecanvasmm.h>
- #include <libgnomecanvasmm/item.h>
--#include <libgnomecanvasmm/group.h>
--#include <libgnomecanvasmm/shape.h>
- #include "canvas-simplerect.h"
-
-
-diff -up ardour-2.8.16/gtk2_ardour/simplerect_p.h~ ardour-2.8.16/gtk2_ardour/simplerect_p.h
---- ardour-2.8.16/gtk2_ardour/simplerect_p.h~ 2009-02-24 13:37:42.000000000 +0100
-+++ ardour-2.8.16/gtk2_ardour/simplerect_p.h 2013-05-10 13:10:33.654095934 +0200
-@@ -21,7 +21,7 @@
- #ifndef _LIBGNOMECANVASMM_SIMPLERECT_P_H
- #define _LIBGNOMECANVASMM_SIMPLERECT_P_H
-
--#include <glibmm/class.h>
-+#include <glibmm.h>
-
- namespace Gnome
- {
-diff -up ardour-2.8.16/gtk2_ardour/splash.h~ ardour-2.8.16/gtk2_ardour/splash.h
---- ardour-2.8.16/gtk2_ardour/splash.h~ 2009-02-24 13:37:42.000000000 +0100
-+++ ardour-2.8.16/gtk2_ardour/splash.h 2013-05-10 13:10:41.782096563 +0200
-@@ -20,11 +20,7 @@
- #ifndef __ardour_gtk_splash_h__
- #define __ardour_gtk_splash_h__
-
--#include <gtkmm/window.h>
--#include <gtkmm/drawingarea.h>
--#include <gtkmm/box.h>
--#include <gtkmm/label.h>
--#include <gdkmm/pixbuf.h>
-+#include <gtkmm.h>
-
- class ARDOUR_UI;
-
-diff -up ardour-2.8.16/gtk2_ardour/tempo_dialog.h~ ardour-2.8.16/gtk2_ardour/tempo_dialog.h
---- ardour-2.8.16/gtk2_ardour/tempo_dialog.h~ 2009-02-24 13:37:42.000000000 +0100
-+++ ardour-2.8.16/gtk2_ardour/tempo_dialog.h 2013-05-10 13:10:50.070097205 +0200
-@@ -20,15 +20,7 @@
- #ifndef __ardour_gtk_tempo_dialog_h__
- #define __ardour_gtk_tempo_dialog_h__
-
--#include <gtkmm/entry.h>
--#include <gtkmm/frame.h>
--#include <gtkmm/box.h>
--#include <gtkmm/button.h>
--#include <gtkmm/label.h>
--#include <gtkmm/table.h>
--#include <gtkmm/entry.h>
--#include <gtkmm/spinbutton.h>
--#include <gtkmm/comboboxtext.h>
-+#include <gtkmm.h>
-
- #include <ardour/types.h>
- #include <ardour/tempo.h>
-diff -up ardour-2.8.16/gtk2_ardour/theme_manager.h~ ardour-2.8.16/gtk2_ardour/theme_manager.h
---- ardour-2.8.16/gtk2_ardour/theme_manager.h~ 2011-09-12 21:22:34.000000000 +0200
-+++ ardour-2.8.16/gtk2_ardour/theme_manager.h 2013-05-10 13:10:59.014097897 +0200
-@@ -20,13 +20,7 @@
- #ifndef __ardour_gtk_color_manager_h__
- #define __ardour_gtk_color_manager_h__
-
--#include <gtkmm/treeview.h>
--#include <gtkmm/liststore.h>
--#include <gtkmm/scrolledwindow.h>
--#include <gtkmm/colorselection.h>
--#include <gtkmm/radiobutton.h>
--#include <gtkmm/button.h>
--#include <gtkmm/rc.h>
-+#include <gtkmm.h>
- #include "ardour_dialog.h"
- #include "ui_config.h"
-
-diff -up ardour-2.8.16/gtk2_ardour/time_axis_view.h~ ardour-2.8.16/gtk2_ardour/time_axis_view.h
---- ardour-2.8.16/gtk2_ardour/time_axis_view.h~ 2010-05-21 17:15:17.000000000 +0200
-+++ ardour-2.8.16/gtk2_ardour/time_axis_view.h 2013-05-10 13:11:13.398099010 +0200
-@@ -23,14 +23,7 @@
- #include <vector>
- #include <list>
-
--#include <gtkmm/box.h>
--#include <gtkmm/frame.h>
--#include <gtkmm/drawingarea.h>
--#include <gtkmm/eventbox.h>
--#include <gtkmm/table.h>
--#include <gtkmm/entry.h>
--#include <gtkmm/label.h>
--
-+#include <gtkmm.h>
- #include <gtkmm2ext/focus_entry.h>
-
- #include <pbd/stateful.h>
-diff -up ardour-2.8.16/gtk2_ardour/time_axis_view_item.h~ ardour-2.8.16/gtk2_ardour/time_axis_view_item.h
---- ardour-2.8.16/gtk2_ardour/time_axis_view_item.h~ 2011-09-12 21:22:34.000000000 +0200
-+++ ardour-2.8.16/gtk2_ardour/time_axis_view_item.h 2013-05-10 13:11:17.798099351 +0200
-@@ -23,7 +23,7 @@
- #include <jack/jack.h>
- #include <string>
-
--#include <libgnomecanvasmm/pixbuf.h>
-+#include <libgnomecanvasmm.h>
-
- #include "selectable.h"
- #include "simplerect.h"
-diff -up ardour-2.8.16/gtk2_ardour/utils.h~ ardour-2.8.16/gtk2_ardour/utils.h
---- ardour-2.8.16/gtk2_ardour/utils.h~ 2011-09-12 21:22:34.000000000 +0200
-+++ ardour-2.8.16/gtk2_ardour/utils.h 2013-05-10 13:11:28.934100213 +0200
-@@ -24,8 +24,8 @@
- #include <cmath>
- #include <vector>
- #include <ardour/types.h>
--#include <libgnomecanvasmm/line.h>
--#include <gdkmm/types.h>
-+#include <gtkmm.h>
-+#include <libgnomecanvasmm.h>
-
- #include "canvas.h"
- #include "public_editor.h"
-diff -up ardour-2.8.16/gtk2_ardour/visual_time_axis.h~ ardour-2.8.16/gtk2_ardour/visual_time_axis.h
---- ardour-2.8.16/gtk2_ardour/visual_time_axis.h~ 2009-02-24 13:37:42.000000000 +0100
-+++ ardour-2.8.16/gtk2_ardour/visual_time_axis.h 2013-05-10 13:11:35.062100687 +0200
-@@ -20,9 +20,7 @@
- #ifndef __ardour_visual_time_axis_h__
- #define __ardour_visual_time_axis_h__
-
--#include <gtkmm/box.h>
--#include <gtkmm/button.h>
--
-+#include <gtkmm.h>
- #include <gtkmm2ext/selector.h>
-
- #include "ardour_dialog.h"
-diff -up ardour-2.8.16/gtk2_ardour/waveview.h~ ardour-2.8.16/gtk2_ardour/waveview.h
---- ardour-2.8.16/gtk2_ardour/waveview.h~ 2009-02-24 13:37:42.000000000 +0100
-+++ ardour-2.8.16/gtk2_ardour/waveview.h 2013-05-10 13:11:56.822102371 +0200
-@@ -27,6 +27,7 @@
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-+#include <libgnomecanvasmm.h>
- #include <libgnomecanvasmm/item.h>
- #include "canvas-waveview.h"
- #include <libgnomecanvas/gnome-canvas-util.h>
-diff -up ardour-2.8.16/gtk2_ardour/waveview_p.h~ ardour-2.8.16/gtk2_ardour/waveview_p.h
---- ardour-2.8.16/gtk2_ardour/waveview_p.h~ 2009-02-24 13:37:42.000000000 +0100
-+++ ardour-2.8.16/gtk2_ardour/waveview_p.h 2013-05-10 13:12:06.613103129 +0200
-@@ -22,7 +22,7 @@
- #define _LIBGNOMECANVASMM_WAVEVIEW_P_H
-
- #include <libgnomecanvasmm/private/item_p.h>
--#include <glibmm/class.h>
-+#include <glibmm.h>
-
- namespace Gnome
- {
diff --git a/ardour-lilv016fix.patch b/ardour-lilv016fix.patch
deleted file mode 100644
index 2f4545b..0000000
--- a/ardour-lilv016fix.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff -rupN ardour-2.8.16.old/libs/ardour/ardour/lv2_plugin.h ardour-2.8.16/libs/ardour/ardour/lv2_plugin.h
---- ardour-2.8.16.old/libs/ardour/ardour/lv2_plugin.h 2012-04-19 14:51:59.000000000 -0400
-+++ ardour-2.8.16/libs/ardour/ardour/lv2_plugin.h 2013-08-03 16:18:15.556223746 -0400
-@@ -154,7 +154,7 @@ class LV2Plugin : public ARDOUR::Plugin
- /** Find the LV2 input port with the given designation.
- * If found, bufptrs[port_index] will be set to bufptr.
- */
-- LilvPort* designated_input (const char* uri, void** bufptrs[], void** bufptr);
-+ const LilvPort* designated_input (const char* uri, void** bufptrs[], void** bufptr);
- };
-
-
-diff -rupN ardour-2.8.16.old/libs/ardour/lv2_plugin.cc ardour-2.8.16/libs/ardour/lv2_plugin.cc
---- ardour-2.8.16.old/libs/ardour/lv2_plugin.cc 2012-04-19 14:51:59.000000000 -0400
-+++ ardour-2.8.16/libs/ardour/lv2_plugin.cc 2013-08-03 16:17:03.564508732 -0400
-@@ -644,10 +644,10 @@ LV2Plugin::latency_compute_run ()
- deactivate ();
- }
-
--LilvPort*
-+const LilvPort*
- LV2Plugin::designated_input (const char* uri, void** bufptrs[], void** bufptr)
- {
-- LilvPort* port = NULL;
-+ const LilvPort* port = NULL;
- #ifdef HAVE_NEW_LILV
- LilvNode* designation = lilv_new_uri(_world.world, uri);
- port = lilv_plugin_get_port_by_designation(
diff --git a/ardour-no-grep-options.patch b/ardour-no-grep-options.patch
deleted file mode 100644
index c6145e5..0000000
--- a/ardour-no-grep-options.patch
+++ /dev/null
@@ -1,10 +0,0 @@
-diff -rupN ardour-2.8.13.old/gtk2_ardour/ardour.sh.in ardour-2.8.13/gtk2_ardour/ardour.sh.in
---- ardour-2.8.13.old/gtk2_ardour/ardour.sh.in 2012-07-09 22:12:15.834833285 -0400
-+++ ardour-2.8.13/gtk2_ardour/ardour.sh.in 2012-07-09 22:11:45.957934297 -0400
-@@ -1,5 +1,6 @@
- #!/bin/sh
-
-+unset GREP_OPTIONS
- export GTK_PATH=%INSTALL_PREFIX%/%LIBDIR%/ardour2${GTK_PATH:+:$GTK_PATH}
-
- export LD_LIBRARY_PATH=%INSTALL_PREFIX%/%LIBDIR%/ardour2${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
diff --git a/ardour.sh b/ardour.sh
deleted file mode 100755
index f560328..0000000
--- a/ardour.sh
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/bin/sh
-
-A2DIR=~/.ardour2
-
-if ! test -d $A2DIR; then
- mkdir -p $A2DIR
- touch $A2DIR/ardourver2.2
- touch $A2DIR/ardourver2.5
-else
- if ! test -a $A2DIR/ardourver2.2; then
- if test -a $A2DIR/ardour2_ui.rc; then
- mv -f $A2DIR/ardour2_ui.rc $A2DIR/ardour2_ui.rc.bak
- fi
- if test -a $A2DIR/ardour2_ui.conf; then
- mv -f $A2DIR/ardour2_ui.conf $A2DIR/ardour2_ui.conf.bak
- fi
- if test -a $A2DIR/ardour.bindings; then
- mv -f $A2DIR/ardour.bindings $A2DIR/ardour.bindings.bak
- fi
- touch $A2DIR/ardourver2.2
- fi
- if ! test -a $A2DIR/ardourver2.5; then
- if test -a $A2DIR/ardour.bindings; then
- mv -f $A2DIR/ardour.bindings $A2DIR/ardour.bindings.bak
- fi
- touch $A2DIR/ardourver2.5
- fi
-fi
-
-exec /usr/libexec/ardour2 "$@"
diff --git a/ardour2.spec b/ardour2.spec
deleted file mode 100644
index 02e25ae..0000000
--- a/ardour2.spec
+++ /dev/null
@@ -1,293 +0,0 @@
-Summary: Digital Audio Workstation
-Name: ardour2
-Version: 2.8.16
-Release: 30%{?dist}
-# No more direct links. Download from
-# http://ardour.org/download
-Source: ardour-%{version}.tar.bz2
-Source2: ardour.sh
-Patch0: ardour-SConscript.patch
-# Colored grep output makes the script print errors:
-Patch1: ardour-no-grep-options.patch
-Patch3: ardour-2.5-HOST_NOT_FOUND.patch
-# Filed upstream: http://tracker.ardour.org/view.php?id=5476
-Patch4: ardour-fix-mm-includes.patch
-# lilv-0.16 compatibility. Fixed in trunk
-Patch5: ardour-lilv016fix.patch
-# Need to link various plugins against boost (rhbz#1156179)
-Patch6: 0001-Add-boost-linking-to-tranzport-and-generic-midi-surf.patch
-Patch7: 0002-Add-boost-linking-to-wiimote.patch
-# C++11 needs this
-Patch8: ardour-2.8.16-c++11-namespaces.patch
-Patch9: ardour-2.8.16-c++11-xpm.patch
-Patch10: ardour-2.8.16-c++11-bool-from-pointer.patch
-# libsigc++ >= 2.6 needs this
-Patch11: ardour-2.8.16-libsigc++26.patch
-# aubio >= 0.4.0 needs this
-Patch12: ardour-2.8.16-aubio04.patch
-# include a freely licensed version of dmalloc.c
-# this code is not actually used, but eh.
-# Taken from http://dmalloc.com/releases/ v5.5.2
-Patch13: ardour-2.8.16-free-dmalloc.patch
-# fix to compile with gcc6
-# There are almost certainly other cleanups that could be made here
-# but this code is legacy, so just get it building again.
-Patch14: ardour-2.8.16-gcc6.patch
-# Fix to compile with glibmm 2.50.x
-Patch15: ardour-2.8.16-glibmm250.patch
-# Fix to compile with gcc7
-Patch16: ardour-2.8.16-gcc7.patch
-URL: http://ardour.org
-License: GPLv2+
-Group: Applications/Multimedia
-
-BuildRequires: alsa-lib-devel
-BuildRequires: aubio-devel
-BuildRequires: boost-devel
-BuildRequires: cwiid-devel
-BuildRequires: desktop-file-utils
-BuildRequires: fftw-devel
-BuildRequires: gettext >= 0.11.5
-BuildRequires: gtkmm24-devel >= 2.8
-BuildRequires: jack-audio-connection-kit-devel
-BuildRequires: libcurl-devel
-BuildRequires: libgnomecanvas-devel
-BuildRequires: libgnomecanvasmm26-devel >= 2.12
-BuildRequires: liblo-devel
-BuildRequires: liblrdf-devel >= 0.3.1
-BuildRequires: libsamplerate-devel >= 0.0.13
-BuildRequires: libsndfile-devel >= 1.0.18
-BuildRequires: libtool
-BuildRequires: libusb-devel
-BuildRequires: libxslt-devel
-BuildRequires: lilv-devel
-BuildRequires: pkgconfig
-BuildRequires: scons
-BuildRequires: soundtouch-devel
-BuildRequires: suil-devel
-# For up2date config.guess for new architectures (ie aarch64) support
-BuildRequires: redhat-rpm-config
-
-Requires: hicolor-icon-theme
-
-Obsoletes: ardour < 2.8.16-16
-
-%description
-This package contains the legacy version 2 of Ardour. It is provided as a way
-to work on sessions created by this version. Please use the current version of
-Ardour for new projects.
-
-Ardour is a multichannel hard disk recorder (HDR) and digital audio workstation
-(DAW). It is capable of simultaneously recording 24 or more channels of 32 bit
-audio at 48kHz.
-
-%prep
-%setup -q -n ardour-%{version}
-%patch0 -p1 -b .SConscript
-%patch1 -p1 -b .no.grep.opts
-%patch3 -p0 -b .host.not.found
-%patch4 -p1 -b .fix-mm-includes
-%patch5 -p1 -b .lilv016
-%patch6 -p1 -b .boost-tranzport-generic-midi
-%patch7 -p1 -b .boost-linking-wiimote
-%patch8 -p1 -b .c++11-namespaces
-%patch9 -p1 -b .c++11-xpm
-%patch10 -p1 -b .c++11-bool-from-pointer
-%patch11 -p1 -b .libsigc++26
-%patch12 -p1 -b .aubio04
-%patch13 -p1 -b .free-dmalloc
-%patch14 -p1 -b .gcc6
-%patch15 -p1 -b .glibmm250
-%patch16 -p1 -b .gcc7
-
-# Update config.guess for new architectures (ie aarch64) support
-cp /usr/lib/rpm/redhat/config.guess tools
-
-# Fix encodings:
-iconv -f ISO-8859-1 -t UTF8 ardour.1.fr > ardour.1.fr.tmp
-touch -r ardour.1.fr ardour.1.fr.tmp
-mv -f ardour.1.fr.tmp ardour.1.fr
-iconv -f KOI8-R -t UTF8 ardour.1.ru > ardour.1.ru.tmp
-touch -r ardour.1.ru ardour.1.ru.tmp
-mv -f ardour.1.ru.tmp ardour.1.ru
-
-%build
-echo "GenericName=Digital Audio Workstation" >> gtk2_ardour/ardour2.desktop.in
-# <sigh> ardours SConstruct script is a mess when it comes to determining
-# opt_flags, so we override the lot using the ARCH= and DIST_TARGET= options
-
-TARGETCPU="none"
-
-%ifarch %{ix86}
-ARCH_FLAGS="-DARCH_X86 -DBUILD_SSE_OPTIMIZATIONS -msse -mfpmath=sse -DUSE_XMMINTRIN"
-TARGETCPU="i386"
-%endif
-%ifarch x86_64
-ARCH_FLAGS="-DARCH_X86 -DBUILD_SSE_OPTIMIZATIONS -DUSE_X86_64_ASM -msse -mfpmath=sse -DUSE_XMMINTRIN"
-TARGETCPU="x86_64"
-%endif
-
-# Parallel build fails
-scons PREFIX=%{_prefix} LIBDIR=%{_lib} SYSLIBS=1 \
- FREESOUND=1 \
- DIST_TARGET="${TARGETCPU}" \
- ARCH="$RPM_OPT_FLAGS $ARCH_FLAGS -std=c++11" \
- AUSTATE=1 \
- DIST_LIBDIR=%{_lib} \
- WIIMOTE=1
-
-%install
-scons DESTDIR=$RPM_BUILD_ROOT install
-
-# Current Ardour versions have their own appdata file:
-# https://github.com/Ardour/ardour/pull/158
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/appdata
-cat > $RPM_BUILD_ROOT%{_datadir}/appdata/ardour2.appdata.xml <<EOF
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright 2014 Richard Hughes <richard(a)hughsie.com> -->
-<application>
- <id type="desktop">ardour2.desktop</id>
- <metadata_license>CC0-1.0</metadata_license>
- <summary>Digital Audio Workstation (Legacy Version)</summary>
- <description>
- <p>
- This package contains the legacy version 2 of Ardour. It is provided as a
- way to work on sessions created by this version. Please use the current
- version of Ardour for new projects.
- </p>
- <p>
- Ardour is a digital audio workstation that permits you to record and
- create music.
- Ardour supports multi-track recording, and allows you to use plug-ins to
- create music in a virtual studio.
- </p>
- </description>
- <url type="homepage">http://ardour.org</url>
- <screenshots>
- <screenshot type="default">http://ardour.org/images/lsdedits.png</screenshot>
- <screenshot>http://ardour.org/images/eno.png</screenshot>
- <screenshot>http://ardour.org/images/lsd-mixer.jpg</screenshot>
- </screenshots>
- <updatecontact>ardour-users(a)lists.ardour.org</updatecontact>
-</application>
-EOF
-
-# Replace ardour2 with a script
-install -dm 755 $RPM_BUILD_ROOT%{_libexecdir}
-mv $RPM_BUILD_ROOT%{_bindir}/ardour2 $RPM_BUILD_ROOT%{_libexecdir}
-install -pm 755 %{SOURCE2} $RPM_BUILD_ROOT%{_bindir}/ardour2
-
-# copy icons to freedesktop locations
-for s in 16 22 32 48 ; do
- mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/${s}x${s}/apps
- cp -p $RPM_BUILD_ROOT%{_datadir}/ardour2/icons/ardour_icon_${s}px.png \
- $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/${s}x${s}/apps/ardour2.png
-done
-
-# install the desktop entry
-cp -dpf gtk2_ardour/ardour2.desktop{.in,}
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
-desktop-file-install --dir ${RPM_BUILD_ROOT}%{_datadir}/applications \
- gtk2_ardour/ardour2.desktop
-
-# install mime entry
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/mime/packages/
-install -p -m 0644 gtk2_ardour/ardour2.xml $RPM_BUILD_ROOT%{_datadir}/mime/packages/
-
-# install the man pages
-install -dm 755 $RPM_BUILD_ROOT%{_mandir}/man1/
-install -p -m 0644 ardour.1 $RPM_BUILD_ROOT%{_mandir}/man1/ardour2.1
-for lang in es fr ru ; do
- install -dm 755 $RPM_BUILD_ROOT%{_mandir}/${lang}/man1/
- install -p -m 0644 ardour.1.${lang} $RPM_BUILD_ROOT%{_mandir}/${lang}/man1/ardour2.1
-done
-
-%find_lang gtk2_ardour
-cat gtk2_ardour.lang > ardour.lang
-%find_lang libardour2
-cat libardour2.lang >> ardour.lang
-%find_lang libgtkmm2ext
-cat libgtkmm2ext.lang >> ardour.lang
-
-%files -f ardour.lang
-%license COPYING
-%doc README
-%config(noreplace) %{_sysconfdir}/ardour2
-%{_bindir}/ardour2
-%{_libexecdir}/ardour2
-%{_libdir}/ardour2/
-%{_datadir}/ardour2/
-%{_datadir}/icons/hicolor/*/apps/ardour2.png
-%{_datadir}/appdata/*.appdata.xml
-%{_datadir}/applications/ardour2.desktop
-%{_datadir}/mime/packages/ardour2.xml
-%{_mandir}/man1/ardour2.1*
-%{_mandir}/es/man1/ardour2.1*
-%{_mandir}/fr/man1/ardour2.1*
-%{_mandir}/ru/man1/ardour2.1*
-
-%changelog
-* Wed Feb 07 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 2.8.16-30
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
-
-* Sun Jan 07 2018 Igor Gnatenko <ignatenkobrain(a)fedoraproject.org> - 2.8.16-29
-- Remove obsolete scriptlets
-
-* Sat Sep 30 2017 Jerry James <loganjerry(a)gmail.com> - 2.8.16-28
-- Rebuild for soundtouch 2.0.0
-
-* Wed Aug 02 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 2.8.16-27
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
-
-* Wed Jul 26 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 2.8.16-26
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
-
-* Mon May 15 2017 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 2.8.16-25
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_27_Mass_Rebuild
-
-* Fri Feb 10 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 2.8.16-24
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
-
-* Tue Jan 31 2017 Jonathan Wakely <jwakely(a)redhat.com> - 2.8.16-23
-- Rebuilt for Boost 1.63 and patched for glibmm 2.50.x and GCC 7
-
-* Tue Mar 8 2016 Tom Callaway <spot(a)fedoraproject.org> - 2.8.16-22
-- replace non-free dmalloc.cc with a freely licensed version (bz1313285)
-- fix FTBFS with gcc6 (bz1307324)
-
-* Wed Feb 03 2016 Fedora Release Engineering <releng(a)fedoraproject.org> - 2.8.16-21
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
-
-* Sat Jan 16 2016 Jonathan Wakely <jwakely(a)redhat.com> - 2.8.16-20
-- Rebuilt for Boost 1.60
-
-* Sun Nov 29 2015 Nils Philippsen <nils(a)redhat.com> - 2.8.16-19
-- patch for and build with -std=c++11
-- patch for libsigc++20 >= 2.6
-- patch for aubio >= 0.4.0
-- mention legacy version in appdata file
-- miscellaneous fixes
-
-* Thu Aug 27 2015 Jonathan Wakely <jwakely(a)redhat.com> - 2.8.16-18
-- Rebuilt for Boost 1.59
-
-* Wed Jul 29 2015 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 2.8.16-17
-- Rebuilt for https://fedoraproject.org/wiki/Changes/F23Boost159
-
-* Wed Jul 22 2015 David Tardon <dtardon(a)redhat.com> - 2.8.16-16
-- rebuild for Boost 1.58
-
-* Wed Jun 17 2015 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 2.8.16-15
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
-
-* Thu Jun 11 2015 Nils Philippsen <nils(a)redhat.com> 2.8.16-14
-- make release higher than ardour to break obsoletes loop (#1230469)
-
-* Mon May 11 2015 Nils Philippsen <nils(a)redhat.com> 2.8.16-1
-- rename ardour.script to ardour.sh to appease rpmlint
-- trim description
-
-* Fri May 08 2015 Nils Philippsen <nils(a)redhat.com> 2.8.16-1
-- rename package to ardour2
-- mention legacy status in %%changelog
-- fix file names of man pages
diff --git a/dead.package b/dead.package
new file mode 100644
index 0000000..1a0cff8
--- /dev/null
+++ b/dead.package
@@ -0,0 +1 @@
+Obsoleted by ardour5.
diff --git a/sources b/sources
deleted file mode 100644
index 368454d..0000000
--- a/sources
+++ /dev/null
@@ -1 +0,0 @@
-5bafe41df00d25e7a357baaa1038f16d ardour-2.8.16.tar.bz2
6 years, 1 month
Architecture specific change in rpms/ardour2.git
by githook-noreply@fedoraproject.org
The package rpms/ardour2.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/ardour2.git/commit/?id=0ff63771f4....
Change:
-%ifarch x86_64
Thanks.
Full change:
============
commit 0ff63771f444c00d79d60866dd8daa135c573ffe
Author: Nils Philippsen <nils(a)redhat.com>
Date: Tue Mar 20 12:20:24 2018 +0100
Obsoleted by ardour5.
diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index ec37559..0000000
--- a/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/ardour-2.8.16.tar.bz2
diff --git a/0001-Add-boost-linking-to-tranzport-and-generic-midi-surf.patch b/0001-Add-boost-linking-to-tranzport-and-generic-midi-surf.patch
deleted file mode 100644
index 1c5ba07..0000000
--- a/0001-Add-boost-linking-to-tranzport-and-generic-midi-surf.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From ba7881d97f701960b9cea04f9911ba105857c3fa Mon Sep 17 00:00:00 2001
-From: David Henningsson <david.henningsson(a)canonical.com>
-Date: Thu, 3 Oct 2013 20:26:52 +0200
-Subject: [PATCH] Add boost linking to "tranzport" and "generic midi" surfaces
-
-This fixes the following scary errors, shown at startup:
-ardour: [ERROR]: ControlProtocolManager: cannot load module "/usr/lib/ardour2/surfaces//libardour_genericmidi.so" (/usr/lib/ardour2/surfaces//libardour_genericmidi.so: undefined symbol: _ZN5boost6system15system_categoryEv)
-ardour: [ERROR]: ControlProtocolManager: cannot load module "/usr/lib/ardour2/surfaces//libardour_tranzport.so" (/usr/lib/ardour2/surfaces//libardour_tranzport.so: undefined symbol: _ZN5boost6system15system_categoryEv)
-
-Signed-off-by: David Henningsson <david.henningsson(a)canonical.com>
----
- libs/surfaces/generic_midi/SConscript | 3 ++-
- libs/surfaces/tranzport/SConscript | 1 +
- 2 files changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/libs/surfaces/generic_midi/SConscript b/libs/surfaces/generic_midi/SConscript
-index 27f8865..ce37359 100644
---- a/libs/surfaces/generic_midi/SConscript
-+++ b/libs/surfaces/generic_midi/SConscript
-@@ -42,7 +42,8 @@ genericmidi.Merge ([
- libraries['usb'],
- libraries['xml'],
- libraries['glib2'],
-- libraries['glibmm2']
-+ libraries['glibmm2'],
-+ libraries['boost']
- ])
-
- libardour_genericmidi = genericmidi.SharedLibrary('ardour_genericmidi', genericmidi_files)
-diff --git a/libs/surfaces/tranzport/SConscript b/libs/surfaces/tranzport/SConscript
-index c2ab351..3ea0d4f 100644
---- a/libs/surfaces/tranzport/SConscript
-+++ b/libs/surfaces/tranzport/SConscript
-@@ -64,6 +64,7 @@ tranzport.Merge ([
- libraries['glib2'],
- libraries['glibmm2'],
- libraries['usb'],
-+ libraries['boost'],
- libraries['sndfile']
- ])
-
---
-1.8.3.2
-
diff --git a/0002-Add-boost-linking-to-wiimote.patch b/0002-Add-boost-linking-to-wiimote.patch
deleted file mode 100644
index 03beca5..0000000
--- a/0002-Add-boost-linking-to-wiimote.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- ardour-2.8.16/libs/surfaces/wiimote/SConscript~ 2009-10-01 07:56:53.000000000 -0700
-+++ ardour-2.8.16/libs/surfaces/wiimote/SConscript 2014-10-23 10:59:30.000000000 -0700
-@@ -42,7 +42,8 @@
- libraries['usb'],
- libraries['xml'],
- libraries['glib2'],
-- libraries['glibmm2']
-+ libraries['glibmm2'],
-+ libraries['boost']
- ])
-
- libardour_wiimote = wiimote.SharedLibrary('ardour_wiimote', wiimote_files)
diff --git a/ardour-2.5-HOST_NOT_FOUND.patch b/ardour-2.5-HOST_NOT_FOUND.patch
deleted file mode 100644
index 827743e..0000000
--- a/ardour-2.5-HOST_NOT_FOUND.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- gtk2_ardour/ardour_ui.h~ 2008-06-17 07:58:37.000000000 -0700
-+++ gtk2_ardour/ardour_ui.h 2008-09-21 08:19:26.000000000 -0700
-@@ -53,6 +53,9 @@
- #include <gtkmm/textbuffer.h>
- #include <gtkmm/adjustment.h>
- #include <gtkmm2ext/gtk_ui.h>
-+#ifdef HOST_NOT_FOUND
-+#undef HOST_NOT_FOUND
-+#endif
- #include <gtkmm2ext/click_box.h>
- #include <gtkmm2ext/stateful_button.h>
- #include <gtkmm2ext/bindable_button.h>
diff --git a/ardour-2.8.16-aubio04.patch b/ardour-2.8.16-aubio04.patch
deleted file mode 100644
index 308bdd6..0000000
--- a/ardour-2.8.16-aubio04.patch
+++ /dev/null
@@ -1,363 +0,0 @@
-From 799e4369f1850c36fae856477539cebd2d0c3ad0 Mon Sep 17 00:00:00 2001
-From: Robin Gareus <robin(a)gareus.org>
-Date: Sun, 12 Jan 2014 18:11:14 +0100
-Subject: [PATCH] aubio 3+4 compat
-
-plus relevant changes for scons
-(cherry picked from commit 1eaa30b7257f006878c9b2c88ecbaea5bc36b174)
----
- SConstruct | 2 +
- libs/vamp-plugins/Onset.cpp | 125 +++++++++++++++++++++++++++++++++++++++++---
- libs/vamp-plugins/Onset.h | 26 +++++++--
- 3 files changed, 142 insertions(+), 11 deletions(-)
-
-diff --git a/SConstruct b/SConstruct
-index 7ad8cdf..290bce1 100644
---- a/SConstruct
-+++ b/SConstruct
-@@ -514,6 +514,8 @@ if conf.CheckPKGExists ('fftw3'):
- if conf.CheckPKGExists ('aubio'):
- libraries['aubio'] = LibraryInfo()
- libraries['aubio'].ParseConfig('pkg-config --cflags --libs aubio')
-+ if conf.CheckPKGVersion ('aubio', '0.4.0'):
-+ env.Append (CCFLAGS="-DHAVE_AUBIO4")
-
- env = conf.Finish ()
-
-diff --git a/libs/vamp-plugins/Onset.cpp b/libs/vamp-plugins/Onset.cpp
-index d475b11..64f197c 100644
---- a/libs/vamp-plugins/Onset.cpp
-+++ b/libs/vamp-plugins/Onset.cpp
-@@ -22,29 +22,51 @@ using std::vector;
- using std::cerr;
- using std::endl;
-
-+#ifdef HAVE_AUBIO4
-+const char *getAubioNameForOnsetType(OnsetType t)
-+{
-+ // In the same order as the enum elements in the header
-+ static const char *const names[] = {
-+ "energy", "specdiff", "hfc", "complex", "phase", "kl", "mkl", "specflux"
-+ };
-+ return names[(int)t];
-+}
-+#endif
-+
- Onset::Onset(float inputSampleRate) :
- Plugin(inputSampleRate),
- m_ibuf(0),
-- m_fftgrain(0),
- m_onset(0),
-+#ifdef HAVE_AUBIO4
-+ m_onsetdet(0),
-+ m_onsettype(OnsetComplex),
-+ m_minioi(4),
-+ m_silence(-70),
-+#else
-+ m_fftgrain(0),
- m_pv(0),
- m_peakpick(0),
- m_onsetdet(0),
- m_onsettype(aubio_onset_complex),
-- m_threshold(0.3),
-+ m_channelCount(1),
- m_silence(-90),
-- m_channelCount(1)
-+#endif
-+ m_threshold(0.3)
- {
- }
-
- Onset::~Onset()
- {
-+#ifdef HAVE_AUBIO4
-+ if (m_onsetdet) del_aubio_onset(m_onsetdet);
-+#else
- if (m_onsetdet) aubio_onsetdetection_free(m_onsetdet);
-- if (m_ibuf) del_fvec(m_ibuf);
-- if (m_onset) del_fvec(m_onset);
- if (m_fftgrain) del_cvec(m_fftgrain);
- if (m_pv) del_aubio_pvoc(m_pv);
- if (m_peakpick) del_aubio_peakpicker(m_peakpick);
-+#endif
-+ if (m_ibuf) del_fvec(m_ibuf);
-+ if (m_onset) del_fvec(m_onset);
- }
-
- string
-@@ -74,7 +96,11 @@ Onset::getMaker() const
- int
- Onset::getPluginVersion() const
- {
-+#ifdef HAVE_AUBIO4
-+ return 2;
-+#else
- return 1;
-+#endif
- }
-
- string
-@@ -86,10 +112,20 @@ Onset::getCopyright() const
- bool
- Onset::initialise(size_t channels, size_t stepSize, size_t blockSize)
- {
-- m_channelCount = channels;
- m_stepSize = stepSize;
- m_blockSize = blockSize;
-
-+#ifdef HAVE_AUBIO4
-+ if (channels != 1) {
-+ std::cerr << "Onset::initialise: channels must be 1" << std::endl;
-+ return false;
-+ }
-+ m_ibuf = new_fvec(stepSize);
-+ m_onset = new_fvec(1);
-+ reset();
-+#else
-+ m_channelCount = channels;
-+
- m_ibuf = new_fvec(stepSize, channels);
- m_onset = new_fvec(1, channels);
- m_fftgrain = new_cvec(blockSize, channels);
-@@ -103,13 +139,32 @@ Onset::initialise(size_t channels, size_t stepSize, size_t blockSize)
-
- m_lastOnset = Vamp::RealTime::zeroTime - m_delay - m_delay;
-
-+#endif
- return true;
- }
-
-+#ifdef HAVE_AUBIO4
- void
- Onset::reset()
- {
-+ if (m_onsetdet) del_aubio_onset(m_onsetdet);
-+
-+ m_onsetdet = new_aubio_onset
-+ (const_cast<char *>(getAubioNameForOnsetType(m_onsettype)),
-+ m_blockSize,
-+ m_stepSize,
-+ lrintf(m_inputSampleRate));
-+
-+ aubio_onset_set_threshold(m_onsetdet, m_threshold);
-+ aubio_onset_set_silence(m_onsetdet, m_silence);
-+ aubio_onset_set_minioi(m_onsetdet, m_minioi);
-+
-+ m_delay = Vamp::RealTime::frame2RealTime(4 * m_stepSize,
-+ lrintf(m_inputSampleRate));
-+
-+ m_lastOnset = Vamp::RealTime::zeroTime - m_delay - m_delay;
- }
-+#endif
-
- size_t
- Onset::getPreferredStepSize() const
-@@ -132,8 +187,13 @@ Onset::getParameterDescriptors() const
- desc.identifier = "onsettype";
- desc.name = "Onset Detection Function Type";
- desc.minValue = 0;
-+#ifdef HAVE_AUBIO4
-+ desc.maxValue = 7;
-+ desc.defaultValue = (int)OnsetComplex;
-+#else
- desc.maxValue = 6;
- desc.defaultValue = (int)aubio_onset_complex;
-+#endif
- desc.isQuantized = true;
- desc.quantizeStep = 1;
- desc.valueNames.push_back("Energy Based");
-@@ -143,6 +203,9 @@ Onset::getParameterDescriptors() const
- desc.valueNames.push_back("Phase Deviation");
- desc.valueNames.push_back("Kullback-Liebler");
- desc.valueNames.push_back("Modified Kullback-Liebler");
-+#ifdef HAVE_AUBIO4
-+ desc.valueNames.push_back("Spectral Flux");
-+#endif
- list.push_back(desc);
-
- desc = ParameterDescriptor();
-@@ -159,11 +222,27 @@ Onset::getParameterDescriptors() const
- desc.name = "Silence Threshold";
- desc.minValue = -120;
- desc.maxValue = 0;
-+#ifdef HAVE_AUBIO4
-+ desc.defaultValue = -70;
-+#else
- desc.defaultValue = -90;
-+#endif
- desc.unit = "dB";
- desc.isQuantized = false;
- list.push_back(desc);
-
-+#ifdef HAVE_AUBIO4
-+ desc = ParameterDescriptor();
-+ desc.identifier = "minioi";
-+ desc.name = "Minimum Inter-Onset Interval";
-+ desc.minValue = 0;
-+ desc.maxValue = 40;
-+ desc.defaultValue = 4;
-+ desc.unit = "ms";
-+ desc.isQuantized = true;
-+ desc.quantizeStep = 1;
-+ list.push_back(desc);
-+#endif
- return list;
- }
-
-@@ -176,6 +255,10 @@ Onset::getParameter(std::string param) const
- return m_threshold;
- } else if (param == "silencethreshold") {
- return m_silence;
-+#ifdef HAVE_AUBIO4
-+ } else if (param == "minioi") {
-+ return m_minioi;
-+#endif
- } else {
- return 0.0;
- }
-@@ -186,6 +269,16 @@ Onset::setParameter(std::string param, float value)
- {
- if (param == "onsettype") {
- switch (lrintf(value)) {
-+#ifdef HAVE_AUBIO4
-+ case 0: m_onsettype = OnsetEnergy; break;
-+ case 1: m_onsettype = OnsetSpecDiff; break;
-+ case 2: m_onsettype = OnsetHFC; break;
-+ case 3: m_onsettype = OnsetComplex; break;
-+ case 4: m_onsettype = OnsetPhase; break;
-+ case 5: m_onsettype = OnsetKL; break;
-+ case 6: m_onsettype = OnsetMKL; break;
-+ case 7: m_onsettype = OnsetSpecFlux; break;
-+#else
- case 0: m_onsettype = aubio_onset_energy; break;
- case 1: m_onsettype = aubio_onset_specdiff; break;
- case 2: m_onsettype = aubio_onset_hfc; break;
-@@ -193,11 +286,16 @@ Onset::setParameter(std::string param, float value)
- case 4: m_onsettype = aubio_onset_phase; break;
- case 5: m_onsettype = aubio_onset_kl; break;
- case 6: m_onsettype = aubio_onset_mkl; break;
-+#endif
- }
- } else if (param == "peakpickthreshold") {
- m_threshold = value;
- } else if (param == "silencethreshold") {
- m_silence = value;
-+#ifdef HAVE_AUBIO4
-+ } else if (param == "minioi") {
-+ m_minioi = value;
-+#endif
- }
- }
-
-@@ -216,6 +314,7 @@ Onset::getOutputDescriptors() const
- d.sampleRate = 0;
- list.push_back(d);
-
-+#ifndef HAVE_AUBIO4
- d = OutputDescriptor();
- d.identifier = "detectionfunction";
- d.name = "Onset Detection Function";
-@@ -226,7 +325,7 @@ Onset::getOutputDescriptors() const
- d.isQuantized = false;
- d.sampleType = OutputDescriptor::OneSamplePerStep;
- list.push_back(d);
--
-+#endif
- return list;
- }
-
-@@ -234,6 +333,15 @@ Onset::FeatureSet
- Onset::process(const float *const *inputBuffers,
- Vamp::RealTime timestamp)
- {
-+#ifdef HAVE_AUBIO4
-+ for (size_t i = 0; i < m_stepSize; ++i) {
-+ fvec_set_sample(m_ibuf, inputBuffers[0][i], i);
-+ }
-+
-+ aubio_onset_do(m_onsetdet, m_ibuf, m_onset);
-+
-+ bool isonset = m_onset->data[0];
-+#else
- for (size_t i = 0; i < m_stepSize; ++i) {
- for (size_t j = 0; j < m_channelCount; ++j) {
- fvec_write_sample(m_ibuf, inputBuffers[j][i], j, i);
-@@ -250,6 +358,7 @@ Onset::process(const float *const *inputBuffers,
- isonset = false;
- }
- }
-+#endif
-
- FeatureSet returnFeatures;
-
-@@ -263,11 +372,13 @@ Onset::process(const float *const *inputBuffers,
- m_lastOnset = timestamp;
- }
- }
-+#ifndef HAVE_AUBIO4
- Feature feature;
- for (size_t j = 0; j < m_channelCount; ++j) {
- feature.values.push_back(m_onset->data[j][0]);
- }
- returnFeatures[1].push_back(feature);
-+#endif
-
- return returnFeatures;
- }
-diff --git a/libs/vamp-plugins/Onset.h b/libs/vamp-plugins/Onset.h
-index 314e107..bba95e0 100644
---- a/libs/vamp-plugins/Onset.h
-+++ b/libs/vamp-plugins/Onset.h
-@@ -20,6 +20,19 @@
- #include <vamp-sdk/Plugin.h>
- #include <aubio/aubio.h>
-
-+#ifdef HAVE_AUBIO4
-+enum OnsetType {
-+ OnsetEnergy,
-+ OnsetSpecDiff,
-+ OnsetHFC,
-+ OnsetComplex,
-+ OnsetPhase,
-+ OnsetKL,
-+ OnsetMKL,
-+ OnsetSpecFlux // new in 0.4!
-+};
-+#endif
-+
- class Onset : public Vamp::Plugin
- {
- public:
-@@ -54,20 +67,25 @@ public:
-
- protected:
- fvec_t *m_ibuf;
-- cvec_t *m_fftgrain;
- fvec_t *m_onset;
-+#ifdef HAVE_AUBIO4
-+ aubio_onset_t *m_onsetdet;
-+ OnsetType m_onsettype;
-+ float m_minioi;
-+#else
-+ cvec_t *m_fftgrain;
- aubio_pvoc_t *m_pv;
- aubio_pickpeak_t *m_peakpick;
- aubio_onsetdetection_t *m_onsetdet;
- aubio_onsetdetection_type m_onsettype;
-- float m_threshold;
-+ size_t m_channelCount;
-+#endif
- float m_silence;
-+ float m_threshold;
- size_t m_stepSize;
- size_t m_blockSize;
-- size_t m_channelCount;
- Vamp::RealTime m_delay;
- Vamp::RealTime m_lastOnset;
- };
-
--
- #endif
---
-2.6.3
-
diff --git a/ardour-2.8.16-c++11-bool-from-pointer.patch b/ardour-2.8.16-c++11-bool-from-pointer.patch
deleted file mode 100644
index b91a9d3..0000000
--- a/ardour-2.8.16-c++11-bool-from-pointer.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From de79d5107f0d4e47199ac9b733be2d0783791605 Mon Sep 17 00:00:00 2001
-From: Nils Philippsen <nils(a)tiptoe.de>
-Date: Fri, 27 Nov 2015 20:31:20 +0100
-Subject: [PATCH] C++11: don't cast pointer into bool
-
----
- gtk2_ardour/editor_region_list.cc | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/gtk2_ardour/editor_region_list.cc b/gtk2_ardour/editor_region_list.cc
-index 054ef04..0e7cd53 100644
---- a/gtk2_ardour/editor_region_list.cc
-+++ b/gtk2_ardour/editor_region_list.cc
-@@ -94,7 +94,7 @@ Editor::add_audio_region_to_region_display (boost::shared_ptr<AudioRegion> regio
- Gdk::Color c;
- bool missing_source;
-
-- missing_source = boost::dynamic_pointer_cast<SilentFileSource>(region->source());
-+ missing_source = boost::dynamic_pointer_cast<SilentFileSource>(region->source()) != NULL;
-
- if (!show_automatic_regions_in_region_list && region->automatic()) {
- return;
---
-2.6.3
-
diff --git a/ardour-2.8.16-c++11-namespaces.patch b/ardour-2.8.16-c++11-namespaces.patch
deleted file mode 100644
index 87283bc..0000000
--- a/ardour-2.8.16-c++11-namespaces.patch
+++ /dev/null
@@ -1,2782 +0,0 @@
-From c40bff17c7c5ebe13f1a00f49f92c3ddb1179cf9 Mon Sep 17 00:00:00 2001
-From: Nils Philippsen <nils(a)tiptoe.de>
-Date: Sat, 28 Nov 2015 23:59:50 +0100
-Subject: [PATCH] C++11: use explicit namespaces for clashing symbol names
-
----
- gtk2_ardour/ardour_ui2.cc | 36 ++--
- gtk2_ardour/ardour_ui_ed.cc | 234 ++++++++++++------------
- gtk2_ardour/audio_clock.cc | 202 ++++++++++----------
- gtk2_ardour/audio_region_editor.cc | 4 +-
- gtk2_ardour/automation_line.cc | 2 +-
- gtk2_ardour/crossfade_edit.cc | 14 +-
- gtk2_ardour/editor.cc | 204 ++++++++++-----------
- gtk2_ardour/editor_audio_import.cc | 4 +-
- gtk2_ardour/editor_canvas.cc | 16 +-
- gtk2_ardour/editor_markers.cc | 16 +-
- gtk2_ardour/editor_ops.cc | 14 +-
- gtk2_ardour/editor_selection.cc | 2 +-
- gtk2_ardour/generic_pluginui.cc | 40 ++--
- gtk2_ardour/io_selector.cc | 16 +-
- gtk2_ardour/level_meter.cc | 4 +-
- gtk2_ardour/mixer_strip.cc | 18 +-
- gtk2_ardour/mixer_ui.cc | 24 +--
- gtk2_ardour/option_editor.cc | 24 +--
- gtk2_ardour/plugin_ui.cc | 4 +-
- gtk2_ardour/route_time_axis.cc | 36 ++--
- gtk2_ardour/time_axis_view_item.cc | 2 +-
- libs/ardour/automation_event.cc | 4 +-
- libs/ardour/session.cc | 88 ++++-----
- libs/gtkmm2ext/gtk_ui.cc | 6 +-
- libs/surfaces/mackie/mackie_control_protocol.cc | 4 +-
- libs/surfaces/mackie/mackie_jog_wheel.cc | 3 +-
- 26 files changed, 510 insertions(+), 511 deletions(-)
-
-diff --git a/gtk2_ardour/ardour_ui2.cc b/gtk2_ardour/ardour_ui2.cc
-index 7107b64..aa4ee8a 100644
---- a/gtk2_ardour/ardour_ui2.cc
-+++ b/gtk2_ardour/ardour_ui2.cc
-@@ -76,7 +76,7 @@ ARDOUR_UI::setup_windows ()
- setup_transport();
- build_menu_bar ();
-
-- theme_manager->signal_unmap().connect (bind (sigc::ptr_fun(&ActionManager::uncheck_toggleaction), X_("<Actions>/Common/ToggleThemeManager")));
-+ theme_manager->signal_unmap().connect (sigc::bind (sigc::ptr_fun(&ActionManager::uncheck_toggleaction), X_("<Actions>/Common/ToggleThemeManager")));
-
- #ifdef TOP_MENUBAR
- HBox* status_bar_packer = manage (new HBox);
-@@ -156,7 +156,7 @@ ARDOUR_UI::setup_transport ()
- {
- transport_tearoff = manage (new TearOff (transport_tearoff_hbox));
- transport_tearoff->set_name ("TransportBase");
-- transport_tearoff->tearoff_window().signal_key_press_event().connect (bind (sigc::ptr_fun (relay_key_press), &transport_tearoff->tearoff_window()));
-+ transport_tearoff->tearoff_window().signal_key_press_event().connect (sigc::bind (sigc::ptr_fun (relay_key_press), &transport_tearoff->tearoff_window()));
-
- if (Profile->get_sae()) {
- transport_tearoff->set_can_be_torn_off (false);
-@@ -171,13 +171,13 @@ ARDOUR_UI::setup_transport ()
- transport_frame.set_name ("BaseFrame");
- transport_frame.add (transport_base);
-
-- transport_tearoff->Detach.connect (bind (mem_fun(*this, &ARDOUR_UI::detach_tearoff), static_cast<Box*>(&top_packer),
-+ transport_tearoff->Detach.connect (sigc::bind (mem_fun(*this, &ARDOUR_UI::detach_tearoff), static_cast<Box*>(&top_packer),
- static_cast<Widget*>(&transport_frame)));
-- transport_tearoff->Attach.connect (bind (mem_fun(*this, &ARDOUR_UI::reattach_tearoff), static_cast<Box*> (&top_packer),
-+ transport_tearoff->Attach.connect (sigc::bind (mem_fun(*this, &ARDOUR_UI::reattach_tearoff), static_cast<Box*> (&top_packer),
- static_cast<Widget*> (&transport_frame), 1));
-- transport_tearoff->Hidden.connect (bind (mem_fun(*this, &ARDOUR_UI::detach_tearoff), static_cast<Box*>(&top_packer),
-+ transport_tearoff->Hidden.connect (sigc::bind (mem_fun(*this, &ARDOUR_UI::detach_tearoff), static_cast<Box*>(&top_packer),
- static_cast<Widget*>(&transport_frame)));
-- transport_tearoff->Visible.connect (bind (mem_fun(*this, &ARDOUR_UI::reattach_tearoff), static_cast<Box*> (&top_packer),
-+ transport_tearoff->Visible.connect (sigc::bind (mem_fun(*this, &ARDOUR_UI::reattach_tearoff), static_cast<Box*> (&top_packer),
- static_cast<Widget*> (&transport_frame), 1));
-
- shuttle_box.set_name ("TransportButton");
-@@ -282,8 +282,8 @@ ARDOUR_UI::setup_transport ()
-
- /* clocks, etc. */
-
-- ARDOUR_UI::Clock.connect (bind (mem_fun (primary_clock, &AudioClock::set), 1));
-- ARDOUR_UI::Clock.connect (bind (mem_fun (secondary_clock, &AudioClock::set), 2));
-+ ARDOUR_UI::Clock.connect (sigc::bind (mem_fun (primary_clock, &AudioClock::set), 1));
-+ ARDOUR_UI::Clock.connect (sigc::bind (mem_fun (secondary_clock, &AudioClock::set), 2));
-
- primary_clock.ValueChanged.connect (mem_fun(*this, &ARDOUR_UI::primary_clock_value_changed));
- secondary_clock.ValueChanged.connect (mem_fun(*this, &ARDOUR_UI::secondary_clock_value_changed));
-@@ -433,9 +433,9 @@ ARDOUR_UI::setup_transport ()
- void
- ARDOUR_UI::manage_window (Window& win)
- {
-- win.signal_delete_event().connect (bind (sigc::ptr_fun (just_hide_it), &win));
-- win.signal_enter_notify_event().connect (bind (mem_fun (Keyboard::the_keyboard(), &Keyboard::enter_window), &win));
-- win.signal_leave_notify_event().connect (bind (mem_fun (Keyboard::the_keyboard(), &Keyboard::leave_window), &win));
-+ win.signal_delete_event().connect (sigc::bind (sigc::ptr_fun (just_hide_it), &win));
-+ win.signal_enter_notify_event().connect (sigc::bind (mem_fun (Keyboard::the_keyboard(), &Keyboard::enter_window), &win));
-+ win.signal_leave_notify_event().connect (sigc::bind (mem_fun (Keyboard::the_keyboard(), &Keyboard::leave_window), &win));
- }
-
- void
-@@ -472,7 +472,7 @@ ARDOUR_UI::_auditioning_changed (bool onoff)
- void
- ARDOUR_UI::auditioning_changed (bool onoff)
- {
-- UI::instance()->call_slot(bind (mem_fun(*this, &ARDOUR_UI::_auditioning_changed), onoff));
-+ UI::instance()->call_slot(sigc::bind (mem_fun(*this, &ARDOUR_UI::_auditioning_changed), onoff));
- }
-
- void
-@@ -542,27 +542,27 @@ ARDOUR_UI::build_shuttle_context_menu ()
-
- RadioMenuItem::Group group;
-
-- speed_items.push_back (RadioMenuElem (group, "8", bind (mem_fun (*this, &ARDOUR_UI::set_shuttle_max_speed), 8.0f)));
-+ speed_items.push_back (RadioMenuElem (group, "8", sigc::bind (mem_fun (*this, &ARDOUR_UI::set_shuttle_max_speed), 8.0f)));
- if (shuttle_max_speed == 8.0) {
- static_cast<RadioMenuItem*>(&speed_items.back())->set_active ();
- }
-- speed_items.push_back (RadioMenuElem (group, "6", bind (mem_fun (*this, &ARDOUR_UI::set_shuttle_max_speed), 6.0f)));
-+ speed_items.push_back (RadioMenuElem (group, "6", sigc::bind (mem_fun (*this, &ARDOUR_UI::set_shuttle_max_speed), 6.0f)));
- if (shuttle_max_speed == 6.0) {
- static_cast<RadioMenuItem*>(&speed_items.back())->set_active ();
- }
-- speed_items.push_back (RadioMenuElem (group, "4", bind (mem_fun (*this, &ARDOUR_UI::set_shuttle_max_speed), 4.0f)));
-+ speed_items.push_back (RadioMenuElem (group, "4", sigc::bind (mem_fun (*this, &ARDOUR_UI::set_shuttle_max_speed), 4.0f)));
- if (shuttle_max_speed == 4.0) {
- static_cast<RadioMenuItem*>(&speed_items.back())->set_active ();
- }
-- speed_items.push_back (RadioMenuElem (group, "3", bind (mem_fun (*this, &ARDOUR_UI::set_shuttle_max_speed), 3.0f)));
-+ speed_items.push_back (RadioMenuElem (group, "3", sigc::bind (mem_fun (*this, &ARDOUR_UI::set_shuttle_max_speed), 3.0f)));
- if (shuttle_max_speed == 3.0) {
- static_cast<RadioMenuItem*>(&speed_items.back())->set_active ();
- }
-- speed_items.push_back (RadioMenuElem (group, "2", bind (mem_fun (*this, &ARDOUR_UI::set_shuttle_max_speed), 2.0f)));
-+ speed_items.push_back (RadioMenuElem (group, "2", sigc::bind (mem_fun (*this, &ARDOUR_UI::set_shuttle_max_speed), 2.0f)));
- if (shuttle_max_speed == 2.0) {
- static_cast<RadioMenuItem*>(&speed_items.back())->set_active ();
- }
-- speed_items.push_back (RadioMenuElem (group, "1.5", bind (mem_fun (*this, &ARDOUR_UI::set_shuttle_max_speed), 1.5f)));
-+ speed_items.push_back (RadioMenuElem (group, "1.5", sigc::bind (mem_fun (*this, &ARDOUR_UI::set_shuttle_max_speed), 1.5f)));
- if (shuttle_max_speed == 1.5) {
- static_cast<RadioMenuItem*>(&speed_items.back())->set_active ();
- }
-diff --git a/gtk2_ardour/ardour_ui_ed.cc b/gtk2_ardour/ardour_ui_ed.cc
-index 9ae5a71..47a3a8f 100644
---- a/gtk2_ardour/ardour_ui_ed.cc
-+++ b/gtk2_ardour/ardour_ui_ed.cc
-@@ -108,7 +108,7 @@ ARDOUR_UI::install_actions ()
-
- /* the real actions */
-
-- act = ActionManager::register_action (main_actions, X_("New"), _("New"), hide_return (bind (mem_fun(*this, &ARDOUR_UI::get_session_parameters), true, true)));
-+ act = ActionManager::register_action (main_actions, X_("New"), _("New"), hide_return (sigc::bind (mem_fun(*this, &ARDOUR_UI::get_session_parameters), true, true)));
-
- ActionManager::register_action (main_actions, X_("Open"), _("Open"), mem_fun(*this, &ARDOUR_UI::open_session));
- ActionManager::register_action (main_actions, X_("Recent"), _("Recent"), mem_fun(*this, &ARDOUR_UI::open_recent_session));
-@@ -116,7 +116,7 @@ ARDOUR_UI::install_actions ()
- ActionManager::session_sensitive_actions.push_back (act);
-
- act = ActionManager::register_action (main_actions, X_("AddTrackBus"), _("Add Track/Bus"),
-- bind (mem_fun(*this, &ARDOUR_UI::add_route), (Gtk::Window*) 0));
-+ sigc::bind (mem_fun(*this, &ARDOUR_UI::add_route), (Gtk::Window*) 0));
- ActionManager::session_sensitive_actions.push_back (act);
- ActionManager::write_sensitive_actions.push_back (act);
-
-@@ -135,11 +135,11 @@ ARDOUR_UI::install_actions ()
-
- /* </CMT Additions> */
-
-- act = ActionManager::register_action (main_actions, X_("Snapshot"), _("Snapshot"), bind (mem_fun(*this, &ARDOUR_UI::snapshot_session), false));
-+ act = ActionManager::register_action (main_actions, X_("Snapshot"), _("Snapshot"), sigc::bind (mem_fun(*this, &ARDOUR_UI::snapshot_session), false));
- ActionManager::session_sensitive_actions.push_back (act);
- ActionManager::write_sensitive_actions.push_back (act);
-
-- act = ActionManager::register_action (main_actions, X_("Save As"), _("Save As"), bind (mem_fun(*this, &ARDOUR_UI::snapshot_session), true));
-+ act = ActionManager::register_action (main_actions, X_("Save As"), _("Save As"), sigc::bind (mem_fun(*this, &ARDOUR_UI::snapshot_session), true));
- ActionManager::session_sensitive_actions.push_back (act);
- ActionManager::write_sensitive_actions.push_back (act);
-
-@@ -181,23 +181,23 @@ ARDOUR_UI::install_actions ()
-
- RadioAction::Group jack_latency_group;
-
-- act = ActionManager::register_radio_action (jack_actions, jack_latency_group, X_("JACKLatency32"), X_("32"), bind (mem_fun(*this, &ARDOUR_UI::set_jack_buffer_size), (nframes_t) 32));
-+ act = ActionManager::register_radio_action (jack_actions, jack_latency_group, X_("JACKLatency32"), X_("32"), sigc::bind (mem_fun(*this, &ARDOUR_UI::set_jack_buffer_size), (nframes_t) 32));
- ActionManager::jack_sensitive_actions.push_back (act);
-- act = ActionManager::register_radio_action (jack_actions, jack_latency_group, X_("JACKLatency64"), X_("64"), bind (mem_fun(*this, &ARDOUR_UI::set_jack_buffer_size), (nframes_t) 64));
-+ act = ActionManager::register_radio_action (jack_actions, jack_latency_group, X_("JACKLatency64"), X_("64"), sigc::bind (mem_fun(*this, &ARDOUR_UI::set_jack_buffer_size), (nframes_t) 64));
- ActionManager::jack_sensitive_actions.push_back (act);
-- act = ActionManager::register_radio_action (jack_actions, jack_latency_group, X_("JACKLatency128"), X_("128"), bind (mem_fun(*this, &ARDOUR_UI::set_jack_buffer_size), (nframes_t) 128));
-+ act = ActionManager::register_radio_action (jack_actions, jack_latency_group, X_("JACKLatency128"), X_("128"), sigc::bind (mem_fun(*this, &ARDOUR_UI::set_jack_buffer_size), (nframes_t) 128));
- ActionManager::jack_sensitive_actions.push_back (act);
-- act = ActionManager::register_radio_action (jack_actions, jack_latency_group, X_("JACKLatency256"), X_("256"), bind (mem_fun(*this, &ARDOUR_UI::set_jack_buffer_size), (nframes_t) 256));
-+ act = ActionManager::register_radio_action (jack_actions, jack_latency_group, X_("JACKLatency256"), X_("256"), sigc::bind (mem_fun(*this, &ARDOUR_UI::set_jack_buffer_size), (nframes_t) 256));
- ActionManager::jack_sensitive_actions.push_back (act);
-- act = ActionManager::register_radio_action (jack_actions, jack_latency_group, X_("JACKLatency512"), X_("512"), bind (mem_fun(*this, &ARDOUR_UI::set_jack_buffer_size), (nframes_t) 512));
-+ act = ActionManager::register_radio_action (jack_actions, jack_latency_group, X_("JACKLatency512"), X_("512"), sigc::bind (mem_fun(*this, &ARDOUR_UI::set_jack_buffer_size), (nframes_t) 512));
- ActionManager::jack_sensitive_actions.push_back (act);
-- act = ActionManager::register_radio_action (jack_actions, jack_latency_group, X_("JACKLatency1024"), X_("1024"), bind (mem_fun(*this, &ARDOUR_UI::set_jack_buffer_size), (nframes_t) 1024));
-+ act = ActionManager::register_radio_action (jack_actions, jack_latency_group, X_("JACKLatency1024"), X_("1024"), sigc::bind (mem_fun(*this, &ARDOUR_UI::set_jack_buffer_size), (nframes_t) 1024));
- ActionManager::jack_sensitive_actions.push_back (act);
-- act = ActionManager::register_radio_action (jack_actions, jack_latency_group, X_("JACKLatency2048"), X_("2048"), bind (mem_fun(*this, &ARDOUR_UI::set_jack_buffer_size), (nframes_t) 2048));
-+ act = ActionManager::register_radio_action (jack_actions, jack_latency_group, X_("JACKLatency2048"), X_("2048"), sigc::bind (mem_fun(*this, &ARDOUR_UI::set_jack_buffer_size), (nframes_t) 2048));
- ActionManager::jack_sensitive_actions.push_back (act);
-- act = ActionManager::register_radio_action (jack_actions, jack_latency_group, X_("JACKLatency4096"), X_("4096"), bind (mem_fun(*this, &ARDOUR_UI::set_jack_buffer_size), (nframes_t) 4096));
-+ act = ActionManager::register_radio_action (jack_actions, jack_latency_group, X_("JACKLatency4096"), X_("4096"), sigc::bind (mem_fun(*this, &ARDOUR_UI::set_jack_buffer_size), (nframes_t) 4096));
- ActionManager::jack_sensitive_actions.push_back (act);
-- act = ActionManager::register_radio_action (jack_actions, jack_latency_group, X_("JACKLatency8192"), X_("8192"), bind (mem_fun(*this, &ARDOUR_UI::set_jack_buffer_size), (nframes_t) 8192));
-+ act = ActionManager::register_radio_action (jack_actions, jack_latency_group, X_("JACKLatency8192"), X_("8192"), sigc::bind (mem_fun(*this, &ARDOUR_UI::set_jack_buffer_size), (nframes_t) 8192));
- ActionManager::jack_sensitive_actions.push_back (act);
-
- /* these actions are intended to be shared across all windows */
-@@ -230,11 +230,11 @@ ARDOUR_UI::install_actions ()
- ActionManager::register_toggle_action (common_actions, X_("ToggleThemeManager"), _("Theme Manager"), mem_fun(*this, &ARDOUR_UI::toggle_theme_manager));
- ActionManager::register_toggle_action (common_actions, X_("ToggleKeyEditor"), _("Keybindings"), mem_fun(*this, &ARDOUR_UI::toggle_key_editor));
-
-- act = ActionManager::register_action (common_actions, X_("AddAudioTrack"), _("Add Audio Track"), bind (mem_fun(*this, &ARDOUR_UI::session_add_audio_track), 1, 1, ARDOUR::Normal, 1));
-+ act = ActionManager::register_action (common_actions, X_("AddAudioTrack"), _("Add Audio Track"), sigc::bind (mem_fun(*this, &ARDOUR_UI::session_add_audio_track), 1, 1, ARDOUR::Normal, 1));
- ActionManager::session_sensitive_actions.push_back (act);
-- act = ActionManager::register_action (common_actions, X_("AddAudioBus"), _("Add Audio Bus"), bind (mem_fun(*this, &ARDOUR_UI::session_add_audio_bus), 1, 1, 1));
-+ act = ActionManager::register_action (common_actions, X_("AddAudioBus"), _("Add Audio Bus"), sigc::bind (mem_fun(*this, &ARDOUR_UI::session_add_audio_bus), 1, 1, 1));
- ActionManager::session_sensitive_actions.push_back (act);
-- act = ActionManager::register_action (common_actions, X_("Save"), _("Save"), bind (mem_fun(*this, &ARDOUR_UI::save_state), string(""), false));
-+ act = ActionManager::register_action (common_actions, X_("Save"), _("Save"), sigc::bind (mem_fun(*this, &ARDOUR_UI::save_state), string(""), false));
- ActionManager::session_sensitive_actions.push_back (act);
- ActionManager::write_sensitive_actions.push_back (act);
- act = ActionManager::register_action (common_actions, X_("RemoveLastCapture"), _("Remove Last Capture"), mem_fun(*this, &ARDOUR_UI::remove_last_capture));
-@@ -257,13 +257,13 @@ ARDOUR_UI::install_actions ()
- ActionManager::session_sensitive_actions.push_back (act);
- ActionManager::transport_sensitive_actions.push_back (act);
-
-- act = ActionManager::register_action (transport_actions, X_("ToggleRoll"), _("Start/Stop"), bind (mem_fun (*this, &ARDOUR_UI::toggle_roll), false, false));
-+ act = ActionManager::register_action (transport_actions, X_("ToggleRoll"), _("Start/Stop"), sigc::bind (mem_fun (*this, &ARDOUR_UI::toggle_roll), false, false));
- ActionManager::session_sensitive_actions.push_back (act);
- ActionManager::transport_sensitive_actions.push_back (act);
-- act = ActionManager::register_action (transport_actions, X_("ToggleRollMaybe"), _("Start/Continue/Stop"), bind (mem_fun (*this, &ARDOUR_UI::toggle_roll), false, true));
-+ act = ActionManager::register_action (transport_actions, X_("ToggleRollMaybe"), _("Start/Continue/Stop"), sigc::bind (mem_fun (*this, &ARDOUR_UI::toggle_roll), false, true));
- ActionManager::session_sensitive_actions.push_back (act);
- ActionManager::transport_sensitive_actions.push_back (act);
-- act = ActionManager::register_action (transport_actions, X_("ToggleRollForgetCapture"), _("Stop + Forget Capture"), bind (mem_fun(*this, &ARDOUR_UI::toggle_roll), true, false));
-+ act = ActionManager::register_action (transport_actions, X_("ToggleRollForgetCapture"), _("Stop + Forget Capture"), sigc::bind (mem_fun(*this, &ARDOUR_UI::toggle_roll), true, false));
- ActionManager::session_sensitive_actions.push_back (act);
- ActionManager::transport_sensitive_actions.push_back (act);
-
-@@ -273,11 +273,11 @@ ARDOUR_UI::install_actions ()
- - otherwise do nothing
- */
-
-- act = ActionManager::register_action (transport_actions, X_("TransitionToRoll"), _("Transition To Roll"), bind (mem_fun (*editor, &PublicEditor::transition_to_rolling), true));
-+ act = ActionManager::register_action (transport_actions, X_("TransitionToRoll"), _("Transition To Roll"), sigc::bind (mem_fun (*editor, &PublicEditor::transition_to_rolling), true));
- ActionManager::session_sensitive_actions.push_back (act);
- ActionManager::transport_sensitive_actions.push_back (act);
-
-- act = ActionManager::register_action (transport_actions, X_("TransitionToReverse"), _("Transition To Reverse"), bind (mem_fun (*editor, &PublicEditor::transition_to_rolling), false));
-+ act = ActionManager::register_action (transport_actions, X_("TransitionToReverse"), _("Transition To Reverse"), sigc::bind (mem_fun (*editor, &PublicEditor::transition_to_rolling), false));
- ActionManager::session_sensitive_actions.push_back (act);
- ActionManager::transport_sensitive_actions.push_back (act);
-
-@@ -289,29 +289,29 @@ ARDOUR_UI::install_actions ()
- ActionManager::session_sensitive_actions.push_back (act);
- ActionManager::transport_sensitive_actions.push_back (act);
-
-- act = ActionManager::register_action (transport_actions, X_("Record"), _("Enable Record"), bind (mem_fun(*this, &ARDOUR_UI::transport_record), false));
-+ act = ActionManager::register_action (transport_actions, X_("Record"), _("Enable Record"), sigc::bind (mem_fun(*this, &ARDOUR_UI::transport_record), false));
- ActionManager::session_sensitive_actions.push_back (act);
- ActionManager::write_sensitive_actions.push_back (act);
-- act = ActionManager::register_action (transport_actions, X_("record-roll"), _("Start Recording"), bind (mem_fun(*this, &ARDOUR_UI::transport_record), true));
-+ act = ActionManager::register_action (transport_actions, X_("record-roll"), _("Start Recording"), sigc::bind (mem_fun(*this, &ARDOUR_UI::transport_record), true));
- ActionManager::session_sensitive_actions.push_back (act);
- ActionManager::write_sensitive_actions.push_back (act);
- ActionManager::transport_sensitive_actions.push_back (act);
-- act = ActionManager::register_action (transport_actions, X_("Rewind"), _("Rewind"), bind (mem_fun(*this, &ARDOUR_UI::transport_rewind), 0));
-+ act = ActionManager::register_action (transport_actions, X_("Rewind"), _("Rewind"), sigc::bind (mem_fun(*this, &ARDOUR_UI::transport_rewind), 0));
- ActionManager::session_sensitive_actions.push_back (act);
- ActionManager::transport_sensitive_actions.push_back (act);
-- act = ActionManager::register_action (transport_actions, X_("RewindSlow"), _("Rewind (Slow)"), bind (mem_fun(*this, &ARDOUR_UI::transport_rewind), -1));
-+ act = ActionManager::register_action (transport_actions, X_("RewindSlow"), _("Rewind (Slow)"), sigc::bind (mem_fun(*this, &ARDOUR_UI::transport_rewind), -1));
- ActionManager::session_sensitive_actions.push_back (act);
- ActionManager::transport_sensitive_actions.push_back (act);
-- act = ActionManager::register_action (transport_actions, X_("RewindFast"), _("Rewind (Fast)"), bind (mem_fun(*this, &ARDOUR_UI::transport_rewind), 1));
-+ act = ActionManager::register_action (transport_actions, X_("RewindFast"), _("Rewind (Fast)"), sigc::bind (mem_fun(*this, &ARDOUR_UI::transport_rewind), 1));
- ActionManager::session_sensitive_actions.push_back (act);
- ActionManager::transport_sensitive_actions.push_back (act);
-- act = ActionManager::register_action (transport_actions, X_("Forward"), _("Forward"), bind (mem_fun(*this, &ARDOUR_UI::transport_forward), 0));
-+ act = ActionManager::register_action (transport_actions, X_("Forward"), _("Forward"), sigc::bind (mem_fun(*this, &ARDOUR_UI::transport_forward), 0));
- ActionManager::session_sensitive_actions.push_back (act);
- ActionManager::transport_sensitive_actions.push_back (act);
-- act = ActionManager::register_action (transport_actions, X_("ForwardSlow"), _("Forward (Slow)"), bind (mem_fun(*this, &ARDOUR_UI::transport_forward), -1));
-+ act = ActionManager::register_action (transport_actions, X_("ForwardSlow"), _("Forward (Slow)"), sigc::bind (mem_fun(*this, &ARDOUR_UI::transport_forward), -1));
- ActionManager::session_sensitive_actions.push_back (act);
- ActionManager::transport_sensitive_actions.push_back (act);
-- act = ActionManager::register_action (transport_actions, X_("ForwardFast"), _("Forward (Fast)"), bind (mem_fun(*this, &ARDOUR_UI::transport_forward), 1));
-+ act = ActionManager::register_action (transport_actions, X_("ForwardFast"), _("Forward (Fast)"), sigc::bind (mem_fun(*this, &ARDOUR_UI::transport_forward), 1));
- ActionManager::session_sensitive_actions.push_back (act);
- ActionManager::transport_sensitive_actions.push_back (act);
- act = ActionManager::register_action (transport_actions, X_("GotoZero"), _("Goto Zero"), mem_fun(*this, &ARDOUR_UI::transport_goto_zero));
-@@ -331,22 +331,22 @@ ARDOUR_UI::install_actions ()
- ActionManager::session_sensitive_actions.push_back (act);
- ActionManager::transport_sensitive_actions.push_back (act);
-
-- act = ActionManager::register_action (transport_actions, X_("primary-clock-bbt"), _("Bars & Beats"), bind (mem_fun(primary_clock, &AudioClock::set_mode), AudioClock::BBT));
-+ act = ActionManager::register_action (transport_actions, X_("primary-clock-bbt"), _("Bars & Beats"), sigc::bind (mem_fun(primary_clock, &AudioClock::set_mode), AudioClock::BBT));
- ActionManager::session_sensitive_actions.push_back (act);
-- act = ActionManager::register_action (transport_actions, X_("primary-clock-minsec"), _("Minutes & Seconds"), bind (mem_fun(primary_clock, &AudioClock::set_mode), AudioClock::MinSec));
-+ act = ActionManager::register_action (transport_actions, X_("primary-clock-minsec"), _("Minutes & Seconds"), sigc::bind (mem_fun(primary_clock, &AudioClock::set_mode), AudioClock::MinSec));
- ActionManager::session_sensitive_actions.push_back (act);
-- act = ActionManager::register_action (transport_actions, X_("primary-clock-samples"), _("Samples"), bind (mem_fun(primary_clock, &AudioClock::set_mode), AudioClock::Frames));
-+ act = ActionManager::register_action (transport_actions, X_("primary-clock-samples"), _("Samples"), sigc::bind (mem_fun(primary_clock, &AudioClock::set_mode), AudioClock::Frames));
- ActionManager::session_sensitive_actions.push_back (act);
-- act = ActionManager::register_action (transport_actions, X_("primary-clock-off"), _("Off"), bind (mem_fun(primary_clock, &AudioClock::set_mode), AudioClock::Off));
-+ act = ActionManager::register_action (transport_actions, X_("primary-clock-off"), _("Off"), sigc::bind (mem_fun(primary_clock, &AudioClock::set_mode), AudioClock::Off));
- ActionManager::session_sensitive_actions.push_back (act);
-
-- act = ActionManager::register_action (transport_actions, X_("secondary-clock-bbt"), _("Bars & Beats"), bind (mem_fun(secondary_clock, &AudioClock::set_mode), AudioClock::BBT));
-+ act = ActionManager::register_action (transport_actions, X_("secondary-clock-bbt"), _("Bars & Beats"), sigc::bind (mem_fun(secondary_clock, &AudioClock::set_mode), AudioClock::BBT));
- ActionManager::session_sensitive_actions.push_back (act);
-- act = ActionManager::register_action (transport_actions, X_("secondary-clock-minsec"), _("Minutes & Seconds"), bind (mem_fun(secondary_clock, &AudioClock::set_mode), AudioClock::MinSec));
-+ act = ActionManager::register_action (transport_actions, X_("secondary-clock-minsec"), _("Minutes & Seconds"), sigc::bind (mem_fun(secondary_clock, &AudioClock::set_mode), AudioClock::MinSec));
- ActionManager::session_sensitive_actions.push_back (act);
-- act = ActionManager::register_action (transport_actions, X_("secondary-clock-samples"), _("Samples"), bind (mem_fun(secondary_clock, &AudioClock::set_mode), AudioClock::Frames));
-+ act = ActionManager::register_action (transport_actions, X_("secondary-clock-samples"), _("Samples"), sigc::bind (mem_fun(secondary_clock, &AudioClock::set_mode), AudioClock::Frames));
- ActionManager::session_sensitive_actions.push_back (act);
-- act = ActionManager::register_action (transport_actions, X_("secondary-clock-off"), _("Off"), bind (mem_fun(secondary_clock, &AudioClock::set_mode), AudioClock::Off));
-+ act = ActionManager::register_action (transport_actions, X_("secondary-clock-off"), _("Off"), sigc::bind (mem_fun(secondary_clock, &AudioClock::set_mode), AudioClock::Off));
- ActionManager::session_sensitive_actions.push_back (act);
-
- act = ActionManager::register_toggle_action (transport_actions, X_("TogglePunchIn"), _("Punch In"), mem_fun(*this, &ARDOUR_UI::toggle_punch_in));
-@@ -375,75 +375,75 @@ ARDOUR_UI::install_actions ()
- act = ActionManager::register_toggle_action (transport_actions, X_("ToggleTimeMaster"), _("Time master"), mem_fun(*this, &ARDOUR_UI::toggle_time_master));
- ActionManager::session_sensitive_actions.push_back (act);
-
-- act = ActionManager::register_action (common_actions, X_("ToggleRecordEnableTrack1"), _("Toggle Record Enable Track1"), bind (mem_fun(*this, &ARDOUR_UI::toggle_record_enable), 0U));
-+ act = ActionManager::register_action (common_actions, X_("ToggleRecordEnableTrack1"), _("Toggle Record Enable Track1"), sigc::bind (mem_fun(*this, &ARDOUR_UI::toggle_record_enable), 0U));
- ActionManager::session_sensitive_actions.push_back (act);
-- act = ActionManager::register_action (common_actions, X_("ToggleRecordEnableTrack2"), _("Toggle Record Enable Track2"), bind (mem_fun(*this, &ARDOUR_UI::toggle_record_enable), 1U));
-+ act = ActionManager::register_action (common_actions, X_("ToggleRecordEnableTrack2"), _("Toggle Record Enable Track2"), sigc::bind (mem_fun(*this, &ARDOUR_UI::toggle_record_enable), 1U));
- ActionManager::session_sensitive_actions.push_back (act);
-- act = ActionManager::register_action (common_actions, X_("ToggleRecordEnableTrack3"), _("Toggle Record Enable Track3"), bind (mem_fun(*this, &ARDOUR_UI::toggle_record_enable), 2U));
-+ act = ActionManager::register_action (common_actions, X_("ToggleRecordEnableTrack3"), _("Toggle Record Enable Track3"), sigc::bind (mem_fun(*this, &ARDOUR_UI::toggle_record_enable), 2U));
- ActionManager::session_sensitive_actions.push_back (act);
-- act = ActionManager::register_action (common_actions, X_("ToggleRecordEnableTrack4"), _("Toggle Record Enable Track4"), bind (mem_fun(*this, &ARDOUR_UI::toggle_record_enable), 3U));
-+ act = ActionManager::register_action (common_actions, X_("ToggleRecordEnableTrack4"), _("Toggle Record Enable Track4"), sigc::bind (mem_fun(*this, &ARDOUR_UI::toggle_record_enable), 3U));
- ActionManager::session_sensitive_actions.push_back (act);
-- act = ActionManager::register_action (common_actions, X_("ToggleRecordEnableTrack5"), _("Toggle Record Enable Track5"), bind (mem_fun(*this, &ARDOUR_UI::toggle_record_enable), 4U));
-+ act = ActionManager::register_action (common_actions, X_("ToggleRecordEnableTrack5"), _("Toggle Record Enable Track5"), sigc::bind (mem_fun(*this, &ARDOUR_UI::toggle_record_enable), 4U));
- ActionManager::session_sensitive_actions.push_back (act);
-- act = ActionManager::register_action (common_actions, X_("ToggleRecordEnableTrack6"), _("Toggle Record Enable Track6"), bind (mem_fun(*this, &ARDOUR_UI::toggle_record_enable), 5U));
-+ act = ActionManager::register_action (common_actions, X_("ToggleRecordEnableTrack6"), _("Toggle Record Enable Track6"), sigc::bind (mem_fun(*this, &ARDOUR_UI::toggle_record_enable), 5U));
- ActionManager::session_sensitive_actions.push_back (act);
-- act = ActionManager::register_action (common_actions, X_("ToggleRecordEnableTrack7"), _("Toggle Record Enable Track7"), bind (mem_fun(*this, &ARDOUR_UI::toggle_record_enable), 6U));
-+ act = ActionManager::register_action (common_actions, X_("ToggleRecordEnableTrack7"), _("Toggle Record Enable Track7"), sigc::bind (mem_fun(*this, &ARDOUR_UI::toggle_record_enable), 6U));
- ActionManager::session_sensitive_actions.push_back (act);
-- act = ActionManager::register_action (common_actions, X_("ToggleRecordEnableTrack8"), _("Toggle Record Enable Track8"), bind (mem_fun(*this, &ARDOUR_UI::toggle_record_enable), 7U));
-+ act = ActionManager::register_action (common_actions, X_("ToggleRecordEnableTrack8"), _("Toggle Record Enable Track8"), sigc::bind (mem_fun(*this, &ARDOUR_UI::toggle_record_enable), 7U));
- ActionManager::session_sensitive_actions.push_back (act);
-- act = ActionManager::register_action (common_actions, X_("ToggleRecordEnableTrack9"), _("Toggle Record Enable Track9"), bind (mem_fun(*this, &ARDOUR_UI::toggle_record_enable), 8U));
-+ act = ActionManager::register_action (common_actions, X_("ToggleRecordEnableTrack9"), _("Toggle Record Enable Track9"), sigc::bind (mem_fun(*this, &ARDOUR_UI::toggle_record_enable), 8U));
- ActionManager::session_sensitive_actions.push_back (act);
-- act = ActionManager::register_action (common_actions, X_("ToggleRecordEnableTrack10"), _("Toggle Record Enable Track10"), bind (mem_fun(*this, &ARDOUR_UI::toggle_record_enable), 9U));
-+ act = ActionManager::register_action (common_actions, X_("ToggleRecordEnableTrack10"), _("Toggle Record Enable Track10"), sigc::bind (mem_fun(*this, &ARDOUR_UI::toggle_record_enable), 9U));
- ActionManager::session_sensitive_actions.push_back (act);
-- act = ActionManager::register_action (common_actions, X_("ToggleRecordEnableTrack11"), _("Toggle Record Enable Track11"), bind (mem_fun(*this, &ARDOUR_UI::toggle_record_enable), 10U));
-+ act = ActionManager::register_action (common_actions, X_("ToggleRecordEnableTrack11"), _("Toggle Record Enable Track11"), sigc::bind (mem_fun(*this, &ARDOUR_UI::toggle_record_enable), 10U));
- ActionManager::session_sensitive_actions.push_back (act);
-- act = ActionManager::register_action (common_actions, X_("ToggleRecordEnableTrack12"), _("Toggle Record Enable Track12"), bind (mem_fun(*this, &ARDOUR_UI::toggle_record_enable), 11U));
-+ act = ActionManager::register_action (common_actions, X_("ToggleRecordEnableTrack12"), _("Toggle Record Enable Track12"), sigc::bind (mem_fun(*this, &ARDOUR_UI::toggle_record_enable), 11U));
- ActionManager::session_sensitive_actions.push_back (act);
-- act = ActionManager::register_action (common_actions, X_("ToggleRecordEnableTrack13"), _("Toggle Record Enable Track13"), bind (mem_fun(*this, &ARDOUR_UI::toggle_record_enable), 12U));
-+ act = ActionManager::register_action (common_actions, X_("ToggleRecordEnableTrack13"), _("Toggle Record Enable Track13"), sigc::bind (mem_fun(*this, &ARDOUR_UI::toggle_record_enable), 12U));
- ActionManager::session_sensitive_actions.push_back (act);
-- act = ActionManager::register_action (common_actions, X_("ToggleRecordEnableTrack14"), _("Toggle Record Enable Track14"), bind (mem_fun(*this, &ARDOUR_UI::toggle_record_enable), 13U));
-+ act = ActionManager::register_action (common_actions, X_("ToggleRecordEnableTrack14"), _("Toggle Record Enable Track14"), sigc::bind (mem_fun(*this, &ARDOUR_UI::toggle_record_enable), 13U));
- ActionManager::session_sensitive_actions.push_back (act);
-- act = ActionManager::register_action (common_actions, X_("ToggleRecordEnableTrack15"), _("Toggle Record Enable Track15"), bind (mem_fun(*this, &ARDOUR_UI::toggle_record_enable), 14U));
-+ act = ActionManager::register_action (common_actions, X_("ToggleRecordEnableTrack15"), _("Toggle Record Enable Track15"), sigc::bind (mem_fun(*this, &ARDOUR_UI::toggle_record_enable), 14U));
- ActionManager::session_sensitive_actions.push_back (act);
-- act = ActionManager::register_action (common_actions, X_("ToggleRecordEnableTrack16"), _("Toggle Record Enable Track16"), bind (mem_fun(*this, &ARDOUR_UI::toggle_record_enable), 15U));
-+ act = ActionManager::register_action (common_actions, X_("ToggleRecordEnableTrack16"), _("Toggle Record Enable Track16"), sigc::bind (mem_fun(*this, &ARDOUR_UI::toggle_record_enable), 15U));
- ActionManager::session_sensitive_actions.push_back (act);
-- act = ActionManager::register_action (common_actions, X_("ToggleRecordEnableTrack17"), _("Toggle Record Enable Track17"), bind (mem_fun(*this, &ARDOUR_UI::toggle_record_enable), 16U));
-+ act = ActionManager::register_action (common_actions, X_("ToggleRecordEnableTrack17"), _("Toggle Record Enable Track17"), sigc::bind (mem_fun(*this, &ARDOUR_UI::toggle_record_enable), 16U));
- ActionManager::session_sensitive_actions.push_back (act);
-- act = ActionManager::register_action (common_actions, X_("ToggleRecordEnableTrack18"), _("Toggle Record Enable Track18"), bind (mem_fun(*this, &ARDOUR_UI::toggle_record_enable), 17U));
-+ act = ActionManager::register_action (common_actions, X_("ToggleRecordEnableTrack18"), _("Toggle Record Enable Track18"), sigc::bind (mem_fun(*this, &ARDOUR_UI::toggle_record_enable), 17U));
- ActionManager::session_sensitive_actions.push_back (act);
-- act = ActionManager::register_action (common_actions, X_("ToggleRecordEnableTrack19"), _("Toggle Record Enable Track19"), bind (mem_fun(*this, &ARDOUR_UI::toggle_record_enable), 18U));
-+ act = ActionManager::register_action (common_actions, X_("ToggleRecordEnableTrack19"), _("Toggle Record Enable Track19"), sigc::bind (mem_fun(*this, &ARDOUR_UI::toggle_record_enable), 18U));
- ActionManager::session_sensitive_actions.push_back (act);
-- act = ActionManager::register_action (common_actions, X_("ToggleRecordEnableTrack20"), _("Toggle Record Enable Track20"), bind (mem_fun(*this, &ARDOUR_UI::toggle_record_enable), 19U));
-+ act = ActionManager::register_action (common_actions, X_("ToggleRecordEnableTrack20"), _("Toggle Record Enable Track20"), sigc::bind (mem_fun(*this, &ARDOUR_UI::toggle_record_enable), 19U));
- ActionManager::session_sensitive_actions.push_back (act);
-- act = ActionManager::register_action (common_actions, X_("ToggleRecordEnableTrack21"), _("Toggle Record Enable Track21"), bind (mem_fun(*this, &ARDOUR_UI::toggle_record_enable), 20U));
-+ act = ActionManager::register_action (common_actions, X_("ToggleRecordEnableTrack21"), _("Toggle Record Enable Track21"), sigc::bind (mem_fun(*this, &ARDOUR_UI::toggle_record_enable), 20U));
- ActionManager::session_sensitive_actions.push_back (act);
-- act = ActionManager::register_action (common_actions, X_("ToggleRecordEnableTrack22"), _("Toggle Record Enable Track22"), bind (mem_fun(*this, &ARDOUR_UI::toggle_record_enable), 21U));
-+ act = ActionManager::register_action (common_actions, X_("ToggleRecordEnableTrack22"), _("Toggle Record Enable Track22"), sigc::bind (mem_fun(*this, &ARDOUR_UI::toggle_record_enable), 21U));
- ActionManager::session_sensitive_actions.push_back (act);
-- act = ActionManager::register_action (common_actions, X_("ToggleRecordEnableTrack23"), _("Toggle Record Enable Track23"), bind (mem_fun(*this, &ARDOUR_UI::toggle_record_enable), 22U));
-+ act = ActionManager::register_action (common_actions, X_("ToggleRecordEnableTrack23"), _("Toggle Record Enable Track23"), sigc::bind (mem_fun(*this, &ARDOUR_UI::toggle_record_enable), 22U));
- ActionManager::session_sensitive_actions.push_back (act);
-- act = ActionManager::register_action (common_actions, X_("ToggleRecordEnableTrack24"), _("Toggle Record Enable Track24"), bind (mem_fun(*this, &ARDOUR_UI::toggle_record_enable), 23U));
-+ act = ActionManager::register_action (common_actions, X_("ToggleRecordEnableTrack24"), _("Toggle Record Enable Track24"), sigc::bind (mem_fun(*this, &ARDOUR_UI::toggle_record_enable), 23U));
- ActionManager::session_sensitive_actions.push_back (act);
-- act = ActionManager::register_action (common_actions, X_("ToggleRecordEnableTrack25"), _("Toggle Record Enable Track25"), bind (mem_fun(*this, &ARDOUR_UI::toggle_record_enable), 24U));
-+ act = ActionManager::register_action (common_actions, X_("ToggleRecordEnableTrack25"), _("Toggle Record Enable Track25"), sigc::bind (mem_fun(*this, &ARDOUR_UI::toggle_record_enable), 24U));
- ActionManager::session_sensitive_actions.push_back (act);
-- act = ActionManager::register_action (common_actions, X_("ToggleRecordEnableTrack26"), _("Toggle Record Enable Track26"), bind (mem_fun(*this, &ARDOUR_UI::toggle_record_enable), 25U));
-+ act = ActionManager::register_action (common_actions, X_("ToggleRecordEnableTrack26"), _("Toggle Record Enable Track26"), sigc::bind (mem_fun(*this, &ARDOUR_UI::toggle_record_enable), 25U));
- ActionManager::session_sensitive_actions.push_back (act);
-- act = ActionManager::register_action (common_actions, X_("ToggleRecordEnableTrack27"), _("Toggle Record Enable Track27"), bind (mem_fun(*this, &ARDOUR_UI::toggle_record_enable), 26U));
-+ act = ActionManager::register_action (common_actions, X_("ToggleRecordEnableTrack27"), _("Toggle Record Enable Track27"), sigc::bind (mem_fun(*this, &ARDOUR_UI::toggle_record_enable), 26U));
- ActionManager::session_sensitive_actions.push_back (act);
-- act = ActionManager::register_action (common_actions, X_("ToggleRecordEnableTrack28"), _("Toggle Record Enable Track28"), bind (mem_fun(*this, &ARDOUR_UI::toggle_record_enable), 27U));
-+ act = ActionManager::register_action (common_actions, X_("ToggleRecordEnableTrack28"), _("Toggle Record Enable Track28"), sigc::bind (mem_fun(*this, &ARDOUR_UI::toggle_record_enable), 27U));
- ActionManager::session_sensitive_actions.push_back (act);
-- act = ActionManager::register_action (common_actions, X_("ToggleRecordEnableTrack29"), _("Toggle Record Enable Track29"), bind (mem_fun(*this, &ARDOUR_UI::toggle_record_enable), 28U));
-+ act = ActionManager::register_action (common_actions, X_("ToggleRecordEnableTrack29"), _("Toggle Record Enable Track29"), sigc::bind (mem_fun(*this, &ARDOUR_UI::toggle_record_enable), 28U));
- ActionManager::session_sensitive_actions.push_back (act);
-- act = ActionManager::register_action (common_actions, X_("ToggleRecordEnableTrack30"), _("Toggle Record Enable Track30"), bind (mem_fun(*this, &ARDOUR_UI::toggle_record_enable), 29U));
-+ act = ActionManager::register_action (common_actions, X_("ToggleRecordEnableTrack30"), _("Toggle Record Enable Track30"), sigc::bind (mem_fun(*this, &ARDOUR_UI::toggle_record_enable), 29U));
- ActionManager::session_sensitive_actions.push_back (act);
-- act = ActionManager::register_action (common_actions, X_("ToggleRecordEnableTrack31"), _("Toggle Record Enable Track31"), bind (mem_fun(*this, &ARDOUR_UI::toggle_record_enable), 30U));
-+ act = ActionManager::register_action (common_actions, X_("ToggleRecordEnableTrack31"), _("Toggle Record Enable Track31"), sigc::bind (mem_fun(*this, &ARDOUR_UI::toggle_record_enable), 30U));
- ActionManager::session_sensitive_actions.push_back (act);
-- act = ActionManager::register_action (common_actions, X_("ToggleRecordEnableTrack32"), _("Toggle Record Enable Track32"), bind (mem_fun(*this, &ARDOUR_UI::toggle_record_enable), 31U));
-+ act = ActionManager::register_action (common_actions, X_("ToggleRecordEnableTrack32"), _("Toggle Record Enable Track32"), sigc::bind (mem_fun(*this, &ARDOUR_UI::toggle_record_enable), 31U));
- ActionManager::session_sensitive_actions.push_back (act);
-
- Glib::RefPtr<ActionGroup> shuttle_actions = ActionGroup::create ("ShuttleActions");
-
-- shuttle_actions->add (Action::create (X_("SetShuttleUnitsPercentage"), _("Percentage")), hide_return (bind (mem_fun (*Config, &Configuration::set_shuttle_units), Percentage)));
-- shuttle_actions->add (Action::create (X_("SetShuttleUnitsSemitones"), _("Semitones")), hide_return (bind (mem_fun (*Config, &Configuration::set_shuttle_units), Semitones)));
-+ shuttle_actions->add (Action::create (X_("SetShuttleUnitsPercentage"), _("Percentage")), hide_return (sigc::bind (mem_fun (*Config, &Configuration::set_shuttle_units), Percentage)));
-+ shuttle_actions->add (Action::create (X_("SetShuttleUnitsSemitones"), _("Semitones")), hide_return (sigc::bind (mem_fun (*Config, &Configuration::set_shuttle_units), Semitones)));
-
- Glib::RefPtr<ActionGroup> option_actions = ActionGroup::create ("options");
-
-@@ -490,7 +490,7 @@ ARDOUR_UI::install_actions ()
-
- ActionManager::register_toggle_action (option_actions, X_("DenormalProtection"), _("Use DC bias"), mem_fun (*this, &ARDOUR_UI::toggle_denormal_protection));
-
-- ActionManager::register_radio_action (option_actions, denormal_group, X_("DenormalNone"), _("No processor handling"), bind (mem_fun (*this, &ARDOUR_UI::set_denormal_model), DenormalNone));
-+ ActionManager::register_radio_action (option_actions, denormal_group, X_("DenormalNone"), _("No processor handling"), sigc::bind (mem_fun (*this, &ARDOUR_UI::set_denormal_model), DenormalNone));
-
- // as of September 10th 2007, Valgrind cannot handle various FPU flag setting instructions
- // so avoid them
-@@ -499,28 +499,28 @@ ARDOUR_UI::install_actions ()
-
- /* we still need these actions to exist, but make them all insensitive */
-
-- act = ActionManager::register_radio_action (option_actions, denormal_group, X_("DenormalFTZ"), _("Use FlushToZero"), bind (mem_fun (*this, &ARDOUR_UI::set_denormal_model), DenormalFTZ));
-+ act = ActionManager::register_radio_action (option_actions, denormal_group, X_("DenormalFTZ"), _("Use FlushToZero"), sigc::bind (mem_fun (*this, &ARDOUR_UI::set_denormal_model), DenormalFTZ));
- act->set_sensitive (false);
-- act = ActionManager::register_radio_action (option_actions, denormal_group, X_("DenormalDAZ"), _("Use DenormalsAreZero"), bind (mem_fun (*this, &ARDOUR_UI::set_denormal_model), DenormalDAZ));
-+ act = ActionManager::register_radio_action (option_actions, denormal_group, X_("DenormalDAZ"), _("Use DenormalsAreZero"), sigc::bind (mem_fun (*this, &ARDOUR_UI::set_denormal_model), DenormalDAZ));
- act->set_sensitive (false);
-- act = ActionManager::register_radio_action (option_actions, denormal_group, X_("DenormalFTZDAZ"), _("Use FlushToZero & DenormalsAreZero"), bind (mem_fun (*this, &ARDOUR_UI::set_denormal_model), DenormalFTZDAZ));
-+ act = ActionManager::register_radio_action (option_actions, denormal_group, X_("DenormalFTZDAZ"), _("Use FlushToZero & DenormalsAreZero"), sigc::bind (mem_fun (*this, &ARDOUR_UI::set_denormal_model), DenormalFTZDAZ));
- act->set_sensitive (false);
-
- } else {
-
- FPU fpu;
-
-- act = ActionManager::register_radio_action (option_actions, denormal_group, X_("DenormalFTZ"), _("Use FlushToZero"), bind (mem_fun (*this, &ARDOUR_UI::set_denormal_model), DenormalFTZ));
-+ act = ActionManager::register_radio_action (option_actions, denormal_group, X_("DenormalFTZ"), _("Use FlushToZero"), sigc::bind (mem_fun (*this, &ARDOUR_UI::set_denormal_model), DenormalFTZ));
- if (!fpu.has_flush_to_zero()) {
- act->set_sensitive (false);
- }
-
-- act = ActionManager::register_radio_action (option_actions, denormal_group, X_("DenormalDAZ"), _("Use DenormalsAreZero"), bind (mem_fun (*this, &ARDOUR_UI::set_denormal_model), DenormalDAZ));
-+ act = ActionManager::register_radio_action (option_actions, denormal_group, X_("DenormalDAZ"), _("Use DenormalsAreZero"), sigc::bind (mem_fun (*this, &ARDOUR_UI::set_denormal_model), DenormalDAZ));
- if (!fpu.has_denormals_are_zero()) {
- act->set_sensitive (false);
- }
-
-- act = ActionManager::register_radio_action (option_actions, denormal_group, X_("DenormalFTZDAZ"), _("Use FlushToZero & DenormalsAreZero"), bind (mem_fun (*this, &ARDOUR_UI::set_denormal_model), DenormalFTZDAZ));
-+ act = ActionManager::register_radio_action (option_actions, denormal_group, X_("DenormalFTZDAZ"), _("Use FlushToZero & DenormalsAreZero"), sigc::bind (mem_fun (*this, &ARDOUR_UI::set_denormal_model), DenormalFTZDAZ));
- if (!fpu.has_flush_to_zero() || !fpu.has_denormals_are_zero()) {
- act->set_sensitive (false);
- }
-@@ -540,34 +540,34 @@ ARDOUR_UI::install_actions ()
- RadioAction::Group meter_falloff_group;
- RadioAction::Group meter_hold_group;
-
-- ActionManager::register_radio_action (option_actions, meter_falloff_group, X_("MeterFalloffOff"), _("Off"), bind (mem_fun (*this, &ARDOUR_UI::set_meter_falloff), MeterFalloffOff));
-- ActionManager::register_radio_action (option_actions, meter_falloff_group, X_("MeterFalloffSlowest"), _("Slowest"), bind (mem_fun (*this, &ARDOUR_UI::set_meter_falloff), MeterFalloffSlowest));
-- ActionManager::register_radio_action (option_actions, meter_falloff_group, X_("MeterFalloffSlow"), _("Slow"), bind (mem_fun (*this, &ARDOUR_UI::set_meter_falloff), MeterFalloffSlow));
-- ActionManager::register_radio_action (option_actions, meter_falloff_group, X_("MeterFalloffMedium"), _("Medium"), bind (mem_fun (*this, &ARDOUR_UI::set_meter_falloff), MeterFalloffMedium));
-- ActionManager::register_radio_action (option_actions, meter_falloff_group, X_("MeterFalloffFast"), _("Fast"), bind (mem_fun (*this, &ARDOUR_UI::set_meter_falloff), MeterFalloffFast));
-- ActionManager::register_radio_action (option_actions, meter_falloff_group, X_("MeterFalloffFaster"), _("Faster"), bind (mem_fun (*this, &ARDOUR_UI::set_meter_falloff), MeterFalloffFaster));
-- ActionManager::register_radio_action (option_actions, meter_falloff_group, X_("MeterFalloffFastest"), _("Fastest"), bind (mem_fun (*this, &ARDOUR_UI::set_meter_falloff), MeterFalloffFastest));
-+ ActionManager::register_radio_action (option_actions, meter_falloff_group, X_("MeterFalloffOff"), _("Off"), sigc::bind (mem_fun (*this, &ARDOUR_UI::set_meter_falloff), MeterFalloffOff));
-+ ActionManager::register_radio_action (option_actions, meter_falloff_group, X_("MeterFalloffSlowest"), _("Slowest"), sigc::bind (mem_fun (*this, &ARDOUR_UI::set_meter_falloff), MeterFalloffSlowest));
-+ ActionManager::register_radio_action (option_actions, meter_falloff_group, X_("MeterFalloffSlow"), _("Slow"), sigc::bind (mem_fun (*this, &ARDOUR_UI::set_meter_falloff), MeterFalloffSlow));
-+ ActionManager::register_radio_action (option_actions, meter_falloff_group, X_("MeterFalloffMedium"), _("Medium"), sigc::bind (mem_fun (*this, &ARDOUR_UI::set_meter_falloff), MeterFalloffMedium));
-+ ActionManager::register_radio_action (option_actions, meter_falloff_group, X_("MeterFalloffFast"), _("Fast"), sigc::bind (mem_fun (*this, &ARDOUR_UI::set_meter_falloff), MeterFalloffFast));
-+ ActionManager::register_radio_action (option_actions, meter_falloff_group, X_("MeterFalloffFaster"), _("Faster"), sigc::bind (mem_fun (*this, &ARDOUR_UI::set_meter_falloff), MeterFalloffFaster));
-+ ActionManager::register_radio_action (option_actions, meter_falloff_group, X_("MeterFalloffFastest"), _("Fastest"), sigc::bind (mem_fun (*this, &ARDOUR_UI::set_meter_falloff), MeterFalloffFastest));
-
-- ActionManager::register_radio_action (option_actions, meter_hold_group, X_("MeterHoldOff"), _("Off"), bind (mem_fun (*this, &ARDOUR_UI::set_meter_hold), MeterHoldOff));
-- ActionManager::register_radio_action (option_actions, meter_hold_group, X_("MeterHoldShort"), _("Short"), bind (mem_fun (*this, &ARDOUR_UI::set_meter_hold), MeterHoldShort));
-- ActionManager::register_radio_action (option_actions, meter_hold_group, X_("MeterHoldMedium"), _("Medium"), bind (mem_fun (*this, &ARDOUR_UI::set_meter_hold), MeterHoldMedium));
-- ActionManager::register_radio_action (option_actions, meter_hold_group, X_("MeterHoldLong"), _("Long"), bind (mem_fun (*this, &ARDOUR_UI::set_meter_hold), MeterHoldLong));
-+ ActionManager::register_radio_action (option_actions, meter_hold_group, X_("MeterHoldOff"), _("Off"), sigc::bind (mem_fun (*this, &ARDOUR_UI::set_meter_hold), MeterHoldOff));
-+ ActionManager::register_radio_action (option_actions, meter_hold_group, X_("MeterHoldShort"), _("Short"), sigc::bind (mem_fun (*this, &ARDOUR_UI::set_meter_hold), MeterHoldShort));
-+ ActionManager::register_radio_action (option_actions, meter_hold_group, X_("MeterHoldMedium"), _("Medium"), sigc::bind (mem_fun (*this, &ARDOUR_UI::set_meter_hold), MeterHoldMedium));
-+ ActionManager::register_radio_action (option_actions, meter_hold_group, X_("MeterHoldLong"), _("Long"), sigc::bind (mem_fun (*this, &ARDOUR_UI::set_meter_hold), MeterHoldLong));
-
- RadioAction::Group file_header_group;
-
-- act = ActionManager::register_radio_action (option_actions, file_header_group, X_("FileHeaderFormatBWF"), X_("Broadcast WAVE"), bind (mem_fun (*this, &ARDOUR_UI::set_native_file_header_format), ARDOUR::BWF));
-- act = ActionManager::register_radio_action (option_actions, file_header_group, X_("FileHeaderFormatWAVE"), X_("WAVE"), bind (mem_fun (*this, &ARDOUR_UI::set_native_file_header_format), ARDOUR::WAVE));
-- act = ActionManager::register_radio_action (option_actions, file_header_group, X_("FileHeaderFormatWAVE64"), X_("WAVE-64"), bind (mem_fun (*this, &ARDOUR_UI::set_native_file_header_format), ARDOUR::WAVE64));
-- // act = ActionManager::register_radio_action (option_actions, file_header_group, X_("FileHeaderFormatiXML"), X_("iXML"), bind (mem_fun (*this, &ARDOUR_UI::set_native_file_header_format), ARDOUR::iXML));
-- // act = ActionManager::register_radio_action (option_actions, file_header_group, X_("FileHeaderFormatRF64"), X_("RF64"), bind (mem_fun (*this, &ARDOUR_UI::set_native_file_header_format), ARDOUR::RF64));
-- act = ActionManager::register_radio_action (option_actions, file_header_group, X_("FileHeaderFormatCAF"), X_("CAF"), bind (mem_fun (*this, &ARDOUR_UI::set_native_file_header_format), ARDOUR::CAF));
-+ act = ActionManager::register_radio_action (option_actions, file_header_group, X_("FileHeaderFormatBWF"), X_("Broadcast WAVE"), sigc::bind (mem_fun (*this, &ARDOUR_UI::set_native_file_header_format), ARDOUR::BWF));
-+ act = ActionManager::register_radio_action (option_actions, file_header_group, X_("FileHeaderFormatWAVE"), X_("WAVE"), sigc::bind (mem_fun (*this, &ARDOUR_UI::set_native_file_header_format), ARDOUR::WAVE));
-+ act = ActionManager::register_radio_action (option_actions, file_header_group, X_("FileHeaderFormatWAVE64"), X_("WAVE-64"), sigc::bind (mem_fun (*this, &ARDOUR_UI::set_native_file_header_format), ARDOUR::WAVE64));
-+ // act = ActionManager::register_radio_action (option_actions, file_header_group, X_("FileHeaderFormatiXML"), X_("iXML"), sigc::bind (mem_fun (*this, &ARDOUR_UI::set_native_file_header_format), ARDOUR::iXML));
-+ // act = ActionManager::register_radio_action (option_actions, file_header_group, X_("FileHeaderFormatRF64"), X_("RF64"), sigc::bind (mem_fun (*this, &ARDOUR_UI::set_native_file_header_format), ARDOUR::RF64));
-+ act = ActionManager::register_radio_action (option_actions, file_header_group, X_("FileHeaderFormatCAF"), X_("CAF"), sigc::bind (mem_fun (*this, &ARDOUR_UI::set_native_file_header_format), ARDOUR::CAF));
-
- RadioAction::Group file_data_group;
-
-
-- act = ActionManager::register_radio_action (option_actions, file_data_group, X_("FileDataFormatFloat"), X_("32-bit floating point"), bind (mem_fun (*this, &ARDOUR_UI::set_native_file_data_format), ARDOUR::FormatFloat));
-- act = ActionManager::register_radio_action (option_actions, file_data_group, X_("FileDataFormat24bit"), X_("24-bit integer"), bind (mem_fun (*this, &ARDOUR_UI::set_native_file_data_format), ARDOUR::FormatInt24));
-- act = ActionManager::register_radio_action (option_actions, file_data_group, X_("FileDataFormat16bit"), X_("16-bit integer"), bind (mem_fun (*this, &ARDOUR_UI::set_native_file_data_format), ARDOUR::FormatInt16));
-+ act = ActionManager::register_radio_action (option_actions, file_data_group, X_("FileDataFormatFloat"), X_("32-bit floating point"), sigc::bind (mem_fun (*this, &ARDOUR_UI::set_native_file_data_format), ARDOUR::FormatFloat));
-+ act = ActionManager::register_radio_action (option_actions, file_data_group, X_("FileDataFormat24bit"), X_("24-bit integer"), sigc::bind (mem_fun (*this, &ARDOUR_UI::set_native_file_data_format), ARDOUR::FormatInt24));
-+ act = ActionManager::register_radio_action (option_actions, file_data_group, X_("FileDataFormat16bit"), X_("16-bit integer"), sigc::bind (mem_fun (*this, &ARDOUR_UI::set_native_file_data_format), ARDOUR::FormatInt16));
-
- RadioAction::Group monitoring_group;
-
-@@ -578,44 +578,44 @@ ARDOUR_UI::install_actions ()
-
- #ifndef __APPLE__
- /* JACK has no monitoring capabilities with the CoreAudio backend */
-- act = ActionManager::register_radio_action (option_actions, monitoring_group, X_("UseHardwareMonitoring"), _("JACK does monitoring"), bind (mem_fun (*this, &ARDOUR_UI::set_monitor_model), HardwareMonitoring));
-+ act = ActionManager::register_radio_action (option_actions, monitoring_group, X_("UseHardwareMonitoring"), _("JACK does monitoring"), sigc::bind (mem_fun (*this, &ARDOUR_UI::set_monitor_model), HardwareMonitoring));
- if (!engine->can_request_hardware_monitoring()) {
- act->set_sensitive (false);
- }
- #endif
-- act = ActionManager::register_radio_action (option_actions, monitoring_group, X_("UseSoftwareMonitoring"), string_compose (_("%1 does monitoring"), PROGRAM_NAME).c_str(), bind (mem_fun (*this, &ARDOUR_UI::set_monitor_model), SoftwareMonitoring));
-- act = ActionManager::register_radio_action (option_actions, monitoring_group, X_("UseExternalMonitoring"), _("Audio Hardware does monitoring"), bind (mem_fun (*this, &ARDOUR_UI::set_monitor_model), ExternalMonitoring));
-+ act = ActionManager::register_radio_action (option_actions, monitoring_group, X_("UseSoftwareMonitoring"), string_compose (_("%1 does monitoring"), PROGRAM_NAME).c_str(), sigc::bind (mem_fun (*this, &ARDOUR_UI::set_monitor_model), SoftwareMonitoring));
-+ act = ActionManager::register_radio_action (option_actions, monitoring_group, X_("UseExternalMonitoring"), _("Audio Hardware does monitoring"), sigc::bind (mem_fun (*this, &ARDOUR_UI::set_monitor_model), ExternalMonitoring));
-
- RadioAction::Group solo_group;
-
-- act = ActionManager::register_radio_action (option_actions, solo_group, X_("SoloInPlace"), _("Solo in-place"), hide_return (bind (mem_fun (*this, &ARDOUR_UI::set_solo_model), InverseMute)));
-+ act = ActionManager::register_radio_action (option_actions, solo_group, X_("SoloInPlace"), _("Solo in-place"), hide_return (sigc::bind (mem_fun (*this, &ARDOUR_UI::set_solo_model), InverseMute)));
- ActionManager::session_sensitive_actions.push_back (act);
-- act = ActionManager::register_radio_action (option_actions, solo_group, X_("SoloViaBus"), _("Solo via bus"), hide_return (bind (mem_fun (*this, &ARDOUR_UI::set_solo_model), SoloBus)));
-+ act = ActionManager::register_radio_action (option_actions, solo_group, X_("SoloViaBus"), _("Solo via bus"), hide_return (sigc::bind (mem_fun (*this, &ARDOUR_UI::set_solo_model), SoloBus)));
- ActionManager::session_sensitive_actions.push_back (act);
-
- RadioAction::Group input_auto_connect_group;
-
-- act = ActionManager::register_radio_action (option_actions, input_auto_connect_group, X_("InputAutoConnectPhysical"), _("Auto-connect inputs to physical inputs"), hide_return (bind (mem_fun (*this, &ARDOUR_UI::set_input_auto_connect), AutoConnectPhysical)));
-+ act = ActionManager::register_radio_action (option_actions, input_auto_connect_group, X_("InputAutoConnectPhysical"), _("Auto-connect inputs to physical inputs"), hide_return (sigc::bind (mem_fun (*this, &ARDOUR_UI::set_input_auto_connect), AutoConnectPhysical)));
- ActionManager::session_sensitive_actions.push_back (act);
-- act = ActionManager::register_radio_action (option_actions, input_auto_connect_group, X_("InputAutoConnectManual"), _("Manually connect inputs"), hide_return (bind (mem_fun (*this, &ARDOUR_UI::set_input_auto_connect), (AutoConnectOption) 0)));
-+ act = ActionManager::register_radio_action (option_actions, input_auto_connect_group, X_("InputAutoConnectManual"), _("Manually connect inputs"), hide_return (sigc::bind (mem_fun (*this, &ARDOUR_UI::set_input_auto_connect), (AutoConnectOption) 0)));
- ActionManager::session_sensitive_actions.push_back (act);
-
- RadioAction::Group output_auto_connect_group;
-
-- act = ActionManager::register_radio_action (option_actions, output_auto_connect_group, X_("OutputAutoConnectPhysical"), _("Auto-connect outputs to physical outs"), hide_return (bind (mem_fun (*this, &ARDOUR_UI::set_output_auto_connect), AutoConnectPhysical)));
-+ act = ActionManager::register_radio_action (option_actions, output_auto_connect_group, X_("OutputAutoConnectPhysical"), _("Auto-connect outputs to physical outs"), hide_return (sigc::bind (mem_fun (*this, &ARDOUR_UI::set_output_auto_connect), AutoConnectPhysical)));
- ActionManager::session_sensitive_actions.push_back (act);
-- act = ActionManager::register_radio_action (option_actions, output_auto_connect_group, X_("OutputAutoConnectMaster"), _("Auto-connect outputs to master bus"), hide_return (bind (mem_fun (*this, &ARDOUR_UI::set_output_auto_connect), AutoConnectMaster)));
-+ act = ActionManager::register_radio_action (option_actions, output_auto_connect_group, X_("OutputAutoConnectMaster"), _("Auto-connect outputs to master bus"), hide_return (sigc::bind (mem_fun (*this, &ARDOUR_UI::set_output_auto_connect), AutoConnectMaster)));
- ActionManager::session_sensitive_actions.push_back (act);
-- act = ActionManager::register_radio_action (option_actions, output_auto_connect_group, X_("OutputAutoConnectManual"), _("Manually connect outputs"), hide_return (bind (mem_fun (*this, &ARDOUR_UI::set_output_auto_connect), (AutoConnectOption) 0)));
-+ act = ActionManager::register_radio_action (option_actions, output_auto_connect_group, X_("OutputAutoConnectManual"), _("Manually connect outputs"), hide_return (sigc::bind (mem_fun (*this, &ARDOUR_UI::set_output_auto_connect), (AutoConnectOption) 0)));
- ActionManager::session_sensitive_actions.push_back (act);
-
- RadioAction::Group remote_group;
-
-- act = ActionManager::register_radio_action (option_actions, remote_group, X_("RemoteUserDefined"), _("Remote ID assigned by User"), hide_return (bind (mem_fun (*this, &ARDOUR_UI::set_remote_model), UserOrdered)));
-+ act = ActionManager::register_radio_action (option_actions, remote_group, X_("RemoteUserDefined"), _("Remote ID assigned by User"), hide_return (sigc::bind (mem_fun (*this, &ARDOUR_UI::set_remote_model), UserOrdered)));
- ActionManager::session_sensitive_actions.push_back (act);
-- act = ActionManager::register_radio_action (option_actions, remote_group, X_("RemoteMixerDefined"), _("Remote ID follows order of Mixer"), hide_return (bind (mem_fun (*this, &ARDOUR_UI::set_remote_model), MixerOrdered)));
-+ act = ActionManager::register_radio_action (option_actions, remote_group, X_("RemoteMixerDefined"), _("Remote ID follows order of Mixer"), hide_return (sigc::bind (mem_fun (*this, &ARDOUR_UI::set_remote_model), MixerOrdered)));
- ActionManager::session_sensitive_actions.push_back (act);
-- act = ActionManager::register_radio_action (option_actions, remote_group, X_("RemoteEditorDefined"), _("Remote ID follows order of Editor"), hide_return (bind (mem_fun (*this, &ARDOUR_UI::set_remote_model), EditorOrdered)));
-+ act = ActionManager::register_radio_action (option_actions, remote_group, X_("RemoteEditorDefined"), _("Remote ID follows order of Editor"), hide_return (sigc::bind (mem_fun (*this, &ARDOUR_UI::set_remote_model), EditorOrdered)));
- ActionManager::session_sensitive_actions.push_back (act);
-
- act = ActionManager::register_toggle_action (option_actions, X_("AutoRebinding"), _("Auto Rebind Controls"), mem_fun (*(this->mixer), &Mixer_UI::toggle_auto_rebinding));
-@@ -809,7 +809,7 @@ ARDOUR_UI::build_control_surface_menu ()
- string action_label = (*i)->name;
-
- Glib::RefPtr<Action> act = ActionManager::register_toggle_action (editor->editor_actions, action_name.c_str(), action_label.c_str(),
-- (bind (mem_fun (*this, &ARDOUR_UI::toggle_control_protocol), *i)));
-+ (sigc::bind (mem_fun (*this, &ARDOUR_UI::toggle_control_protocol), *i)));
-
- Glib::RefPtr<ToggleAction> tact = Glib::RefPtr<ToggleAction>::cast_dynamic (act);
-
-@@ -834,7 +834,7 @@ ARDOUR_UI::build_control_surface_menu ()
- action_name += "Feedback";
-
- Glib::RefPtr<Action> act = ActionManager::register_toggle_action (editor->editor_actions, action_name.c_str(), _("Feedback"),
-- (bind (mem_fun (*this, &ARDOUR_UI::toggle_control_protocol_feedback),
-+ (sigc::bind (mem_fun (*this, &ARDOUR_UI::toggle_control_protocol_feedback),
- *i,
- "Editor",
- action_name)));
-@@ -946,19 +946,19 @@ ARDOUR_UI::use_menubar_as_top_menubar ()
- void
- ARDOUR_UI::setup_clock ()
- {
-- ARDOUR_UI::Clock.connect (bind (mem_fun (big_clock, &AudioClock::set), false));
-+ ARDOUR_UI::Clock.connect (sigc::bind (mem_fun (big_clock, &AudioClock::set), false));
-
- big_clock_window = new Window (WINDOW_TOPLEVEL);
-
- big_clock_window->set_keep_above (true);
- big_clock_window->set_border_width (0);
- big_clock_window->add (big_clock);
-- big_clock_window->signal_key_press_event().connect (bind (sigc::ptr_fun (relay_key_press), big_clock_window));
-+ big_clock_window->signal_key_press_event().connect (sigc::bind (sigc::ptr_fun (relay_key_press), big_clock_window));
-
- big_clock_window->set_title (_("Clock"));
- big_clock_window->set_type_hint (Gdk::WINDOW_TYPE_HINT_UTILITY);
-- big_clock_window->signal_realize().connect (bind (sigc::ptr_fun (set_decoration), big_clock_window, (Gdk::DECOR_BORDER|Gdk::DECOR_RESIZEH)));
-- big_clock_window->signal_unmap().connect (bind (sigc::ptr_fun(&ActionManager::uncheck_toggleaction), X_("<Actions>/Common/ToggleBigClock")));
-+ big_clock_window->signal_realize().connect (sigc::bind (sigc::ptr_fun (set_decoration), big_clock_window, (Gdk::DECOR_BORDER|Gdk::DECOR_RESIZEH)));
-+ big_clock_window->signal_unmap().connect (sigc::bind (sigc::ptr_fun(&ActionManager::uncheck_toggleaction), X_("<Actions>/Common/ToggleBigClock")));
-
- manage_window (*big_clock_window);
- }
-diff --git a/gtk2_ardour/audio_clock.cc b/gtk2_ardour/audio_clock.cc
-index 518bd1c..1ee26fc 100644
---- a/gtk2_ardour/audio_clock.cc
-+++ b/gtk2_ardour/audio_clock.cc
-@@ -209,7 +209,7 @@ AudioClock::AudioClock (std::string clock_name, bool transient, std::string widg
- */
-
- clock_base.add_events (Gdk::BUTTON_PRESS_MASK|Gdk::BUTTON_RELEASE_MASK|Gdk::SCROLL_MASK);
-- clock_base.signal_button_release_event().connect (bind (mem_fun (*this, &AudioClock::field_button_release_event), SMPTE_Hours));
-+ clock_base.signal_button_release_event().connect (sigc::bind (mem_fun (*this, &AudioClock::field_button_release_event), SMPTE_Hours));
-
- Session::SMPTEOffsetChanged.connect (mem_fun (*this, &AudioClock::smpte_offset_changed));
-
-@@ -294,101 +294,101 @@ AudioClock::setup_events ()
- ms_minutes_ebox.set_flags (Gtk::CAN_FOCUS);
- ms_seconds_ebox.set_flags (Gtk::CAN_FOCUS);
-
-- hours_ebox.signal_motion_notify_event().connect (bind (mem_fun(*this, &AudioClock::field_motion_notify_event), SMPTE_Hours));
-- minutes_ebox.signal_motion_notify_event().connect (bind (mem_fun(*this, &AudioClock::field_motion_notify_event), SMPTE_Minutes));
-- seconds_ebox.signal_motion_notify_event().connect (bind (mem_fun(*this, &AudioClock::field_motion_notify_event), SMPTE_Seconds));
-- frames_ebox.signal_motion_notify_event().connect (bind (mem_fun(*this, &AudioClock::field_motion_notify_event), SMPTE_Frames));
-- audio_frames_ebox.signal_motion_notify_event().connect (bind (mem_fun(*this, &AudioClock::field_motion_notify_event), AudioFrames));
-- bars_ebox.signal_motion_notify_event().connect (bind (mem_fun(*this, &AudioClock::field_motion_notify_event), Bars));
-- beats_ebox.signal_motion_notify_event().connect (bind (mem_fun(*this, &AudioClock::field_motion_notify_event), Beats));
-- ticks_ebox.signal_motion_notify_event().connect (bind (mem_fun(*this, &AudioClock::field_motion_notify_event), Ticks));
-- ms_hours_ebox.signal_motion_notify_event().connect (bind (mem_fun(*this, &AudioClock::field_motion_notify_event), MS_Hours));
-- ms_minutes_ebox.signal_motion_notify_event().connect (bind (mem_fun(*this, &AudioClock::field_motion_notify_event), MS_Minutes));
-- ms_seconds_ebox.signal_motion_notify_event().connect (bind (mem_fun(*this, &AudioClock::field_motion_notify_event), MS_Seconds));
--
-- hours_ebox.signal_button_press_event().connect (bind (mem_fun(*this, &AudioClock::field_button_press_event), SMPTE_Hours));
-- minutes_ebox.signal_button_press_event().connect (bind (mem_fun(*this, &AudioClock::field_button_press_event), SMPTE_Minutes));
-- seconds_ebox.signal_button_press_event().connect (bind (mem_fun(*this, &AudioClock::field_button_press_event), SMPTE_Seconds));
-- frames_ebox.signal_button_press_event().connect (bind (mem_fun(*this, &AudioClock::field_button_press_event), SMPTE_Frames));
-- audio_frames_ebox.signal_button_press_event().connect (bind (mem_fun(*this, &AudioClock::field_button_press_event), AudioFrames));
-- bars_ebox.signal_button_press_event().connect (bind (mem_fun(*this, &AudioClock::field_button_press_event), Bars));
-- beats_ebox.signal_button_press_event().connect (bind (mem_fun(*this, &AudioClock::field_button_press_event), Beats));
-- ticks_ebox.signal_button_press_event().connect (bind (mem_fun(*this, &AudioClock::field_button_press_event), Ticks));
-- ms_hours_ebox.signal_button_press_event().connect (bind (mem_fun(*this, &AudioClock::field_button_press_event), MS_Hours));
-- ms_minutes_ebox.signal_button_press_event().connect (bind (mem_fun(*this, &AudioClock::field_button_press_event), MS_Minutes));
-- ms_seconds_ebox.signal_button_press_event().connect (bind (mem_fun(*this, &AudioClock::field_button_press_event), MS_Seconds));
--
-- hours_ebox.signal_button_release_event().connect (bind (mem_fun(*this, &AudioClock::field_button_release_event), SMPTE_Hours));
-- minutes_ebox.signal_button_release_event().connect (bind (mem_fun(*this, &AudioClock::field_button_release_event), SMPTE_Minutes));
-- seconds_ebox.signal_button_release_event().connect (bind (mem_fun(*this, &AudioClock::field_button_release_event), SMPTE_Seconds));
-- frames_ebox.signal_button_release_event().connect (bind (mem_fun(*this, &AudioClock::field_button_release_event), SMPTE_Frames));
-- audio_frames_ebox.signal_button_release_event().connect (bind (mem_fun(*this, &AudioClock::field_button_release_event), AudioFrames));
-- bars_ebox.signal_button_release_event().connect (bind (mem_fun(*this, &AudioClock::field_button_release_event), Bars));
-- beats_ebox.signal_button_release_event().connect (bind (mem_fun(*this, &AudioClock::field_button_release_event), Beats));
-- ticks_ebox.signal_button_release_event().connect (bind (mem_fun(*this, &AudioClock::field_button_release_event), Ticks));
-- ms_hours_ebox.signal_button_release_event().connect (bind (mem_fun(*this, &AudioClock::field_button_release_event), MS_Hours));
-- ms_minutes_ebox.signal_button_release_event().connect (bind (mem_fun(*this, &AudioClock::field_button_release_event), MS_Minutes));
-- ms_seconds_ebox.signal_button_release_event().connect (bind (mem_fun(*this, &AudioClock::field_button_release_event), MS_Seconds));
--
-- hours_ebox.signal_scroll_event().connect (bind (mem_fun(*this, &AudioClock::field_button_scroll_event), SMPTE_Hours));
-- minutes_ebox.signal_scroll_event().connect (bind (mem_fun(*this, &AudioClock::field_button_scroll_event), SMPTE_Minutes));
-- seconds_ebox.signal_scroll_event().connect (bind (mem_fun(*this, &AudioClock::field_button_scroll_event), SMPTE_Seconds));
-- frames_ebox.signal_scroll_event().connect (bind (mem_fun(*this, &AudioClock::field_button_scroll_event), SMPTE_Frames));
-- audio_frames_ebox.signal_scroll_event().connect (bind (mem_fun(*this, &AudioClock::field_button_scroll_event), AudioFrames));
-- bars_ebox.signal_scroll_event().connect (bind (mem_fun(*this, &AudioClock::field_button_scroll_event), Bars));
-- beats_ebox.signal_scroll_event().connect (bind (mem_fun(*this, &AudioClock::field_button_scroll_event), Beats));
-- ticks_ebox.signal_scroll_event().connect (bind (mem_fun(*this, &AudioClock::field_button_scroll_event), Ticks));
-- ms_hours_ebox.signal_scroll_event().connect (bind (mem_fun(*this, &AudioClock::field_button_scroll_event), MS_Hours));
-- ms_minutes_ebox.signal_scroll_event().connect (bind (mem_fun(*this, &AudioClock::field_button_scroll_event), MS_Minutes));
-- ms_seconds_ebox.signal_scroll_event().connect (bind (mem_fun(*this, &AudioClock::field_button_scroll_event), MS_Seconds));
--
-- hours_ebox.signal_key_press_event().connect (bind (mem_fun(*this, &AudioClock::field_key_press_event), SMPTE_Hours));
-- minutes_ebox.signal_key_press_event().connect (bind (mem_fun(*this, &AudioClock::field_key_press_event), SMPTE_Minutes));
-- seconds_ebox.signal_key_press_event().connect (bind (mem_fun(*this, &AudioClock::field_key_press_event), SMPTE_Seconds));
-- frames_ebox.signal_key_press_event().connect (bind (mem_fun(*this, &AudioClock::field_key_press_event), SMPTE_Frames));
-- audio_frames_ebox.signal_key_press_event().connect (bind (mem_fun(*this, &AudioClock::field_key_press_event), AudioFrames));
-- bars_ebox.signal_key_press_event().connect (bind (mem_fun(*this, &AudioClock::field_key_press_event), Bars));
-- beats_ebox.signal_key_press_event().connect (bind (mem_fun(*this, &AudioClock::field_key_press_event), Beats));
-- ticks_ebox.signal_key_press_event().connect (bind (mem_fun(*this, &AudioClock::field_key_press_event), Ticks));
-- ms_hours_ebox.signal_key_press_event().connect (bind (mem_fun(*this, &AudioClock::field_key_press_event), MS_Hours));
-- ms_minutes_ebox.signal_key_press_event().connect (bind (mem_fun(*this, &AudioClock::field_key_press_event), MS_Minutes));
-- ms_seconds_ebox.signal_key_press_event().connect (bind (mem_fun(*this, &AudioClock::field_key_press_event), MS_Seconds));
--
-- hours_ebox.signal_key_release_event().connect (bind (mem_fun(*this, &AudioClock::field_key_release_event), SMPTE_Hours));
-- minutes_ebox.signal_key_release_event().connect (bind (mem_fun(*this, &AudioClock::field_key_release_event), SMPTE_Minutes));
-- seconds_ebox.signal_key_release_event().connect (bind (mem_fun(*this, &AudioClock::field_key_release_event), SMPTE_Seconds));
-- frames_ebox.signal_key_release_event().connect (bind (mem_fun(*this, &AudioClock::field_key_release_event), SMPTE_Frames));
-- audio_frames_ebox.signal_key_release_event().connect (bind (mem_fun(*this, &AudioClock::field_key_release_event), AudioFrames));
-- bars_ebox.signal_key_release_event().connect (bind (mem_fun(*this, &AudioClock::field_key_release_event), Bars));
-- beats_ebox.signal_key_release_event().connect (bind (mem_fun(*this, &AudioClock::field_key_release_event), Beats));
-- ticks_ebox.signal_key_release_event().connect (bind (mem_fun(*this, &AudioClock::field_key_release_event), Ticks));
-- ms_hours_ebox.signal_key_release_event().connect (bind (mem_fun(*this, &AudioClock::field_key_release_event), MS_Hours));
-- ms_minutes_ebox.signal_key_release_event().connect (bind (mem_fun(*this, &AudioClock::field_key_release_event), MS_Minutes));
-- ms_seconds_ebox.signal_key_release_event().connect (bind (mem_fun(*this, &AudioClock::field_key_release_event), MS_Seconds));
--
-- hours_ebox.signal_focus_in_event().connect (bind (mem_fun(*this, &AudioClock::field_focus_in_event), SMPTE_Hours));
-- minutes_ebox.signal_focus_in_event().connect (bind (mem_fun(*this, &AudioClock::field_focus_in_event), SMPTE_Minutes));
-- seconds_ebox.signal_focus_in_event().connect (bind (mem_fun(*this, &AudioClock::field_focus_in_event), SMPTE_Seconds));
-- frames_ebox.signal_focus_in_event().connect (bind (mem_fun(*this, &AudioClock::field_focus_in_event), SMPTE_Frames));
-- audio_frames_ebox.signal_focus_in_event().connect (bind (mem_fun(*this, &AudioClock::field_focus_in_event), AudioFrames));
-- bars_ebox.signal_focus_in_event().connect (bind (mem_fun(*this, &AudioClock::field_focus_in_event), Bars));
-- beats_ebox.signal_focus_in_event().connect (bind (mem_fun(*this, &AudioClock::field_focus_in_event), Beats));
-- ticks_ebox.signal_focus_in_event().connect (bind (mem_fun(*this, &AudioClock::field_focus_in_event), Ticks));
-- ms_hours_ebox.signal_focus_in_event().connect (bind (mem_fun(*this, &AudioClock::field_focus_in_event), MS_Hours));
-- ms_minutes_ebox.signal_focus_in_event().connect (bind (mem_fun(*this, &AudioClock::field_focus_in_event), MS_Minutes));
-- ms_seconds_ebox.signal_focus_in_event().connect (bind (mem_fun(*this, &AudioClock::field_focus_in_event), MS_Seconds));
--
-- hours_ebox.signal_focus_out_event().connect (bind (mem_fun(*this, &AudioClock::field_focus_out_event), SMPTE_Hours));
-- minutes_ebox.signal_focus_out_event().connect (bind (mem_fun(*this, &AudioClock::field_focus_out_event), SMPTE_Minutes));
-- seconds_ebox.signal_focus_out_event().connect (bind (mem_fun(*this, &AudioClock::field_focus_out_event), SMPTE_Seconds));
-- frames_ebox.signal_focus_out_event().connect (bind (mem_fun(*this, &AudioClock::field_focus_out_event), SMPTE_Frames));
-- audio_frames_ebox.signal_focus_out_event().connect (bind (mem_fun(*this, &AudioClock::field_focus_out_event), AudioFrames));
-- bars_ebox.signal_focus_out_event().connect (bind (mem_fun(*this, &AudioClock::field_focus_out_event), Bars));
-- beats_ebox.signal_focus_out_event().connect (bind (mem_fun(*this, &AudioClock::field_focus_out_event), Beats));
-- ticks_ebox.signal_focus_out_event().connect (bind (mem_fun(*this, &AudioClock::field_focus_out_event), Ticks));
-- ms_hours_ebox.signal_focus_out_event().connect (bind (mem_fun(*this, &AudioClock::field_focus_out_event), MS_Hours));
-- ms_minutes_ebox.signal_focus_out_event().connect (bind (mem_fun(*this, &AudioClock::field_focus_out_event), MS_Minutes));
-- ms_seconds_ebox.signal_focus_out_event().connect (bind (mem_fun(*this, &AudioClock::field_focus_out_event), MS_Seconds));
-+ hours_ebox.signal_motion_notify_event().connect (sigc::bind (mem_fun(*this, &AudioClock::field_motion_notify_event), SMPTE_Hours));
-+ minutes_ebox.signal_motion_notify_event().connect (sigc::bind (mem_fun(*this, &AudioClock::field_motion_notify_event), SMPTE_Minutes));
-+ seconds_ebox.signal_motion_notify_event().connect (sigc::bind (mem_fun(*this, &AudioClock::field_motion_notify_event), SMPTE_Seconds));
-+ frames_ebox.signal_motion_notify_event().connect (sigc::bind (mem_fun(*this, &AudioClock::field_motion_notify_event), SMPTE_Frames));
-+ audio_frames_ebox.signal_motion_notify_event().connect (sigc::bind (mem_fun(*this, &AudioClock::field_motion_notify_event), AudioFrames));
-+ bars_ebox.signal_motion_notify_event().connect (sigc::bind (mem_fun(*this, &AudioClock::field_motion_notify_event), Bars));
-+ beats_ebox.signal_motion_notify_event().connect (sigc::bind (mem_fun(*this, &AudioClock::field_motion_notify_event), Beats));
-+ ticks_ebox.signal_motion_notify_event().connect (sigc::bind (mem_fun(*this, &AudioClock::field_motion_notify_event), Ticks));
-+ ms_hours_ebox.signal_motion_notify_event().connect (sigc::bind (mem_fun(*this, &AudioClock::field_motion_notify_event), MS_Hours));
-+ ms_minutes_ebox.signal_motion_notify_event().connect (sigc::bind (mem_fun(*this, &AudioClock::field_motion_notify_event), MS_Minutes));
-+ ms_seconds_ebox.signal_motion_notify_event().connect (sigc::bind (mem_fun(*this, &AudioClock::field_motion_notify_event), MS_Seconds));
-+
-+ hours_ebox.signal_button_press_event().connect (sigc::bind (mem_fun(*this, &AudioClock::field_button_press_event), SMPTE_Hours));
-+ minutes_ebox.signal_button_press_event().connect (sigc::bind (mem_fun(*this, &AudioClock::field_button_press_event), SMPTE_Minutes));
-+ seconds_ebox.signal_button_press_event().connect (sigc::bind (mem_fun(*this, &AudioClock::field_button_press_event), SMPTE_Seconds));
-+ frames_ebox.signal_button_press_event().connect (sigc::bind (mem_fun(*this, &AudioClock::field_button_press_event), SMPTE_Frames));
-+ audio_frames_ebox.signal_button_press_event().connect (sigc::bind (mem_fun(*this, &AudioClock::field_button_press_event), AudioFrames));
-+ bars_ebox.signal_button_press_event().connect (sigc::bind (mem_fun(*this, &AudioClock::field_button_press_event), Bars));
-+ beats_ebox.signal_button_press_event().connect (sigc::bind (mem_fun(*this, &AudioClock::field_button_press_event), Beats));
-+ ticks_ebox.signal_button_press_event().connect (sigc::bind (mem_fun(*this, &AudioClock::field_button_press_event), Ticks));
-+ ms_hours_ebox.signal_button_press_event().connect (sigc::bind (mem_fun(*this, &AudioClock::field_button_press_event), MS_Hours));
-+ ms_minutes_ebox.signal_button_press_event().connect (sigc::bind (mem_fun(*this, &AudioClock::field_button_press_event), MS_Minutes));
-+ ms_seconds_ebox.signal_button_press_event().connect (sigc::bind (mem_fun(*this, &AudioClock::field_button_press_event), MS_Seconds));
-+
-+ hours_ebox.signal_button_release_event().connect (sigc::bind (mem_fun(*this, &AudioClock::field_button_release_event), SMPTE_Hours));
-+ minutes_ebox.signal_button_release_event().connect (sigc::bind (mem_fun(*this, &AudioClock::field_button_release_event), SMPTE_Minutes));
-+ seconds_ebox.signal_button_release_event().connect (sigc::bind (mem_fun(*this, &AudioClock::field_button_release_event), SMPTE_Seconds));
-+ frames_ebox.signal_button_release_event().connect (sigc::bind (mem_fun(*this, &AudioClock::field_button_release_event), SMPTE_Frames));
-+ audio_frames_ebox.signal_button_release_event().connect (sigc::bind (mem_fun(*this, &AudioClock::field_button_release_event), AudioFrames));
-+ bars_ebox.signal_button_release_event().connect (sigc::bind (mem_fun(*this, &AudioClock::field_button_release_event), Bars));
-+ beats_ebox.signal_button_release_event().connect (sigc::bind (mem_fun(*this, &AudioClock::field_button_release_event), Beats));
-+ ticks_ebox.signal_button_release_event().connect (sigc::bind (mem_fun(*this, &AudioClock::field_button_release_event), Ticks));
-+ ms_hours_ebox.signal_button_release_event().connect (sigc::bind (mem_fun(*this, &AudioClock::field_button_release_event), MS_Hours));
-+ ms_minutes_ebox.signal_button_release_event().connect (sigc::bind (mem_fun(*this, &AudioClock::field_button_release_event), MS_Minutes));
-+ ms_seconds_ebox.signal_button_release_event().connect (sigc::bind (mem_fun(*this, &AudioClock::field_button_release_event), MS_Seconds));
-+
-+ hours_ebox.signal_scroll_event().connect (sigc::bind (mem_fun(*this, &AudioClock::field_button_scroll_event), SMPTE_Hours));
-+ minutes_ebox.signal_scroll_event().connect (sigc::bind (mem_fun(*this, &AudioClock::field_button_scroll_event), SMPTE_Minutes));
-+ seconds_ebox.signal_scroll_event().connect (sigc::bind (mem_fun(*this, &AudioClock::field_button_scroll_event), SMPTE_Seconds));
-+ frames_ebox.signal_scroll_event().connect (sigc::bind (mem_fun(*this, &AudioClock::field_button_scroll_event), SMPTE_Frames));
-+ audio_frames_ebox.signal_scroll_event().connect (sigc::bind (mem_fun(*this, &AudioClock::field_button_scroll_event), AudioFrames));
-+ bars_ebox.signal_scroll_event().connect (sigc::bind (mem_fun(*this, &AudioClock::field_button_scroll_event), Bars));
-+ beats_ebox.signal_scroll_event().connect (sigc::bind (mem_fun(*this, &AudioClock::field_button_scroll_event), Beats));
-+ ticks_ebox.signal_scroll_event().connect (sigc::bind (mem_fun(*this, &AudioClock::field_button_scroll_event), Ticks));
-+ ms_hours_ebox.signal_scroll_event().connect (sigc::bind (mem_fun(*this, &AudioClock::field_button_scroll_event), MS_Hours));
-+ ms_minutes_ebox.signal_scroll_event().connect (sigc::bind (mem_fun(*this, &AudioClock::field_button_scroll_event), MS_Minutes));
-+ ms_seconds_ebox.signal_scroll_event().connect (sigc::bind (mem_fun(*this, &AudioClock::field_button_scroll_event), MS_Seconds));
-+
-+ hours_ebox.signal_key_press_event().connect (sigc::bind (mem_fun(*this, &AudioClock::field_key_press_event), SMPTE_Hours));
-+ minutes_ebox.signal_key_press_event().connect (sigc::bind (mem_fun(*this, &AudioClock::field_key_press_event), SMPTE_Minutes));
-+ seconds_ebox.signal_key_press_event().connect (sigc::bind (mem_fun(*this, &AudioClock::field_key_press_event), SMPTE_Seconds));
-+ frames_ebox.signal_key_press_event().connect (sigc::bind (mem_fun(*this, &AudioClock::field_key_press_event), SMPTE_Frames));
-+ audio_frames_ebox.signal_key_press_event().connect (sigc::bind (mem_fun(*this, &AudioClock::field_key_press_event), AudioFrames));
-+ bars_ebox.signal_key_press_event().connect (sigc::bind (mem_fun(*this, &AudioClock::field_key_press_event), Bars));
-+ beats_ebox.signal_key_press_event().connect (sigc::bind (mem_fun(*this, &AudioClock::field_key_press_event), Beats));
-+ ticks_ebox.signal_key_press_event().connect (sigc::bind (mem_fun(*this, &AudioClock::field_key_press_event), Ticks));
-+ ms_hours_ebox.signal_key_press_event().connect (sigc::bind (mem_fun(*this, &AudioClock::field_key_press_event), MS_Hours));
-+ ms_minutes_ebox.signal_key_press_event().connect (sigc::bind (mem_fun(*this, &AudioClock::field_key_press_event), MS_Minutes));
-+ ms_seconds_ebox.signal_key_press_event().connect (sigc::bind (mem_fun(*this, &AudioClock::field_key_press_event), MS_Seconds));
-+
-+ hours_ebox.signal_key_release_event().connect (sigc::bind (mem_fun(*this, &AudioClock::field_key_release_event), SMPTE_Hours));
-+ minutes_ebox.signal_key_release_event().connect (sigc::bind (mem_fun(*this, &AudioClock::field_key_release_event), SMPTE_Minutes));
-+ seconds_ebox.signal_key_release_event().connect (sigc::bind (mem_fun(*this, &AudioClock::field_key_release_event), SMPTE_Seconds));
-+ frames_ebox.signal_key_release_event().connect (sigc::bind (mem_fun(*this, &AudioClock::field_key_release_event), SMPTE_Frames));
-+ audio_frames_ebox.signal_key_release_event().connect (sigc::bind (mem_fun(*this, &AudioClock::field_key_release_event), AudioFrames));
-+ bars_ebox.signal_key_release_event().connect (sigc::bind (mem_fun(*this, &AudioClock::field_key_release_event), Bars));
-+ beats_ebox.signal_key_release_event().connect (sigc::bind (mem_fun(*this, &AudioClock::field_key_release_event), Beats));
-+ ticks_ebox.signal_key_release_event().connect (sigc::bind (mem_fun(*this, &AudioClock::field_key_release_event), Ticks));
-+ ms_hours_ebox.signal_key_release_event().connect (sigc::bind (mem_fun(*this, &AudioClock::field_key_release_event), MS_Hours));
-+ ms_minutes_ebox.signal_key_release_event().connect (sigc::bind (mem_fun(*this, &AudioClock::field_key_release_event), MS_Minutes));
-+ ms_seconds_ebox.signal_key_release_event().connect (sigc::bind (mem_fun(*this, &AudioClock::field_key_release_event), MS_Seconds));
-+
-+ hours_ebox.signal_focus_in_event().connect (sigc::bind (mem_fun(*this, &AudioClock::field_focus_in_event), SMPTE_Hours));
-+ minutes_ebox.signal_focus_in_event().connect (sigc::bind (mem_fun(*this, &AudioClock::field_focus_in_event), SMPTE_Minutes));
-+ seconds_ebox.signal_focus_in_event().connect (sigc::bind (mem_fun(*this, &AudioClock::field_focus_in_event), SMPTE_Seconds));
-+ frames_ebox.signal_focus_in_event().connect (sigc::bind (mem_fun(*this, &AudioClock::field_focus_in_event), SMPTE_Frames));
-+ audio_frames_ebox.signal_focus_in_event().connect (sigc::bind (mem_fun(*this, &AudioClock::field_focus_in_event), AudioFrames));
-+ bars_ebox.signal_focus_in_event().connect (sigc::bind (mem_fun(*this, &AudioClock::field_focus_in_event), Bars));
-+ beats_ebox.signal_focus_in_event().connect (sigc::bind (mem_fun(*this, &AudioClock::field_focus_in_event), Beats));
-+ ticks_ebox.signal_focus_in_event().connect (sigc::bind (mem_fun(*this, &AudioClock::field_focus_in_event), Ticks));
-+ ms_hours_ebox.signal_focus_in_event().connect (sigc::bind (mem_fun(*this, &AudioClock::field_focus_in_event), MS_Hours));
-+ ms_minutes_ebox.signal_focus_in_event().connect (sigc::bind (mem_fun(*this, &AudioClock::field_focus_in_event), MS_Minutes));
-+ ms_seconds_ebox.signal_focus_in_event().connect (sigc::bind (mem_fun(*this, &AudioClock::field_focus_in_event), MS_Seconds));
-+
-+ hours_ebox.signal_focus_out_event().connect (sigc::bind (mem_fun(*this, &AudioClock::field_focus_out_event), SMPTE_Hours));
-+ minutes_ebox.signal_focus_out_event().connect (sigc::bind (mem_fun(*this, &AudioClock::field_focus_out_event), SMPTE_Minutes));
-+ seconds_ebox.signal_focus_out_event().connect (sigc::bind (mem_fun(*this, &AudioClock::field_focus_out_event), SMPTE_Seconds));
-+ frames_ebox.signal_focus_out_event().connect (sigc::bind (mem_fun(*this, &AudioClock::field_focus_out_event), SMPTE_Frames));
-+ audio_frames_ebox.signal_focus_out_event().connect (sigc::bind (mem_fun(*this, &AudioClock::field_focus_out_event), AudioFrames));
-+ bars_ebox.signal_focus_out_event().connect (sigc::bind (mem_fun(*this, &AudioClock::field_focus_out_event), Bars));
-+ beats_ebox.signal_focus_out_event().connect (sigc::bind (mem_fun(*this, &AudioClock::field_focus_out_event), Beats));
-+ ticks_ebox.signal_focus_out_event().connect (sigc::bind (mem_fun(*this, &AudioClock::field_focus_out_event), Ticks));
-+ ms_hours_ebox.signal_focus_out_event().connect (sigc::bind (mem_fun(*this, &AudioClock::field_focus_out_event), MS_Hours));
-+ ms_minutes_ebox.signal_focus_out_event().connect (sigc::bind (mem_fun(*this, &AudioClock::field_focus_out_event), MS_Minutes));
-+ ms_seconds_ebox.signal_focus_out_event().connect (sigc::bind (mem_fun(*this, &AudioClock::field_focus_out_event), MS_Seconds));
-
- clock_base.signal_focus_in_event().connect (mem_fun (*this, &AudioClock::drop_focus_handler));
- }
-@@ -1945,12 +1945,12 @@ AudioClock::build_ops_menu ()
- ops_menu->set_name ("ArdourContextMenu");
-
- if (!Profile->get_sae()) {
-- ops_items.push_back (MenuElem (_("Timecode"), bind (mem_fun(*this, &AudioClock::set_mode), SMPTE)));
-+ ops_items.push_back (MenuElem (_("Timecode"), sigc::bind (mem_fun(*this, &AudioClock::set_mode), SMPTE)));
- }
-- ops_items.push_back (MenuElem (_("Bars:Beats"), bind (mem_fun(*this, &AudioClock::set_mode), BBT)));
-- ops_items.push_back (MenuElem (_("Minutes:Seconds"), bind (mem_fun(*this, &AudioClock::set_mode), MinSec)));
-- ops_items.push_back (MenuElem (_("Samples"), bind (mem_fun(*this, &AudioClock::set_mode), Frames)));
-- ops_items.push_back (MenuElem (_("Off"), bind (mem_fun(*this, &AudioClock::set_mode), Off)));
-+ ops_items.push_back (MenuElem (_("Bars:Beats"), sigc::bind (mem_fun(*this, &AudioClock::set_mode), BBT)));
-+ ops_items.push_back (MenuElem (_("Minutes:Seconds"), sigc::bind (mem_fun(*this, &AudioClock::set_mode), MinSec)));
-+ ops_items.push_back (MenuElem (_("Samples"), sigc::bind (mem_fun(*this, &AudioClock::set_mode), Frames)));
-+ ops_items.push_back (MenuElem (_("Off"), sigc::bind (mem_fun(*this, &AudioClock::set_mode), Off)));
- }
-
- void
-diff --git a/gtk2_ardour/audio_region_editor.cc b/gtk2_ardour/audio_region_editor.cc
-index b30b462..c4a600c 100644
---- a/gtk2_ardour/audio_region_editor.cc
-+++ b/gtk2_ardour/audio_region_editor.cc
-@@ -143,7 +143,7 @@ AudioRegionEditor::AudioRegionEditor (Session& s, boost::shared_ptr<AudioRegion>
- set_name ("AudioRegionEditorWindow");
- add_events (Gdk::KEY_PRESS_MASK|Gdk::KEY_RELEASE_MASK);
-
-- signal_delete_event().connect (bind (sigc::ptr_fun (just_hide_it), static_cast<Window *> (this)));
-+ signal_delete_event().connect (sigc::bind (sigc::ptr_fun (just_hide_it), static_cast<Window *> (this)));
-
- set_title (string_compose (_("Region %1"), _region->name()));
-
-@@ -361,7 +361,7 @@ AudioRegionEditor::name_entry_changed ()
- void
- AudioRegionEditor::audition_state_changed (bool yn)
- {
-- ENSURE_GUI_THREAD (bind (mem_fun(*this, &AudioRegionEditor::audition_state_changed), yn));
-+ ENSURE_GUI_THREAD (sigc::bind (mem_fun(*this, &AudioRegionEditor::audition_state_changed), yn));
-
- if (!yn) {
- audition_button.set_active (false);
-diff --git a/gtk2_ardour/automation_line.cc b/gtk2_ardour/automation_line.cc
-index ded54a5..2fcf221 100644
---- a/gtk2_ardour/automation_line.cc
-+++ b/gtk2_ardour/automation_line.cc
-@@ -606,7 +606,7 @@ AutomationLine::determine_visible_control_points (ALPoints& points)
- double tx = points[pi].x;
- double ty = points[pi].y;
-
-- if (isnan (tx) || isnan (ty)) {
-+ if (std::isnan (tx) || std::isnan (ty)) {
- warning << string_compose (_("Ignoring illegal points on AutomationLine \"%1\""),
- _name) << endmsg;
- continue;
-diff --git a/gtk2_ardour/crossfade_edit.cc b/gtk2_ardour/crossfade_edit.cc
-index 918c4a5..97aa569 100644
---- a/gtk2_ardour/crossfade_edit.cc
-+++ b/gtk2_ardour/crossfade_edit.cc
-@@ -156,8 +156,8 @@ CrossfadeEditor::CrossfadeEditor (Session& s, boost::shared_ptr<Crossfade> xf, d
- select_in_button.set_name (X_("CrossfadeEditCurveButton"));
- select_out_button.set_name (X_("CrossfadeEditCurveButton"));
-
-- select_in_button.signal_clicked().connect (bind (mem_fun (*this, &CrossfadeEditor::curve_select_clicked), In));
-- select_out_button.signal_clicked().connect (bind (mem_fun (*this, &CrossfadeEditor::curve_select_clicked), Out));
-+ select_in_button.signal_clicked().connect (sigc::bind (mem_fun (*this, &CrossfadeEditor::curve_select_clicked), In));
-+ select_out_button.signal_clicked().connect (sigc::bind (mem_fun (*this, &CrossfadeEditor::curve_select_clicked), Out));
-
- HBox* acbox = manage (new HBox);
-
-@@ -198,7 +198,7 @@ CrossfadeEditor::CrossfadeEditor (Session& s, boost::shared_ptr<Crossfade> xf, d
- pbutton = manage (new Button);
- pbutton->add (*pxmap);
- pbutton->set_name ("CrossfadeEditButton");
-- pbutton->signal_clicked().connect (bind (mem_fun(*this, &CrossfadeEditor::apply_preset), *i));
-+ pbutton->signal_clicked().connect (sigc::bind (mem_fun(*this, &CrossfadeEditor::apply_preset), *i));
- ARDOUR_UI::instance()->set_tip (pbutton, (*i)->name, "");
- fade_in_table.attach (*pbutton, col, col+1, row, row+1);
- fade_in_buttons.push_back (pbutton);
-@@ -220,7 +220,7 @@ CrossfadeEditor::CrossfadeEditor (Session& s, boost::shared_ptr<Crossfade> xf, d
- pbutton = manage (new Button);
- pbutton->add (*pxmap);
- pbutton->set_name ("CrossfadeEditButton");
-- pbutton->signal_clicked().connect (bind (mem_fun(*this, &CrossfadeEditor::apply_preset), *i));
-+ pbutton->signal_clicked().connect (sigc::bind (mem_fun(*this, &CrossfadeEditor::apply_preset), *i));
- ARDOUR_UI::instance()->set_tip (pbutton, (*i)->name, "");
- fade_out_table.attach (*pbutton, col, col+1, row, row+1);
- fade_out_buttons.push_back (pbutton);
-@@ -318,7 +318,7 @@ CrossfadeEditor::dump ()
- void
- CrossfadeEditor::audition_state_changed (bool yn)
- {
-- ENSURE_GUI_THREAD (bind (mem_fun(*this, &CrossfadeEditor::audition_state_changed), yn));
-+ ENSURE_GUI_THREAD (sigc::bind (mem_fun(*this, &CrossfadeEditor::audition_state_changed), yn));
-
- if (!yn) {
- audition_both_button.set_active (false);
-@@ -464,7 +464,7 @@ CrossfadeEditor::make_point ()
-
- p->curve = fade[current].line;
-
-- p->box->signal_event().connect (bind (mem_fun (*this, &CrossfadeEditor::point_event), p));
-+ p->box->signal_event().connect (sigc::bind (mem_fun (*this, &CrossfadeEditor::point_event), p));
-
- return p;
- }
-@@ -1140,7 +1140,7 @@ CrossfadeEditor::make_waves (boost::shared_ptr<AudioRegion> region, WhichFade wh
-
- gdouble yoff = n * ht;
-
-- if (region->source(n)->peaks_ready (bind (mem_fun(*this, &CrossfadeEditor::peaks_ready), region, which), peaks_ready_connection)) {
-+ if (region->source(n)->peaks_ready (sigc::bind (mem_fun(*this, &CrossfadeEditor::peaks_ready), region, which), peaks_ready_connection)) {
-
- WaveView* waveview = new WaveView (*(canvas->root()));
-
-diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc
-index 81d5ce1..d2bd781 100644
---- a/gtk2_ardour/editor.cc
-+++ b/gtk2_ardour/editor.cc
-@@ -677,7 +677,7 @@ Editor::Editor ()
- region_list_display.signal_button_press_event().connect (mem_fun(*this, &Editor::region_list_display_button_press), false);
- region_list_display.signal_button_release_event().connect (mem_fun(*this, &Editor::region_list_display_button_release));
- region_list_display.get_selection()->signal_changed().connect (mem_fun(*this, &Editor::region_list_selection_changed));
-- // region_list_display.signal_popup_menu().connect (bind (mem_fun (*this, &Editor::show_region_list_display_context_menu), 1, 0));
-+ // region_list_display.signal_popup_menu().connect (sigc::bind (mem_fun (*this, &Editor::show_region_list_display_context_menu), 1, 0));
-
- named_selection_scroller.add (named_selection_display);
- named_selection_scroller.set_policy (POLICY_NEVER, POLICY_AUTOMATIC);
-@@ -741,10 +741,10 @@ Editor::Editor ()
- edit_pane.pack1 (edit_packer, true, true);
- edit_pane.pack2 (the_notebook, false, true);
-
-- edit_pane.signal_size_allocate().connect (bind (mem_fun(*this, &Editor::pane_allocation_handler), static_cast<Paned*> (&edit_pane)));
-+ edit_pane.signal_size_allocate().connect (sigc::bind (mem_fun(*this, &Editor::pane_allocation_handler), static_cast<Paned*> (&edit_pane)));
-
- Glib::PropertyProxy<int> proxy = edit_pane.property_position();
-- proxy.signal_changed().connect (bind (sigc::ptr_fun (pane_size_watcher), static_cast<Paned*> (&edit_pane)));
-+ proxy.signal_changed().connect (sigc::bind (sigc::ptr_fun (pane_size_watcher), static_cast<Paned*> (&edit_pane)));
-
- top_hbox.pack_start (toolbar_frame, true, true);
-
-@@ -778,7 +778,7 @@ Editor::Editor ()
- set_state (*node);
-
- _playlist_selector = new PlaylistSelector();
-- _playlist_selector->signal_delete_event().connect (bind (sigc::ptr_fun (just_hide_it), static_cast<Window *> (_playlist_selector)));
-+ _playlist_selector->signal_delete_event().connect (sigc::bind (sigc::ptr_fun (just_hide_it), static_cast<Window *> (_playlist_selector)));
-
- RegionView::RegionViewGoingAway.connect (mem_fun(*this, &Editor::catch_vanishing_regionview));
-
-@@ -831,8 +831,8 @@ Editor::Editor ()
- /* allow external control surfaces/protocols to do various things */
-
- ControlProtocol::ZoomToSession.connect (mem_fun (*this, &Editor::temporal_zoom_session));
-- ControlProtocol::ZoomIn.connect (bind (mem_fun (*this, &Editor::temporal_zoom_step), false));
-- ControlProtocol::ZoomOut.connect (bind (mem_fun (*this, &Editor::temporal_zoom_step), true));
-+ ControlProtocol::ZoomIn.connect (sigc::bind (mem_fun (*this, &Editor::temporal_zoom_step), false));
-+ ControlProtocol::ZoomOut.connect (sigc::bind (mem_fun (*this, &Editor::temporal_zoom_step), true));
- ControlProtocol::ScrollTimeline.connect (mem_fun (*this, &Editor::control_scroll));
- BasicUI::AccessAction.connect (mem_fun (*this, &Editor::access_action));
-
-@@ -997,7 +997,7 @@ Editor::zoom_adjustment_changed ()
- void
- Editor::control_scroll (float fraction)
- {
-- ENSURE_GUI_THREAD(bind (mem_fun (*this, &Editor::control_scroll), fraction));
-+ ENSURE_GUI_THREAD(sigc::bind (mem_fun (*this, &Editor::control_scroll), fraction));
-
- if (!session) {
- return;
-@@ -1053,7 +1053,7 @@ Editor::control_scroll (float fraction)
-
- /* add the next timeout */
-
-- control_scroll_connection = Glib::signal_timeout().connect (bind (mem_fun (*this, &Editor::deferred_control_scroll), *_control_scroll_target), 250);
-+ control_scroll_connection = Glib::signal_timeout().connect (sigc::bind (mem_fun (*this, &Editor::deferred_control_scroll), *_control_scroll_target), 250);
- }
-
- bool
-@@ -1073,7 +1073,7 @@ Editor::access_action (std::string action_group, std::string action_item)
- return;
- }
-
-- ENSURE_GUI_THREAD (bind (mem_fun (*this, &Editor::access_action), action_group, action_item));
-+ ENSURE_GUI_THREAD (sigc::bind (mem_fun (*this, &Editor::access_action), action_group, action_item));
-
- RefPtr<Action> act;
- act = ActionManager::get_action( action_group.c_str(), action_item.c_str() );
-@@ -1109,7 +1109,7 @@ Editor::stop_scrolling ()
- void
- Editor::map_position_change (nframes64_t frame)
- {
-- ENSURE_GUI_THREAD (bind (mem_fun(*this, &Editor::map_position_change), frame));
-+ ENSURE_GUI_THREAD (sigc::bind (mem_fun(*this, &Editor::map_position_change), frame));
-
- if (session == 0 || !_follow_playhead) {
- return;
-@@ -1169,7 +1169,7 @@ Editor::handle_new_duration ()
- void
- Editor::update_title_s (const string & snap_name)
- {
-- ENSURE_GUI_THREAD(bind (mem_fun(*this, &Editor::update_title_s), snap_name));
-+ ENSURE_GUI_THREAD(sigc::bind (mem_fun(*this, &Editor::update_title_s), snap_name));
-
- update_title ();
- }
-@@ -1454,44 +1454,44 @@ Editor::popup_fade_context_menu (int button, int32_t time, ArdourCanvas::Item* i
- case FadeInItem:
- case FadeInHandleItem:
- if (arv->audio_region()->fade_in_active()) {
-- items.push_back (MenuElem (_("Deactivate"), bind (mem_fun (*this, &Editor::set_fade_in_active), false)));
-+ items.push_back (MenuElem (_("Deactivate"), sigc::bind (mem_fun (*this, &Editor::set_fade_in_active), false)));
- } else {
-- items.push_back (MenuElem (_("Activate"), bind (mem_fun (*this, &Editor::set_fade_in_active), true)));
-+ items.push_back (MenuElem (_("Activate"), sigc::bind (mem_fun (*this, &Editor::set_fade_in_active), true)));
- }
-
- items.push_back (SeparatorElem());
-
- if (Profile->get_sae()) {
-- items.push_back (MenuElem (_("Linear"), bind (mem_fun (*this, &Editor::set_fade_in_shape), AudioRegion::Linear)));
-- items.push_back (MenuElem (_("Slowest"), bind (mem_fun (*this, &Editor::set_fade_in_shape), AudioRegion::Fast)));
-+ items.push_back (MenuElem (_("Linear"), sigc::bind (mem_fun (*this, &Editor::set_fade_in_shape), AudioRegion::Linear)));
-+ items.push_back (MenuElem (_("Slowest"), sigc::bind (mem_fun (*this, &Editor::set_fade_in_shape), AudioRegion::Fast)));
- } else {
-- items.push_back (MenuElem (_("Linear"), bind (mem_fun (*this, &Editor::set_fade_in_shape), AudioRegion::Linear)));
-- items.push_back (MenuElem (_("Slowest"), bind (mem_fun (*this, &Editor::set_fade_in_shape), AudioRegion::Fast)));
-- items.push_back (MenuElem (_("Slow"), bind (mem_fun (*this, &Editor::set_fade_in_shape), AudioRegion::LogB)));
-- items.push_back (MenuElem (_("Fast"), bind (mem_fun (*this, &Editor::set_fade_in_shape), AudioRegion::LogA)));
-- items.push_back (MenuElem (_("Fastest"), bind (mem_fun (*this, &Editor::set_fade_in_shape), AudioRegion::Slow)));
-+ items.push_back (MenuElem (_("Linear"), sigc::bind (mem_fun (*this, &Editor::set_fade_in_shape), AudioRegion::Linear)));
-+ items.push_back (MenuElem (_("Slowest"), sigc::bind (mem_fun (*this, &Editor::set_fade_in_shape), AudioRegion::Fast)));
-+ items.push_back (MenuElem (_("Slow"), sigc::bind (mem_fun (*this, &Editor::set_fade_in_shape), AudioRegion::LogB)));
-+ items.push_back (MenuElem (_("Fast"), sigc::bind (mem_fun (*this, &Editor::set_fade_in_shape), AudioRegion::LogA)));
-+ items.push_back (MenuElem (_("Fastest"), sigc::bind (mem_fun (*this, &Editor::set_fade_in_shape), AudioRegion::Slow)));
- }
- break;
-
- case FadeOutItem:
- case FadeOutHandleItem:
- if (arv->audio_region()->fade_out_active()) {
-- items.push_back (MenuElem (_("Deactivate"), bind (mem_fun (*this, &Editor::set_fade_out_active), false)));
-+ items.push_back (MenuElem (_("Deactivate"), sigc::bind (mem_fun (*this, &Editor::set_fade_out_active), false)));
- } else {
-- items.push_back (MenuElem (_("Activate"), bind (mem_fun (*this, &Editor::set_fade_out_active), true)));
-+ items.push_back (MenuElem (_("Activate"), sigc::bind (mem_fun (*this, &Editor::set_fade_out_active), true)));
- }
-
- items.push_back (SeparatorElem());
-
- if (Profile->get_sae()) {
-- items.push_back (MenuElem (_("Linear"), bind (mem_fun (*this, &Editor::set_fade_out_shape), AudioRegion::Linear)));
-- items.push_back (MenuElem (_("Slowest"), bind (mem_fun (*this, &Editor::set_fade_out_shape), AudioRegion::Slow)));
-+ items.push_back (MenuElem (_("Linear"), sigc::bind (mem_fun (*this, &Editor::set_fade_out_shape), AudioRegion::Linear)));
-+ items.push_back (MenuElem (_("Slowest"), sigc::bind (mem_fun (*this, &Editor::set_fade_out_shape), AudioRegion::Slow)));
- } else {
-- items.push_back (MenuElem (_("Linear"), bind (mem_fun (*this, &Editor::set_fade_out_shape), AudioRegion::Linear)));
-- items.push_back (MenuElem (_("Slowest"), bind (mem_fun (*this, &Editor::set_fade_out_shape), AudioRegion::Slow)));
-- items.push_back (MenuElem (_("Slow"), bind (mem_fun (*this, &Editor::set_fade_out_shape), AudioRegion::LogA)));
-- items.push_back (MenuElem (_("Fast"), bind (mem_fun (*this, &Editor::set_fade_out_shape), AudioRegion::LogB)));
-- items.push_back (MenuElem (_("Fastest"), bind (mem_fun (*this, &Editor::set_fade_out_shape), AudioRegion::Fast)));
-+ items.push_back (MenuElem (_("Linear"), sigc::bind (mem_fun (*this, &Editor::set_fade_out_shape), AudioRegion::Linear)));
-+ items.push_back (MenuElem (_("Slowest"), sigc::bind (mem_fun (*this, &Editor::set_fade_out_shape), AudioRegion::Slow)));
-+ items.push_back (MenuElem (_("Slow"), sigc::bind (mem_fun (*this, &Editor::set_fade_out_shape), AudioRegion::LogA)));
-+ items.push_back (MenuElem (_("Fast"), sigc::bind (mem_fun (*this, &Editor::set_fade_out_shape), AudioRegion::LogB)));
-+ items.push_back (MenuElem (_("Fastest"), sigc::bind (mem_fun (*this, &Editor::set_fade_out_shape), AudioRegion::Fast)));
- }
- break;
-
-@@ -1798,8 +1798,8 @@ Editor::add_crossfade_context_items (AudioStreamView* view, boost::shared_ptr<Cr
- str = _("Unmute");
- }
-
-- items.push_back (MenuElem (str, bind (mem_fun(*this, &Editor::toggle_xfade_active), boost::weak_ptr<Crossfade> (xfade))));
-- items.push_back (MenuElem (_("Edit"), bind (mem_fun(*this, &Editor::edit_xfade), boost::weak_ptr<Crossfade> (xfade))));
-+ items.push_back (MenuElem (str, sigc::bind (mem_fun(*this, &Editor::toggle_xfade_active), boost::weak_ptr<Crossfade> (xfade))));
-+ items.push_back (MenuElem (_("Edit"), sigc::bind (mem_fun(*this, &Editor::edit_xfade), boost::weak_ptr<Crossfade> (xfade))));
-
- if (xfade->can_follow_overlap()) {
-
-@@ -1809,7 +1809,7 @@ Editor::add_crossfade_context_items (AudioStreamView* view, boost::shared_ptr<Cr
- str = _("Convert to full");
- }
-
-- items.push_back (MenuElem (str, bind (mem_fun(*this, &Editor::toggle_xfade_length), xfade)));
-+ items.push_back (MenuElem (str, sigc::bind (mem_fun(*this, &Editor::toggle_xfade_length), xfade)));
- }
-
- if (many) {
-@@ -1860,7 +1860,7 @@ Editor::add_region_context_items (AudioStreamView* sv, boost::shared_ptr<Region>
- */
-
- region_menu->signal_map_event().connect (
-- bind (
-+ sigc::bind (
- mem_fun(*this, &Editor::set_selected_regionview_from_map_event),
- sv,
- boost::weak_ptr<Region>(region)
-@@ -1919,7 +1919,7 @@ Editor::add_region_context_items (AudioStreamView* sv, boost::shared_ptr<Region>
- break;
- }
-
-- bbt_glue_item->signal_activate().connect (bind (mem_fun (*this, &Editor::set_region_lock_style), Region::MusicTime));
-+ bbt_glue_item->signal_activate().connect (sigc::bind (mem_fun (*this, &Editor::set_region_lock_style), Region::MusicTime));
-
- items.push_back (CheckMenuElem (_("Mute")));
- CheckMenuItem* region_mute_item = static_cast<CheckMenuItem*>(&items.back());
-@@ -2007,8 +2007,8 @@ Editor::add_region_context_items (AudioStreamView* sv, boost::shared_ptr<Region>
- MenuList& nudge_items = nudge_menu->items();
- nudge_menu->set_name ("ArdourContextMenu");
-
-- nudge_items.push_back (MenuElem (_("Nudge fwd"), (bind (mem_fun(*this, &Editor::nudge_forward), false, false))));
-- nudge_items.push_back (MenuElem (_("Nudge bwd"), (bind (mem_fun(*this, &Editor::nudge_backward), false, false))));
-+ nudge_items.push_back (MenuElem (_("Nudge fwd"), (sigc::bind (mem_fun(*this, &Editor::nudge_forward), false, false))));
-+ nudge_items.push_back (MenuElem (_("Nudge bwd"), (sigc::bind (mem_fun(*this, &Editor::nudge_backward), false, false))));
- nudge_items.push_back (MenuElem (_("Nudge fwd by capture offset"), (mem_fun(*this, &Editor::nudge_forward_capture_offset))));
- nudge_items.push_back (MenuElem (_("Nudge bwd by capture offset"), (mem_fun(*this, &Editor::nudge_backward_capture_offset))));
-
-@@ -2045,8 +2045,8 @@ Editor::add_region_context_items (AudioStreamView* sv, boost::shared_ptr<Region>
- items.push_back (MenuElem (_("Make mono regions"), (mem_fun(*this, &Editor::split_multichannel_region))));
- region_edit_menu_split_multichannel_item = &items.back();
-
-- items.push_back (MenuElem (_("Duplicate"), (bind (mem_fun(*this, &Editor::duplicate_dialog), false))));
-- items.push_back (MenuElem (_("Multi-Duplicate"), (bind (mem_fun(*this, &Editor::duplicate_dialog), true))));
-+ items.push_back (MenuElem (_("Duplicate"), (sigc::bind (mem_fun(*this, &Editor::duplicate_dialog), false))));
-+ items.push_back (MenuElem (_("Multi-Duplicate"), (sigc::bind (mem_fun(*this, &Editor::duplicate_dialog), true))));
- items.push_back (MenuElem (_("Fill Track"), (mem_fun(*this, &Editor::region_fill_track))));
- items.push_back (SeparatorElem());
- items.push_back (MenuElem (_("Remove"), mem_fun(*this, &Editor::remove_region)));
-@@ -2069,7 +2069,7 @@ Editor::add_region_context_items (AudioStreamView* sv, boost::shared_ptr<Region>
-
- edit_items.push_back (MenuElem (menu_item_name, *region_menu));
- if (multiple_region_at_position && (layering_order_editor == 0 || !layering_order_editor->is_visible ())) {
-- edit_items.push_back (MenuElem (_("Choose top region"), (bind (mem_fun(*this, &Editor::change_region_layering_order), position))));
-+ edit_items.push_back (MenuElem (_("Choose top region"), (sigc::bind (mem_fun(*this, &Editor::change_region_layering_order), position))));
- }
- edit_items.push_back (SeparatorElem());
- }
-@@ -2080,10 +2080,10 @@ Editor::add_selection_context_items (Menu_Helpers::MenuList& items)
- using namespace Menu_Helpers;
-
- items.push_back (MenuElem (_("Play range"), mem_fun(*this, &Editor::play_selection)));
-- items.push_back (MenuElem (_("Loop range"), bind (mem_fun(*this, &Editor::set_loop_from_selection), true)));
-+ items.push_back (MenuElem (_("Loop range"), sigc::bind (mem_fun(*this, &Editor::set_loop_from_selection), true)));
-
- items.push_back (SeparatorElem());
-- items.push_back (MenuElem (_("Set loop from selection"), bind (mem_fun(*this, &Editor::set_loop_from_selection), false)));
-+ items.push_back (MenuElem (_("Set loop from selection"), sigc::bind (mem_fun(*this, &Editor::set_loop_from_selection), false)));
- items.push_back (MenuElem (_("Set punch from selection"), mem_fun(*this, &Editor::set_punch_from_selection)));
-
- #ifdef FFT_ANALYSIS
-@@ -2092,8 +2092,8 @@ Editor::add_selection_context_items (Menu_Helpers::MenuList& items)
- #endif
-
- items.push_back (SeparatorElem());
-- items.push_back (MenuElem (_("Extend Range to End of Region"), bind (mem_fun(*this, &Editor::extend_selection_to_end_of_region), false)));
-- items.push_back (MenuElem (_("Extend Range to Start of Region"), bind (mem_fun(*this, &Editor::extend_selection_to_start_of_region), false)));
-+ items.push_back (MenuElem (_("Extend Range to End of Region"), sigc::bind (mem_fun(*this, &Editor::extend_selection_to_end_of_region), false)));
-+ items.push_back (MenuElem (_("Extend Range to Start of Region"), sigc::bind (mem_fun(*this, &Editor::extend_selection_to_start_of_region), false)));
-
- items.push_back (SeparatorElem());
- items.push_back (MenuElem (_("Convert to region in-place"), mem_fun(*this, &Editor::separate_region_from_selection)));
-@@ -2107,13 +2107,13 @@ Editor::add_selection_context_items (Menu_Helpers::MenuList& items)
- items.push_back (SeparatorElem());
- items.push_back (MenuElem (_("Crop region to range"), mem_fun(*this, &Editor::crop_region_to_selection)));
- items.push_back (MenuElem (_("Fill range with region"), mem_fun(*this, &Editor::region_fill_selection)));
-- items.push_back (MenuElem (_("Duplicate range"), bind (mem_fun(*this, &Editor::duplicate_dialog), false)));
-+ items.push_back (MenuElem (_("Duplicate range"), sigc::bind (mem_fun(*this, &Editor::duplicate_dialog), false)));
- items.push_back (MenuElem (_("Create chunk from range"), mem_fun(*this, &Editor::create_named_selection)));
- items.push_back (SeparatorElem());
-- items.push_back (MenuElem (_("Consolidate range"), bind (mem_fun(*this, &Editor::bounce_range_selection), true, false)));
-- items.push_back (MenuElem (_("Consolidate range with processing"), bind (mem_fun(*this, &Editor::bounce_range_selection), true, true)));
-- items.push_back (MenuElem (_("Bounce range to region list"), bind (mem_fun(*this, &Editor::bounce_range_selection), false, false)));
-- items.push_back (MenuElem (_("Bounce range to region list with processing"), bind (mem_fun(*this, &Editor::bounce_range_selection), false, true)));
-+ items.push_back (MenuElem (_("Consolidate range"), sigc::bind (mem_fun(*this, &Editor::bounce_range_selection), true, false)));
-+ items.push_back (MenuElem (_("Consolidate range with processing"), sigc::bind (mem_fun(*this, &Editor::bounce_range_selection), true, true)));
-+ items.push_back (MenuElem (_("Bounce range to region list"), sigc::bind (mem_fun(*this, &Editor::bounce_range_selection), false, false)));
-+ items.push_back (MenuElem (_("Bounce range to region list with processing"), sigc::bind (mem_fun(*this, &Editor::bounce_range_selection), false, true)));
- items.push_back (MenuElem (_("Export range"), mem_fun(*this, &Editor::export_selection)));
- }
-
-@@ -2142,20 +2142,20 @@ Editor::add_dstream_context_items (Menu_Helpers::MenuList& edit_items)
- MenuList& select_items = select_menu->items();
- select_menu->set_name ("ArdourContextMenu");
-
-- select_items.push_back (MenuElem (_("Select All in track"), bind (mem_fun(*this, &Editor::select_all_in_track), Selection::Set)));
-- select_items.push_back (MenuElem (_("Select All"), bind (mem_fun(*this, &Editor::select_all), Selection::Set)));
-+ select_items.push_back (MenuElem (_("Select All in track"), sigc::bind (mem_fun(*this, &Editor::select_all_in_track), Selection::Set)));
-+ select_items.push_back (MenuElem (_("Select All"), sigc::bind (mem_fun(*this, &Editor::select_all), Selection::Set)));
- select_items.push_back (MenuElem (_("Invert selection in track"), mem_fun(*this, &Editor::invert_selection_in_track)));
- select_items.push_back (MenuElem (_("Invert selection"), mem_fun(*this, &Editor::invert_selection)));
- select_items.push_back (SeparatorElem());
- select_items.push_back (MenuElem (_("Set range to loop range"), mem_fun(*this, &Editor::set_selection_from_loop)));
- select_items.push_back (MenuElem (_("Set range to punch range"), mem_fun(*this, &Editor::set_selection_from_punch)));
- select_items.push_back (SeparatorElem());
-- select_items.push_back (MenuElem (_("Select All After Edit Point"), bind (mem_fun(*this, &Editor::select_all_selectables_using_edit), true)));
-- select_items.push_back (MenuElem (_("Select All Before Edit Point"), bind (mem_fun(*this, &Editor::select_all_selectables_using_edit), false)));
-- select_items.push_back (MenuElem (_("Select All After Playhead"), bind (mem_fun(*this, &Editor::select_all_selectables_using_cursor), playhead_cursor, true)));
-- select_items.push_back (MenuElem (_("Select All Before Playhead"), bind (mem_fun(*this, &Editor::select_all_selectables_using_cursor), playhead_cursor, false)));
-- select_items.push_back (MenuElem (_("Select All Between Playhead & Edit Point"), bind (mem_fun(*this, &Editor::select_all_selectables_between), false)));
-- select_items.push_back (MenuElem (_("Select All Within Playhead & Edit Point"), bind (mem_fun(*this, &Editor::select_all_selectables_between), true)));
-+ select_items.push_back (MenuElem (_("Select All After Edit Point"), sigc::bind (mem_fun(*this, &Editor::select_all_selectables_using_edit), true)));
-+ select_items.push_back (MenuElem (_("Select All Before Edit Point"), sigc::bind (mem_fun(*this, &Editor::select_all_selectables_using_edit), false)));
-+ select_items.push_back (MenuElem (_("Select All After Playhead"), sigc::bind (mem_fun(*this, &Editor::select_all_selectables_using_cursor), playhead_cursor, true)));
-+ select_items.push_back (MenuElem (_("Select All Before Playhead"), sigc::bind (mem_fun(*this, &Editor::select_all_selectables_using_cursor), playhead_cursor, false)));
-+ select_items.push_back (MenuElem (_("Select All Between Playhead & Edit Point"), sigc::bind (mem_fun(*this, &Editor::select_all_selectables_between), false)));
-+ select_items.push_back (MenuElem (_("Select All Within Playhead & Edit Point"), sigc::bind (mem_fun(*this, &Editor::select_all_selectables_between), true)));
- select_items.push_back (MenuElem (_("Select Range Between Playhead & Edit Point"), mem_fun(*this, &Editor::select_range_between)));
-
- select_items.push_back (SeparatorElem());
-@@ -2170,24 +2170,24 @@ Editor::add_dstream_context_items (Menu_Helpers::MenuList& edit_items)
-
- cutnpaste_items.push_back (MenuElem (_("Cut"), mem_fun(*this, &Editor::cut)));
- cutnpaste_items.push_back (MenuElem (_("Copy"), mem_fun(*this, &Editor::copy)));
-- cutnpaste_items.push_back (MenuElem (_("Paste"), bind (mem_fun(*this, &Editor::paste), 1.0f)));
-+ cutnpaste_items.push_back (MenuElem (_("Paste"), sigc::bind (mem_fun(*this, &Editor::paste), 1.0f)));
-
- cutnpaste_items.push_back (SeparatorElem());
-
-- cutnpaste_items.push_back (MenuElem (_("Align"), bind (mem_fun(*this, &Editor::align), ARDOUR::SyncPoint)));
-- cutnpaste_items.push_back (MenuElem (_("Align Relative"), bind (mem_fun(*this, &Editor::align_relative), ARDOUR::SyncPoint)));
-+ cutnpaste_items.push_back (MenuElem (_("Align"), sigc::bind (mem_fun(*this, &Editor::align), ARDOUR::SyncPoint)));
-+ cutnpaste_items.push_back (MenuElem (_("Align Relative"), sigc::bind (mem_fun(*this, &Editor::align_relative), ARDOUR::SyncPoint)));
-
- cutnpaste_items.push_back (SeparatorElem());
-
-- cutnpaste_items.push_back (MenuElem (_("Insert chunk"), bind (mem_fun(*this, &Editor::paste_named_selection), 1.0f)));
-+ cutnpaste_items.push_back (MenuElem (_("Insert chunk"), sigc::bind (mem_fun(*this, &Editor::paste_named_selection), 1.0f)));
-
- edit_items.push_back (MenuElem (_("Edit"), *cutnpaste_menu));
-
- /* Adding new material */
-
- edit_items.push_back (SeparatorElem());
-- edit_items.push_back (MenuElem (_("Insert Selected Region"), bind (mem_fun(*this, &Editor::insert_region_list_selection), 1.0f)));
-- edit_items.push_back (MenuElem (_("Insert Existing Audio"), bind (mem_fun(*this, &Editor::add_external_audio_action), ImportToTrack)));
-+ edit_items.push_back (MenuElem (_("Insert Selected Region"), sigc::bind (mem_fun(*this, &Editor::insert_region_list_selection), 1.0f)));
-+ edit_items.push_back (MenuElem (_("Insert Existing Audio"), sigc::bind (mem_fun(*this, &Editor::add_external_audio_action), ImportToTrack)));
-
- /* Nudge track */
-
-@@ -2196,10 +2196,10 @@ Editor::add_dstream_context_items (Menu_Helpers::MenuList& edit_items)
- nudge_menu->set_name ("ArdourContextMenu");
-
- edit_items.push_back (SeparatorElem());
-- nudge_items.push_back (MenuElem (_("Nudge entire track fwd"), (bind (mem_fun(*this, &Editor::nudge_track), false, true))));
-- nudge_items.push_back (MenuElem (_("Nudge track after edit point fwd"), (bind (mem_fun(*this, &Editor::nudge_track), true, true))));
-- nudge_items.push_back (MenuElem (_("Nudge entire track bwd"), (bind (mem_fun(*this, &Editor::nudge_track), false, false))));
-- nudge_items.push_back (MenuElem (_("Nudge track after edit point bwd"), (bind (mem_fun(*this, &Editor::nudge_track), true, false))));
-+ nudge_items.push_back (MenuElem (_("Nudge entire track fwd"), (sigc::bind (mem_fun(*this, &Editor::nudge_track), false, true))));
-+ nudge_items.push_back (MenuElem (_("Nudge track after edit point fwd"), (sigc::bind (mem_fun(*this, &Editor::nudge_track), true, true))));
-+ nudge_items.push_back (MenuElem (_("Nudge entire track bwd"), (sigc::bind (mem_fun(*this, &Editor::nudge_track), false, false))));
-+ nudge_items.push_back (MenuElem (_("Nudge track after edit point bwd"), (sigc::bind (mem_fun(*this, &Editor::nudge_track), true, false))));
-
- edit_items.push_back (MenuElem (_("Nudge"), *nudge_menu));
- }
-@@ -2225,15 +2225,15 @@ Editor::add_bus_context_items (Menu_Helpers::MenuList& edit_items)
- MenuList& select_items = select_menu->items();
- select_menu->set_name ("ArdourContextMenu");
-
-- select_items.push_back (MenuElem (_("Select All in track"), bind (mem_fun(*this, &Editor::select_all_in_track), Selection::Set)));
-- select_items.push_back (MenuElem (_("Select All"), bind (mem_fun(*this, &Editor::select_all), Selection::Set)));
-+ select_items.push_back (MenuElem (_("Select All in track"), sigc::bind (mem_fun(*this, &Editor::select_all_in_track), Selection::Set)));
-+ select_items.push_back (MenuElem (_("Select All"), sigc::bind (mem_fun(*this, &Editor::select_all), Selection::Set)));
- select_items.push_back (MenuElem (_("Invert selection in track"), mem_fun(*this, &Editor::invert_selection_in_track)));
- select_items.push_back (MenuElem (_("Invert selection"), mem_fun(*this, &Editor::invert_selection)));
- select_items.push_back (SeparatorElem());
-- select_items.push_back (MenuElem (_("Select all after edit point"), bind (mem_fun(*this, &Editor::select_all_selectables_using_edit), true)));
-- select_items.push_back (MenuElem (_("Select all before edit point"), bind (mem_fun(*this, &Editor::select_all_selectables_using_edit), false)));
-- select_items.push_back (MenuElem (_("Select all after playhead"), bind (mem_fun(*this, &Editor::select_all_selectables_using_cursor), playhead_cursor, true)));
-- select_items.push_back (MenuElem (_("Select all before playhead"), bind (mem_fun(*this, &Editor::select_all_selectables_using_cursor), playhead_cursor, false)));
-+ select_items.push_back (MenuElem (_("Select all after edit point"), sigc::bind (mem_fun(*this, &Editor::select_all_selectables_using_edit), true)));
-+ select_items.push_back (MenuElem (_("Select all before edit point"), sigc::bind (mem_fun(*this, &Editor::select_all_selectables_using_edit), false)));
-+ select_items.push_back (MenuElem (_("Select all after playhead"), sigc::bind (mem_fun(*this, &Editor::select_all_selectables_using_cursor), playhead_cursor, true)));
-+ select_items.push_back (MenuElem (_("Select all before playhead"), sigc::bind (mem_fun(*this, &Editor::select_all_selectables_using_cursor), playhead_cursor, false)));
-
- edit_items.push_back (MenuElem (_("Select"), *select_menu));
-
-@@ -2245,17 +2245,17 @@ Editor::add_bus_context_items (Menu_Helpers::MenuList& edit_items)
-
- cutnpaste_items.push_back (MenuElem (_("Cut"), mem_fun(*this, &Editor::cut)));
- cutnpaste_items.push_back (MenuElem (_("Copy"), mem_fun(*this, &Editor::copy)));
-- cutnpaste_items.push_back (MenuElem (_("Paste"), bind (mem_fun(*this, &Editor::paste), 1.0f)));
-+ cutnpaste_items.push_back (MenuElem (_("Paste"), sigc::bind (mem_fun(*this, &Editor::paste), 1.0f)));
-
- Menu *nudge_menu = manage (new Menu());
- MenuList& nudge_items = nudge_menu->items();
- nudge_menu->set_name ("ArdourContextMenu");
-
- edit_items.push_back (SeparatorElem());
-- nudge_items.push_back (MenuElem (_("Nudge entire track fwd"), (bind (mem_fun(*this, &Editor::nudge_track), false, true))));
-- nudge_items.push_back (MenuElem (_("Nudge track after edit point fwd"), (bind (mem_fun(*this, &Editor::nudge_track), true, true))));
-- nudge_items.push_back (MenuElem (_("Nudge entire track bwd"), (bind (mem_fun(*this, &Editor::nudge_track), false, false))));
-- nudge_items.push_back (MenuElem (_("Nudge track after edit point bwd"), (bind (mem_fun(*this, &Editor::nudge_track), true, false))));
-+ nudge_items.push_back (MenuElem (_("Nudge entire track fwd"), (sigc::bind (mem_fun(*this, &Editor::nudge_track), false, true))));
-+ nudge_items.push_back (MenuElem (_("Nudge track after edit point fwd"), (sigc::bind (mem_fun(*this, &Editor::nudge_track), true, true))));
-+ nudge_items.push_back (MenuElem (_("Nudge entire track bwd"), (sigc::bind (mem_fun(*this, &Editor::nudge_track), false, false))));
-+ nudge_items.push_back (MenuElem (_("Nudge track after edit point bwd"), (sigc::bind (mem_fun(*this, &Editor::nudge_track), true, false))));
-
- edit_items.push_back (MenuElem (_("Nudge"), *nudge_menu));
- }
-@@ -2972,19 +2972,19 @@ Editor::setup_toolbar ()
-
- mouse_mode_tearoff = manage (new TearOff (*mode_box));
- mouse_mode_tearoff->set_name ("MouseModeBase");
-- mouse_mode_tearoff->tearoff_window().signal_key_press_event().connect (bind (sigc::ptr_fun (relay_key_press), &mouse_mode_tearoff->tearoff_window()));
-+ mouse_mode_tearoff->tearoff_window().signal_key_press_event().connect (sigc::bind (sigc::ptr_fun (relay_key_press), &mouse_mode_tearoff->tearoff_window()));
-
- if (Profile->get_sae()) {
- mouse_mode_tearoff->set_can_be_torn_off (false);
- }
-
-- mouse_mode_tearoff->Detach.connect (bind (mem_fun(*this, &Editor::detach_tearoff), static_cast<Box*>(&toolbar_hbox),
-+ mouse_mode_tearoff->Detach.connect (sigc::bind (mem_fun(*this, &Editor::detach_tearoff), static_cast<Box*>(&toolbar_hbox),
- &mouse_mode_tearoff->tearoff_window()));
-- mouse_mode_tearoff->Attach.connect (bind (mem_fun(*this, &Editor::reattach_tearoff), static_cast<Box*> (&toolbar_hbox),
-+ mouse_mode_tearoff->Attach.connect (sigc::bind (mem_fun(*this, &Editor::reattach_tearoff), static_cast<Box*> (&toolbar_hbox),
- &mouse_mode_tearoff->tearoff_window(), 1));
-- mouse_mode_tearoff->Hidden.connect (bind (mem_fun(*this, &Editor::detach_tearoff), static_cast<Box*>(&toolbar_hbox),
-+ mouse_mode_tearoff->Hidden.connect (sigc::bind (mem_fun(*this, &Editor::detach_tearoff), static_cast<Box*>(&toolbar_hbox),
- &mouse_mode_tearoff->tearoff_window()));
-- mouse_mode_tearoff->Visible.connect (bind (mem_fun(*this, &Editor::reattach_tearoff), static_cast<Box*> (&toolbar_hbox),
-+ mouse_mode_tearoff->Visible.connect (sigc::bind (mem_fun(*this, &Editor::reattach_tearoff), static_cast<Box*> (&toolbar_hbox),
- &mouse_mode_tearoff->tearoff_window(), 1));
-
- mouse_move_button.set_name ("MouseModeButton");
-@@ -3008,14 +3008,14 @@ Editor::setup_toolbar ()
- mouse_timefx_button.unset_flags (CAN_FOCUS);
- mouse_audition_button.unset_flags (CAN_FOCUS);
-
-- mouse_select_button.signal_toggled().connect (bind (mem_fun(*this, &Editor::mouse_mode_toggled), Editing::MouseRange));
-+ mouse_select_button.signal_toggled().connect (sigc::bind (mem_fun(*this, &Editor::mouse_mode_toggled), Editing::MouseRange));
- mouse_select_button.signal_button_release_event().connect (mem_fun(*this, &Editor::mouse_select_button_release));
-
-- mouse_move_button.signal_toggled().connect (bind (mem_fun(*this, &Editor::mouse_mode_toggled), Editing::MouseObject));
-- mouse_gain_button.signal_toggled().connect (bind (mem_fun(*this, &Editor::mouse_mode_toggled), Editing::MouseGain));
-- mouse_zoom_button.signal_toggled().connect (bind (mem_fun(*this, &Editor::mouse_mode_toggled), Editing::MouseZoom));
-- mouse_timefx_button.signal_toggled().connect (bind (mem_fun(*this, &Editor::mouse_mode_toggled), Editing::MouseTimeFX));
-- mouse_audition_button.signal_toggled().connect (bind (mem_fun(*this, &Editor::mouse_mode_toggled), Editing::MouseAudition));
-+ mouse_move_button.signal_toggled().connect (sigc::bind (mem_fun(*this, &Editor::mouse_mode_toggled), Editing::MouseObject));
-+ mouse_gain_button.signal_toggled().connect (sigc::bind (mem_fun(*this, &Editor::mouse_mode_toggled), Editing::MouseGain));
-+ mouse_zoom_button.signal_toggled().connect (sigc::bind (mem_fun(*this, &Editor::mouse_mode_toggled), Editing::MouseZoom));
-+ mouse_timefx_button.signal_toggled().connect (sigc::bind (mem_fun(*this, &Editor::mouse_mode_toggled), Editing::MouseTimeFX));
-+ mouse_audition_button.signal_toggled().connect (sigc::bind (mem_fun(*this, &Editor::mouse_mode_toggled), Editing::MouseAudition));
-
- // mouse_move_button.set_active (true);
-
-@@ -3028,13 +3028,13 @@ Editor::setup_toolbar ()
- zoom_in_button.set_name ("EditorTimeButton");
- zoom_in_button.set_size_request(-1,16);
- zoom_in_button.add (*(manage (new Image (::get_icon("zoom_in")))));
-- zoom_in_button.signal_clicked().connect (bind (mem_fun(*this, &Editor::temporal_zoom_step), false));
-+ zoom_in_button.signal_clicked().connect (sigc::bind (mem_fun(*this, &Editor::temporal_zoom_step), false));
- ARDOUR_UI::instance()->tooltips().set_tip (zoom_in_button, _("Zoom In"));
-
- zoom_out_button.set_name ("EditorTimeButton");
- zoom_out_button.set_size_request(-1,16);
- zoom_out_button.add (*(manage (new Image (::get_icon("zoom_out")))));
-- zoom_out_button.signal_clicked().connect (bind (mem_fun(*this, &Editor::temporal_zoom_step), true));
-+ zoom_out_button.signal_clicked().connect (sigc::bind (mem_fun(*this, &Editor::temporal_zoom_step), true));
- ARDOUR_UI::instance()->tooltips().set_tip (zoom_out_button, _("Zoom Out"));
-
- zoom_out_full_button.set_name ("EditorTimeButton");
-@@ -3099,19 +3099,19 @@ Editor::setup_toolbar ()
-
- tools_tearoff = new TearOff (*hbox);
- tools_tearoff->set_name ("MouseModeBase");
-- tools_tearoff->tearoff_window().signal_key_press_event().connect (bind (sigc::ptr_fun (relay_key_press), &tools_tearoff->tearoff_window()));
-+ tools_tearoff->tearoff_window().signal_key_press_event().connect (sigc::bind (sigc::ptr_fun (relay_key_press), &tools_tearoff->tearoff_window()));
-
- if (Profile->get_sae()) {
- tools_tearoff->set_can_be_torn_off (false);
- }
-
-- tools_tearoff->Detach.connect (bind (mem_fun(*this, &Editor::detach_tearoff), static_cast<Box*>(&toolbar_hbox),
-+ tools_tearoff->Detach.connect (sigc::bind (mem_fun(*this, &Editor::detach_tearoff), static_cast<Box*>(&toolbar_hbox),
- &tools_tearoff->tearoff_window()));
-- tools_tearoff->Attach.connect (bind (mem_fun(*this, &Editor::reattach_tearoff), static_cast<Box*> (&toolbar_hbox),
-+ tools_tearoff->Attach.connect (sigc::bind (mem_fun(*this, &Editor::reattach_tearoff), static_cast<Box*> (&toolbar_hbox),
- &tools_tearoff->tearoff_window(), 0));
-- tools_tearoff->Hidden.connect (bind (mem_fun(*this, &Editor::detach_tearoff), static_cast<Box*>(&toolbar_hbox),
-+ tools_tearoff->Hidden.connect (sigc::bind (mem_fun(*this, &Editor::detach_tearoff), static_cast<Box*>(&toolbar_hbox),
- &tools_tearoff->tearoff_window()));
-- tools_tearoff->Visible.connect (bind (mem_fun(*this, &Editor::reattach_tearoff), static_cast<Box*> (&toolbar_hbox),
-+ tools_tearoff->Visible.connect (sigc::bind (mem_fun(*this, &Editor::reattach_tearoff), static_cast<Box*> (&toolbar_hbox),
- &tools_tearoff->tearoff_window(), 0));
-
- toolbar_hbox.set_spacing (10);
-@@ -3283,7 +3283,7 @@ Editor::get_memento () const
- State *state = new State;
-
- store_state (*state);
-- return bind (mem_fun (*(const_cast<Editor*>(this)), &Editor::restore_state), state);
-+ return sigc::bind (mem_fun (*(const_cast<Editor*>(this)), &Editor::restore_state), state);
- }
-
- void
-@@ -3960,7 +3960,7 @@ Editor::get_nudge_distance (nframes64_t pos, nframes64_t& next)
- void
- Editor::end_location_changed (Location* location)
- {
-- ENSURE_GUI_THREAD (bind (mem_fun(*this, &Editor::end_location_changed), location));
-+ ENSURE_GUI_THREAD (sigc::bind (mem_fun(*this, &Editor::end_location_changed), location));
- //reset_scrolling_region ();
- nframes64_t session_span = location->start() + (nframes64_t) floorf (current_page_frames() * 0.10f);
- horizontal_adjustment.set_upper (session_span / frames_per_unit);
-@@ -4137,12 +4137,12 @@ Editor::popup_snapshot_context_menu (int button, int32_t time, string snapshot_n
-
- const bool modification_allowed = (session->snap_name() != snapshot_name && session->name() != snapshot_name);
-
-- items.push_back (MenuElem (_("Remove"), bind (mem_fun (*this, &Editor::remove_snapshot), snapshot_name)));
-+ items.push_back (MenuElem (_("Remove"), sigc::bind (mem_fun (*this, &Editor::remove_snapshot), snapshot_name)));
- if (!modification_allowed) {
- items.back().set_sensitive (false);
- }
-
-- items.push_back (MenuElem (_("Rename"), bind (mem_fun (*this, &Editor::rename_snapshot), snapshot_name)));
-+ items.push_back (MenuElem (_("Rename"), sigc::bind (mem_fun (*this, &Editor::rename_snapshot), snapshot_name)));
- if (!modification_allowed) {
- items.back().set_sensitive (false);
- }
-@@ -4230,7 +4230,7 @@ Editor::redisplay_snapshots ()
- void
- Editor::session_state_saved (string snap_name)
- {
-- ENSURE_GUI_THREAD (bind (mem_fun(*this, &Editor::session_state_saved), snap_name));
-+ ENSURE_GUI_THREAD (sigc::bind (mem_fun(*this, &Editor::session_state_saved), snap_name));
- redisplay_snapshots ();
- }
-
-@@ -4289,7 +4289,7 @@ Editor::new_playlists (TimeAxisView* v)
- begin_reversible_command (_("new playlists"));
- vector<boost::shared_ptr<ARDOUR::Playlist> > playlists;
- session->get_playlists(playlists);
-- mapover_audio_tracks ( bind(mem_fun (*this, &Editor::mapped_use_new_playlist), playlists), v );
-+ mapover_audio_tracks ( sigc::bind(mem_fun (*this, &Editor::mapped_use_new_playlist), playlists), v );
- commit_reversible_command ();
- }
-
-@@ -4306,7 +4306,7 @@ Editor::copy_playlists (TimeAxisView* v)
- begin_reversible_command (_("copy playlists"));
- vector<boost::shared_ptr<ARDOUR::Playlist> > playlists;
- session->get_playlists(playlists);
-- mapover_audio_tracks ( bind(mem_fun (*this, &Editor::mapped_use_copy_playlist), playlists), v );
-+ mapover_audio_tracks ( sigc::bind(mem_fun (*this, &Editor::mapped_use_copy_playlist), playlists), v );
- commit_reversible_command ();
- }
-
-diff --git a/gtk2_ardour/editor_audio_import.cc b/gtk2_ardour/editor_audio_import.cc
-index 05e31e8..08c6373 100644
---- a/gtk2_ardour/editor_audio_import.cc
-+++ b/gtk2_ardour/editor_audio_import.cc
-@@ -498,7 +498,7 @@ Editor::import_sndfiles (vector<string> paths, ImportMode mode, SrcQuality quali
- import_status.track = track;
- import_status.replace = replace;
- interthread_progress_connection = Glib::signal_timeout().connect
-- (bind (mem_fun(*this, &Editor::import_progress_timeout), (gpointer) 0), 500);
-+ (sigc::bind (mem_fun(*this, &Editor::import_progress_timeout), (gpointer) 0), 500);
-
- track_canvas->get_window()->set_cursor (Gdk::Cursor (Gdk::WATCH));
- gdk_flush ();
-@@ -944,7 +944,7 @@ Editor::import_progress_timeout (void *arg)
-
- interthread_progress_connection.disconnect ();
- interthread_progress_connection = Glib::signal_timeout().connect
-- (bind (mem_fun(*this, &Editor::import_progress_timeout), (gpointer) 0), 100);
-+ (sigc::bind (mem_fun(*this, &Editor::import_progress_timeout), (gpointer) 0), 100);
- return false;
- } else {
- return !(import_status.done || import_status.cancel);
-diff --git a/gtk2_ardour/editor_canvas.cc b/gtk2_ardour/editor_canvas.cc
-index 878e2cd..f384fe7 100644
---- a/gtk2_ardour/editor_canvas.cc
-+++ b/gtk2_ardour/editor_canvas.cc
-@@ -268,7 +268,7 @@ Editor::initialize_canvas ()
- zoom_rect->property_outline_pixels() = 1;
- zoom_rect->hide();
-
-- zoom_rect->signal_event().connect (bind (mem_fun (*this, &Editor::canvas_zoom_rect_event), (ArdourCanvas::Item*) 0));
-+ zoom_rect->signal_event().connect (sigc::bind (mem_fun (*this, &Editor::canvas_zoom_rect_event), (ArdourCanvas::Item*) 0));
-
- // used as rubberband rect
- rubberband_rect = new ArdourCanvas::SimpleRect (*_trackview_group, 0.0, 0.0, 0.0, 0.0);
-@@ -276,12 +276,12 @@ Editor::initialize_canvas ()
- rubberband_rect->property_outline_pixels() = 1;
- rubberband_rect->hide();
-
-- tempo_bar->signal_event().connect (bind (mem_fun (*this, &Editor::canvas_tempo_bar_event), tempo_bar));
-- meter_bar->signal_event().connect (bind (mem_fun (*this, &Editor::canvas_meter_bar_event), meter_bar));
-- marker_bar->signal_event().connect (bind (mem_fun (*this, &Editor::canvas_marker_bar_event), marker_bar));
-- cd_marker_bar->signal_event().connect (bind (mem_fun (*this, &Editor::canvas_cd_marker_bar_event), cd_marker_bar));
-- range_marker_bar->signal_event().connect (bind (mem_fun (*this, &Editor::canvas_range_marker_bar_event), range_marker_bar));
-- transport_marker_bar->signal_event().connect (bind (mem_fun (*this, &Editor::canvas_transport_marker_bar_event), transport_marker_bar));
-+ tempo_bar->signal_event().connect (sigc::bind (mem_fun (*this, &Editor::canvas_tempo_bar_event), tempo_bar));
-+ meter_bar->signal_event().connect (sigc::bind (mem_fun (*this, &Editor::canvas_meter_bar_event), meter_bar));
-+ marker_bar->signal_event().connect (sigc::bind (mem_fun (*this, &Editor::canvas_marker_bar_event), marker_bar));
-+ cd_marker_bar->signal_event().connect (sigc::bind (mem_fun (*this, &Editor::canvas_cd_marker_bar_event), cd_marker_bar));
-+ range_marker_bar->signal_event().connect (sigc::bind (mem_fun (*this, &Editor::canvas_range_marker_bar_event), range_marker_bar));
-+ transport_marker_bar->signal_event().connect (sigc::bind (mem_fun (*this, &Editor::canvas_transport_marker_bar_event), transport_marker_bar));
-
- playhead_cursor = new Cursor (*this, &Editor::canvas_playhead_cursor_event);
-
-@@ -518,7 +518,7 @@ Editor::drop_paths (const RefPtr<Gdk::DragContext>& context,
- the main event loop with GTK/Quartz. Since import/embed wants
- to push up a progress dialog, defer all this till we go idle.
- */
-- Glib::signal_idle().connect (bind (mem_fun (*this, &Editor::idle_drop_paths), paths, frame, cy));
-+ Glib::signal_idle().connect (sigc::bind (mem_fun (*this, &Editor::idle_drop_paths), paths, frame, cy));
- #else
- drop_paths_part_two (paths, frame, cy);
- #endif
-diff --git a/gtk2_ardour/editor_markers.cc b/gtk2_ardour/editor_markers.cc
-index 80c8b34..b47a3d3 100644
---- a/gtk2_ardour/editor_markers.cc
-+++ b/gtk2_ardour/editor_markers.cc
-@@ -59,7 +59,7 @@ Editor::clear_marker_display ()
- void
- Editor::add_new_location (Location *location)
- {
-- ENSURE_GUI_THREAD (bind (mem_fun(*this, &Editor::add_new_location), location));
-+ ENSURE_GUI_THREAD (sigc::bind (mem_fun(*this, &Editor::add_new_location), location));
-
- LocationMarkers *lam = new LocationMarkers;
- uint32_t color;
-@@ -145,7 +145,7 @@ Editor::add_new_location (Location *location)
- void
- Editor::location_changed (Location *location)
- {
-- ENSURE_GUI_THREAD (bind (mem_fun(*this, &Editor::location_changed), location));
-+ ENSURE_GUI_THREAD (sigc::bind (mem_fun(*this, &Editor::location_changed), location));
-
- LocationMarkers *lam = find_location_markers (location);
-
-@@ -167,7 +167,7 @@ Editor::location_changed (Location *location)
- void
- Editor::location_flags_changed (Location *location, void *src)
- {
-- ENSURE_GUI_THREAD(bind (mem_fun(*this, &Editor::location_flags_changed), location, src));
-+ ENSURE_GUI_THREAD(sigc::bind (mem_fun(*this, &Editor::location_flags_changed), location, src));
-
- LocationMarkers *lam = find_location_markers (location);
-
-@@ -345,7 +345,7 @@ Editor::refresh_location_display ()
- void
- Editor::refresh_location_display_s (Change ignored)
- {
-- ENSURE_GUI_THREAD(bind (mem_fun(*this, &Editor::refresh_location_display_s), ignored));
-+ ENSURE_GUI_THREAD(sigc::bind (mem_fun(*this, &Editor::refresh_location_display_s), ignored));
-
- if (session) {
- session->locations()->apply (*this, &Editor::refresh_location_display_internal);
-@@ -442,7 +442,7 @@ Editor::remove_marker (ArdourCanvas::Item& item, GdkEvent* event)
- Location* loc = find_location_from_marker (marker, is_start);
-
- if (session && loc) {
-- Glib::signal_idle().connect (bind (mem_fun(*this, &Editor::really_remove_marker), loc));
-+ Glib::signal_idle().connect (sigc::bind (mem_fun(*this, &Editor::really_remove_marker), loc));
- }
- }
-
-@@ -461,7 +461,7 @@ Editor::really_remove_marker (Location* loc)
- void
- Editor::location_gone (Location *location)
- {
-- ENSURE_GUI_THREAD(bind (mem_fun(*this, &Editor::location_gone), location));
-+ ENSURE_GUI_THREAD(sigc::bind (mem_fun(*this, &Editor::location_gone), location));
-
- LocationMarkerMap::iterator i;
-
-@@ -601,8 +601,8 @@ Editor::build_marker_menu (bool start_or_end)
- items.push_back (MenuElem (_("Hide"), mem_fun(*this, &Editor::marker_menu_hide)));
- if (start_or_end) return;
- items.push_back (MenuElem (_("Rename"), mem_fun(*this, &Editor::marker_menu_rename)));
-- items.push_back (MenuElem (_("Lock"), bind (mem_fun(*this, &Editor::marker_menu_lock), true)));
-- items.push_back (MenuElem (_("Unlock"), bind (mem_fun(*this, &Editor::marker_menu_lock), false)));
-+ items.push_back (MenuElem (_("Lock"), sigc::bind (mem_fun(*this, &Editor::marker_menu_lock), true)));
-+ items.push_back (MenuElem (_("Unlock"), sigc::bind (mem_fun(*this, &Editor::marker_menu_lock), false)));
-
- items.push_back (SeparatorElem());
-
-diff --git a/gtk2_ardour/editor_ops.cc b/gtk2_ardour/editor_ops.cc
-index 9fc77dd..3a470ab 100644
---- a/gtk2_ardour/editor_ops.cc
-+++ b/gtk2_ardour/editor_ops.cc
-@@ -1580,7 +1580,7 @@ Editor::scroll_tracks_up_line ()
- void
- Editor::temporal_zoom_step (bool coarser)
- {
-- ENSURE_GUI_THREAD (bind (mem_fun (*this, &Editor::temporal_zoom_step), coarser));
-+ ENSURE_GUI_THREAD (sigc::bind (mem_fun (*this, &Editor::temporal_zoom_step), coarser));
-
- double nfpu;
-
-@@ -1890,8 +1890,8 @@ Editor::temporal_zoom_to_frame (bool coarser, nframes64_t frame)
- new_leftmost = 0;
- }
- // begin_reversible_command (_("zoom to frame"));
--// session->add_undo (bind (mem_fun(*this, &Editor::reposition_and_zoom), leftmost_frame, frames_per_unit));
--// session->add_redo (bind (mem_fun(*this, &Editor::reposition_and_zoom), new_leftmost, new_fpu));
-+// session->add_undo (sigc::bind (mem_fun(*this, &Editor::reposition_and_zoom), leftmost_frame, frames_per_unit));
-+// session->add_redo (sigc::bind (mem_fun(*this, &Editor::reposition_and_zoom), new_leftmost, new_fpu));
- // commit_reversible_command ();
-
- reposition_and_zoom (new_leftmost, new_fpu);
-@@ -2536,7 +2536,7 @@ Editor::rename_region()
- entry.set_text (rs.front()->region()->name());
- entry.select_region (0, -1);
-
-- entry.signal_activate().connect (bind (mem_fun (d, &Dialog::response), RESPONSE_OK));
-+ entry.signal_activate().connect (sigc::bind (mem_fun (d, &Dialog::response), RESPONSE_OK));
-
- d.show_all ();
-
-@@ -2851,7 +2851,7 @@ Editor::separate_regions_between (const TimeSelection& ts)
-
- got_some = true;
-
-- atv->view()->foreach_regionview (bind (sigc::ptr_fun (add_if_covered), &(*t), &new_selection));
-+ atv->view()->foreach_regionview (sigc::bind (sigc::ptr_fun (add_if_covered), &(*t), &new_selection));
-
- if (!in_command) {
- begin_reversible_command (_("separate"));
-@@ -3578,7 +3578,7 @@ Editor::freeze_route ()
- current_interthread_info = &itt;
-
- interthread_progress_connection =
-- Glib::signal_timeout().connect (bind (mem_fun(*this, &Editor::freeze_progress_timeout), (gpointer) 0), 100);
-+ Glib::signal_timeout().connect (sigc::bind (mem_fun(*this, &Editor::freeze_progress_timeout), (gpointer) 0), 100);
-
- itt.done = false;
- itt.cancel = false;
-@@ -3710,7 +3710,7 @@ Editor::cut_copy (CutCopyOp op)
- Location* loc = find_location_from_marker (entered_marker, ignored);
-
- if (session && loc) {
-- Glib::signal_idle().connect (bind (mem_fun(*this, &Editor::really_remove_marker), loc));
-+ Glib::signal_idle().connect (sigc::bind (mem_fun(*this, &Editor::really_remove_marker), loc));
- }
-
- break_drag ();
-diff --git a/gtk2_ardour/editor_selection.cc b/gtk2_ardour/editor_selection.cc
-index 1c0469c..45e19c1 100644
---- a/gtk2_ardour/editor_selection.cc
-+++ b/gtk2_ardour/editor_selection.cc
-@@ -440,7 +440,7 @@ Editor::mapped_get_equivalent_regions (RouteTimeAxisView& tv, uint32_t ignored,
- void
- Editor::get_equivalent_regions (RegionView* basis, vector<RegionView*>& equivalent_regions)
- {
-- mapover_audio_tracks (bind (mem_fun (*this, &Editor::mapped_get_equivalent_regions), basis, &equivalent_regions), &basis->get_trackview());
-+ mapover_audio_tracks (sigc::bind (mem_fun (*this, &Editor::mapped_get_equivalent_regions), basis, &equivalent_regions), &basis->get_trackview());
-
- /* add clicked regionview since we skipped all other regions in the same track as the one it was in */
-
-diff --git a/gtk2_ardour/generic_pluginui.cc b/gtk2_ardour/generic_pluginui.cc
-index 8642d1f..9b5d998 100644
---- a/gtk2_ardour/generic_pluginui.cc
-+++ b/gtk2_ardour/generic_pluginui.cc
-@@ -404,8 +404,8 @@ GenericPluginUI::build_control_ui (guint32 port_index, PBD::Controllable* mcontr
- control_ui->combo = new Gtk::ComboBoxText;
- //control_ui->combo->set_value_in_list(true, false);
- set_popdown_strings (*control_ui->combo, setup_scale_values(port_index, control_ui));
-- control_ui->combo->signal_changed().connect (bind (mem_fun(*this, &GenericPluginUI::control_combo_changed), control_ui));
-- plugin->ParameterChanged.connect (bind (mem_fun (*this, &GenericPluginUI::parameter_changed), control_ui));
-+ control_ui->combo->signal_changed().connect (sigc::bind (mem_fun(*this, &GenericPluginUI::control_combo_changed), control_ui));
-+ plugin->ParameterChanged.connect (sigc::bind (mem_fun (*this, &GenericPluginUI::parameter_changed), control_ui));
- control_ui->pack_start(control_ui->label, true, true);
- control_ui->pack_start(*control_ui->combo, false, true);
-
-@@ -425,8 +425,8 @@ GenericPluginUI::build_control_ui (guint32 port_index, PBD::Controllable* mcontr
- control_ui->combo = new Gtk::ComboBoxText;
- //control_ui->combo->set_value_in_list(true, false);
- set_popdown_strings (*control_ui->combo, setup_scale_values(port_index, control_ui));
-- control_ui->combo->signal_changed().connect (bind (mem_fun(*this, &GenericPluginUI::control_combo_changed), control_ui));
-- plugin->ParameterChanged.connect (bind (mem_fun (*this, &GenericPluginUI::parameter_changed), control_ui));
-+ control_ui->combo->signal_changed().connect (sigc::bind (mem_fun(*this, &GenericPluginUI::control_combo_changed), control_ui));
-+ plugin->ParameterChanged.connect (sigc::bind (mem_fun (*this, &GenericPluginUI::parameter_changed), control_ui));
- control_ui->pack_start(control_ui->label, true, true);
- control_ui->pack_start(*control_ui->combo, false, true);
-
-@@ -454,14 +454,14 @@ GenericPluginUI::build_control_ui (guint32 port_index, PBD::Controllable* mcontr
- control_ui->button->set_active(true);
- }
-
-- control_ui->button->signal_clicked().connect (bind (mem_fun(*this, &GenericPluginUI::control_port_toggled), control_ui));
-+ control_ui->button->signal_clicked().connect (sigc::bind (mem_fun(*this, &GenericPluginUI::control_port_toggled), control_ui));
-
-- plugin->ParameterChanged.connect (bind (mem_fun(*this, &GenericPluginUI::toggle_parameter_changed), control_ui));
-+ plugin->ParameterChanged.connect (sigc::bind (mem_fun(*this, &GenericPluginUI::toggle_parameter_changed), control_ui));
-
-- control_ui->automate_button.signal_clicked().connect (bind (mem_fun(*this, &GenericPluginUI::astate_clicked), control_ui, (uint32_t) port_index));
-+ control_ui->automate_button.signal_clicked().connect (sigc::bind (mem_fun(*this, &GenericPluginUI::astate_clicked), control_ui, (uint32_t) port_index));
- automation_state_changed (control_ui);
- insert->automation_list (port_index).automation_state_changed.connect
-- (bind (mem_fun(*this, &GenericPluginUI::automation_state_changed), control_ui));
-+ (sigc::bind (mem_fun(*this, &GenericPluginUI::automation_state_changed), control_ui));
-
- return control_ui;
- }
-@@ -501,8 +501,8 @@ GenericPluginUI::build_control_ui (guint32 port_index, PBD::Controllable* mcontr
- control_ui->control->set_use_parent (true);
- control_ui->control->set_logarithmic (control_ui->logarithmic);
-
-- control_ui->control->StartGesture.connect (bind (mem_fun(*this, &GenericPluginUI::start_touch), control_ui));
-- control_ui->control->StopGesture.connect (bind (mem_fun(*this, &GenericPluginUI::stop_touch), control_ui));
-+ control_ui->control->StartGesture.connect (sigc::bind (mem_fun(*this, &GenericPluginUI::start_touch), control_ui));
-+ control_ui->control->StopGesture.connect (sigc::bind (mem_fun(*this, &GenericPluginUI::stop_touch), control_ui));
-
- }
-
-@@ -525,14 +525,14 @@ GenericPluginUI::build_control_ui (guint32 port_index, PBD::Controllable* mcontr
- }
-
- control_ui->pack_start (control_ui->automate_button, false, false);
-- control_ui->adjustment->signal_value_changed().connect (bind (mem_fun(*this, &GenericPluginUI::control_adjustment_changed), control_ui));
-- control_ui->automate_button.signal_clicked().connect (bind (mem_fun(*this, &GenericPluginUI::astate_clicked), control_ui, (uint32_t) port_index));
-+ control_ui->adjustment->signal_value_changed().connect (sigc::bind (mem_fun(*this, &GenericPluginUI::control_adjustment_changed), control_ui));
-+ control_ui->automate_button.signal_clicked().connect (sigc::bind (mem_fun(*this, &GenericPluginUI::astate_clicked), control_ui, (uint32_t) port_index));
-
- automation_state_changed (control_ui);
-
-- plugin->ParameterChanged.connect (bind (mem_fun(*this, &GenericPluginUI::parameter_changed), control_ui));
-+ plugin->ParameterChanged.connect (sigc::bind (mem_fun(*this, &GenericPluginUI::parameter_changed), control_ui));
- insert->automation_list (port_index).automation_state_changed.connect
-- (bind (mem_fun(*this, &GenericPluginUI::automation_state_changed), control_ui));
-+ (sigc::bind (mem_fun(*this, &GenericPluginUI::automation_state_changed), control_ui));
-
- } else if (plugin->parameter_is_output (port_index)) {
-
-@@ -580,7 +580,7 @@ GenericPluginUI::build_control_ui (guint32 port_index, PBD::Controllable* mcontr
-
- output_controls.push_back (control_ui);
-
-- plugin->ParameterChanged.connect (bind (mem_fun(*this, &GenericPluginUI::parameter_changed), control_ui));
-+ plugin->ParameterChanged.connect (sigc::bind (mem_fun(*this, &GenericPluginUI::parameter_changed), control_ui));
- }
-
- return control_ui;
-@@ -627,13 +627,13 @@ GenericPluginUI::astate_clicked (ControlUI* cui, uint32_t port)
-
- items.clear ();
- items.push_back (MenuElem (_("Manual"),
-- bind (mem_fun(*this, &GenericPluginUI::set_automation_state), (AutoState) Auto_Off, cui)));
-+ sigc::bind (mem_fun(*this, &GenericPluginUI::set_automation_state), (AutoState) Auto_Off, cui)));
- items.push_back (MenuElem (_("Play"),
-- bind (mem_fun(*this, &GenericPluginUI::set_automation_state), (AutoState) Auto_Play, cui)));
-+ sigc::bind (mem_fun(*this, &GenericPluginUI::set_automation_state), (AutoState) Auto_Play, cui)));
- items.push_back (MenuElem (_("Write"),
-- bind (mem_fun(*this, &GenericPluginUI::set_automation_state), (AutoState) Auto_Write, cui)));
-+ sigc::bind (mem_fun(*this, &GenericPluginUI::set_automation_state), (AutoState) Auto_Write, cui)));
- items.push_back (MenuElem (_("Touch"),
-- bind (mem_fun(*this, &GenericPluginUI::set_automation_state), (AutoState) Auto_Touch, cui)));
-+ sigc::bind (mem_fun(*this, &GenericPluginUI::set_automation_state), (AutoState) Auto_Touch, cui)));
-
- automation_menu->popup (1, gtk_get_current_event_time());
- }
-@@ -678,7 +678,7 @@ GenericPluginUI::parameter_changed (uint32_t abs_port_id, float val, ControlUI*
- if (cui->port_index == abs_port_id) {
- if (!cui->update_pending) {
- cui->update_pending = true;
-- Gtkmm2ext::UI::instance()->call_slot (bind (mem_fun(*this, &GenericPluginUI::update_control_display), cui));
-+ Gtkmm2ext::UI::instance()->call_slot (sigc::bind (mem_fun(*this, &GenericPluginUI::update_control_display), cui));
- }
- }
- }
-diff --git a/gtk2_ardour/io_selector.cc b/gtk2_ardour/io_selector.cc
-index ecb91e0..77dd219 100644
---- a/gtk2_ardour/io_selector.cc
-+++ b/gtk2_ardour/io_selector.cc
-@@ -97,7 +97,7 @@ IOSelectorWindow::IOSelectorWindow (Session& sess, boost::shared_ptr<IO> ior, bo
- set_title (title);
- set_position (WIN_POS_MOUSE);
-
-- signal_delete_event().connect (bind (sigc::ptr_fun (just_hide_it), reinterpret_cast<Window *> (this)));
-+ signal_delete_event().connect (sigc::bind (sigc::ptr_fun (just_hide_it), reinterpret_cast<Window *> (this)));
- }
-
- IOSelectorWindow::~IOSelectorWindow()
-@@ -263,7 +263,7 @@ IOSelector::set_button_sensitivity ()
- void
- IOSelector::name_changed (void* src)
- {
-- ENSURE_GUI_THREAD(bind (mem_fun(*this, &IOSelector::name_changed), src));
-+ ENSURE_GUI_THREAD(sigc::bind (mem_fun(*this, &IOSelector::name_changed), src));
-
- display_ports ();
- }
-@@ -352,7 +352,7 @@ IOSelector::rescan ()
- row[port_display_columns.full_name] = s->second;
- }
-
-- display->signal_button_release_event().connect (bind (mem_fun(*this, &IOSelector::port_selection_changed), display));
-+ display->signal_button_release_event().connect (sigc::bind (mem_fun(*this, &IOSelector::port_selection_changed), display));
- Label *tab_label = manage (new Label);
-
- tab_label->set_name ("IOSelectorNotebookTab");
-@@ -367,7 +367,7 @@ IOSelector::rescan ()
- }
-
- notebook.set_current_page (current_page);
-- page_selection_connection = notebook.signal_show().connect (bind (mem_fun (notebook, &Notebook::set_current_page), current_page));
-+ page_selection_connection = notebook.signal_show().connect (sigc::bind (mem_fun (notebook, &Notebook::set_current_page), current_page));
- selector_box.show_all ();
- }
-
-@@ -475,10 +475,10 @@ IOSelector::display_ports ()
- col->set_clickable (true);
-
- /* handle button events on the column header ... */
-- col->signal_clicked().connect (bind (mem_fun(*this, &IOSelector::select_treeview), tview));
-+ col->signal_clicked().connect (sigc::bind (mem_fun(*this, &IOSelector::select_treeview), tview));
-
- /* ... and within the treeview itself */
-- tview->signal_button_release_event().connect (bind (mem_fun(*this, &IOSelector::connection_button_release), tview));
-+ tview->signal_button_release_event().connect (sigc::bind (mem_fun(*this, &IOSelector::connection_button_release), tview));
- }
-
- port_box.show_all ();
-@@ -529,7 +529,7 @@ IOSelector::port_selection_changed (GdkEventButton *ev, TreeView* treeview)
- void
- IOSelector::ports_changed (IOChange change, void *src)
- {
-- ENSURE_GUI_THREAD(bind (mem_fun(*this, &IOSelector::ports_changed), change, src));
-+ ENSURE_GUI_THREAD(sigc::bind (mem_fun(*this, &IOSelector::ports_changed), change, src));
-
- display_ports ();
- }
-@@ -866,7 +866,7 @@ PortInsertWindow::PortInsertWindow (Session& sess, boost::shared_ptr<PortInsert>
- cancel_button.signal_clicked().connect (mem_fun(*this, &PortInsertWindow::cancel));
- rescan_button.signal_clicked().connect (mem_fun(*this, &PortInsertWindow::rescan));
-
-- signal_delete_event().connect (bind (sigc::ptr_fun (just_hide_it), reinterpret_cast<Window *> (this)));
-+ signal_delete_event().connect (sigc::bind (sigc::ptr_fun (just_hide_it), reinterpret_cast<Window *> (this)));
-
- going_away_connection = pi->GoingAway.connect (mem_fun(*this, &PortInsertWindow::plugin_going_away));
- }
-diff --git a/gtk2_ardour/level_meter.cc b/gtk2_ardour/level_meter.cc
-index f6680db..a3b7210 100644
---- a/gtk2_ardour/level_meter.cc
-+++ b/gtk2_ardour/level_meter.cc
-@@ -114,7 +114,7 @@ LevelMeter::parameter_changed(const char* parameter_name)
- {
- #define PARAM_IS(x) (!strcmp (parameter_name, (x)))
-
-- ENSURE_GUI_THREAD (bind (mem_fun(*this, &LevelMeter::parameter_changed), parameter_name));
-+ ENSURE_GUI_THREAD (sigc::bind (mem_fun(*this, &LevelMeter::parameter_changed), parameter_name));
-
- if (PARAM_IS ("meter-hold")) {
-
-@@ -205,7 +205,7 @@ LevelMeter::setup_meters (int len, int initial_width)
- meters[n].width = width;
- meters[n].length = len;
- meters[n].meter->add_events (Gdk::BUTTON_RELEASE_MASK);
-- meters[n].meter->signal_button_release_event().connect (bind (mem_fun(*this, &LevelMeter::meter_button_release), n));
-+ meters[n].meter->signal_button_release_event().connect (sigc::bind (mem_fun(*this, &LevelMeter::meter_button_release), n));
- }
-
- pack_end (*meters[n].meter, false, false);
-diff --git a/gtk2_ardour/mixer_strip.cc b/gtk2_ardour/mixer_strip.cc
-index ac8ebfd..7265e64 100644
---- a/gtk2_ardour/mixer_strip.cc
-+++ b/gtk2_ardour/mixer_strip.cc
-@@ -712,7 +712,7 @@ MixerStrip::add_connection_to_input_menu (ARDOUR::Connection* c)
-
- if (c->nports() == _route->n_inputs()) {
-
-- citems.push_back (CheckMenuElem (c->name(), bind (mem_fun(*this, &MixerStrip::connection_input_chosen), c)));
-+ citems.push_back (CheckMenuElem (c->name(), sigc::bind (mem_fun(*this, &MixerStrip::connection_input_chosen), c)));
-
- ARDOUR::Connection *current = _route->input_connection();
-
-@@ -736,7 +736,7 @@ MixerStrip::add_connection_to_output_menu (ARDOUR::Connection* c)
- if (c->nports() == _route->n_outputs()) {
-
- MenuList& citems = output_menu.items();
-- citems.push_back (CheckMenuElem (c->name(), bind (mem_fun(*this, &MixerStrip::connection_output_chosen), c)));
-+ citems.push_back (CheckMenuElem (c->name(), sigc::bind (mem_fun(*this, &MixerStrip::connection_output_chosen), c)));
-
- ARDOUR::Connection *current = _route->output_connection();
-
-@@ -1129,7 +1129,7 @@ MixerStrip::setup_comment_editor ()
- void
- MixerStrip::comment_changed (void *src)
- {
-- ENSURE_GUI_THREAD(bind (mem_fun(*this, &MixerStrip::comment_changed), src));
-+ ENSURE_GUI_THREAD(sigc::bind (mem_fun(*this, &MixerStrip::comment_changed), src));
-
- if (src != this) {
- ignore_comment_edit = true;
-@@ -1153,7 +1153,7 @@ MixerStrip::add_mix_group_to_menu (RouteGroup *rg, RadioMenuItem::Group* group)
-
- MenuList& items = group_menu->items();
-
-- items.push_back (RadioMenuElem (*group, rg->name(), bind (mem_fun(*this, &MixerStrip::set_mix_group), rg)));
-+ items.push_back (RadioMenuElem (*group, rg->name(), sigc::bind (mem_fun(*this, &MixerStrip::set_mix_group), rg)));
-
- if (_route->mix_group() == rg) {
- static_cast<RadioMenuItem*>(&items.back())->set_active ();
-@@ -1176,9 +1176,9 @@ MixerStrip::select_mix_group (GdkEventButton *ev)
- case 1:
-
- items.clear ();
-- items.push_back (RadioMenuElem (group, _("No group"), bind (mem_fun(*this, &MixerStrip::set_mix_group), (RouteGroup *) 0)));
-+ items.push_back (RadioMenuElem (group, _("No group"), sigc::bind (mem_fun(*this, &MixerStrip::set_mix_group), (RouteGroup *) 0)));
-
-- _session.foreach_mix_group (bind (mem_fun (*this, &MixerStrip::add_mix_group_to_menu), &group));
-+ _session.foreach_mix_group (sigc::bind (mem_fun (*this, &MixerStrip::add_mix_group_to_menu), &group));
-
- group_menu->popup (1, ev->time);
- break;
-@@ -1193,7 +1193,7 @@ MixerStrip::select_mix_group (GdkEventButton *ev)
- void
- MixerStrip::mix_group_changed (void *ignored)
- {
-- ENSURE_GUI_THREAD(bind (mem_fun(*this, &MixerStrip::mix_group_changed), ignored));
-+ ENSURE_GUI_THREAD(sigc::bind (mem_fun(*this, &MixerStrip::mix_group_changed), ignored));
-
- RouteGroup *rg = _route->mix_group();
-
-@@ -1215,7 +1215,7 @@ MixerStrip::mix_group_changed (void *ignored)
- void
- MixerStrip::route_gui_changed (string what_changed, void* ignored)
- {
-- ENSURE_GUI_THREAD(bind (mem_fun(*this, &MixerStrip::route_gui_changed), what_changed, ignored));
-+ ENSURE_GUI_THREAD(sigc::bind (mem_fun(*this, &MixerStrip::route_gui_changed), what_changed, ignored));
-
- if (what_changed == "color") {
- if (set_color_from_route () == 0) {
-@@ -1483,7 +1483,7 @@ void
- MixerStrip::meter_changed (void *src)
- {
-
-- ENSURE_GUI_THREAD (bind (mem_fun(*this, &MixerStrip::meter_changed), src));
-+ ENSURE_GUI_THREAD (sigc::bind (mem_fun(*this, &MixerStrip::meter_changed), src));
-
- switch (_route->meter_point()) {
- case MeterInput:
-diff --git a/gtk2_ardour/mixer_ui.cc b/gtk2_ardour/mixer_ui.cc
-index d283d80..cc4acf7 100644
---- a/gtk2_ardour/mixer_ui.cc
-+++ b/gtk2_ardour/mixer_ui.cc
-@@ -233,13 +233,13 @@ Mixer_UI::Mixer_UI ()
- list_hpane.add1(list_vpacker);
- list_hpane.add2(global_hpacker);
-
-- rhs_pane1.signal_size_allocate().connect (bind (mem_fun(*this, &Mixer_UI::pane_allocation_handler),
-+ rhs_pane1.signal_size_allocate().connect (sigc::bind (mem_fun(*this, &Mixer_UI::pane_allocation_handler),
- static_cast<Gtk::Paned*> (&rhs_pane1)));
-- list_hpane.signal_size_allocate().connect (bind (mem_fun(*this, &Mixer_UI::pane_allocation_handler),
-+ list_hpane.signal_size_allocate().connect (sigc::bind (mem_fun(*this, &Mixer_UI::pane_allocation_handler),
- static_cast<Gtk::Paned*> (&list_hpane)));
-
- Glib::PropertyProxy<int> proxy = list_hpane.property_position();
-- proxy.signal_changed().connect (bind (sigc::ptr_fun (pane_size_watcher), static_cast<Paned*> (&list_hpane)));
-+ proxy.signal_changed().connect (sigc::bind (sigc::ptr_fun (pane_size_watcher), static_cast<Paned*> (&list_hpane)));
-
-
- global_vpacker.pack_start (list_hpane, true, true);
-@@ -311,7 +311,7 @@ Mixer_UI::hide_window (GdkEventAny *ev)
- void
- Mixer_UI::add_strip (Session::RouteList& routes)
- {
-- ENSURE_GUI_THREAD(bind (mem_fun(*this, &Mixer_UI::add_strip), routes));
-+ ENSURE_GUI_THREAD(sigc::bind (mem_fun(*this, &Mixer_UI::add_strip), routes));
-
- MixerStrip* strip;
-
-@@ -346,13 +346,13 @@ Mixer_UI::add_strip (Session::RouteList& routes)
- route->set_order_key (N_("signal"), track_model->children().size()-1);
- }
-
-- route->name_changed.connect (bind (mem_fun(*this, &Mixer_UI::strip_name_changed), strip));
-+ route->name_changed.connect (sigc::bind (mem_fun(*this, &Mixer_UI::strip_name_changed), strip));
-
-- strip->GoingAway.connect (bind (mem_fun(*this, &Mixer_UI::remove_strip), strip));
-+ strip->GoingAway.connect (sigc::bind (mem_fun(*this, &Mixer_UI::remove_strip), strip));
- #ifdef GTKOSX
- strip->WidthChanged.connect (mem_fun(*this, &Mixer_UI::queue_draw_all_strips));
- #endif
-- strip->signal_button_release_event().connect (bind (mem_fun(*this, &Mixer_UI::strip_button_release_event), strip));
-+ strip->signal_button_release_event().connect (sigc::bind (mem_fun(*this, &Mixer_UI::strip_button_release_event), strip));
- }
-
- no_track_list_redisplay = false;
-@@ -365,7 +365,7 @@ Mixer_UI::add_strip (Session::RouteList& routes)
- void
- Mixer_UI::remove_strip (MixerStrip* strip)
- {
-- ENSURE_GUI_THREAD(bind (mem_fun(*this, &Mixer_UI::remove_strip), strip));
-+ ENSURE_GUI_THREAD(sigc::bind (mem_fun(*this, &Mixer_UI::remove_strip), strip));
-
- TreeModel::Children rows = track_model->children();
- TreeModel::Children::iterator ri;
-@@ -1012,7 +1012,7 @@ Mixer_UI::build_track_menu ()
- void
- Mixer_UI::strip_name_changed (void* src, MixerStrip* mx)
- {
-- ENSURE_GUI_THREAD(bind (mem_fun(*this, &Mixer_UI::strip_name_changed), src, mx));
-+ ENSURE_GUI_THREAD(sigc::bind (mem_fun(*this, &Mixer_UI::strip_name_changed), src, mx));
-
- TreeModel::Children rows = track_model->children();
- TreeModel::Children::iterator i;
-@@ -1203,7 +1203,7 @@ Mixer_UI::group_flags_changed (void* src, RouteGroup* group)
- return;
- }
-
-- ENSURE_GUI_THREAD(bind (mem_fun(*this, &Mixer_UI::group_flags_changed), src, group));
-+ ENSURE_GUI_THREAD(sigc::bind (mem_fun(*this, &Mixer_UI::group_flags_changed), src, group));
-
- /* force an update of any mixer strips that are using this group,
- otherwise mix group names don't change in mixer strips
-@@ -1293,7 +1293,7 @@ void
- Mixer_UI::add_mix_group (RouteGroup* group)
-
- {
-- ENSURE_GUI_THREAD(bind (mem_fun(*this, &Mixer_UI::add_mix_group), group));
-+ ENSURE_GUI_THREAD(sigc::bind (mem_fun(*this, &Mixer_UI::add_mix_group), group));
- bool focus = false;
-
- in_group_row_change = true;
-@@ -1320,7 +1320,7 @@ Mixer_UI::add_mix_group (RouteGroup* group)
- focus = true;
- }
-
-- group->FlagsChanged.connect (bind (mem_fun(*this, &Mixer_UI::group_flags_changed), group));
-+ group->FlagsChanged.connect (sigc::bind (mem_fun(*this, &Mixer_UI::group_flags_changed), group));
-
- if (focus) {
- TreeViewColumn* col = group_display.get_column (GROUP_DISPLAY_GROUP_COLUMN);
-diff --git a/gtk2_ardour/option_editor.cc b/gtk2_ardour/option_editor.cc
-index 7b5ecd5..6b66d57 100644
---- a/gtk2_ardour/option_editor.cc
-+++ b/gtk2_ardour/option_editor.cc
-@@ -282,7 +282,7 @@ OptionEditor::setup_misc_options ()
- label->set_name ("OptionsLabel");
-
- dpi_range->set_update_policy (Gtk::UPDATE_DISCONTINUOUS);
-- dpi_adj->signal_value_changed().connect (bind (sigc::ptr_fun (font_scale_changed), dpi_adj));
-+ dpi_adj->signal_value_changed().connect (sigc::bind (sigc::ptr_fun (font_scale_changed), dpi_adj));
-
- hbox = manage (new HBox);
- hbox->set_border_width (5);
-@@ -629,7 +629,7 @@ OptionEditor::redisplay_midi_ports ()
- bb->show ();
- midi_port_table_widgets.push_back (bb);
- midi_port_table.attach (*bb, 9, 10, n+2, n+3, FILL|EXPAND, FILL);
-- bb->signal_clicked().connect (bind (mem_fun(*this, &OptionEditor::remove_midi_port), i->second));
-+ bb->signal_clicked().connect (sigc::bind (mem_fun(*this, &OptionEditor::remove_midi_port), i->second));
- bb->set_sensitive (port_removable (i->second));
-
- label = (manage (new Label (i->first)));
-@@ -652,8 +652,8 @@ OptionEditor::redisplay_midi_ports ()
-
- if (i->second->input()) {
- tb->set_active (!i->second->input()->offline());
-- tb->signal_toggled().connect (bind (mem_fun(*this, &OptionEditor::port_online_toggled), i->second, tb));
-- i->second->input()->OfflineStatusChanged.connect (bind (mem_fun(*this, &OptionEditor::map_port_online), (*i).second, tb));
-+ tb->signal_toggled().connect (sigc::bind (mem_fun(*this, &OptionEditor::port_online_toggled), i->second, tb));
-+ i->second->input()->OfflineStatusChanged.connect (sigc::bind (mem_fun(*this, &OptionEditor::map_port_online), (*i).second, tb));
- }
- tb->show ();
- midi_port_table_widgets.push_back (tb);
-@@ -661,7 +661,7 @@ OptionEditor::redisplay_midi_ports ()
-
- tb = manage (new ToggleButton ());
- tb->set_name ("OptionEditorToggleButton");
-- tb->signal_toggled().connect (bind (mem_fun(*this, &OptionEditor::port_trace_in_toggled), (*i).second, tb));
-+ tb->signal_toggled().connect (sigc::bind (mem_fun(*this, &OptionEditor::port_trace_in_toggled), (*i).second, tb));
- tb->set_size_request (10, 10);
- tb->show ();
- midi_port_table_widgets.push_back (tb);
-@@ -669,7 +669,7 @@ OptionEditor::redisplay_midi_ports ()
-
- tb = manage (new ToggleButton ());
- tb->set_name ("OptionEditorToggleButton");
-- tb->signal_toggled().connect (bind (mem_fun(*this, &OptionEditor::port_trace_out_toggled), (*i).second, tb));
-+ tb->signal_toggled().connect (sigc::bind (mem_fun(*this, &OptionEditor::port_trace_out_toggled), (*i).second, tb));
- tb->set_size_request (10, 10);
- tb->show ();
- midi_port_table_widgets.push_back (tb);
-@@ -686,7 +686,7 @@ OptionEditor::redisplay_midi_ports ()
- rb->show ();
- midi_port_table_widgets.push_back (rb);
- midi_port_table.attach (*rb, 4, 5, n+2, n+3, FILL|EXPAND, FILL);
-- rb->signal_toggled().connect (bind (mem_fun(*this, &OptionEditor::mtc_port_chosen), (*i).second, rb, bb));
-+ rb->signal_toggled().connect (sigc::bind (mem_fun(*this, &OptionEditor::mtc_port_chosen), (*i).second, rb, bb));
-
- if (session && i->second == session->mtc_port()) {
- rb->set_active (true);
-@@ -702,7 +702,7 @@ OptionEditor::redisplay_midi_ports ()
- rb->show ();
- midi_port_table_widgets.push_back (rb);
- midi_port_table.attach (*rb, 6, 7, n+2, n+3, FILL|EXPAND, FILL);
-- rb->signal_toggled().connect (bind (mem_fun(*this, &OptionEditor::mmc_port_chosen), (*i).second, rb, bb));
-+ rb->signal_toggled().connect (sigc::bind (mem_fun(*this, &OptionEditor::mmc_port_chosen), (*i).second, rb, bb));
-
- if (session && i->second == session->mmc_port()) {
- rb->set_active (true);
-@@ -718,7 +718,7 @@ OptionEditor::redisplay_midi_ports ()
- rb->show ();
- midi_port_table_widgets.push_back (rb);
- midi_port_table.attach (*rb, 8, 9, n+2, n+3, FILL|EXPAND, FILL);
-- rb->signal_toggled().connect (bind (mem_fun(*this, &OptionEditor::midi_port_chosen), (*i).second, rb, bb));
-+ rb->signal_toggled().connect (sigc::bind (mem_fun(*this, &OptionEditor::midi_port_chosen), (*i).second, rb, bb));
-
- if (session && i->second == session->midi_port()) {
- rb->set_active (true);
-@@ -1039,8 +1039,8 @@ OptionEditor::setup_click_editor ()
- click_path_entry.signal_activate().connect (mem_fun(*this, &OptionEditor::click_sound_changed));
- click_emphasis_path_entry.signal_activate().connect (mem_fun(*this, &OptionEditor::click_emphasis_sound_changed));
-
-- click_path_entry.signal_focus_out_event().connect (bind (mem_fun(*this, &OptionEditor::focus_out_event_handler), &OptionEditor::click_sound_changed));
-- click_emphasis_path_entry.signal_focus_out_event().connect (bind (mem_fun(*this, &OptionEditor::focus_out_event_handler), &OptionEditor::click_emphasis_sound_changed));
-+ click_path_entry.signal_focus_out_event().connect (sigc::bind (mem_fun(*this, &OptionEditor::focus_out_event_handler), &OptionEditor::click_sound_changed));
-+ click_emphasis_path_entry.signal_focus_out_event().connect (sigc::bind (mem_fun(*this, &OptionEditor::focus_out_event_handler), &OptionEditor::click_emphasis_sound_changed));
-
- click_browse_button.set_name ("EditorGTKButton");
- click_emphasis_browse_button.set_name ("EditorGTKButton");
-@@ -1355,7 +1355,7 @@ OptionEditor::edit_button_changed ()
- void
- OptionEditor::parameter_changed (const char* parameter_name)
- {
-- ENSURE_GUI_THREAD (bind (mem_fun (*this, &OptionEditor::parameter_changed), parameter_name));
-+ ENSURE_GUI_THREAD (sigc::bind (mem_fun (*this, &OptionEditor::parameter_changed), parameter_name));
-
- #define PARAM_IS(x) (!strcmp (parameter_name, (x)))
-
-diff --git a/gtk2_ardour/plugin_ui.cc b/gtk2_ardour/plugin_ui.cc
-index c4c42d9..45f3241 100644
---- a/gtk2_ardour/plugin_ui.cc
-+++ b/gtk2_ardour/plugin_ui.cc
-@@ -127,7 +127,7 @@ PluginUIWindow::PluginUIWindow (Gtk::Window* win, boost::shared_ptr<PluginInsert
- set_name ("PluginEditor");
- add_events (Gdk::KEY_PRESS_MASK|Gdk::KEY_RELEASE_MASK|Gdk::BUTTON_PRESS_MASK|Gdk::BUTTON_RELEASE_MASK);
-
-- signal_delete_event().connect (bind (sigc::ptr_fun (just_hide_it), reinterpret_cast<Window*> (this)), false);
-+ signal_delete_event().connect (sigc::bind (sigc::ptr_fun (just_hide_it), reinterpret_cast<Window*> (this)), false);
- death_connection = insert->GoingAway.connect (mem_fun(*this, &PluginUIWindow::plugin_going_away));
-
- gint h = _pluginui->get_preferred_height ();
-@@ -445,7 +445,7 @@ PlugUIBase::plugin_going_away ()
- void
- PlugUIBase::redirect_active_changed (Redirect* r, void* src)
- {
-- ENSURE_GUI_THREAD(bind (mem_fun(*this, &PlugUIBase::redirect_active_changed), r, src));
-+ ENSURE_GUI_THREAD(sigc::bind (mem_fun(*this, &PlugUIBase::redirect_active_changed), r, src));
- bypass_button.set_active (!r->active());
- }
-
-diff --git a/gtk2_ardour/route_time_axis.cc b/gtk2_ardour/route_time_axis.cc
-index 8ed0f97..8980e88 100644
---- a/gtk2_ardour/route_time_axis.cc
-+++ b/gtk2_ardour/route_time_axis.cc
-@@ -306,13 +306,13 @@ RouteTimeAxisView::edit_click (GdkEventButton *ev)
-
- items.clear ();
- items.push_back (RadioMenuElem (group, _("No group"),
-- bind (mem_fun(*this, &RouteTimeAxisView::set_edit_group_from_menu), (RouteGroup *) 0)));
-+ sigc::bind (mem_fun(*this, &RouteTimeAxisView::set_edit_group_from_menu), (RouteGroup *) 0)));
-
- if (_route->edit_group() == 0) {
- static_cast<RadioMenuItem*>(&items.back())->set_active ();
- }
-
-- _session.foreach_edit_group (bind (mem_fun (*this, &RouteTimeAxisView::add_edit_group_menu_item), &group));
-+ _session.foreach_edit_group (sigc::bind (mem_fun (*this, &RouteTimeAxisView::add_edit_group_menu_item), &group));
- edit_group_menu.popup (ev->button, ev->time);
-
- return FALSE;
-@@ -325,7 +325,7 @@ RouteTimeAxisView::add_edit_group_menu_item (RouteGroup *eg, RadioMenuItem::Grou
-
- MenuList &items = edit_group_menu.items();
-
-- items.push_back (RadioMenuElem (*group, eg->name(), bind (mem_fun(*this, &RouteTimeAxisView::set_edit_group_from_menu), eg)));
-+ items.push_back (RadioMenuElem (*group, eg->name(), sigc::bind (mem_fun(*this, &RouteTimeAxisView::set_edit_group_from_menu), eg)));
- if (_route->edit_group() == eg) {
- static_cast<RadioMenuItem*>(&items.back())->set_active ();
- }
-@@ -468,13 +468,13 @@ RouteTimeAxisView::build_display_menu ()
- RadioMenuItem::Group align_group;
-
- alignment_items.push_back (RadioMenuElem (align_group, _("Align with existing material"),
-- bind (mem_fun(*this, &RouteTimeAxisView::set_align_style), ExistingMaterial)));
-+ sigc::bind (mem_fun(*this, &RouteTimeAxisView::set_align_style), ExistingMaterial)));
- align_existing_item = dynamic_cast<RadioMenuItem*>(&alignment_items.back());
- if (get_diskstream()->alignment_style() == ExistingMaterial)
- align_existing_item->set_active();
-
- alignment_items.push_back (RadioMenuElem (align_group, _("Align with capture time"),
-- bind (mem_fun(*this, &RouteTimeAxisView::set_align_style), CaptureTime)));
-+ sigc::bind (mem_fun(*this, &RouteTimeAxisView::set_align_style), CaptureTime)));
- align_capture_item = dynamic_cast<RadioMenuItem*>(&alignment_items.back());
- if (get_diskstream()->alignment_style() == CaptureTime)
- align_capture_item->set_active();
-@@ -485,10 +485,10 @@ RouteTimeAxisView::build_display_menu ()
-
- RadioMenuItem::Group mode_group;
- items.push_back (RadioMenuElem (mode_group, _("Normal mode"),
-- bind (mem_fun (*this, &RouteTimeAxisView::set_track_mode), ARDOUR::Normal)));
-+ sigc::bind (mem_fun (*this, &RouteTimeAxisView::set_track_mode), ARDOUR::Normal)));
- normal_track_mode_item = dynamic_cast<RadioMenuItem*>(&items.back());
- items.push_back (RadioMenuElem (mode_group, _("Tape mode"),
-- bind (mem_fun (*this, &RouteTimeAxisView::set_track_mode), ARDOUR::Destructive)));
-+ sigc::bind (mem_fun (*this, &RouteTimeAxisView::set_track_mode), ARDOUR::Destructive)));
- destructive_track_mode_item = dynamic_cast<RadioMenuItem*>(&items.back());
-
- switch (track()->mode()) {
-@@ -559,7 +559,7 @@ RouteTimeAxisView::_set_track_mode (boost::shared_ptr<Track> track, TrackMode mo
-
- if (!needs_bounce) {
- /* cannot be done */
-- Glib::signal_idle().connect (bind (sigc::ptr_fun (__reset_item), reset_item));
-+ Glib::signal_idle().connect (sigc::bind (sigc::ptr_fun (__reset_item), reset_item));
- return;
- } else {
- cerr << "would bounce this one\n";
-@@ -1399,7 +1399,7 @@ RouteTimeAxisView::build_playlist_menu (Gtk::Menu * menu)
- playlist_items.push_back (RadioMenuElem (playlist_group, (*i)->name()));
- RadioMenuItem *item = static_cast<RadioMenuItem*>(&playlist_items.back());
-
-- item->signal_toggled().connect(bind (mem_fun (*this, &RouteTimeAxisView::use_playlist), item, boost::weak_ptr<Playlist> (*i)));
-+ item->signal_toggled().connect(sigc::bind (mem_fun (*this, &RouteTimeAxisView::use_playlist), item, boost::weak_ptr<Playlist> (*i)));
-
- if (ds->playlist()->id() == (*i)->id()) {
- item->set_active();
-@@ -1411,16 +1411,16 @@ RouteTimeAxisView::build_playlist_menu (Gtk::Menu * menu)
- playlist_items.push_back (SeparatorElem());
-
- if (!edit_group() || !edit_group()->is_active()) {
-- playlist_items.push_back (MenuElem (_("New"), bind(mem_fun(editor, &PublicEditor::new_playlists), this)));
-- playlist_items.push_back (MenuElem (_("New Copy"), bind(mem_fun(editor, &PublicEditor::copy_playlists), this)));
-+ playlist_items.push_back (MenuElem (_("New"), sigc::bind(mem_fun(editor, &PublicEditor::new_playlists), this)));
-+ playlist_items.push_back (MenuElem (_("New Copy"), sigc::bind(mem_fun(editor, &PublicEditor::copy_playlists), this)));
- } else {
- // Use a label which tells the user what is happening
-- playlist_items.push_back (MenuElem (_("New Take"), bind(mem_fun(editor, &PublicEditor::new_playlists), this)));
-- playlist_items.push_back (MenuElem (_("Copy Take"), bind(mem_fun(editor, &PublicEditor::copy_playlists), this)));
-+ playlist_items.push_back (MenuElem (_("New Take"), sigc::bind(mem_fun(editor, &PublicEditor::new_playlists), this)));
-+ playlist_items.push_back (MenuElem (_("Copy Take"), sigc::bind(mem_fun(editor, &PublicEditor::copy_playlists), this)));
- }
-
- playlist_items.push_back (SeparatorElem());
-- playlist_items.push_back (MenuElem (_("Clear Current"), bind(mem_fun(editor, &PublicEditor::clear_playlists), this)));
-+ playlist_items.push_back (MenuElem (_("Clear Current"), sigc::bind(mem_fun(editor, &PublicEditor::clear_playlists), this)));
- playlist_items.push_back (SeparatorElem());
- playlist_items.push_back (MenuElem(_("Select from all ..."), mem_fun(*this, &RouteTimeAxisView::show_playlist_selector)));
- }
-@@ -1705,7 +1705,7 @@ RouteTimeAxisView::add_redirect_automation_curve (boost::shared_ptr<Redirect> re
-
- ran->view->add_line (*ral);
-
-- ran->view->Hiding.connect (bind (mem_fun(*this, &RouteTimeAxisView::redirect_automation_track_hidden), ran, redirect));
-+ ran->view->Hiding.connect (sigc::bind (mem_fun(*this, &RouteTimeAxisView::redirect_automation_track_hidden), ran, redirect));
-
- if (!ran->view->marked_for_display()) {
- ran->view->hide ();
-@@ -1716,7 +1716,7 @@ RouteTimeAxisView::add_redirect_automation_curve (boost::shared_ptr<Redirect> re
- add_child (ran->view);
-
- if (_view) {
-- _view->foreach_regionview (bind (mem_fun(*this, &RouteTimeAxisView::add_ghost_to_redirect), ran->view));
-+ _view->foreach_regionview (sigc::bind (mem_fun(*this, &RouteTimeAxisView::add_ghost_to_redirect), ran->view));
- }
-
- redirect->mark_automation_visible (what, true);
-@@ -1823,7 +1823,7 @@ RouteTimeAxisView::add_redirect_to_subplugin_menu (boost::shared_ptr<Redirect> r
-
- }
-
-- mitem->signal_toggled().connect (bind (mem_fun(*this, &RouteTimeAxisView::redirect_menu_item_toggled), rai, ran));
-+ mitem->signal_toggled().connect (sigc::bind (mem_fun(*this, &RouteTimeAxisView::redirect_menu_item_toggled), rai, ran));
- }
-
- /* add the menu for this redirect, because the subplugin
-@@ -1978,7 +1978,7 @@ RouteTimeAxisView::clear_meter ()
- void
- RouteTimeAxisView::meter_changed (void *src)
- {
-- ENSURE_GUI_THREAD (bind (mem_fun(*this, &RouteTimeAxisView::meter_changed), src));
-+ ENSURE_GUI_THREAD (sigc::bind (mem_fun(*this, &RouteTimeAxisView::meter_changed), src));
- reset_meter();
- }
-
-diff --git a/gtk2_ardour/time_axis_view_item.cc b/gtk2_ardour/time_axis_view_item.cc
-index b9753f4..83ac972 100644
---- a/gtk2_ardour/time_axis_view_item.cc
-+++ b/gtk2_ardour/time_axis_view_item.cc
-@@ -957,7 +957,7 @@ TimeAxisViewItem::remove_this_item(void* src)
- defer to idle loop, otherwise we'll delete this object
- while we're still inside this function ...
- */
-- Glib::signal_idle().connect(bind (sigc::ptr_fun (&TimeAxisViewItem::idle_remove_this_item), this, src));
-+ Glib::signal_idle().connect(sigc::bind (sigc::ptr_fun (&TimeAxisViewItem::idle_remove_this_item), this, src));
- }
-
- /**
-diff --git a/libs/ardour/automation_event.cc b/libs/ardour/automation_event.cc
-index ed23ad7..0f0606d 100644
---- a/libs/ardour/automation_event.cc
-+++ b/libs/ardour/automation_event.cc
-@@ -663,7 +663,7 @@ AutomationList::move_range (iterator start, iterator end, double xdelta, double
- while (start != end) {
- (*start)->when += xdelta;
- (*start)->value += ydelta;
-- if (isnan ((*start)->value)) {
-+ if (std::isnan ((*start)->value)) {
- abort ();
- }
- ++start;
-@@ -714,7 +714,7 @@ AutomationList::modify (iterator iter, double when, double val)
- (*iter)->when = when;
- (*iter)->value = val;
-
-- if (isnan (val)) {
-+ if (std::isnan (val)) {
- abort ();
- }
-
-diff --git a/libs/ardour/session.cc b/libs/ardour/session.cc
-index 86e07f2..5f5231a 100644
---- a/libs/ardour/session.cc
-+++ b/libs/ardour/session.cc
-@@ -399,14 +399,14 @@ Session::Session (AudioEngine &eng,
- int control_id = 1;
-
- if (control_out_channels) {
-- shared_ptr<Route> r (new Route (*this, _("monitor"), -1, control_out_channels, -1, control_out_channels, Route::ControlOut));
-+ boost::shared_ptr<Route> r (new Route (*this, _("monitor"), -1, control_out_channels, -1, control_out_channels, Route::ControlOut));
- r->set_remote_control_id (control_id++);
-
- rl.push_back (r);
- }
-
- if (master_out_channels) {
-- shared_ptr<Route> r (new Route (*this, _("master"), -1, master_out_channels, -1, master_out_channels, Route::MasterOut));
-+ boost::shared_ptr<Route> r (new Route (*this, _("master"), -1, master_out_channels, -1, master_out_channels, Route::MasterOut));
- r->set_remote_control_id (control_id);
-
- rl.push_back (r);
-@@ -984,8 +984,8 @@ Session::hookup_io ()
- boost::shared_ptr<Session::RouteList>
- Session::get_routes_with_regions_at (nframes64_t const p) const
- {
-- shared_ptr<RouteList> r = routes.reader ();
-- shared_ptr<RouteList> rl (new RouteList);
-+ boost::shared_ptr<RouteList> r = routes.reader ();
-+ boost::shared_ptr<RouteList> rl (new RouteList);
-
- for (RouteList::iterator i = r->begin(); i != r->end(); ++i) {
- boost::shared_ptr<Track> tr = boost::dynamic_pointer_cast<Track> (*i);
-@@ -1590,9 +1590,9 @@ struct RouteSorter {
- };
-
- static void
--trace_terminal (shared_ptr<Route> r1, shared_ptr<Route> rbase)
-+trace_terminal (boost::shared_ptr<Route> r1, boost::shared_ptr<Route> rbase)
- {
-- shared_ptr<Route> r2;
-+ boost::shared_ptr<Route> r2;
-
- if ((r1->fed_by.find (rbase) != r1->fed_by.end()) && (rbase->fed_by.find (r1) != rbase->fed_by.end())) {
- info << string_compose(_("feedback loop setup between %1 and %2"), r1->name(), rbase->name()) << endmsg;
-@@ -1601,13 +1601,13 @@ trace_terminal (shared_ptr<Route> r1, shared_ptr<Route> rbase)
-
- /* make a copy of the existing list of routes that feed r1 */
-
-- set<shared_ptr<Route> > existing = r1->fed_by;
-+ set<boost::shared_ptr<Route> > existing = r1->fed_by;
-
- /* for each route that feeds r1, recurse, marking it as feeding
- rbase as well.
- */
-
-- for (set<shared_ptr<Route> >::iterator i = existing.begin(); i != existing.end(); ++i) {
-+ for (set<boost::shared_ptr<Route> >::iterator i = existing.begin(); i != existing.end(); ++i) {
- r2 =* i;
-
- /* r2 is a route that feeds r1 which somehow feeds base. mark
-@@ -1651,14 +1651,14 @@ Session::resort_routes ()
- {
-
- RCUWriter<RouteList> writer (routes);
-- shared_ptr<RouteList> r = writer.get_copy ();
-+ boost::shared_ptr<RouteList> r = writer.get_copy ();
- resort_routes_using (r);
- /* writer goes out of scope and forces update */
- }
- }
-
- void
--Session::resort_routes_using (shared_ptr<RouteList> r)
-+Session::resort_routes_using (boost::shared_ptr<RouteList> r)
- {
- RouteList::iterator i, j;
-
-@@ -1723,7 +1723,7 @@ Session::new_audio_track (int input_channels, int output_channels, TrackMode mod
- /* count existing audio tracks */
-
- {
-- shared_ptr<RouteList> r = routes.reader ();
-+ boost::shared_ptr<RouteList> r = routes.reader ();
-
- for (RouteList::iterator i = r->begin(); i != r->end(); ++i) {
- if (dynamic_cast<AudioTrack*>((*i).get()) != 0) {
-@@ -1776,7 +1776,7 @@ Session::new_audio_track (int input_channels, int output_channels, TrackMode mod
- nphysical_out = 0;
- }
-
-- shared_ptr<AudioTrack> track;
-+ boost::shared_ptr<AudioTrack> track;
-
- try {
- track = boost::shared_ptr<AudioTrack>((new AudioTrack (*this, track_name, Route::Flag (0), mode)));
-@@ -1884,7 +1884,7 @@ Session::set_remote_control_ids ()
- {
- RemoteModel m = Config->get_remote_model();
-
-- shared_ptr<RouteList> r = routes.reader ();
-+ boost::shared_ptr<RouteList> r = routes.reader ();
-
- for (RouteList::iterator i = r->begin(); i != r->end(); ++i) {
- if ( MixerOrdered == m) {
-@@ -1913,7 +1913,7 @@ Session::new_audio_route (int input_channels, int output_channels, uint32_t how_
- /* count existing audio busses */
-
- {
-- shared_ptr<RouteList> r = routes.reader ();
-+ boost::shared_ptr<RouteList> r = routes.reader ();
-
- for (RouteList::iterator i = r->begin(); i != r->end(); ++i) {
- if (dynamic_cast<AudioTrack*>((*i).get()) == 0) {
-@@ -1945,7 +1945,7 @@ Session::new_audio_route (int input_channels, int output_channels, uint32_t how_
- } while (bus_id < (UINT_MAX-1));
-
- try {
-- shared_ptr<Route> bus (new Route (*this, bus_name, -1, -1, -1, -1, Route::Flag(0), DataType::AUDIO));
-+ boost::shared_ptr<Route> bus (new Route (*this, bus_name, -1, -1, -1, -1, Route::Flag(0), DataType::AUDIO));
-
- if (bus->ensure_io (input_channels, output_channels, false, this)) {
- error << string_compose (_("cannot configure %1 in/%2 out configuration for new audio track"),
-@@ -2060,7 +2060,7 @@ Session::new_route_from_template (uint32_t how_many, const std::string& template
- Track::zero_diskstream_id_in_xml (node_copy);
-
- try {
-- shared_ptr<Route> route (XMLRouteFactory (node_copy));
-+ boost::shared_ptr<Route> route (XMLRouteFactory (node_copy));
-
- if (route == 0) {
- error << _("Session: cannot create track/bus from template description") << endmsg;
-@@ -2107,7 +2107,7 @@ boost::shared_ptr<Route>
- Session::new_video_track (string name)
- {
- uint32_t control_id = ntracks() + nbusses() + 1;
-- shared_ptr<Route> new_route (
-+ boost::shared_ptr<Route> new_route (
- new Route ( *this, name, -1, -1, -1, -1, Route::Flag(0), ARDOUR::DataType::NIL));
- new_route->set_remote_control_id (control_id);
-
-@@ -2115,7 +2115,7 @@ Session::new_video_track (string name)
- rl.push_back (new_route);
- {
- RCUWriter<RouteList> writer (routes);
-- shared_ptr<RouteList> r = writer.get_copy ();
-+ boost::shared_ptr<RouteList> r = writer.get_copy ();
- r->insert (r->end(), rl.begin(), rl.end());
- resort_routes_using (r);
- }
-@@ -2127,7 +2127,7 @@ Session::add_routes (RouteList& new_routes, bool save)
- {
- {
- RCUWriter<RouteList> writer (routes);
-- shared_ptr<RouteList> r = writer.get_copy ();
-+ boost::shared_ptr<RouteList> r = writer.get_copy ();
- r->insert (r->end(), new_routes.begin(), new_routes.end());
- resort_routes_using (r);
- }
-@@ -2198,14 +2198,14 @@ Session::add_diskstream (boost::shared_ptr<Diskstream> dstream)
- }
-
- void
--Session::remove_route (shared_ptr<Route> route)
-+Session::remove_route (boost::shared_ptr<Route> route)
- {
- //clear solos before removing the route
- route->set_solo ( false, this);
-
- {
- RCUWriter<RouteList> writer (routes);
-- shared_ptr<RouteList> rs = writer.get_copy ();
-+ boost::shared_ptr<RouteList> rs = writer.get_copy ();
-
- rs->remove (route);
-
-@@ -2215,11 +2215,11 @@ Session::remove_route (shared_ptr<Route> route)
- */
-
- if (route == _master_out) {
-- _master_out = shared_ptr<Route> ();
-+ _master_out = boost::shared_ptr<Route> ();
- }
-
- if (route == _control_out) {
-- _control_out = shared_ptr<Route> ();
-+ _control_out = boost::shared_ptr<Route> ();
-
- /* cancel control outs for all routes */
-
-@@ -2308,7 +2308,7 @@ Session::route_solo_changed (void* src, boost::weak_ptr<Route> wpr)
-
- is_track = (boost::dynamic_pointer_cast<AudioTrack>(route) != 0);
-
-- shared_ptr<RouteList> r = routes.reader ();
-+ boost::shared_ptr<RouteList> r = routes.reader ();
-
- for (RouteList::iterator i = r->begin(); i != r->end(); ++i) {
-
-@@ -2404,7 +2404,7 @@ Session::update_route_solo_state ()
- the solo mute setting of each track.
- */
-
-- shared_ptr<RouteList> r = routes.reader ();
-+ boost::shared_ptr<RouteList> r = routes.reader ();
-
- for (RouteList::iterator i = r->begin(); i != r->end(); ++i) {
- if ((*i)->soloed()) {
-@@ -2446,7 +2446,7 @@ Session::update_route_solo_state ()
- void
- Session::modify_solo_mute (bool is_track, bool mute)
- {
-- shared_ptr<RouteList> r = routes.reader ();
-+ boost::shared_ptr<RouteList> r = routes.reader ();
-
- for (RouteList::iterator i = r->begin(); i != r->end(); ++i) {
-
-@@ -2511,7 +2511,7 @@ Session::catch_up_on_solo_mute_override ()
- /* this is called whenever the param solo-mute-override is
- changed.
- */
-- shared_ptr<RouteList> r = routes.reader ();
-+ boost::shared_ptr<RouteList> r = routes.reader ();
-
- for (RouteList::iterator i = r->begin(); i != r->end(); ++i) {
- (*i)->catch_up_on_solo_mute_override ();
-@@ -2521,7 +2521,7 @@ Session::catch_up_on_solo_mute_override ()
- bool
- Session::io_name_is_legal (const std::string& name)
- {
-- shared_ptr<RouteList> r = routes.reader ();
-+ boost::shared_ptr<RouteList> r = routes.reader ();
-
- for (RouteList::iterator i = r->begin(); i != r->end(); ++i) {
- if ((*i)->name() == name) {
-@@ -2536,10 +2536,10 @@ Session::io_name_is_legal (const std::string& name)
- return true;
- }
-
--shared_ptr<Route>
-+boost::shared_ptr<Route>
- Session::route_by_name (const std::string& name)
- {
-- shared_ptr<RouteList> r = routes.reader ();
-+ boost::shared_ptr<RouteList> r = routes.reader ();
-
- for (RouteList::iterator i = r->begin(); i != r->end(); ++i) {
- if ((*i)->name() == name) {
-@@ -2547,13 +2547,13 @@ Session::route_by_name (const std::string& name)
- }
- }
-
-- return shared_ptr<Route> ((Route*) 0);
-+ return boost::shared_ptr<Route> ((Route*) 0);
- }
-
--shared_ptr<Route>
-+boost::shared_ptr<Route>
- Session::route_by_id (PBD::ID id)
- {
-- shared_ptr<RouteList> r = routes.reader ();
-+ boost::shared_ptr<RouteList> r = routes.reader ();
-
- for (RouteList::iterator i = r->begin(); i != r->end(); ++i) {
- if ((*i)->id() == id) {
-@@ -2561,13 +2561,13 @@ Session::route_by_id (PBD::ID id)
- }
- }
-
-- return shared_ptr<Route> ((Route*) 0);
-+ return boost::shared_ptr<Route> ((Route*) 0);
- }
-
--shared_ptr<Route>
-+boost::shared_ptr<Route>
- Session::route_by_remote_id (uint32_t id)
- {
-- shared_ptr<RouteList> r = routes.reader ();
-+ boost::shared_ptr<RouteList> r = routes.reader ();
-
- for (RouteList::iterator i = r->begin(); i != r->end(); ++i) {
- if ((*i)->remote_control_id() == id) {
-@@ -2575,7 +2575,7 @@ Session::route_by_remote_id (uint32_t id)
- }
- }
-
-- return shared_ptr<Route> ((Route*) 0);
-+ return boost::shared_ptr<Route> ((Route*) 0);
- }
-
- void
-@@ -3595,7 +3595,7 @@ Session::is_auditioning () const
- void
- Session::set_all_solo (bool yn)
- {
-- shared_ptr<RouteList> r = routes.reader ();
-+ boost::shared_ptr<RouteList> r = routes.reader ();
-
- for (RouteList::iterator i = r->begin(); i != r->end(); ++i) {
- if (!(*i)->hidden()) {
-@@ -3609,7 +3609,7 @@ Session::set_all_solo (bool yn)
- void
- Session::set_all_mute (bool yn)
- {
-- shared_ptr<RouteList> r = routes.reader ();
-+ boost::shared_ptr<RouteList> r = routes.reader ();
-
- for (RouteList::iterator i = r->begin(); i != r->end(); ++i) {
- if (!(*i)->hidden()) {
-@@ -3680,7 +3680,7 @@ Session::record_enable_all ()
- void
- Session::record_enable_change_all (bool yn)
- {
-- shared_ptr<RouteList> r = routes.reader ();
-+ boost::shared_ptr<RouteList> r = routes.reader ();
-
- for (RouteList::iterator i = r->begin(); i != r->end(); ++i) {
- AudioTrack* at;
-@@ -4071,7 +4071,7 @@ Session::reset_native_file_format ()
- bool
- Session::route_name_unique (string n) const
- {
-- shared_ptr<RouteList> r = routes.reader ();
-+ boost::shared_ptr<RouteList> r = routes.reader ();
-
- for (RouteList::const_iterator i = r->begin(); i != r->end(); ++i) {
- if ((*i)->name() == n) {
-@@ -4117,7 +4117,7 @@ Session::allocate_pan_automation_buffers (nframes_t nframes, uint32_t howmany, b
- int
- Session::freeze (InterThreadInfo& itt)
- {
-- shared_ptr<RouteList> r = routes.reader ();
-+ boost::shared_ptr<RouteList> r = routes.reader ();
-
- for (RouteList::iterator i = r->begin(); i != r->end(); ++i) {
-
-@@ -4355,7 +4355,7 @@ uint32_t
- Session::ntracks () const
- {
- uint32_t n = 0;
-- shared_ptr<RouteList> r = routes.reader ();
-+ boost::shared_ptr<RouteList> r = routes.reader ();
-
- for (RouteList::const_iterator i = r->begin(); i != r->end(); ++i) {
- if (dynamic_cast<AudioTrack*> ((*i).get())) {
-@@ -4370,7 +4370,7 @@ uint32_t
- Session::nbusses () const
- {
- uint32_t n = 0;
-- shared_ptr<RouteList> r = routes.reader ();
-+ boost::shared_ptr<RouteList> r = routes.reader ();
-
- for (RouteList::const_iterator i = r->begin(); i != r->end(); ++i) {
- if (dynamic_cast<AudioTrack*> ((*i).get()) == 0) {
-diff --git a/libs/gtkmm2ext/gtk_ui.cc b/libs/gtkmm2ext/gtk_ui.cc
-index 291740c..48a03c5 100644
---- a/libs/gtkmm2ext/gtk_ui.cc
-+++ b/libs/gtkmm2ext/gtk_ui.cc
-@@ -100,7 +100,7 @@ UI::UI (string namestr, int *argc, char ***argv)
- errors->set_title (title.get_string());
-
- errors->dismiss_button().set_name ("ErrorLogCloseButton");
-- errors->signal_delete_event().connect (bind (sigc::ptr_fun (just_hide_it), (Window *) errors));
-+ errors->signal_delete_event().connect (sigc::bind (sigc::ptr_fun (just_hide_it), (Window *) errors));
- errors->set_type_hint (Gdk::WINDOW_TYPE_HINT_UTILITY);
-
- register_thread (pthread_self(), X_("GUI"));
-@@ -624,8 +624,8 @@ UI::get_color (const string& prompt, bool& picked, const Gdk::Color* initial)
- ColorSelectionDialog color_dialog (prompt);
-
- color_dialog.set_modal (true);
-- color_dialog.get_cancel_button()->signal_clicked().connect (bind (mem_fun (*this, &UI::color_selection_done), false));
-- color_dialog.get_ok_button()->signal_clicked().connect (bind (mem_fun (*this, &UI::color_selection_done), true));
-+ color_dialog.get_cancel_button()->signal_clicked().connect (sigc::bind (mem_fun (*this, &UI::color_selection_done), false));
-+ color_dialog.get_ok_button()->signal_clicked().connect (sigc::bind (mem_fun (*this, &UI::color_selection_done), true));
- color_dialog.signal_delete_event().connect (mem_fun (*this, &UI::color_selection_deleted));
-
- if (initial) {
-diff --git a/libs/surfaces/mackie/mackie_control_protocol.cc b/libs/surfaces/mackie/mackie_control_protocol.cc
-index 7cb017f..62eac81 100644
---- a/libs/surfaces/mackie/mackie_control_protocol.cc
-+++ b/libs/surfaces/mackie/mackie_control_protocol.cc
-@@ -200,7 +200,7 @@ MackieControlProtocol::port_for_id( uint32_t index )
- // predicate for sort call in get_sorted_routes
- struct RouteByRemoteId
- {
-- bool operator () ( const shared_ptr<Route> & a, const shared_ptr<Route> & b ) const {
-+ bool operator () ( const boost::shared_ptr<Route> & a, const boost::shared_ptr<Route> & b ) const {
- return a->remote_control_id() < b->remote_control_id();
- }
-
-@@ -680,7 +680,7 @@ MackieControlProtocol::create_ports()
- }
- }
-
--shared_ptr<Route>
-+boost::shared_ptr<Route>
- MackieControlProtocol::master_route()
- {
- boost::shared_ptr<IO> mo = session->master_out ();
-diff --git a/libs/surfaces/mackie/mackie_jog_wheel.cc b/libs/surfaces/mackie/mackie_jog_wheel.cc
-index d05eb23..b4372cf 100644
---- a/libs/surfaces/mackie/mackie_jog_wheel.cc
-+++ b/libs/surfaces/mackie/mackie_jog_wheel.cc
-@@ -10,7 +10,6 @@
- #include <algorithm>
-
- using namespace Mackie;
--using std::isnan;
-
- JogWheel::JogWheel( MackieControlProtocol & mcp )
- : _mcp( mcp )
-@@ -68,7 +67,7 @@ void JogWheel::jog_event( SurfacePort & port, Control & control, const ControlSt
- _transport_speed += _mcp.surface().scaled_delta( state, _mcp.get_session().transport_speed() );
-
- // make sure no weirdness gets to the session
-- if ( _transport_speed < 0 || isnan( _transport_speed ) )
-+ if ( _transport_speed < 0 || std::isnan( _transport_speed ) )
- {
- _transport_speed = 0.0;
- }
---
-2.6.3
-
diff --git a/ardour-2.8.16-c++11-xpm.patch b/ardour-2.8.16-c++11-xpm.patch
deleted file mode 100644
index 10345fd..0000000
--- a/ardour-2.8.16-c++11-xpm.patch
+++ /dev/null
@@ -1,216 +0,0 @@
-From d82af19ee11b6d0b240d89da276824ef4077bbff Mon Sep 17 00:00:00 2001
-From: Nils Philippsen <nils(a)tiptoe.de>
-Date: Fri, 27 Nov 2015 14:56:45 +0100
-Subject: [PATCH] C++11: use explicit unsigned types for XPM data...
-
-...then cast back to 'const char *' for libgdkmm's Bitmap::create()
----
- gtk2_ardour/editor.cc | 14 +++++++-------
- gtk2_ardour/editor_tempodisplay.cc | 10 +++++-----
- gtk2_ardour/editor_xpms | 24 ++++++++++++------------
- 3 files changed, 24 insertions(+), 24 deletions(-)
-
-diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc
-index d2bd781..c3122a9 100644
---- a/gtk2_ardour/editor.cc
-+++ b/gtk2_ardour/editor.cc
-@@ -1388,8 +1388,8 @@ Editor::build_cursors ()
-
- {
- RefPtr<Bitmap> source, mask;
-- source = Bitmap::create (mag_bits, mag_width, mag_height);
-- mask = Bitmap::create (magmask_bits, mag_width, mag_height);
-+ source = Bitmap::create ((const char *)mag_bits, mag_width, mag_height);
-+ mask = Bitmap::create ((const char *)magmask_bits, mag_width, mag_height);
- zoom_cursor = new Gdk::Cursor (source, mask, mfg, mbg, mag_x_hot, mag_y_hot);
- }
-
-@@ -1399,22 +1399,22 @@ Editor::build_cursors ()
- {
- RefPtr<Bitmap> source, mask;
-
-- source = Bitmap::create (fader_cursor_bits, fader_cursor_width, fader_cursor_height);
-- mask = Bitmap::create (fader_cursor_mask_bits, fader_cursor_width, fader_cursor_height);
-+ source = Bitmap::create ((const char *)fader_cursor_bits, fader_cursor_width, fader_cursor_height);
-+ mask = Bitmap::create ((const char *)fader_cursor_mask_bits, fader_cursor_width, fader_cursor_height);
- fader_cursor = new Gdk::Cursor (source, mask, ffg, fbg, fader_cursor_x_hot, fader_cursor_y_hot);
- }
-
- {
- RefPtr<Bitmap> source, mask;
-- source = Bitmap::create (speaker_cursor_bits, speaker_cursor_width, speaker_cursor_height);
-- mask = Bitmap::create (speaker_cursor_mask_bits, speaker_cursor_width, speaker_cursor_height);
-+ source = Bitmap::create ((const char *)speaker_cursor_bits, speaker_cursor_width, speaker_cursor_height);
-+ mask = Bitmap::create ((const char *)speaker_cursor_mask_bits, speaker_cursor_width, speaker_cursor_height);
- speaker_cursor = new Gdk::Cursor (source, mask, ffg, fbg, speaker_cursor_x_hot, speaker_cursor_y_hot);
- }
-
- {
- RefPtr<Bitmap> bits;
- char pix[4] = { 0, 0, 0, 0 };
-- bits = Bitmap::create (pix, 2, 2);
-+ bits = Bitmap::create ((const char *)pix, 2, 2);
- Gdk::Color c;
- transparent_cursor = new Gdk::Cursor (bits, bits, c, c, 0, 0);
- }
-diff --git a/gtk2_ardour/editor_tempodisplay.cc b/gtk2_ardour/editor_tempodisplay.cc
-index d30981b..95a64a9 100644
---- a/gtk2_ardour/editor_tempodisplay.cc
-+++ b/gtk2_ardour/editor_tempodisplay.cc
-@@ -101,7 +101,7 @@ Editor::tempo_map_changed (Change ignored)
- return;
- }
-
-- ENSURE_GUI_THREAD(bind (mem_fun (*this, &Editor::tempo_map_changed), ignored));
-+ ENSURE_GUI_THREAD(sigc::bind (mem_fun (*this, &Editor::tempo_map_changed), ignored));
-
- if (tempo_lines) {
- tempo_lines->tempo_map_changed();
-@@ -215,7 +215,7 @@ Editor::mouse_add_new_tempo_event (nframes64_t frame)
-
- tempo_dialog.set_position (Gtk::WIN_POS_MOUSE);
- //this causes compiz to display no border.
-- //tempo_dialog.signal_realize().connect (bind (sigc::ptr_fun (set_decoration), &tempo_dialog, Gdk::WMDecoration (Gdk::DECOR_BORDER|Gdk::DECOR_RESIZEH)));
-+ //tempo_dialog.signal_realize().connect (sigc::bind (sigc::ptr_fun (set_decoration), &tempo_dialog, Gdk::WMDecoration (Gdk::DECOR_BORDER|Gdk::DECOR_RESIZEH)));
-
- ensure_float (tempo_dialog);
-
-@@ -259,7 +259,7 @@ Editor::mouse_add_new_meter_event (nframes64_t frame)
- meter_dialog.set_position (Gtk::WIN_POS_MOUSE);
-
- //this causes compiz to display no border..
-- //meter_dialog.signal_realize().connect (bind (sigc::ptr_fun (set_decoration), &meter_dialog, Gdk::WMDecoration (Gdk::DECOR_BORDER|Gdk::DECOR_RESIZEH)));
-+ //meter_dialog.signal_realize().connect (sigc::bind (sigc::ptr_fun (set_decoration), &meter_dialog, Gdk::WMDecoration (Gdk::DECOR_BORDER|Gdk::DECOR_RESIZEH)));
-
- ensure_float (meter_dialog);
-
-@@ -304,7 +304,7 @@ Editor::remove_tempo_marker (ArdourCanvas::Item* item)
- }
-
- if (tempo_marker->tempo().movable()) {
-- Glib::signal_idle().connect (bind (mem_fun(*this, &Editor::real_remove_tempo_marker), &tempo_marker->tempo()));
-+ Glib::signal_idle().connect (sigc::bind (mem_fun(*this, &Editor::real_remove_tempo_marker), &tempo_marker->tempo()));
- }
- }
-
-@@ -440,7 +440,7 @@ Editor::remove_meter_marker (ArdourCanvas::Item* item)
- }
-
- if (meter_marker->meter().movable()) {
-- Glib::signal_idle().connect (bind (mem_fun(*this, &Editor::real_remove_meter_marker), &meter_marker->meter()));
-+ Glib::signal_idle().connect (sigc::bind (mem_fun(*this, &Editor::real_remove_meter_marker), &meter_marker->meter()));
- }
- }
-
-diff --git a/gtk2_ardour/editor_xpms b/gtk2_ardour/editor_xpms
-index 95a51a8..deea1fb 100644
---- a/gtk2_ardour/editor_xpms
-+++ b/gtk2_ardour/editor_xpms
-@@ -3,12 +3,12 @@
- #define mag_height 16
- #define mag_x_hot 9
- #define mag_y_hot 5
--static const gchar mag_bits[] = {
-+static const guchar mag_bits[] = {
- 0x7f, 0xe0, 0x3f, 0xc0, 0x1f, 0x8f, 0x8f, 0x9f, 0xcf, 0x3f, 0xcf, 0x3f,
- 0xcf, 0x3f, 0xcf, 0x3f, 0x8f, 0x1f, 0x1f, 0x8f, 0x0f, 0xc0, 0x47, 0xe0,
- 0xe3, 0xff, 0xf1, 0xff, 0xf8, 0xff, 0xfc, 0xff };
-
--static const gchar magmask_bits[] = {
-+static const guchar magmask_bits[] = {
- 0x80, 0x1f, 0xc0, 0x3f, 0xe0, 0x70, 0x70, 0x66, 0x30, 0xc6, 0xb0, 0xdf,
- 0xb0, 0xdf, 0x30, 0xc6, 0x70, 0xe6, 0xe0, 0x70, 0xf0, 0x3f, 0xb8, 0x1f,
- 0x1c, 0x00, 0x0e, 0x00, 0x07, 0x00, 0x03, 0x00 };
-@@ -18,7 +18,7 @@ static const gchar magmask_bits[] = {
- #define fader_cursor_height 25
- #define fader_cursor_x_hot 3
- #define fader_cursor_y_hot 21
--static const gchar fader_cursor_bits[] = {
-+static const guchar fader_cursor_bits[] = {
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x30, 0x00, 0x00, 0x00, 0x30, 0x00,
- 0x00, 0x00, 0x30, 0x00, 0x00, 0x00, 0xfe, 0x01, 0x00, 0x00, 0x02, 0x01,
- 0x00, 0x00, 0x02, 0x01, 0x00, 0x00, 0x02, 0x01, 0x00, 0x00, 0x02, 0x01,
-@@ -30,7 +30,7 @@ static const gchar fader_cursor_bits[] = {
- 0x00, 0x00, 0x00, 0x00 };
-
- /* Created with The GIMP */
--static const gchar fader_cursor_mask_bits[] = {
-+static const guchar fader_cursor_mask_bits[] = {
- 0x00, 0x00, 0x30, 0x00, 0x00, 0x00, 0x78, 0x00, 0x00, 0x00, 0x78, 0x00,
- 0x00, 0x00, 0x78, 0x00, 0x00, 0x00, 0xfe, 0x01, 0x00, 0x00, 0xfe, 0x01,
- 0x00, 0x00, 0xfe, 0x01, 0x00, 0x00, 0xfe, 0x01, 0x00, 0x00, 0xfe, 0x01,
-@@ -46,7 +46,7 @@ static const gchar fader_cursor_mask_bits[] = {
- #define speaker_cursor_height 26
- #define speaker_cursor_x_hot 0
- #define speaker_cursor_y_hot 0
--static const gchar speaker_cursor_bits[] = {
-+static const guchar speaker_cursor_bits[] = {
- 0x00, 0xc0, 0x00, 0xc0, 0x00, 0xf0, 0x00, 0xf0, 0x00, 0xcc, 0x00, 0xcc,
- 0xff, 0xc3, 0xff, 0xc3, 0x03, 0xc0, 0x03, 0xc0, 0xc3, 0xc0, 0xc3, 0xc0,
- 0xc3, 0xc0, 0xc3, 0xc0, 0xc3, 0xc0, 0xc3, 0xc0, 0x03, 0xc0, 0x03, 0xc0,
-@@ -57,7 +57,7 @@ static const gchar speaker_cursor_bits[] = {
- #define speaker_cursor_mask_height 26
- #define speaker_cursor_mask_x_hot 0
- #define speaker_cursor_mask_y_hot 0
--static const gchar speaker_cursor_mask_bits[] = {
-+static const guchar speaker_cursor_mask_bits[] = {
- 0x00, 0xc0, 0x00, 0xc0, 0x00, 0xf0, 0x00, 0xf0, 0x00, 0xfc, 0x00, 0xfc,
- 0xff, 0xff, 0xff, 0xff, 0x3f, 0xff, 0x3f, 0xff, 0xff, 0xff, 0xff, 0xff,
- 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x3f, 0xff, 0x3f, 0xff,
-@@ -68,7 +68,7 @@ static const gchar speaker_cursor_mask_bits[] = {
- #define cursor_audition_height 16
- #define cursor_audition_x_hot 0
- #define cursor_audition_y_hot 7
--static const short cursor_audition_bits[] = {
-+static const unsigned short cursor_audition_bits[] = {
- 0x1000, 0x1800, 0x1400, 0x1200, 0x11f0, 0x1110, 0x111f, 0x1111, 0x1112,
- 0x111e, 0x1110, 0x11f0, 0x1200, 0x1400, 0x1800, 0x1000 };
-
-@@ -76,7 +76,7 @@ static const short cursor_audition_bits[] = {
- #define cursor_audition_mask_height 16
- #define cursor_audition_mask_x_hot 0
- #define cursor_audition_mask_y_hot 7
--static const short cursor_audition_mask_bits[] = {
-+static const unsigned short cursor_audition_mask_bits[] = {
- 0x1000, 0x1800, 0x1c00, 0x1e00, 0x1ff0, 0x1ff0, 0x1fff, 0x1fff, 0x1ffe,
- 0x1ffe, 0x1ff0, 0x1ff0, 0x1e00, 0x1c00, 0x1800, 0x1000 };
-
-@@ -84,7 +84,7 @@ static const short cursor_audition_mask_bits[] = {
- #define cursor_timestretch_height 16
- #define cursor_timestretch_x_hot 7
- #define cursor_timestretch_y_hot 8
--static const short cursor_timestretch_bits[] = {
-+static const unsigned short cursor_timestretch_bits[] = {
- 0x01c0, 0x0140, 0x0140, 0x0140, 0x0540, 0x0d40, 0x1548, 0x274c, 0x417e,
- 0x274c, 0x1548, 0x0d40, 0x0540, 0x0140, 0x0140, 0x01c0 };
-
-@@ -92,7 +92,7 @@ static const short cursor_timestretch_bits[] = {
- #define cursor_timestretch_mask_height 16
- #define cursor_timestretch_mask_x_hot 7
- #define cursor_timestretch_mask_y_hot 8
--static const short cursor_timestretch_mask_bits[] = {
-+static const unsigned short cursor_timestretch_mask_bits[] = {
- 0x01c0, 0x01c0, 0x01c0, 0x01c0, 0x05d0, 0x0dd8, 0x1ddc, 0x3ffe, 0x7fff,
- 0x3ffe, 0x1ddc, 0x0dd8, 0x05d0, 0x01c0, 0x01c0, 0x01c0 };
-
-@@ -100,7 +100,7 @@ static const short cursor_timestretch_mask_bits[] = {
- #define cursor_zoom_height 16
- #define cursor_zoom_x_hot 6
- #define cursor_zoom_y_hot 6
--static const short cursor_zoom_bits[] = {
-+static const unsigned short cursor_zoom_bits[] = {
- 0x00e0, 0x0000, 0x03b8, 0x0000, 0x0604, 0x0000, 0x0806, 0x0000, 0x0842,
- 0x0000, 0x1843, 0x0000, 0x11f1, 0x0000, 0x1843, 0x0000, 0x0842, 0x0000,
- 0x1806, 0x0000, 0x2604, 0x0000, 0x4758, 0x0000, 0x88e0, 0x0000, 0x1000,
-@@ -110,7 +110,7 @@ static const short cursor_zoom_bits[] = {
- #define cursor_zoom_mask_height 16
- #define cursor_zoom_mask_x_hot 6
- #define cursor_zoom_mask_y_hot 6
--static const short cursor_zoom_mask_bits[] = {
-+static const unsigned short cursor_zoom_mask_bits[] = {
- 0x00e0, 0x0000, 0x03f8, 0x0000, 0x07fc, 0x0000, 0x0ffe, 0x0000, 0x0ffe,
- 0x0000, 0x1fff, 0x0000, 0x1fff, 0x0000, 0x1fff, 0x0000, 0x0ffe, 0x0000,
- 0x1ffe, 0x0000, 0x3ffc, 0x0000, 0x7ff8, 0x0000, 0xf8e0, 0x0000, 0xf000,
---
-2.6.3
-
diff --git a/ardour-2.8.16-free-dmalloc.patch b/ardour-2.8.16-free-dmalloc.patch
deleted file mode 100644
index 763d184..0000000
--- a/ardour-2.8.16-free-dmalloc.patch
+++ /dev/null
@@ -1,112 +0,0 @@
-diff -up ardour-2.8.16/libs/pbd/dmalloc.cc.old ardour-2.8.16/libs/pbd/dmalloc.cc
---- ardour-2.8.16/libs/pbd/dmalloc.cc.old 2009-02-24 06:38:16.000000000 -0600
-+++ ardour-2.8.16/libs/pbd/dmalloc.cc 2016-03-08 23:26:11.192874608 -0600
-@@ -1,27 +1,24 @@
- /*
-- * file that facilitates C++ program debugging.
-+ * File that facilitates C++ program debugging.
- *
-- * Copyright 1995 by Gray Watson
-+ * Copyright 2000 by Gray Watson
- *
- * This file is part of the dmalloc package.
- *
-- * Permission to use, copy, modify, and distribute this software for any
-- * NON-COMMERCIAL purpose and without fee is hereby granted, provided
-- * that the above copyright notice and this permission notice appear
-- * in all copies, and that the name of Gray Watson not be used in
-- * advertising or publicity pertaining to distribution of the document
-- * or software without specific, written prior permission.
-- *
-- * Please see the PERMISSIONS file or contact the author for information
-- * about commercial licenses.
-+ * Permission to use, copy, modify, and distribute this software for
-+ * any purpose and without fee is hereby granted, provided that the
-+ * above copyright notice and this permission notice appear in all
-+ * copies, and that the name of Gray Watson not be used in advertising
-+ * or publicity pertaining to distribution of the document or software
-+ * without specific, written prior permission.
- *
- * Gray Watson makes no representations about the suitability of the
- * software described herein for any purpose. It is provided "as is"
- * without express or implied warranty.
- *
-- * The author may be contacted via http://www.letters.com/~gray/
-+ * The author may be contacted via http://dmalloc.com/
- *
-- * $Id: dmalloc.cc 4 2005-05-13 20:47:18Z taybin $
-+ * $Id: dmallocc.cc,v 1.3 2003/05/15 20:08:46 gray Exp $
- */
-
- /*
-@@ -37,11 +34,14 @@
- */
-
- #ifdef DEBUG_MALLOC
--
-+
- extern "C" {
- #include <stdlib.h>
--#include <dmalloc.h>
--#include "/usr/local/src/dmalloc-4.1.2/return.h"
-+
-+#define DMALLOC_DISABLE
-+
-+#include "dmalloc.h"
-+#include "return.h"
- }
-
- /*
-@@ -52,12 +52,8 @@ operator new(size_t size)
- {
- char *file;
- GET_RET_ADDR(file);
--
-- /* handle correct C++ semantics for an alloc of size 0 */
--
-- if (size == 0) size = 1;
--
-- return _malloc_leap(file, 0, size);
-+ return dmalloc_malloc(file, 0, size, DMALLOC_FUNC_NEW,
-+ 0 /* no alignment */, 0 /* no xalloc messages */);
- }
-
- /*
-@@ -68,12 +64,8 @@ operator new[](size_t size)
- {
- char *file;
- GET_RET_ADDR(file);
--
-- /* handle correct C++ semantics for an alloc of size 0 */
--
-- if (size == 0) size = 1;
--
-- return _malloc_leap(file, 0, size);
-+ return dmalloc_malloc(file, 0, size, DMALLOC_FUNC_NEW_ARRAY,
-+ 0 /* no alignment */, 0 /* no xalloc messages */);
- }
-
- /*
-@@ -84,19 +76,18 @@ operator delete(void *pnt)
- {
- char *file;
- GET_RET_ADDR(file);
-- _free_leap(file, 0, pnt);
-+ dmalloc_free(file, 0, pnt, DMALLOC_FUNC_DELETE);
- }
-
- /*
-- * An overload function for the C++ delete[]. Thanks to Jens Krinke
-- * <j.krinke(a)gmx.de>
-+ * An overload function for the C++ delete[]. Thanks to Jens Krinke.
- */
- void
- operator delete[](void *pnt)
- {
- char *file;
- GET_RET_ADDR(file);
-- _free_leap(file, 0, pnt);
-+ dmalloc_free(file, 0, pnt, DMALLOC_FUNC_DELETE_ARRAY);
- }
-
- #endif
diff --git a/ardour-2.8.16-gcc6.patch b/ardour-2.8.16-gcc6.patch
deleted file mode 100644
index 849bbfe..0000000
--- a/ardour-2.8.16-gcc6.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff -up ardour-2.8.16/gtk2_ardour/gain_meter.cc.fix ardour-2.8.16/gtk2_ardour/gain_meter.cc
---- ardour-2.8.16/gtk2_ardour/gain_meter.cc.fix 2016-03-08 23:48:45.663150677 -0600
-+++ ardour-2.8.16/gtk2_ardour/gain_meter.cc 2016-03-08 23:49:04.970011796 -0600
-@@ -89,11 +89,11 @@ GainMeterBase::GainMeterBase (Session& s
- if (horizontal) {
- gain_slider = manage (new HSliderController (pix,
- &gain_adjustment,
-- false));
-+ (PBD::Controllable*) false));
- } else {
- gain_slider = manage (new VSliderController (pix,
- &gain_adjustment,
-- false));
-+ (PBD::Controllable*) false));
- }
-
- level_meter = new LevelMeter(_session);
diff --git a/ardour-2.8.16-gcc7.patch b/ardour-2.8.16-gcc7.patch
deleted file mode 100644
index 7582399..0000000
--- a/ardour-2.8.16-gcc7.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- ardour-2.8.16/gtk2_ardour/ardour_ui.cc.orig 2017-01-31 16:28:28.898346791 +0000
-+++ ardour-2.8.16/gtk2_ardour/ardour_ui.cc 2017-01-31 16:30:41.021026990 +0000
-@@ -1964,7 +1964,7 @@
-
- const char **connections = io.input(0)->get_connections();
-
-- if (connections == 0 || connections[0] == '\0') {
-+ if (connections == 0 || connections[0] == 0) {
- buf = _("off");
- } else {
- buf = connections[0];
-@@ -1983,7 +1983,7 @@
-
- const char **connections = io.output(0)->get_connections();
-
-- if (connections == 0 || connections[0] == '\0') {
-+ if (connections == 0 || connections[0] == 0) {
- buf = _("off");
- } else {
- buf = connections[0];
diff --git a/ardour-2.8.16-glibmm250.patch b/ardour-2.8.16-glibmm250.patch
deleted file mode 100644
index a2687c6..0000000
--- a/ardour-2.8.16-glibmm250.patch
+++ /dev/null
@@ -1,133 +0,0 @@
---- ardour-2.8.16/libs/gtkmm2ext/fastmeter.cc
-+++ ardour-2.8.16/libs/gtkmm2ext/fastmeter.cc
-@@ -475,7 +475,7 @@
-
- Glib::RefPtr<Gdk::Window> win;
-
-- if ((win = get_window()) == 0) {
-+ if (! (win = get_window())) {
- queue_draw ();
- return;
- }
---- ardour-2.8.16/gtk2_ardour/editor.cc
-+++ ardour-2.8.16/gtk2_ardour/editor.cc
-@@ -800,16 +800,16 @@
- list<Glib::RefPtr<Gdk::Pixbuf> > window_icons;
- Glib::RefPtr<Gdk::Pixbuf> 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()) {
---- ardour-2.8.16/gtk2_ardour/editor_keyboard.cc
-+++ ardour-2.8.16/gtk2_ardour/editor_keyboard.cc
-@@ -42,9 +42,9 @@
- Glib::RefPtr<Gdk::Window> evw = track_canvas->get_window()->get_pointer (x, y, mask);
- bool doit = false;
-
-- if (use_track_canvas && track_canvas_event_box.get_window()->get_pointer(x, y, mask) != 0) {
-+ if (use_track_canvas && track_canvas_event_box.get_window()->get_pointer(x, y, mask)) {
- doit = true;
-- } else if (use_time_canvas && time_canvas_event_box.get_window()->get_pointer(x, y, mask)!= 0) {
-+ } else if (use_time_canvas && time_canvas_event_box.get_window()->get_pointer(x, y, mask)) {
- doit = true;
- }
-
---- ardour-2.8.16/gtk2_ardour/gain_meter.cc
-+++ ardour-2.8.16/gtk2_ardour/gain_meter.cc
-@@ -63,7 +63,7 @@
- void
- GainMeter::setup_slider_pix ()
- {
-- if ((slider = ::get_icon ("fader_belt")) == 0) {
-+ if (! (slider = ::get_icon ("fader_belt"))) {
- throw failed_constructor();
- }
- }
---- ardour-2.8.16/gtk2_ardour/new_session_dialog.cc
-+++ ardour-2.8.16/gtk2_ardour/new_session_dialog.cc
-@@ -354,16 +354,16 @@
- list<Glib::RefPtr<Gdk::Pixbuf> > window_icons;
- Glib::RefPtr<Gdk::Pixbuf> 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()) {
---- ardour-2.8.16/gtk2_ardour/panner2d.cc
-+++ ardour-2.8.16/gtk2_ardour/panner2d.cc
-@@ -427,7 +427,7 @@
- gint x, y;
- float fx, fy;
-
-- if (layout == 0) {
-+ if (! layout) {
- layout = create_pango_layout ("");
- layout->set_font_description (get_style()->get_font());
- }
-@@ -579,7 +579,7 @@
- {
- using namespace Menu_Helpers;
-
-- if (context_menu == 0) {
-+ if (! context_menu) {
- context_menu = manage (new Menu);
- context_menu->set_name ("ArdourContextMenu");
- MenuList& items = context_menu->items();
---- ardour-2.8.16/gtk2_ardour/route_time_axis.cc
-+++ ardour-2.8.16/gtk2_ardour/route_time_axis.cc
-@@ -88,7 +88,7 @@
- void
- RouteTimeAxisView::setup_slider_pix ()
- {
-- if ((slider = ::get_icon ("fader_belt_h")) == 0) {
-+ if (! (slider = ::get_icon ("fader_belt_h"))) {
- throw failed_constructor ();
- }
- }
---- ardour-2.8.16/gtk2_ardour/fft_graph.cc
-+++ ardour-2.8.16/gtk2_ardour/fft_graph.cc
-@@ -190,7 +190,7 @@
-
-
-
-- if (graph_gc == 0) {
-+ if (! graph_gc) {
- graph_gc = GC::create( get_window() );
- }
-
-@@ -200,7 +200,7 @@
-
- graph_gc->set_rgb_fg_color( grey );
-
-- if (layout == 0) {
-+ if (! layout) {
- layout = create_pango_layout ("");
- layout->set_font_description (get_style()->get_font());
- }
diff --git a/ardour-2.8.16-libsigc++26.patch b/ardour-2.8.16-libsigc++26.patch
deleted file mode 100644
index d88ec19..0000000
--- a/ardour-2.8.16-libsigc++26.patch
+++ /dev/null
@@ -1,114 +0,0 @@
-From f7ae7643c2733403f742dcad0045551a26a8c2b7 Mon Sep 17 00:00:00 2001
-From: Nils Philippsen <nils(a)tiptoe.de>
-Date: Sun, 29 Nov 2015 00:16:18 +0100
-Subject: [PATCH] libsigc++-2.6.x: don't #include obsolete headers
-
----
- gtk2_ardour/editor_markers.cc | 1 -
- libs/ardour/audio_track.cc | 5 ++---
- libs/ardour/audioregion.cc | 1 -
- libs/ardour/region.cc | 1 -
- libs/ardour/session.cc | 3 +--
- libs/ardour/session_transport.cc | 3 +--
- libs/ardour/track.cc | 5 ++---
- 7 files changed, 6 insertions(+), 13 deletions(-)
-
-diff --git a/gtk2_ardour/editor_markers.cc b/gtk2_ardour/editor_markers.cc
-index b47a3d3..0809dea 100644
---- a/gtk2_ardour/editor_markers.cc
-+++ b/gtk2_ardour/editor_markers.cc
-@@ -17,7 +17,6 @@
-
- */
-
--#include <sigc++/retype.h>
- #include <cstdlib>
- #include <cmath>
-
-diff --git a/libs/ardour/audio_track.cc b/libs/ardour/audio_track.cc
-index 688030d..fa260d3 100644
---- a/libs/ardour/audio_track.cc
-+++ b/libs/ardour/audio_track.cc
-@@ -19,9 +19,8 @@
-
- #include <boost/scoped_array.hpp>
-
--#include <sigc++/retype.h>
--#include <sigc++/retype_return.h>
--#include <sigc++/bind.h>
-+#include <sigc++/adaptors/retype_return.h>
-+#include <sigc++/adaptors/bind.h>
-
- #include <pbd/error.h>
- #include <pbd/enumwriter.h>
-diff --git a/libs/ardour/audioregion.cc b/libs/ardour/audioregion.cc
-index 7eefd68..3245319 100644
---- a/libs/ardour/audioregion.cc
-+++ b/libs/ardour/audioregion.cc
-@@ -26,7 +26,6 @@
- #include <boost/scoped_array.hpp>
-
- #include <sigc++/bind.h>
--#include <sigc++/class_slot.h>
-
- #include <glibmm/thread.h>
-
-diff --git a/libs/ardour/region.cc b/libs/ardour/region.cc
-index a575700..0c1eb40 100644
---- a/libs/ardour/region.cc
-+++ b/libs/ardour/region.cc
-@@ -24,7 +24,6 @@
- #include <sstream>
-
- #include <sigc++/bind.h>
--#include <sigc++/class_slot.h>
-
- #include <glibmm/thread.h>
- #include <pbd/xml++.h>
-diff --git a/libs/ardour/session.cc b/libs/ardour/session.cc
-index 5f5231a..4463eb5 100644
---- a/libs/ardour/session.cc
-+++ b/libs/ardour/session.cc
-@@ -29,8 +29,7 @@
- #include <limits.h>
- #include <sys/time.h>
-
--#include <sigc++/bind.h>
--#include <sigc++/retype.h>
-+#include <sigc++/adaptors/bind.h>
-
- #include <glibmm/thread.h>
- #include <glibmm/miscutils.h>
-diff --git a/libs/ardour/session_transport.cc b/libs/ardour/session_transport.cc
-index c19c115..02129bc 100644
---- a/libs/ardour/session_transport.cc
-+++ b/libs/ardour/session_transport.cc
-@@ -21,8 +21,7 @@
- #include <cerrno>
- #include <unistd.h>
-
--#include <sigc++/bind.h>
--#include <sigc++/retype.h>
-+#include <sigc++/adaptors/bind.h>
-
- #include <pbd/undo.h>
- #include <pbd/error.h>
-diff --git a/libs/ardour/track.cc b/libs/ardour/track.cc
-index 63254a3..4706452 100644
---- a/libs/ardour/track.cc
-+++ b/libs/ardour/track.cc
-@@ -16,9 +16,8 @@
- Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
- #include <pbd/error.h>
--#include <sigc++/retype.h>
--#include <sigc++/retype_return.h>
--#include <sigc++/bind.h>
-+#include <sigc++/adaptors/retype_return.h>
-+#include <sigc++/adaptors/bind.h>
-
- #include <ardour/track.h>
- #include <ardour/diskstream.h>
---
-2.6.3
-
diff --git a/ardour-SConscript.patch b/ardour-SConscript.patch
deleted file mode 100644
index ce39fb1..0000000
--- a/ardour-SConscript.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -rupN ardour-2.8.3.old/libs/midi++2/SConscript ardour-2.8.3/libs/midi++2/SConscript
---- ardour-2.8.3.old/libs/midi++2/SConscript 2009-03-19 13:52:43.000000000 -0400
-+++ ardour-2.8.3/libs/midi++2/SConscript 2009-11-12 04:01:48.000000000 -0500
-@@ -42,7 +42,7 @@ if env['SYSMIDI'] == 'CoreMIDI':
- else:
- sysdep_src = [ 'alsa_sequencer_midiport.cc' ]
- midi2.Append (CCFLAGS="-DWITH_ALSA")
--
-+ midi2.Append (LIBS = "-lasound")
- midi2.Append(CCFLAGS="-D_REENTRANT -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE")
- midi2.Append(CCFLAGS="-DLIBSIGC_DISABLE_DEPRECATED")
-
-diff -rupN ardour-2.8.3.old/libs/vamp-sdk/SConscript ardour-2.8.3/libs/vamp-sdk/SConscript
---- ardour-2.8.3.old/libs/vamp-sdk/SConscript 2009-03-26 11:20:21.000000000 -0400
-+++ ardour-2.8.3/libs/vamp-sdk/SConscript 2009-11-12 04:04:32.000000000 -0500
-@@ -27,7 +27,7 @@ vampsdk.Merge ([libraries['fftw3'], libr
- # HAVE_FFTW3 is used to help improve some performance aspects of VAMP's InputDomainAdapter
-
- vampsdk.Append (CPPATH='#libs/vamp-sdk/vamp', CXXFLAGS="-Ilibs/vamp-sdk -DHAVE_FFTW3")
--
-+vampsdk.Append (LIBS = "-ldl")
- libvampsdk = vampsdk.SharedLibrary('vampsdk', vampsdk_files)
- libvamphostsdk = vampsdk.SharedLibrary('vamphostsdk', vamphostsdk_files)
-
diff --git a/ardour-fix-mm-includes.patch b/ardour-fix-mm-includes.patch
deleted file mode 100644
index a0978a1..0000000
--- a/ardour-fix-mm-includes.patch
+++ /dev/null
@@ -1,1915 +0,0 @@
-gtkmm is sensitive to headers not being included in the right order, esp.
-to glibmm.h and gdkmm.h not being included first. This causes compile errors
-with gcc >= 4.8
-
-Switch to simply including gtkmm.h, rather then specific headers, as that does
-the right thing for us.
-diff -up ardour-2.8.16/libs/gtkmm2ext/application.cc~ ardour-2.8.16/libs/gtkmm2ext/application.cc
---- ardour-2.8.16/libs/gtkmm2ext/application.cc~ 2010-04-16 16:43:29.000000000 +0200
-+++ ardour-2.8.16/libs/gtkmm2ext/application.cc 2013-05-10 12:34:45.890929703 +0200
-@@ -21,8 +21,7 @@
- * Boston, MA 02111-1307, USA.
- */
-
--#include <gtkmm/menushell.h>
--#include <gtkmm/menuitem.h>
-+#include <gtkmm.h>
-
- #include "gtkmm2ext/application.h"
- #include "gtkmm2ext/gtkapplication.h"
-diff -up ardour-2.8.16/libs/gtkmm2ext/choice.cc~ ardour-2.8.16/libs/gtkmm2ext/choice.cc
---- ardour-2.8.16/libs/gtkmm2ext/choice.cc~ 2009-02-24 13:37:45.000000000 +0100
-+++ ardour-2.8.16/libs/gtkmm2ext/choice.cc 2013-05-10 12:36:27.538937570 +0200
-@@ -18,7 +18,7 @@
- $Id: choice.cc 461 2006-04-20 20:41:05Z nickm $
- */
-
--#include <gtkmm/label.h>
-+#include <gtkmm.h>
- #include <gtkmm2ext/choice.h>
-
- using namespace std;
-diff -up ardour-2.8.16/libs/gtkmm2ext/fastmeter.cc~ ardour-2.8.16/libs/gtkmm2ext/fastmeter.cc
---- ardour-2.8.16/libs/gtkmm2ext/fastmeter.cc~ 2009-02-24 13:37:45.000000000 +0100
-+++ ardour-2.8.16/libs/gtkmm2ext/fastmeter.cc 2013-05-10 12:35:45.250934297 +0200
-@@ -21,10 +21,9 @@
- #include <iostream>
- #include <cmath>
- #include <algorithm>
--#include <gdkmm/rectangle.h>
-+#include <gtkmm.h>
- #include <gtkmm2ext/fastmeter.h>
- #include <gtkmm2ext/utils.h>
--#include <gtkmm/style.h>
- #include <cstring>
-
- #define UINT_TO_RGB(u,r,g,b) { (*(r)) = ((u)>>16)&0xff; (*(g)) = ((u)>>8)&0xff; (*(b)) = (u)&0xff; }
-diff -up ardour-2.8.16/libs/gtkmm2ext/gtkmm2ext/barcontroller.h~ ardour-2.8.16/libs/gtkmm2ext/gtkmm2ext/barcontroller.h
---- ardour-2.8.16/libs/gtkmm2ext/gtkmm2ext/barcontroller.h~ 2009-07-09 20:29:31.000000000 +0200
-+++ ardour-2.8.16/libs/gtkmm2ext/gtkmm2ext/barcontroller.h 2013-05-10 12:38:14.145945821 +0200
-@@ -19,8 +19,7 @@
- #ifndef __gtkmm2ext_bar_controller_h__
- #define __gtkmm2ext_bar_controller_h__
-
--#include <gtkmm/frame.h>
--#include <gtkmm/drawingarea.h>
-+#include <gtkmm.h>
- #include <gtkmm2ext/binding_proxy.h>
-
- namespace ARDOUR {
-diff -up ardour-2.8.16/libs/gtkmm2ext/gtkmm2ext/choice.h~ ardour-2.8.16/libs/gtkmm2ext/gtkmm2ext/choice.h
---- ardour-2.8.16/libs/gtkmm2ext/gtkmm2ext/choice.h~ 2009-02-24 13:37:45.000000000 +0100
-+++ ardour-2.8.16/libs/gtkmm2ext/gtkmm2ext/choice.h 2013-05-10 12:38:51.009948674 +0200
-@@ -20,10 +20,7 @@
- #ifndef __pbd_gtkmm_choice_h__
- #define __pbd_gtkmm_choice_h__
-
--#include <gtkmm/dialog.h>
--#include <gtkmm/image.h>
--#include <gtkmm/stock.h>
--#include <gtkmm/box.h>
-+#include <gtkmm.h>
- #include <string>
- #include <vector>
-
-diff -up ardour-2.8.16/libs/gtkmm2ext/gtkmm2ext/dndtreeview.h~ ardour-2.8.16/libs/gtkmm2ext/gtkmm2ext/dndtreeview.h
---- ardour-2.8.16/libs/gtkmm2ext/gtkmm2ext/dndtreeview.h~ 2009-02-24 13:37:45.000000000 +0100
-+++ ardour-2.8.16/libs/gtkmm2ext/gtkmm2ext/dndtreeview.h 2013-05-10 12:39:11.089950228 +0200
-@@ -22,9 +22,7 @@
-
- #include <stdint.h>
- #include <string>
--#include <gtkmm/treeview.h>
--#include <gtkmm/treeselection.h>
--#include <gtkmm/selectiondata.h>
-+#include <gtkmm.h>
-
- namespace Gtkmm2ext {
-
-diff -up ardour-2.8.16/libs/gtkmm2ext/gtkmm2ext/fastmeter.h~ ardour-2.8.16/libs/gtkmm2ext/gtkmm2ext/fastmeter.h
---- ardour-2.8.16/libs/gtkmm2ext/gtkmm2ext/fastmeter.h~ 2009-02-24 13:37:45.000000000 +0100
-+++ ardour-2.8.16/libs/gtkmm2ext/gtkmm2ext/fastmeter.h 2013-05-10 12:38:40.721947878 +0200
-@@ -20,8 +20,7 @@
- #ifndef __gtkmm2ext_fastmeter_h__
- #define __gtkmm2ext_fastmeter_h__
-
--#include <gtkmm/drawingarea.h>
--#include <gdkmm/pixbuf.h>
-+#include <gtkmm.h>
-
- namespace Gtkmm2ext {
-
-diff -up ardour-2.8.16/libs/gtkmm2ext/gtkmm2ext/focus_entry.h~ ardour-2.8.16/libs/gtkmm2ext/gtkmm2ext/focus_entry.h
---- ardour-2.8.16/libs/gtkmm2ext/gtkmm2ext/focus_entry.h~ 2009-02-24 13:37:45.000000000 +0100
-+++ ardour-2.8.16/libs/gtkmm2ext/gtkmm2ext/focus_entry.h 2013-05-10 12:39:19.953950914 +0200
-@@ -20,7 +20,7 @@
- #ifndef __gtkmm2ext_focus_entry_h__
- #define __gtkmm2ext_focus_entry_h__
-
--#include <gtkmm/entry.h>
-+#include <gtkmm.h>
-
- namespace Gtkmm2ext {
-
-diff -up ardour-2.8.16/libs/gtkmm2ext/gtkmm2ext/gtk_ui.h~ ardour-2.8.16/libs/gtkmm2ext/gtkmm2ext/gtk_ui.h
---- ardour-2.8.16/libs/gtkmm2ext/gtkmm2ext/gtk_ui.h~ 2011-02-04 05:05:47.000000000 +0100
-+++ ardour-2.8.16/libs/gtkmm2ext/gtkmm2ext/gtk_ui.h 2013-05-10 12:37:56.737944474 +0200
-@@ -27,14 +27,7 @@
- #include <stdint.h>
- #include <setjmp.h>
- #include <pthread.h>
--#include <gtkmm/widget.h>
--#include <gtkmm/style.h>
--#ifndef GTK_NEW_TOOLTIP_API
--#include <gtkmm/tooltips.h>
--#endif
--#include <gtkmm/textbuffer.h>
--#include <gtkmm/main.h>
--#include <gdkmm/color.h>
-+#include <gtkmm.h>
- #include <pbd/abstract_ui.h>
- #include <pbd/ringbufferNPT.h>
-
-diff -up ardour-2.8.16/libs/gtkmm2ext/gtkmm2ext/idle_adjustment.h~ ardour-2.8.16/libs/gtkmm2ext/gtkmm2ext/idle_adjustment.h
---- ardour-2.8.16/libs/gtkmm2ext/gtkmm2ext/idle_adjustment.h~ 2009-02-24 13:37:45.000000000 +0100
-+++ ardour-2.8.16/libs/gtkmm2ext/gtkmm2ext/idle_adjustment.h 2013-05-10 12:39:33.585951969 +0200
-@@ -21,7 +21,7 @@
- #define __gtkmm2ext_idle_adjustment_h__
-
- #include <sys/time.h>
--#include <gtkmm/adjustment.h>
-+#include <gtkmm.h>
-
- namespace Gtkmm2ext {
-
-diff -up ardour-2.8.16/libs/gtkmm2ext/gtkmm2ext/pixfader.h~ ardour-2.8.16/libs/gtkmm2ext/gtkmm2ext/pixfader.h
---- ardour-2.8.16/libs/gtkmm2ext/gtkmm2ext/pixfader.h~ 2009-02-24 13:37:45.000000000 +0100
-+++ ardour-2.8.16/libs/gtkmm2ext/gtkmm2ext/pixfader.h 2013-05-10 12:38:34.865947425 +0200
-@@ -22,9 +22,7 @@
-
- #include <cmath>
-
--#include <gtkmm/drawingarea.h>
--#include <gtkmm/adjustment.h>
--#include <gdkmm/pixbuf.h>
-+#include <gtkmm.h>
-
- namespace Gtkmm2ext {
-
-diff -up ardour-2.8.16/libs/gtkmm2ext/gtkmm2ext/pixscroller.h~ ardour-2.8.16/libs/gtkmm2ext/gtkmm2ext/pixscroller.h
---- ardour-2.8.16/libs/gtkmm2ext/gtkmm2ext/pixscroller.h~ 2009-02-24 13:37:45.000000000 +0100
-+++ ardour-2.8.16/libs/gtkmm2ext/gtkmm2ext/pixscroller.h 2013-05-10 12:38:03.809945021 +0200
-@@ -20,9 +20,7 @@
- #ifndef __gtkmm2ext_pixscroller_h__
- #define __gtkmm2ext_pixscroller_h__
-
--#include <gtkmm/drawingarea.h>
--#include <gtkmm/adjustment.h>
--#include <gdkmm.h>
-+#include <gtkmm.h>
-
- namespace Gtkmm2ext {
-
-diff -up ardour-2.8.16/libs/gtkmm2ext/gtkmm2ext/prompter.h~ ardour-2.8.16/libs/gtkmm2ext/gtkmm2ext/prompter.h
---- ardour-2.8.16/libs/gtkmm2ext/gtkmm2ext/prompter.h~ 2009-02-24 13:37:45.000000000 +0100
-+++ ardour-2.8.16/libs/gtkmm2ext/gtkmm2ext/prompter.h 2013-05-10 12:38:22.945946502 +0200
-@@ -21,10 +21,7 @@
- #define __gtkmm2ext_prompter_h__
-
- #include <string>
--#include <gtkmm/box.h>
--#include <gtkmm/entry.h>
--#include <gtkmm/label.h>
--#include <gtkmm/dialog.h>
-+#include <gtkmm.h>
- #include <sigc++/sigc++.h>
-
- namespace Gtk {
-diff -up ardour-2.8.16/libs/gtkmm2ext/gtkmm2ext/stateful_button.h~ ardour-2.8.16/libs/gtkmm2ext/gtkmm2ext/stateful_button.h
---- ardour-2.8.16/libs/gtkmm2ext/gtkmm2ext/stateful_button.h~ 2009-02-24 13:37:45.000000000 +0100
-+++ ardour-2.8.16/libs/gtkmm2ext/gtkmm2ext/stateful_button.h 2013-05-10 12:39:25.793951366 +0200
-@@ -22,7 +22,7 @@
-
- #include <vector>
-
--#include <gtkmm/togglebutton.h>
-+#include <gtkmm.h>
-
- namespace Gtkmm2ext {
-
-diff -up ardour-2.8.16/libs/gtkmm2ext/gtkmm2ext/tearoff.h~ ardour-2.8.16/libs/gtkmm2ext/gtkmm2ext/tearoff.h
---- ardour-2.8.16/libs/gtkmm2ext/gtkmm2ext/tearoff.h~ 2009-02-24 13:37:45.000000000 +0100
-+++ ardour-2.8.16/libs/gtkmm2ext/gtkmm2ext/tearoff.h 2013-05-10 12:38:57.297949161 +0200
-@@ -20,10 +20,7 @@
- #ifndef __gtkmm2ext_tearoff_h__
- #define __gtkmm2ext_tearoff_h__
-
--#include <gtkmm/window.h>
--#include <gtkmm/arrow.h>
--#include <gtkmm/box.h>
--#include <gtkmm/eventbox.h>
-+#include <gtkmm.h>
-
- namespace Gtkmm2ext {
-
-diff -up ardour-2.8.16/libs/gtkmm2ext/gtkmm2ext/utils.h~ ardour-2.8.16/libs/gtkmm2ext/gtkmm2ext/utils.h
---- ardour-2.8.16/libs/gtkmm2ext/gtkmm2ext/utils.h~ 2009-03-13 13:42:40.000000000 +0100
-+++ ardour-2.8.16/libs/gtkmm2ext/gtkmm2ext/utils.h 2013-05-10 12:37:19.682941606 +0200
-@@ -23,8 +23,7 @@
- #include <vector>
- #include <string>
-
--#include <gtkmm/treeview.h>
--#include <gdkmm/window.h> /* for WMDecoration */
-+#include <gtkmm.h>
-
- namespace Gtk {
- class ComboBoxText;
-diff -up ardour-2.8.16/libs/gtkmm2ext/idle_adjustment.cc~ ardour-2.8.16/libs/gtkmm2ext/idle_adjustment.cc
---- ardour-2.8.16/libs/gtkmm2ext/idle_adjustment.cc~ 2009-02-24 13:37:45.000000000 +0100
-+++ ardour-2.8.16/libs/gtkmm2ext/idle_adjustment.cc 2013-05-10 12:34:33.891928774 +0200
-@@ -19,7 +19,7 @@
-
- #define _BSD_SOURCE
- #include <gtkmm2ext/idle_adjustment.h>
--#include <gtkmm/main.h>
-+#include <gtkmm.h>
- #include <iostream>
-
- using namespace Gtk;
-diff -up ardour-2.8.16/libs/gtkmm2ext/prompter.cc~ ardour-2.8.16/libs/gtkmm2ext/prompter.cc
---- ardour-2.8.16/libs/gtkmm2ext/prompter.cc~ 2009-02-24 13:37:45.000000000 +0100
-+++ ardour-2.8.16/libs/gtkmm2ext/prompter.cc 2013-05-10 12:36:11.906936360 +0200
-@@ -22,7 +22,7 @@
-
- #include <pbd/whitespace.h>
-
--#include <gtkmm/stock.h>
-+#include <gtkmm.h>
- #include <gtkmm2ext/prompter.h>
-
- #include "i18n.h"
-diff -up ardour-2.8.16/libs/gtkmm2ext/stateful_button.cc~ ardour-2.8.16/libs/gtkmm2ext/stateful_button.cc
---- ardour-2.8.16/libs/gtkmm2ext/stateful_button.cc~ 2010-03-19 20:04:50.000000000 +0100
-+++ ardour-2.8.16/libs/gtkmm2ext/stateful_button.cc 2013-05-10 12:36:18.834936896 +0200
-@@ -20,7 +20,7 @@
- #include <string>
- #include <iostream>
-
--#include <gtkmm/main.h>
-+#include <gtkmm.h>
-
- #include <gtkmm2ext/stateful_button.h>
-
-diff -up ardour-2.8.16/libs/gtkmm2ext/utils.cc~ ardour-2.8.16/libs/gtkmm2ext/utils.cc
---- ardour-2.8.16/libs/gtkmm2ext/utils.cc~ 2009-03-13 14:01:25.000000000 +0100
-+++ ardour-2.8.16/libs/gtkmm2ext/utils.cc 2013-05-10 12:35:09.746931549 +0200
-@@ -21,15 +21,10 @@
- #include <iostream>
- #include <map>
-
--#include <gtk/gtkpaned.h>
- #include <gtk/gtk.h>
-
- #include <gtkmm2ext/utils.h>
--#include <gtkmm/widget.h>
--#include <gtkmm/button.h>
--#include <gtkmm/window.h>
--#include <gtkmm/paned.h>
--#include <gtkmm/comboboxtext.h>
-+#include <gtkmm.h>
-
- #include "i18n.h"
-
-diff -up ardour-2.8.16/gtk2_ardour/actions.cc~ ardour-2.8.16/gtk2_ardour/actions.cc
---- ardour-2.8.16/gtk2_ardour/actions.cc~ 2013-05-10 12:55:41.612026892 +0200
-+++ ardour-2.8.16/gtk2_ardour/actions.cc 2013-05-10 12:48:09.470991898 +0200
-@@ -26,8 +26,8 @@
- #include <gtk/gtkuimanager.h>
- #include <gtk/gtkactiongroup.h>
-
-+#include <gtkmm.h>
- #include <gtkmm/accelmap.h>
--#include <gtkmm/uimanager.h>
-
- #include <pbd/error.h>
-
-diff -up ardour-2.8.16/gtk2_ardour/add_route_dialog.cc~ ardour-2.8.16/gtk2_ardour/add_route_dialog.cc
---- ardour-2.8.16/gtk2_ardour/add_route_dialog.cc~ 2011-09-12 21:22:34.000000000 +0200
-+++ ardour-2.8.16/gtk2_ardour/add_route_dialog.cc 2013-05-10 12:48:43.070994498 +0200
-@@ -21,8 +21,7 @@
- #include <cmath>
-
- #include <sigc++/bind.h>
--#include <gtkmm/stock.h>
--#include <gtkmm/separator.h>
-+#include <gtkmm.h>
- #include <pbd/error.h>
- #include <pbd/convert.h>
- #include <gtkmm2ext/utils.h>
-diff -up ardour-2.8.16/gtk2_ardour/analysis_window.cc~ ardour-2.8.16/gtk2_ardour/analysis_window.cc
---- ardour-2.8.16/gtk2_ardour/analysis_window.cc~ 2011-04-06 19:09:42.000000000 +0200
-+++ ardour-2.8.16/gtk2_ardour/analysis_window.cc 2013-05-10 12:48:51.997995189 +0200
-@@ -19,10 +19,7 @@
- */
-
- #include <gtkmm2ext/gtk_ui.h>
--#include <gtkmm/stock.h>
--#include <gtkmm/label.h>
--#include <gtkmm/treemodel.h>
--#include <gtkmm/treeiter.h>
-+#include <gtkmm.h>
-
- #include <ardour/audioregion.h>
- #include <ardour/audioplaylist.h>
-diff -up ardour-2.8.16/gtk2_ardour/ardour_ui.cc~ ardour-2.8.16/gtk2_ardour/ardour_ui.cc
---- ardour-2.8.16/gtk2_ardour/ardour_ui.cc~ 2012-07-20 17:24:56.000000000 +0200
-+++ ardour-2.8.16/gtk2_ardour/ardour_ui.cc 2013-05-10 12:48:58.814995717 +0200
-@@ -32,7 +32,7 @@
-
- #include <sys/resource.h>
-
--#include <gtkmm/messagedialog.h>
-+#include <gtkmm.h>
- #include <gtkmm/accelmap.h>
- #include <gtkmm2ext/application.h>
-
-diff -up ardour-2.8.16/gtk2_ardour/ardour_ui_ed.cc~ ardour-2.8.16/gtk2_ardour/ardour_ui_ed.cc
---- ardour-2.8.16/gtk2_ardour/ardour_ui_ed.cc~ 2012-10-17 00:35:38.000000000 +0200
-+++ ardour-2.8.16/gtk2_ardour/ardour_ui_ed.cc 2013-05-10 12:49:06.509996312 +0200
-@@ -26,7 +26,7 @@
- #include <pbd/pathscanner.h>
- #include <pbd/fpu.h>
-
--#include <glibmm/miscutils.h>
-+#include <glibmm.h>
-
- #include <gtkmm2ext/utils.h>
- #include <gtkmm2ext/window_title.h>
-diff -up ardour-2.8.16/gtk2_ardour/crossfade_edit.cc~ ardour-2.8.16/gtk2_ardour/crossfade_edit.cc
---- ardour-2.8.16/gtk2_ardour/crossfade_edit.cc~ 2010-03-26 17:39:18.000000000 +0100
-+++ ardour-2.8.16/gtk2_ardour/crossfade_edit.cc 2013-05-10 12:49:47.165999459 +0200
-@@ -21,11 +21,9 @@
-
- #include <sigc++/bind.h>
-
--#include <gtkmm/frame.h>
--#include <gtkmm/image.h>
--#include <gtkmm/scrolledwindow.h>
-+#include <gtkmm.h>
-
--#include <libgnomecanvasmm/line.h>
-+#include <libgnomecanvasmm.h>
-
- #include <ardour/automation_event.h>
- #include <ardour/curve.h>
-diff -up ardour-2.8.16/gtk2_ardour/editor.cc~ ardour-2.8.16/gtk2_ardour/editor.cc
---- ardour-2.8.16/gtk2_ardour/editor.cc~ 2012-03-16 15:33:28.000000000 +0100
-+++ ardour-2.8.16/gtk2_ardour/editor.cc 2013-05-10 12:50:02.782000668 +0200
-@@ -33,10 +33,7 @@
- #include <pbd/enumwriter.h>
- #include <pbd/memento_command.h>
-
--#include <glibmm/miscutils.h>
--#include <gtkmm/image.h>
--#include <gdkmm/color.h>
--#include <gdkmm/bitmap.h>
-+#include <gtkmm.h>
-
- #include <gtkmm2ext/grouped_buttons.h>
- #include <gtkmm2ext/gtk_ui.h>
-diff -up ardour-2.8.16/gtk2_ardour/editor_canvas.cc~ ardour-2.8.16/gtk2_ardour/editor_canvas.cc
---- ardour-2.8.16/gtk2_ardour/editor_canvas.cc~ 2012-03-16 15:33:28.000000000 +0100
-+++ ardour-2.8.16/gtk2_ardour/editor_canvas.cc 2013-05-10 12:50:09.534001190 +0200
-@@ -23,8 +23,7 @@
- #undef Rect
- #endif /* __APPLE__ */
-
--#include <libgnomecanvasmm/init.h>
--#include <libgnomecanvasmm/pixbuf.h>
-+#include <libgnomecanvasmm.h>
- #include <jack/types.h>
- #include <gtkmm2ext/utils.h>
-
-diff -up ardour-2.8.16/gtk2_ardour/editor_export_audio.cc~ ardour-2.8.16/gtk2_ardour/editor_export_audio.cc
---- ardour-2.8.16/gtk2_ardour/editor_export_audio.cc~ 2009-02-24 13:37:42.000000000 +0100
-+++ ardour-2.8.16/gtk2_ardour/editor_export_audio.cc 2013-05-10 12:50:13.918001530 +0200
-@@ -20,7 +20,7 @@
- #include <unistd.h>
- #include <climits>
-
--#include <gtkmm/messagedialog.h>
-+#include <gtkmm.h>
-
- #include "export_session_dialog.h"
- #include "export_region_dialog.h"
-diff -up ardour-2.8.16/gtk2_ardour/editor_keys.cc~ ardour-2.8.16/gtk2_ardour/editor_keys.cc
---- ardour-2.8.16/gtk2_ardour/editor_keys.cc~ 2009-02-24 13:37:42.000000000 +0100
-+++ ardour-2.8.16/gtk2_ardour/editor_keys.cc 2013-05-10 12:50:18.975001921 +0200
-@@ -25,7 +25,7 @@
-
- #include <ardour/session.h>
- #include <ardour/region.h>
--#include <gtkmm/treeview.h>
-+#include <gtkmm.h>
-
- #include "ardour_ui.h"
- #include "editor.h"
-diff -up ardour-2.8.16/gtk2_ardour/editor_mixer.cc~ ardour-2.8.16/gtk2_ardour/editor_mixer.cc
---- ardour-2.8.16/gtk2_ardour/editor_mixer.cc~ 2012-03-09 17:56:54.000000000 +0100
-+++ ardour-2.8.16/gtk2_ardour/editor_mixer.cc 2013-05-10 12:50:23.406002264 +0200
-@@ -17,7 +17,7 @@
-
- */
-
--#include <glibmm/miscutils.h>
-+#include <glibmm.h>
- #include <gtkmm2ext/utils.h>
- #include <gtkmm2ext/window_title.h>
-
-diff -up ardour-2.8.16/gtk2_ardour/engine_dialog.cc~ ardour-2.8.16/gtk2_ardour/engine_dialog.cc
---- ardour-2.8.16/gtk2_ardour/engine_dialog.cc~ 2012-12-02 01:37:37.000000000 +0100
-+++ ardour-2.8.16/gtk2_ardour/engine_dialog.cc 2013-05-10 12:50:36.878003307 +0200
-@@ -4,8 +4,7 @@
- #include <map>
-
- #include <boost/scoped_ptr.hpp>
--#include <glibmm.h>
--#include <gtkmm/messagedialog.h>
-+#include <gtkmm.h>
- #include <pbd/xml++.h>
- #include <pbd/epa.h>
-
-@@ -21,7 +20,6 @@
- #include <ardour/profile.h>
- #include <jack/jack.h>
-
--#include <gtkmm/stock.h>
- #include <gtkmm2ext/utils.h>
-
- #include <pbd/convert.h>
-diff -up ardour-2.8.16/gtk2_ardour/fft_graph.cc~ ardour-2.8.16/gtk2_ardour/fft_graph.cc
---- ardour-2.8.16/gtk2_ardour/fft_graph.cc~ 2009-02-24 13:37:42.000000000 +0100
-+++ ardour-2.8.16/gtk2_ardour/fft_graph.cc 2013-05-10 12:50:53.886004623 +0200
-@@ -19,15 +19,7 @@
-
- #include <iostream>
-
--#include <glibmm.h>
--#include <glibmm/refptr.h>
--
--#include <gdkmm/gc.h>
--
--#include <gtkmm/widget.h>
--#include <gtkmm/style.h>
--#include <gtkmm/treemodel.h>
--#include <gtkmm/treepath.h>
-+#include <gtkmm.h>
-
- #include <pbd/stl_delete.h>
-
-diff -up ardour-2.8.16/gtk2_ardour/imageframe_time_axis.cc~ ardour-2.8.16/gtk2_ardour/imageframe_time_axis.cc
---- ardour-2.8.16/gtk2_ardour/imageframe_time_axis.cc~ 2009-03-02 21:42:15.000000000 +0100
-+++ ardour-2.8.16/gtk2_ardour/imageframe_time_axis.cc 2013-05-10 12:51:13.341006129 +0200
-@@ -22,7 +22,7 @@
-
- #include <pbd/error.h>
-
--#include <gtkmm/menu.h>
-+#include <gtkmm.h>
-
- #include <gtkmm2ext/utils.h>
- #include <gtkmm2ext/gtk_ui.h>
-diff -up ardour-2.8.16/gtk2_ardour/io_selector.cc~ ardour-2.8.16/gtk2_ardour/io_selector.cc
---- ardour-2.8.16/gtk2_ardour/io_selector.cc~ 2011-09-12 21:22:34.000000000 +0200
-+++ ardour-2.8.16/gtk2_ardour/io_selector.cc 2013-05-10 12:51:24.205006970 +0200
-@@ -22,9 +22,7 @@
-
- #include <sigc++/bind.h>
-
--#include <gtkmm/messagedialog.h>
--
--#include <glibmm/thread.h>
-+#include <gtkmm.h>
-
- #include <ardour/io.h>
- #include <ardour/route.h>
-diff -up ardour-2.8.16/gtk2_ardour/keyboard.cc~ ardour-2.8.16/gtk2_ardour/keyboard.cc
---- ardour-2.8.16/gtk2_ardour/keyboard.cc~ 2012-04-19 16:35:13.000000000 +0200
-+++ ardour-2.8.16/gtk2_ardour/keyboard.cc 2013-05-10 12:51:29.773007401 +0200
-@@ -28,6 +28,7 @@
-
- #include <ctype.h>
-
-+#include <gtkmm.h>
- #include <gtkmm/accelmap.h>
-
- #include <gdk/gdkkeysyms.h>
-diff -up ardour-2.8.16/gtk2_ardour/keyeditor.cc~ ardour-2.8.16/gtk2_ardour/keyeditor.cc
---- ardour-2.8.16/gtk2_ardour/keyeditor.cc~ 2012-03-16 15:33:28.000000000 +0100
-+++ ardour-2.8.16/gtk2_ardour/keyeditor.cc 2013-05-10 12:51:37.821008023 +0200
-@@ -2,11 +2,8 @@
-
- #include <ardour/profile.h>
-
--#include <gtkmm/stock.h>
--#include <gtkmm/label.h>
--#include <gtkmm/accelkey.h>
-+#include <gtkmm.h>
- #include <gtkmm/accelmap.h>
--#include <gtkmm/uimanager.h>
-
- #include <pbd/strsplit.h>
- #include <pbd/replace_all.h>
-diff -up ardour-2.8.16/gtk2_ardour/main.cc~ ardour-2.8.16/gtk2_ardour/main.cc
---- ardour-2.8.16/gtk2_ardour/main.cc~ 2012-07-02 15:21:59.000000000 +0200
-+++ ardour-2.8.16/gtk2_ardour/main.cc 2013-05-10 12:51:47.421008766 +0200
-@@ -23,7 +23,7 @@
- #include <fstream>
-
- #include <sigc++/bind.h>
--#include <gtkmm/settings.h>
-+#include <gtkmm.h>
-
- #include <pbd/error.h>
- #include <pbd/textreceiver.h>
-@@ -38,8 +38,6 @@
- #include <ardour/ardour.h>
- #include <ardour/audioengine.h>
-
--#include <gtkmm/main.h>
--
- #include <gtkmm2ext/application.h>
- #include <gtkmm2ext/popup.h>
- #include <gtkmm2ext/utils.h>
-diff -up ardour-2.8.16/gtk2_ardour/marker_time_axis.cc~ ardour-2.8.16/gtk2_ardour/marker_time_axis.cc
---- ardour-2.8.16/gtk2_ardour/marker_time_axis.cc~ 2009-03-02 21:42:15.000000000 +0100
-+++ ardour-2.8.16/gtk2_ardour/marker_time_axis.cc 2013-05-10 12:51:52.333009147 +0200
-@@ -21,7 +21,7 @@
-
- #include <pbd/error.h>
-
--#include <gtkmm/menu.h>
-+#include <gtkmm.h>
-
- #include <gtkmm2ext/utils.h>
-
-diff -up ardour-2.8.16/gtk2_ardour/midi_port_dialog.cc~ ardour-2.8.16/gtk2_ardour/midi_port_dialog.cc
---- ardour-2.8.16/gtk2_ardour/midi_port_dialog.cc~ 2009-02-24 13:37:42.000000000 +0100
-+++ ardour-2.8.16/gtk2_ardour/midi_port_dialog.cc 2013-05-10 12:51:58.029009588 +0200
-@@ -1,6 +1,6 @@
- #include <string>
- #include <sigc++/bind.h>
--#include <gtkmm/stock.h>
-+#include <gtkmm.h>
-
- #include <pbd/convert.h>
- #include <gtkmm2ext/utils.h>
-diff -up ardour-2.8.16/gtk2_ardour/mixer_ui.cc~ ardour-2.8.16/gtk2_ardour/mixer_ui.cc
---- ardour-2.8.16/gtk2_ardour/mixer_ui.cc~ 2011-09-27 18:10:50.000000000 +0200
-+++ ardour-2.8.16/gtk2_ardour/mixer_ui.cc 2013-05-10 12:52:09.053010441 +0200
-@@ -20,11 +20,11 @@
- #include <algorithm>
- #include <sigc++/bind.h>
-
-+#include <gtkmm.h>
- #include <gtkmm/accelmap.h>
-
- #include <pbd/convert.h>
- #include <pbd/stacktrace.h>
--#include <glibmm/thread.h>
-
- #include <gtkmm2ext/gtk_ui.h>
- #include <gtkmm2ext/utils.h>
-diff -up ardour-2.8.16/gtk2_ardour/nag.cc~ ardour-2.8.16/gtk2_ardour/nag.cc
---- ardour-2.8.16/gtk2_ardour/nag.cc~ 2012-07-02 15:21:59.000000000 +0200
-+++ ardour-2.8.16/gtk2_ardour/nag.cc 2013-05-10 12:52:13.501010785 +0200
-@@ -1,6 +1,6 @@
- #include <boost/scoped_ptr.hpp>
- #include <fstream>
--#include <gtkmm/stock.h>
-+#include <gtkmm.h>
-
- #include <ardour/ardour.h>
- #include <pbd/epa.h>
-diff -up ardour-2.8.16/gtk2_ardour/new_session_dialog.cc~ ardour-2.8.16/gtk2_ardour/new_session_dialog.cc
---- ardour-2.8.16/gtk2_ardour/new_session_dialog.cc~ 2012-07-02 02:19:40.000000000 +0200
-+++ ardour-2.8.16/gtk2_ardour/new_session_dialog.cc 2013-05-10 12:52:22.126011453 +0200
-@@ -25,14 +25,7 @@
-
- #include "pbd/stacktrace.h"
-
--#include <gtkmm/entry.h>
--#include <gtkmm/filechooserbutton.h>
--#include <gtkmm/spinbutton.h>
--#include <gtkmm/checkbutton.h>
--#include <gtkmm/radiobutton.h>
--#include <gtkmm/filefilter.h>
--#include <gtkmm/stock.h>
--#include <gdkmm/cursor.h>
-+#include <gtkmm.h>
-
- #include <gtkmm2ext/window_title.h>
-
-diff -up ardour-2.8.16/gtk2_ardour/panner2d.cc~ ardour-2.8.16/gtk2_ardour/panner2d.cc
---- ardour-2.8.16/gtk2_ardour/panner2d.cc~ 2009-02-24 13:37:42.000000000 +0100
-+++ ardour-2.8.16/gtk2_ardour/panner2d.cc 2013-05-10 12:52:27.453011865 +0200
-@@ -21,8 +21,7 @@
- #include <climits>
- #include <cstring>
-
--#include <gtkmm/menu.h>
--#include <gtkmm/checkmenuitem.h>
-+#include <gtkmm.h>
-
- #include <pbd/error.h>
- #include <ardour/panner.h>
-diff -up ardour-2.8.16/gtk2_ardour/playlist_selector.cc~ ardour-2.8.16/gtk2_ardour/playlist_selector.cc
---- ardour-2.8.16/gtk2_ardour/playlist_selector.cc~ 2009-10-26 02:03:48.000000000 +0100
-+++ ardour-2.8.16/gtk2_ardour/playlist_selector.cc 2013-05-10 12:52:32.493012255 +0200
-@@ -18,7 +18,7 @@
-
- */
-
--#include <gtkmm/button.h>
-+#include <gtkmm.h>
-
- #include <ardour/session_playlist.h>
- #include <ardour/audio_diskstream.h>
-diff -up ardour-2.8.16/gtk2_ardour/plugin_selector.cc~ ardour-2.8.16/gtk2_ardour/plugin_selector.cc
---- ardour-2.8.16/gtk2_ardour/plugin_selector.cc~ 2011-09-12 21:22:34.000000000 +0200
-+++ ardour-2.8.16/gtk2_ardour/plugin_selector.cc 2013-05-10 12:52:39.037012761 +0200
-@@ -23,10 +23,7 @@
-
- #include <algorithm>
-
--#include <gtkmm/table.h>
--#include <gtkmm/stock.h>
--#include <gtkmm/button.h>
--#include <gtkmm/notebook.h>
-+#include <gtkmm.h>
-
- #include <gtkmm2ext/utils.h>
-
-diff -up ardour-2.8.16/gtk2_ardour/plugin_ui.cc~ ardour-2.8.16/gtk2_ardour/plugin_ui.cc
---- ardour-2.8.16/gtk2_ardour/plugin_ui.cc~ 2012-06-18 21:49:14.000000000 +0200
-+++ ardour-2.8.16/gtk2_ardour/plugin_ui.cc 2013-05-10 12:52:45.117013232 +0200
-@@ -26,7 +26,7 @@
- #include <pbd/xml++.h>
- #include <pbd/failed_constructor.h>
-
--#include <gtkmm/widget.h>
-+#include <gtkmm.h>
- #include <gtkmm2ext/click_box.h>
- #include <gtkmm2ext/fastmeter.h>
- #include <gtkmm2ext/barcontroller.h>
-diff -up ardour-2.8.16/gtk2_ardour/redirect_box.cc~ ardour-2.8.16/gtk2_ardour/redirect_box.cc
---- ardour-2.8.16/gtk2_ardour/redirect_box.cc~ 2010-03-16 19:30:09.000000000 +0100
-+++ ardour-2.8.16/gtk2_ardour/redirect_box.cc 2013-05-10 12:52:55.325014022 +0200
-@@ -24,9 +24,7 @@
-
- #include <pbd/convert.h>
-
--#include <glibmm/miscutils.h>
--
--#include <gtkmm/messagedialog.h>
-+#include <gtkmm.h>
-
- #include <gtkmm2ext/gtk_ui.h>
- #include <gtkmm2ext/utils.h>
-diff -up ardour-2.8.16/gtk2_ardour/region_layering_order_editor.cc~ ardour-2.8.16/gtk2_ardour/region_layering_order_editor.cc
---- ardour-2.8.16/gtk2_ardour/region_layering_order_editor.cc~ 2009-11-13 15:37:10.000000000 +0100
-+++ ardour-2.8.16/gtk2_ardour/region_layering_order_editor.cc 2013-05-10 12:53:02.061014543 +0200
-@@ -1,6 +1,4 @@
--#include <gtkmm/table.h>
--#include <gtkmm/stock.h>
--#include <gtkmm/alignment.h>
-+#include <gtkmm.h>
- #include <ardour/region.h>
-
- #include "i18n.h"
-diff -up ardour-2.8.16/gtk2_ardour/rhythm_ferret.cc~ ardour-2.8.16/gtk2_ardour/rhythm_ferret.cc
---- ardour-2.8.16/gtk2_ardour/rhythm_ferret.cc~ 2011-04-06 19:09:42.000000000 +0200
-+++ ardour-2.8.16/gtk2_ardour/rhythm_ferret.cc 2013-05-10 12:53:06.893014917 +0200
-@@ -1,4 +1,4 @@
--#include <gtkmm/stock.h>
-+#include <gtkmm.h>
- #include <gtkmm2ext/utils.h>
-
- #include <pbd/memento_command.h>
-diff -up ardour-2.8.16/gtk2_ardour/route_params_ui.cc~ ardour-2.8.16/gtk2_ardour/route_params_ui.cc
---- ardour-2.8.16/gtk2_ardour/route_params_ui.cc~ 2010-03-16 21:00:41.000000000 +0100
-+++ ardour-2.8.16/gtk2_ardour/route_params_ui.cc 2013-05-10 12:53:15.581015590 +0200
-@@ -19,7 +19,7 @@
-
- #include <algorithm>
-
--#include <glibmm/thread.h>
-+#include <glibmm.h>
- #include <gtkmm2ext/utils.h>
- #include <gtkmm2ext/stop_signal.h>
- #include <gtkmm2ext/window_title.h>
-diff -up ardour-2.8.16/gtk2_ardour/route_time_axis.cc~ ardour-2.8.16/gtk2_ardour/route_time_axis.cc
---- ardour-2.8.16/gtk2_ardour/route_time_axis.cc~ 2010-04-17 17:23:01.000000000 +0200
-+++ ardour-2.8.16/gtk2_ardour/route_time_axis.cc 2013-05-10 12:53:22.957016161 +0200
-@@ -31,8 +31,7 @@
- #include <pbd/whitespace.h>
- #include <pbd/memento_command.h>
-
--#include <gtkmm/menu.h>
--#include <gtkmm/menuitem.h>
-+#include <gtkmm.h>
- #include <gtkmm2ext/gtk_ui.h>
- #include <gtkmm2ext/selector.h>
- #include <gtkmm2ext/stop_signal.h>
-diff -up ardour-2.8.16/gtk2_ardour/sfdb_ui.cc~ ardour-2.8.16/gtk2_ardour/sfdb_ui.cc
---- ardour-2.8.16/gtk2_ardour/sfdb_ui.cc~ 2012-07-02 15:21:59.000000000 +0200
-+++ ardour-2.8.16/gtk2_ardour/sfdb_ui.cc 2013-05-10 12:53:31.197016799 +0200
-@@ -25,9 +25,7 @@
- #include <sys/stat.h>
- #include <sys/param.h>
-
--#include <gtkmm/box.h>
--#include <gtkmm/stock.h>
--#include <glibmm/fileutils.h>
-+#include <gtkmm.h>
-
- #include <pbd/convert.h>
- #include <pbd/tokenizer.h>
-diff -up ardour-2.8.16/gtk2_ardour/tempo_dialog.cc~ ardour-2.8.16/gtk2_ardour/tempo_dialog.cc
---- ardour-2.8.16/gtk2_ardour/tempo_dialog.cc~ 2009-09-17 00:13:32.000000000 +0200
-+++ ardour-2.8.16/gtk2_ardour/tempo_dialog.cc 2013-05-10 12:53:42.844017700 +0200
-@@ -19,7 +19,7 @@
-
- #include <cstdio> // for snprintf, grrr
-
--#include <gtkmm/stock.h>
-+#include <gtkmm.h>
- #include <gtkmm2ext/utils.h>
-
- #include "tempo_dialog.h"
-diff -up ardour-2.8.16/gtk2_ardour/tempo_lines.cc~ ardour-2.8.16/gtk2_ardour/tempo_lines.cc
---- ardour-2.8.16/gtk2_ardour/tempo_lines.cc~ 2009-02-24 13:37:42.000000000 +0100
-+++ ardour-2.8.16/gtk2_ardour/tempo_lines.cc 2013-05-10 12:53:49.100018184 +0200
-@@ -17,8 +17,7 @@
-
- */
-
--#include <libgnomecanvasmm/canvas.h>
--#include <libgnomecanvasmm/group.h>
-+#include <libgnomecanvasmm.h>
- #include "tempo_lines.h"
- #include "ardour_ui.h"
-
-diff -up ardour-2.8.16/gtk2_ardour/theme_manager.cc~ ardour-2.8.16/gtk2_ardour/theme_manager.cc
---- ardour-2.8.16/gtk2_ardour/theme_manager.cc~ 2010-03-16 19:30:09.000000000 +0100
-+++ ardour-2.8.16/gtk2_ardour/theme_manager.cc 2013-05-10 12:53:55.916018712 +0200
-@@ -22,9 +22,8 @@
- #include <fstream>
- #include <errno.h>
-
--#include <gtkmm/stock.h>
-+#include <gtkmm.h>
- #include <gtkmm2ext/gtk_ui.h>
--#include <gtkmm/settings.h>
-
- #include <ardour/profile.h>
-
-diff -up ardour-2.8.16/gtk2_ardour/time_axis_view.cc~ ardour-2.8.16/gtk2_ardour/time_axis_view.cc
---- ardour-2.8.16/gtk2_ardour/time_axis_view.cc~ 2010-06-02 17:55:17.000000000 +0200
-+++ ardour-2.8.16/gtk2_ardour/time_axis_view.cc 2013-05-10 12:54:02.060019187 +0200
-@@ -24,7 +24,6 @@
- #include <list>
-
- #include <libgnomecanvasmm.h>
--#include <libgnomecanvasmm/canvas.h>
- #include <libgnomecanvasmm/item.h>
-
- #include <pbd/error.h>
-diff -up ardour-2.8.16/gtk2_ardour/ui_config.cc~ ardour-2.8.16/gtk2_ardour/ui_config.cc
---- ardour-2.8.16/gtk2_ardour/ui_config.cc~ 2010-03-16 19:30:09.000000000 +0100
-+++ ardour-2.8.16/gtk2_ardour/ui_config.cc 2013-05-10 12:54:13.164020047 +0200
-@@ -20,7 +20,7 @@
- #include <unistd.h>
- #include <cstdio> /* for snprintf, grrr */
-
--#include <glibmm/miscutils.h>
-+#include <glibmm.h>
-
- #include <pbd/failed_constructor.h>
- #include <pbd/xml++.h>
-diff -up ardour-2.8.16/gtk2_ardour/utils.cc~ ardour-2.8.16/gtk2_ardour/utils.cc
---- ardour-2.8.16/gtk2_ardour/utils.cc~ 2012-07-27 04:36:07.000000000 +0200
-+++ ardour-2.8.16/gtk2_ardour/utils.cc 2013-05-10 12:54:38.989022045 +0200
-@@ -25,12 +25,8 @@
- #include <fstream>
- #include <sys/stat.h>
- #include <libart_lgpl/art_misc.h>
--#include <gtkmm/rc.h>
--#include <gtkmm/window.h>
--#include <gtkmm/combo.h>
--#include <gtkmm/label.h>
--#include <gtkmm/paned.h>
--#include <gtk/gtkpaned.h>
-+#include <gtk/gtk.h>
-+#include <gtkmm.h>
-
- #include <gtkmm2ext/utils.h>
- #include <ardour/ardour.h>
-diff -up ardour-2.8.16/gtk2_ardour/about.h~ ardour-2.8.16/gtk2_ardour/about.h
---- ardour-2.8.16/gtk2_ardour/about.h~ 2009-02-24 13:37:42.000000000 +0100
-+++ ardour-2.8.16/gtk2_ardour/about.h 2013-05-10 12:59:25.595044228 +0200
-@@ -20,7 +20,7 @@
- #ifndef __ardour_gtk_about_h__
- #define __ardour_gtk_about_h__
-
--#include <gtkmm/aboutdialog.h>
-+#include <gtkmm.h>
-
- class ARDOUR_UI;
-
-diff -up ardour-2.8.16/gtk2_ardour/actions.h~ ardour-2.8.16/gtk2_ardour/actions.h
---- ardour-2.8.16/gtk2_ardour/actions.h~ 2012-03-16 15:33:28.000000000 +0100
-+++ ardour-2.8.16/gtk2_ardour/actions.h 2013-05-10 12:59:33.883044870 +0200
-@@ -21,11 +21,7 @@
- #define __ardour_gtk_actions_h__
-
- #include <vector>
--#include <gtkmm/action.h>
--#include <gtkmm/radioaction.h>
--#include <gtkmm/toggleaction.h>
--#include <gtkmm/actiongroup.h>
--#include <gtkmm/accelkey.h>
-+#include <gtkmm.h>
-
- #include <ardour/configuration.h>
-
-diff -up ardour-2.8.16/gtk2_ardour/add_route_dialog.h~ ardour-2.8.16/gtk2_ardour/add_route_dialog.h
---- ardour-2.8.16/gtk2_ardour/add_route_dialog.h~ 2009-07-04 19:38:23.000000000 +0200
-+++ ardour-2.8.16/gtk2_ardour/add_route_dialog.h 2013-05-10 12:59:40.330045369 +0200
-@@ -22,14 +22,7 @@
-
- #include <string>
-
--#include <gtkmm/entry.h>
--#include <gtkmm/dialog.h>
--#include <gtkmm/frame.h>
--#include <gtkmm/radiobutton.h>
--#include <gtkmm/adjustment.h>
--#include <gtkmm/spinbutton.h>
--#include <gtkmm/button.h>
--#include <gtkmm/comboboxtext.h>
-+#include <gtkmm.h>
-
- #include <ardour/types.h>
- #include <ardour/session.h>
-diff -up ardour-2.8.16/gtk2_ardour/analysis_window.h~ ardour-2.8.16/gtk2_ardour/analysis_window.h
---- ardour-2.8.16/gtk2_ardour/analysis_window.h~ 2009-02-24 13:37:42.000000000 +0100
-+++ ardour-2.8.16/gtk2_ardour/analysis_window.h 2013-05-10 12:59:58.154046748 +0200
-@@ -20,24 +20,9 @@
- #ifndef __ardour_analysis_window_h__
- #define __ardour_analysis_window_h__
-
--#include <glibmm.h>
--#include <glibmm/refptr.h>
--
--#include <gtkmm/radiobutton.h>
--#include <gtkmm/dialog.h>
--#include <gtkmm/layout.h>
--#include <gtkmm/treeview.h>
--#include <gtkmm/notebook.h>
--#include <gtkmm/label.h>
--#include <gtkmm/liststore.h>
--#include <gtkmm/separator.h>
--#include <gtkmm/window.h>
--
-+#include <gtkmm.h>
- #include <gtkmm2ext/dndtreeview.h>
-
--#include <glibmm/thread.h>
--
--
- #include "ardour_dialog.h"
- #include "fft_graph.h"
- #include "fft_result.h"
-diff -up ardour-2.8.16/gtk2_ardour/ardour_dialog.h~ ardour-2.8.16/gtk2_ardour/ardour_dialog.h
---- ardour-2.8.16/gtk2_ardour/ardour_dialog.h~ 2009-02-24 13:37:42.000000000 +0100
-+++ ardour-2.8.16/gtk2_ardour/ardour_dialog.h 2013-05-10 13:00:04.043047204 +0200
-@@ -21,8 +21,7 @@
- #define __ardour_dialog_h__
-
- #include <ardour/ardour.h>
--#include <gtkmm/window.h>
--#include <gtkmm/dialog.h>
-+#include <gtkmm.h>
-
- namespace ARDOUR {
- class Session;
-diff -up ardour-2.8.16/gtk2_ardour/ardour_ui.h~ ardour-2.8.16/gtk2_ardour/ardour_ui.h
---- ardour-2.8.16/gtk2_ardour/ardour_ui.h~ 2013-05-10 12:44:45.000000000 +0200
-+++ ardour-2.8.16/gtk2_ardour/ardour_ui.h 2013-05-10 13:00:36.859049744 +0200
-@@ -35,24 +35,10 @@
- #include <list>
- #include <cmath>
-
--#include <libgnomecanvasmm/canvas.h>
-+#include <gtkmm.h>
-+#include <libgnomecanvasmm.h>
-
- #include <pbd/xml++.h>
--#include <gtkmm/box.h>
--#include <gtkmm/frame.h>
--#include <gtkmm/label.h>
--#include <gtkmm/table.h>
--#include <gtkmm/fixed.h>
--#include <gtkmm/drawingarea.h>
--#include <gtkmm/eventbox.h>
--#include <gtkmm/menu.h>
--#include <gtkmm/menuitem.h>
--#include <gtkmm/button.h>
--#include <gtkmm/togglebutton.h>
--#include <gtkmm/treeview.h>
--#include <gtkmm/menubar.h>
--#include <gtkmm/textbuffer.h>
--#include <gtkmm/adjustment.h>
- #include <gtkmm2ext/gtk_ui.h>
- #ifdef HOST_NOT_FOUND
- #undef HOST_NOT_FOUND
-diff -up ardour-2.8.16/gtk2_ardour/au_pluginui.h~ ardour-2.8.16/gtk2_ardour/au_pluginui.h
---- ardour-2.8.16/gtk2_ardour/au_pluginui.h~ 2012-07-02 15:21:59.000000000 +0200
-+++ ardour-2.8.16/gtk2_ardour/au_pluginui.h 2013-05-10 13:00:47.642050578 +0200
-@@ -20,10 +20,7 @@
- #undef require
- #undef verify
-
--#include <gtkmm/box.h>
--#include <gtkmm/combobox.h>
--#include <gtkmm/button.h>
--#include <gtkmm/label.h>
-+#include <gtkmm.h>
-
- #include "plugin_ui.h"
-
-diff -up ardour-2.8.16/gtk2_ardour/audio_clock.h~ ardour-2.8.16/gtk2_ardour/audio_clock.h
---- ardour-2.8.16/gtk2_ardour/audio_clock.h~ 2009-02-24 13:37:42.000000000 +0100
-+++ ardour-2.8.16/gtk2_ardour/audio_clock.h 2013-05-10 13:00:56.554051268 +0200
-@@ -20,11 +20,7 @@
- #ifndef __audio_clock_h__
- #define __audio_clock_h__
-
--#include <gtkmm/box.h>
--#include <gtkmm/menu.h>
--#include <gtkmm/eventbox.h>
--#include <gtkmm/label.h>
--#include <gtkmm/frame.h>
-+#include <gtkmm.h>
- #include <ardour/ardour.h>
-
- namespace ARDOUR {
-diff -up ardour-2.8.16/gtk2_ardour/audio_region_editor.h~ ardour-2.8.16/gtk2_ardour/audio_region_editor.h
---- ardour-2.8.16/gtk2_ardour/audio_region_editor.h~ 2009-10-28 19:59:09.000000000 +0100
-+++ ardour-2.8.16/gtk2_ardour/audio_region_editor.h 2013-05-10 13:01:47.417055205 +0200
-@@ -22,19 +22,7 @@
-
- #include <map>
-
--#include <gtkmm/label.h>
--#include <gtkmm/entry.h>
--#include <gtkmm/box.h>
--#include <gtkmm/togglebutton.h>
--#include <gtkmm/button.h>
--#include <gtkmm/arrow.h>
--#include <gtkmm/frame.h>
--#include <gtkmm/table.h>
--#include <gtkmm/alignment.h>
--#include <gtkmm/adjustment.h>
--#include <gtkmm/separator.h>
--#include <gtkmm/spinbutton.h>
--
-+#include <gtkmm.h>
- #include <libgnomecanvas/libgnomecanvas.h>
- #include <sigc++/signal.h>
-
-diff -up ardour-2.8.16/gtk2_ardour/audio_time_axis.h~ ardour-2.8.16/gtk2_ardour/audio_time_axis.h
---- ardour-2.8.16/gtk2_ardour/audio_time_axis.h~ 2009-08-21 15:47:47.000000000 +0200
-+++ ardour-2.8.16/gtk2_ardour/audio_time_axis.h 2013-05-10 13:02:02.969056408 +0200
-@@ -20,14 +20,7 @@
- #ifndef __ardour_audio_time_axis_h__
- #define __ardour_audio_time_axis_h__
-
--#include <gtkmm/table.h>
--#include <gtkmm/button.h>
--#include <gtkmm/box.h>
--#include <gtkmm/menu.h>
--#include <gtkmm/menuitem.h>
--#include <gtkmm/radiomenuitem.h>
--#include <gtkmm/checkmenuitem.h>
--
-+#include <gtkmm.h>
- #include <gtkmm2ext/selector.h>
- #include <list>
-
-diff -up ardour-2.8.16/gtk2_ardour/automation_line.h~ ardour-2.8.16/gtk2_ardour/automation_line.h
---- ardour-2.8.16/gtk2_ardour/automation_line.h~ 2010-04-21 17:09:47.000000000 +0200
-+++ ardour-2.8.16/gtk2_ardour/automation_line.h 2013-05-10 13:02:11.769057090 +0200
-@@ -25,7 +25,7 @@
- #include <string>
- #include <sys/types.h>
-
--#include <libgnomecanvasmm/line.h>
-+#include <libgnomecanvasmm.h>
- #include <sigc++/signal.h>
- #include "canvas.h"
- #include "simplerect.h"
-diff -up ardour-2.8.16/gtk2_ardour/axis_view.h~ ardour-2.8.16/gtk2_ardour/axis_view.h
---- ardour-2.8.16/gtk2_ardour/axis_view.h~ 2009-02-24 13:37:42.000000000 +0100
-+++ ardour-2.8.16/gtk2_ardour/axis_view.h 2013-05-10 13:02:19.225057667 +0200
-@@ -22,8 +22,7 @@
-
- #include <list>
-
--#include <gtkmm/label.h>
--#include <gdkmm/color.h>
-+#include <gtkmm.h>
-
- #include <pbd/xml++.h>
- #include "prompter.h"
-diff -up ardour-2.8.16/gtk2_ardour/canvas-noevent-text.h~ ardour-2.8.16/gtk2_ardour/canvas-noevent-text.h
---- ardour-2.8.16/gtk2_ardour/canvas-noevent-text.h~ 2011-09-12 21:22:34.000000000 +0200
-+++ ardour-2.8.16/gtk2_ardour/canvas-noevent-text.h 2013-05-10 13:02:26.601058237 +0200
-@@ -21,8 +21,7 @@
- #ifndef __gtk2_ardour_canvas_noevent_text_h__
- #define __gtk2_ardour_canvas_noevent_text_h__
-
--#include <libgnomecanvasmm/text.h>
--#include <libgnomecanvasmm/text.h>
-+#include <libgnomecanvasmm.h>
-
- namespace Gnome { namespace Canvas {
-
-diff -up ardour-2.8.16/gtk2_ardour/canvas_impl.h~ ardour-2.8.16/gtk2_ardour/canvas_impl.h
---- ardour-2.8.16/gtk2_ardour/canvas_impl.h~ 2009-02-24 13:37:42.000000000 +0100
-+++ ardour-2.8.16/gtk2_ardour/canvas_impl.h 2013-05-10 13:02:33.099058740 +0200
-@@ -22,11 +22,8 @@
-
- #include "canvas.h"
-
--#include <libgnomecanvasmm/canvas.h>
-+#include <libgnomecanvasmm.h>
- #include <libgnomecanvasmm/polygon.h>
--#include <libgnomecanvasmm/text.h>
--#include <libgnomecanvasmm/rect.h>
--#include <libgnomecanvasmm/line.h>
- #include <libgnomecanvasmm/item.h>
-
- using namespace ArdourCanvas;
-diff -up ardour-2.8.16/gtk2_ardour/connection_editor.h~ ardour-2.8.16/gtk2_ardour/connection_editor.h
---- ardour-2.8.16/gtk2_ardour/connection_editor.h~ 2011-09-12 21:22:34.000000000 +0200
-+++ ardour-2.8.16/gtk2_ardour/connection_editor.h 2013-05-10 13:02:47.865059883 +0200
-@@ -27,19 +27,10 @@ using __gnu_cxx::slist;
- #include <slist.h>
- #endif
-
--#include <gtkmm/box.h>
--#include <gtkmm/window.h>
--#include <gtkmm/scrolledwindow.h>
--#include <gtkmm/button.h>
--#include <gtkmm/frame.h>
--#include <gtkmm/notebook.h>
--#include <gtkmm/treeview.h>
--#include <gtkmm/liststore.h>
-+#include <gtkmm.h>
-
- #include "ardour_dialog.h"
-
--#include <glibmm/thread.h>
--
- namespace ARDOUR {
- class Session;
- class Connection;
-diff -up ardour-2.8.16/gtk2_ardour/crossfade_edit.h~ ardour-2.8.16/gtk2_ardour/crossfade_edit.h
---- ardour-2.8.16/gtk2_ardour/crossfade_edit.h~ 2009-02-24 13:37:42.000000000 +0100
-+++ ardour-2.8.16/gtk2_ardour/crossfade_edit.h 2013-05-10 13:02:53.865060348 +0200
-@@ -22,9 +22,7 @@
-
- #include <list>
-
--#include <gtkmm/box.h>
--#include <gtkmm/button.h>
--#include <gtkmm/radiobutton.h>
-+#include <gtkmm.h>
-
- #include <ardour/curve.h>
- #include "ardour_dialog.h"
-diff -up ardour-2.8.16/gtk2_ardour/editor.h~ ardour-2.8.16/gtk2_ardour/editor.h
---- ardour-2.8.16/gtk2_ardour/editor.h~ 2012-03-16 15:33:28.000000000 +0100
-+++ ardour-2.8.16/gtk2_ardour/editor.h 2013-05-10 13:03:13.241061847 +0200
-@@ -28,16 +28,11 @@
-
- #include <boost/optional.hpp>
-
--#include <libgnomecanvasmm/canvas.h>
--#include <libgnomecanvasmm/group.h>
--#include <libgnomecanvasmm/line.h>
--#include <libgnomecanvasmm/pixbuf.h>
-+#include <gtkmm.h>
-+#include <libgnomecanvasmm.h>
-
- #include <cmath>
-
--#include <gtkmm/layout.h>
--#include <gtkmm/comboboxtext.h>
--
- #include <gtkmm2ext/selector.h>
- #include <gtkmm2ext/click_box.h>
- #include <gtkmm2ext/dndtreeview.h>
-diff -up ardour-2.8.16/gtk2_ardour/engine_dialog.h~ ardour-2.8.16/gtk2_ardour/engine_dialog.h
---- ardour-2.8.16/gtk2_ardour/engine_dialog.h~ 2009-09-17 04:19:04.000000000 +0200
-+++ ardour-2.8.16/gtk2_ardour/engine_dialog.h 2013-05-10 13:03:22.281062547 +0200
-@@ -5,15 +5,7 @@
- #include <vector>
- #include <string>
-
--#include <gtkmm/checkbutton.h>
--#include <gtkmm/spinbutton.h>
--#include <gtkmm/notebook.h>
--#include <gtkmm/comboboxtext.h>
--#include <gtkmm/table.h>
--#include <gtkmm/expander.h>
--#include <gtkmm/box.h>
--#include <gtkmm/buttonbox.h>
--#include <gtkmm/button.h>
-+#include <gtkmm.h>
-
- class EngineControl : public Gtk::VBox {
- public:
-diff -up ardour-2.8.16/gtk2_ardour/fft_graph.h~ ardour-2.8.16/gtk2_ardour/fft_graph.h
---- ardour-2.8.16/gtk2_ardour/fft_graph.h~ 2009-02-24 13:37:42.000000000 +0100
-+++ ardour-2.8.16/gtk2_ardour/fft_graph.h 2013-05-10 13:03:30.601063191 +0200
-@@ -23,11 +23,7 @@
- #include <ardour/types.h>
- #include <fftw3.h>
-
--#include <gtkmm/drawingarea.h>
--#include <gtkmm/treemodel.h>
--#include <gdkmm/color.h>
--
--#include <glibmm/refptr.h>
-+#include <gtkmm.h>
-
- #include <string>
-
-diff -up ardour-2.8.16/gtk2_ardour/fft_result.h~ ardour-2.8.16/gtk2_ardour/fft_result.h
---- ardour-2.8.16/gtk2_ardour/fft_result.h~ 2009-02-24 13:37:42.000000000 +0100
-+++ ardour-2.8.16/gtk2_ardour/fft_result.h 2013-05-10 13:03:36.985063685 +0200
-@@ -24,7 +24,7 @@
- #include <ardour/types.h>
- #include <fftw3.h>
-
--#include <gdkmm/color.h>
-+#include <gtkmm.h>
-
- #include <string>
-
-diff -up ardour-2.8.16/gtk2_ardour/gain_meter.h~ ardour-2.8.16/gtk2_ardour/gain_meter.h
---- ardour-2.8.16/gtk2_ardour/gain_meter.h~ 2009-02-24 13:37:42.000000000 +0100
-+++ ardour-2.8.16/gtk2_ardour/gain_meter.h 2013-05-10 13:03:43.656064201 +0200
-@@ -23,13 +23,7 @@
- #include <vector>
- #include <map>
-
--#include <gtkmm/box.h>
--#include <gtkmm/adjustment.h>
--#include <gtkmm/frame.h>
--#include <gtkmm/eventbox.h>
--#include <gtkmm/button.h>
--#include <gtkmm/table.h>
--#include <gtkmm/drawingarea.h>
-+#include <gtkmm.h>
-
- #include <ardour/types.h>
-
-diff -up ardour-2.8.16/gtk2_ardour/imageframe.h~ ardour-2.8.16/gtk2_ardour/imageframe.h
---- ardour-2.8.16/gtk2_ardour/imageframe.h~ 2009-02-24 13:37:42.000000000 +0100
-+++ ardour-2.8.16/gtk2_ardour/imageframe.h 2013-05-10 13:03:49.352064642 +0200
-@@ -27,8 +27,8 @@
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-+#include <libgnomecanvasmm.h>
- #include <libgnomecanvasmm/item.h>
--#include <libgnomecanvasmm/group.h>
- #include <libgnomecanvasmm/shape.h>
- #include "canvas-imageframe.h"
-
-diff -up ardour-2.8.16/gtk2_ardour/imageframe_p.h~ ardour-2.8.16/gtk2_ardour/imageframe_p.h
---- ardour-2.8.16/gtk2_ardour/imageframe_p.h~ 2009-02-24 13:37:42.000000000 +0100
-+++ ardour-2.8.16/gtk2_ardour/imageframe_p.h 2013-05-10 13:03:53.977065000 +0200
-@@ -21,7 +21,7 @@
- #ifndef _LIBGNOMECANVASMM_IMAGEFRAME_P_H
- #define _LIBGNOMECANVASMM_IMAGEFRAME_P_H
-
--#include <glibmm/class.h>
-+#include <glibmm.h>
-
- namespace Gnome
- {
-diff -up ardour-2.8.16/gtk2_ardour/imageframe_time_axis_group.h~ ardour-2.8.16/gtk2_ardour/imageframe_time_axis_group.h
---- ardour-2.8.16/gtk2_ardour/imageframe_time_axis_group.h~ 2009-02-24 13:37:42.000000000 +0100
-+++ ardour-2.8.16/gtk2_ardour/imageframe_time_axis_group.h 2013-05-10 13:04:07.241066027 +0200
-@@ -23,7 +23,7 @@
- #include <list>
- #include <cmath>
-
--#include <gdkmm/color.h>
-+#include <gtkmm.h>
-
- #include <libgnomecanvas/libgnomecanvas.h>
- #include <jack/jack.h>
-diff -up ardour-2.8.16/gtk2_ardour/imageframe_time_axis_view.h~ ardour-2.8.16/gtk2_ardour/imageframe_time_axis_view.h
---- ardour-2.8.16/gtk2_ardour/imageframe_time_axis_view.h~ 2009-02-24 13:37:42.000000000 +0100
-+++ ardour-2.8.16/gtk2_ardour/imageframe_time_axis_view.h 2013-05-10 13:04:12.217066412 +0200
-@@ -23,7 +23,7 @@
- #include <list>
- #include <cmath>
-
--#include <gdkmm/color.h>
-+#include <gtkmm.h>
-
- #include <jack/jack.h>
-
-diff -up ardour-2.8.16/gtk2_ardour/imageframe_view.h~ ardour-2.8.16/gtk2_ardour/imageframe_view.h
---- ardour-2.8.16/gtk2_ardour/imageframe_view.h~ 2009-02-24 13:37:42.000000000 +0100
-+++ ardour-2.8.16/gtk2_ardour/imageframe_view.h 2013-05-10 13:04:44.872068939 +0200
-@@ -21,7 +21,7 @@
- #define __gtk_ardour_imageframe_view_h__
-
- #include <string>
--#include <gdkmm/color.h>
-+#include <gtkmm.h>
- #include <libgnomecanvas/libgnomecanvas.h>
- #include <sigc++/signal.h>
- #include <list>
-diff -up ardour-2.8.16/gtk2_ardour/io_selector.h~ ardour-2.8.16/gtk2_ardour/io_selector.h
---- ardour-2.8.16/gtk2_ardour/io_selector.h~ 2011-09-12 21:22:34.000000000 +0200
-+++ ardour-2.8.16/gtk2_ardour/io_selector.h 2013-05-10 13:04:54.472069682 +0200
-@@ -29,16 +29,7 @@ using __gnu_cxx::slist;
-
- #include <string>
-
--#include <glibmm/thread.h>
--
--#include <gtkmm/box.h>
--#include <gtkmm/frame.h>
--#include <gtkmm/button.h>
--#include <gtkmm/togglebutton.h>
--#include <gtkmm/scrolledwindow.h>
--#include <gtkmm/notebook.h>
--#include <gtkmm/treeview.h>
--#include <gtkmm/liststore.h>
-+#include <gtkmm.h>
-
- #include <ardour_dialog.h>
-
-diff -up ardour-2.8.16/gtk2_ardour/keyboard.h~ ardour-2.8.16/gtk2_ardour/keyboard.h
---- ardour-2.8.16/gtk2_ardour/keyboard.h~ 2009-02-24 13:37:42.000000000 +0100
-+++ ardour-2.8.16/gtk2_ardour/keyboard.h 2013-05-10 13:05:41.912073354 +0200
-@@ -26,8 +26,7 @@
-
- #include <sigc++/signal.h>
- #include <gtk/gtk.h>
--#include <gtkmm/window.h>
--#include <gtkmm/accelkey.h>
-+#include <gtkmm.h>
-
- #include <ardour/types.h>
- #include <pbd/stateful.h>
-diff -up ardour-2.8.16/gtk2_ardour/keyeditor.h~ ardour-2.8.16/gtk2_ardour/keyeditor.h
---- ardour-2.8.16/gtk2_ardour/keyeditor.h~ 2011-09-12 21:22:34.000000000 +0200
-+++ ardour-2.8.16/gtk2_ardour/keyeditor.h 2013-05-10 13:06:25.832076753 +0200
-@@ -3,10 +3,7 @@
-
- #include <string>
-
--#include <gtkmm/buttonbox.h>
--#include <gtkmm/treeview.h>
--#include <gtkmm/treestore.h>
--#include <gtkmm/scrolledwindow.h>
-+#include <gtkmm.h>
-
- #include "ardour_dialog.h"
-
-diff -up ardour-2.8.16/gtk2_ardour/level_meter.h~ ardour-2.8.16/gtk2_ardour/level_meter.h
---- ardour-2.8.16/gtk2_ardour/level_meter.h~ 2009-02-24 13:37:42.000000000 +0100
-+++ ardour-2.8.16/gtk2_ardour/level_meter.h 2013-05-10 13:06:33.047077312 +0200
-@@ -23,13 +23,7 @@
- #include <vector>
- #include <map>
-
--#include <gtkmm/box.h>
--#include <gtkmm/adjustment.h>
--#include <gtkmm/frame.h>
--#include <gtkmm/eventbox.h>
--#include <gtkmm/button.h>
--#include <gtkmm/table.h>
--#include <gtkmm/drawingarea.h>
-+#include <gtkmm.h>
-
- #include <ardour/types.h>
-
-diff -up ardour-2.8.16/gtk2_ardour/location_ui.h~ ardour-2.8.16/gtk2_ardour/location_ui.h
---- ardour-2.8.16/gtk2_ardour/location_ui.h~ 2009-02-24 13:37:42.000000000 +0100
-+++ ardour-2.8.16/gtk2_ardour/location_ui.h 2013-05-10 13:06:39.544077815 +0200
-@@ -20,12 +20,7 @@
- #ifndef __ardour_location_ui_h__
- #define __ardour_location_ui_h__
-
--#include <gtkmm/box.h>
--#include <gtkmm/checkbutton.h>
--#include <gtkmm/button.h>
--#include <gtkmm/table.h>
--#include <gtkmm/entry.h>
--#include <gtkmm/label.h>
-+#include <gtkmm.h>
-
- #include <ardour/location.h>
- #include <ardour/session.h>
-diff -up ardour-2.8.16/gtk2_ardour/lv2_plugin_ui.h~ ardour-2.8.16/gtk2_ardour/lv2_plugin_ui.h
---- ardour-2.8.16/gtk2_ardour/lv2_plugin_ui.h~ 2012-02-27 16:03:44.000000000 +0100
-+++ ardour-2.8.16/gtk2_ardour/lv2_plugin_ui.h 2013-05-10 13:06:45.000078237 +0200
-@@ -26,7 +26,7 @@
- #include <list>
-
- #include <sigc++/signal.h>
--#include <gtkmm/widget.h>
-+#include <gtkmm.h>
-
- #include <ardour_dialog.h>
- #include <ardour/types.h>
-diff -up ardour-2.8.16/gtk2_ardour/marker.h~ ardour-2.8.16/gtk2_ardour/marker.h
---- ardour-2.8.16/gtk2_ardour/marker.h~ 2010-06-02 17:55:17.000000000 +0200
-+++ ardour-2.8.16/gtk2_ardour/marker.h 2013-05-10 13:06:50.200078639 +0200
-@@ -25,7 +25,7 @@
- #include <ardour/ardour.h>
- #include <pbd/destructible.h>
-
--#include <libgnomecanvasmm/pixbuf.h>
-+#include <libgnomecanvasmm.h>
-
- #include "canvas.h"
-
-diff -up ardour-2.8.16/gtk2_ardour/marker_time_axis_view.h~ ardour-2.8.16/gtk2_ardour/marker_time_axis_view.h
---- ardour-2.8.16/gtk2_ardour/marker_time_axis_view.h~ 2009-02-24 13:37:42.000000000 +0100
-+++ ardour-2.8.16/gtk2_ardour/marker_time_axis_view.h 2013-05-10 13:06:59.879079389 +0200
-@@ -21,8 +21,8 @@
- #define __ardour_marker_time_axis_view_h__
-
- #include <list>
--#include <gdkmm/color.h>
--#include <libgnomecanvasmm/group.h>
-+#include <gtkmm.h>
-+#include <libgnomecanvasmm.h>
-
- #include <ardour/location.h>
- #include "simplerect.h"
-diff -up ardour-2.8.16/gtk2_ardour/midi_port_dialog.h~ ardour-2.8.16/gtk2_ardour/midi_port_dialog.h
---- ardour-2.8.16/gtk2_ardour/midi_port_dialog.h~ 2009-02-24 13:37:42.000000000 +0100
-+++ ardour-2.8.16/gtk2_ardour/midi_port_dialog.h 2013-05-10 13:07:06.503079901 +0200
-@@ -1,7 +1,4 @@
--#include <gtkmm/box.h>
--#include <gtkmm/label.h>
--#include <gtkmm/entry.h>
--#include <gtkmm/comboboxtext.h>
-+#include <gtkmm.h>
-
- #include "ardour_dialog.h"
-
-diff -up ardour-2.8.16/gtk2_ardour/mixer_strip.h~ ardour-2.8.16/gtk2_ardour/mixer_strip.h
---- ardour-2.8.16/gtk2_ardour/mixer_strip.h~ 2009-10-01 19:15:47.000000000 +0200
-+++ ardour-2.8.16/gtk2_ardour/mixer_strip.h 2013-05-10 13:07:16.120080646 +0200
-@@ -23,17 +23,7 @@
-
- #include <cmath>
-
--#include <gtkmm/eventbox.h>
--#include <gtkmm/button.h>
--#include <gtkmm/box.h>
--#include <gtkmm/frame.h>
--#include <gtkmm/button.h>
--#include <gtkmm/label.h>
--#include <gtkmm/togglebutton.h>
--#include <gtkmm/menu.h>
--#include <gtkmm/textview.h>
--#include <gtkmm/adjustment.h>
--
-+#include <gtkmm.h>
- #include <gtkmm2ext/auto_spin.h>
- #include <gtkmm2ext/click_box.h>
- #include <gtkmm2ext/slider_controller.h>
-diff -up ardour-2.8.16/gtk2_ardour/mixer_ui.h~ ardour-2.8.16/gtk2_ardour/mixer_ui.h
---- ardour-2.8.16/gtk2_ardour/mixer_ui.h~ 2011-09-12 21:22:34.000000000 +0200
-+++ ardour-2.8.16/gtk2_ardour/mixer_ui.h 2013-05-10 13:07:22.855081167 +0200
-@@ -22,15 +22,7 @@
-
- #include <list>
-
--#include <gtkmm/box.h>
--#include <gtkmm/scrolledwindow.h>
--#include <gtkmm/eventbox.h>
--#include <gtkmm/label.h>
--#include <gtkmm/button.h>
--#include <gtkmm/frame.h>
--#include <gtkmm/paned.h>
--#include <gtkmm/menu.h>
--#include <gtkmm/treeview.h>
-+#include <gtkmm.h>
-
- #include <pbd/stateful.h>
-
-diff -up ardour-2.8.16/gtk2_ardour/nag.h~ ardour-2.8.16/gtk2_ardour/nag.h
---- ardour-2.8.16/gtk2_ardour/nag.h~ 2009-06-04 16:36:00.000000000 +0200
-+++ ardour-2.8.16/gtk2_ardour/nag.h 2013-05-10 13:07:30.423081753 +0200
-@@ -3,9 +3,7 @@
-
- #include "ardour_dialog.h"
-
--#include <gtkmm/label.h>
--#include <gtkmm/radiobutton.h>
--#include <gtkmm/buttonbox.h>
-+#include <gtkmm.h>
-
- class NagScreen : public ArdourDialog
- {
-diff -up ardour-2.8.16/gtk2_ardour/new_session_dialog.h~ ardour-2.8.16/gtk2_ardour/new_session_dialog.h
---- ardour-2.8.16/gtk2_ardour/new_session_dialog.h~ 2011-09-12 21:22:34.000000000 +0200
-+++ ardour-2.8.16/gtk2_ardour/new_session_dialog.h 2013-05-10 13:07:56.743083790 +0200
-@@ -23,20 +23,10 @@
- #define NEW_SESSION_DIALOG_H
-
- #include <string>
--#include <gtkmm/treeview.h>
--#include <gtkmm/treestore.h>
--#include <gtkmm/treepath.h>
--#include <gtkmm/scrolledwindow.h>
--#include <gtkmm/notebook.h>
--#include <gtkmm/table.h>
--#include <gtkmm/alignment.h>
--#include <gtkmm/frame.h>
--#include <gtkmm/expander.h>
-+#include <gtkmm.h>
-
- #include <ardour/utils.h>
-
--#include <glibmm/refptr.h>
--
- #include "ardour_dialog.h"
- #include "engine_dialog.h"
-
-diff -up ardour-2.8.16/gtk2_ardour/option_editor.h~ ardour-2.8.16/gtk2_ardour/option_editor.h
---- ardour-2.8.16/gtk2_ardour/option_editor.h~ 2009-03-13 13:35:02.000000000 +0100
-+++ ardour-2.8.16/gtk2_ardour/option_editor.h 2013-05-10 13:08:04.135084362 +0200
-@@ -22,17 +22,7 @@
-
- #include <vector>
-
--#include <gtkmm/notebook.h>
--#include <gtkmm/checkbutton.h>
--#include <gtkmm/table.h>
--#include <gtkmm/entry.h>
--#include <gtkmm/box.h>
--#include <gtkmm/label.h>
--#include <gtkmm/adjustment.h>
--#include <gtkmm/scale.h>
--#include <gtkmm/spinbutton.h>
--#include <gtkmm/radiobutton.h>
--#include <gtkmm/comboboxtext.h>
-+#include <gtkmm.h>
-
- #include <ardour/session.h>
-
-diff -up ardour-2.8.16/gtk2_ardour/pan_automation_time_axis.h~ ardour-2.8.16/gtk2_ardour/pan_automation_time_axis.h
---- ardour-2.8.16/gtk2_ardour/pan_automation_time_axis.h~ 2009-02-24 13:37:42.000000000 +0100
-+++ ardour-2.8.16/gtk2_ardour/pan_automation_time_axis.h 2013-05-10 13:08:07.751084642 +0200
-@@ -23,7 +23,7 @@
- #include "canvas.h"
- #include "automation_time_axis.h"
-
--#include <gtkmm/comboboxtext.h>
-+#include <gtkmm.h>
-
- namespace ARDOUR {
- class Redirect;
-diff -up ardour-2.8.16/gtk2_ardour/panner2d.h~ ardour-2.8.16/gtk2_ardour/panner2d.h
---- ardour-2.8.16/gtk2_ardour/panner2d.h~ 2009-02-24 13:37:42.000000000 +0100
-+++ ardour-2.8.16/gtk2_ardour/panner2d.h 2013-05-10 13:08:14.919085196 +0200
-@@ -24,8 +24,7 @@
- #include <map>
- #include <string>
-
--#include <glibmm/refptr.h>
--#include <gtkmm/drawingarea.h>
-+#include <gtkmm.h>
-
- using std::map;
- using std::string;
-diff -up ardour-2.8.16/gtk2_ardour/panner_ui.h~ ardour-2.8.16/gtk2_ardour/panner_ui.h
---- ardour-2.8.16/gtk2_ardour/panner_ui.h~ 2009-04-29 15:53:50.000000000 +0200
-+++ ardour-2.8.16/gtk2_ardour/panner_ui.h 2013-05-10 13:08:21.623085715 +0200
-@@ -22,13 +22,7 @@
-
- #include <vector>
-
--#include <gtkmm/box.h>
--#include <gtkmm/adjustment.h>
--#include <gtkmm/viewport.h>
--#include <gtkmm/eventbox.h>
--#include <gtkmm/arrow.h>
--#include <gtkmm/togglebutton.h>
--#include <gtkmm/button.h>
-+#include <gtkmm.h>
-
- #include <gtkmm2ext/click_box.h>
- #include <gtkmm2ext/slider_controller.h>
-diff -up ardour-2.8.16/gtk2_ardour/playlist_selector.h~ ardour-2.8.16/gtk2_ardour/playlist_selector.h
---- ardour-2.8.16/gtk2_ardour/playlist_selector.h~ 2009-02-24 13:37:42.000000000 +0100
-+++ ardour-2.8.16/gtk2_ardour/playlist_selector.h 2013-05-10 13:08:27.767086191 +0200
-@@ -22,10 +22,7 @@
-
- #include <boost/shared_ptr.hpp>
-
--#include <gtkmm/box.h>
--#include <gtkmm/scrolledwindow.h>
--#include <gtkmm/button.h>
--#include <gtkmm/treeview.h>
-+#include <gtkmm.h>
- #include <gtkmm2ext/selector.h>
-
- #include <ardour_dialog.h>
-diff -up ardour-2.8.16/gtk2_ardour/plugin_selector.h~ ardour-2.8.16/gtk2_ardour/plugin_selector.h
---- ardour-2.8.16/gtk2_ardour/plugin_selector.h~ 2011-09-12 21:22:34.000000000 +0200
-+++ ardour-2.8.16/gtk2_ardour/plugin_selector.h 2013-05-10 13:08:36.743086886 +0200
-@@ -20,9 +20,7 @@
- #ifndef __ardour_plugin_selector_h__
- #define __ardour_plugin_selector_h__
-
--#include <gtkmm/dialog.h>
--#include <gtkmm/notebook.h>
--#include <gtkmm/treeview.h>
-+#include <gtkmm.h>
- #include <gtkmm2ext/selector.h>
-
- #include <ardour/plugin.h>
-diff -up ardour-2.8.16/gtk2_ardour/plugin_ui.h~ ardour-2.8.16/gtk2_ardour/plugin_ui.h
---- ardour-2.8.16/gtk2_ardour/plugin_ui.h~ 2012-06-18 21:49:14.000000000 +0200
-+++ ardour-2.8.16/gtk2_ardour/plugin_ui.h 2013-05-10 13:08:49.831087899 +0200
-@@ -26,22 +26,7 @@
-
- #include <sigc++/signal.h>
-
--#include <gtkmm/button.h>
--#include <gtkmm/box.h>
--#include <gtkmm/table.h>
--#include <gtkmm/eventbox.h>
--#include <gtkmm/viewport.h>
--#include <gtkmm/scrolledwindow.h>
--#include <gtkmm/label.h>
--#include <gtkmm/menu.h>
--#include <gtkmm/image.h>
--#include <gtkmm/adjustment.h>
--#include <gtkmm/togglebutton.h>
--#include <gtkmm/socket.h>
--#include <gtkmm/combobox.h>
--#include <gtkmm/liststore.h>
--#include <gtkmm/comboboxtext.h>
--#include <gtkmm/socket.h>
-+#include <gtkmm.h>
-
- #include <ardour_dialog.h>
- #include <ardour/types.h>
-diff -up ardour-2.8.16/gtk2_ardour/public_editor.h~ ardour-2.8.16/gtk2_ardour/public_editor.h
---- ardour-2.8.16/gtk2_ardour/public_editor.h~ 2012-03-16 15:33:28.000000000 +0100
-+++ ardour-2.8.16/gtk2_ardour/public_editor.h 2013-05-10 13:09:04.791089056 +0200
-@@ -25,9 +25,7 @@
- #include <string>
- #include <glib.h>
- #include <gdk/gdktypes.h>
--#include <gtkmm/window.h>
--#include <gtkmm/box.h>
--#include <gtkmm/actiongroup.h>
-+#include <gtkmm.h>
- #include <jack/types.h>
- #include <sigc++/signal.h>
-
-diff -up ardour-2.8.16/gtk2_ardour/redirect_box.h~ ardour-2.8.16/gtk2_ardour/redirect_box.h
---- ardour-2.8.16/gtk2_ardour/redirect_box.h~ 2009-03-07 14:28:24.000000000 +0100
-+++ ardour-2.8.16/gtk2_ardour/redirect_box.h 2013-05-10 13:09:16.439089958 +0200
-@@ -23,10 +23,7 @@
- #include <vector>
-
- #include <cmath>
--#include <gtkmm/box.h>
--#include <gtkmm/eventbox.h>
--#include <gtkmm/menu.h>
--#include <gtkmm/scrolledwindow.h>
-+#include <gtkmm.h>
- #include <gtkmm2ext/dndtreeview.h>
- #include <gtkmm2ext/auto_spin.h>
- #include <gtkmm2ext/click_box.h>
-diff -up ardour-2.8.16/gtk2_ardour/region_layering_order_editor.h~ ardour-2.8.16/gtk2_ardour/region_layering_order_editor.h
---- ardour-2.8.16/gtk2_ardour/region_layering_order_editor.h~ 2009-11-13 15:30:20.000000000 +0100
-+++ ardour-2.8.16/gtk2_ardour/region_layering_order_editor.h 2013-05-10 13:09:23.383090495 +0200
-@@ -1,10 +1,7 @@
- #ifndef __gtk2_ardour_region_layering_order_editor_h__
- #define __gtk2_ardour_region_layering_order_editor_h__
-
--#include <gtkmm/dialog.h>
--#include <gtkmm/liststore.h>
--#include <gtkmm/treeview.h>
--#include <gtkmm/scrolledwindow.h>
-+#include <gtkmm.h>
-
- #include <ardour/region.h>
- #include <ardour/playlist.h>
-diff -up ardour-2.8.16/gtk2_ardour/rhythm_ferret.h~ ardour-2.8.16/gtk2_ardour/rhythm_ferret.h
---- ardour-2.8.16/gtk2_ardour/rhythm_ferret.h~ 2009-02-24 13:37:42.000000000 +0100
-+++ ardour-2.8.16/gtk2_ardour/rhythm_ferret.h 2013-05-10 13:09:34.678091370 +0200
-@@ -1,16 +1,7 @@
- #ifndef __gtk2_ardour_rhythm_ferret_h__
- #define __gtk2_ardour_rhythm_ferret_h__
-
--#include <gtkmm/box.h>
--#include <gtkmm/scale.h>
--#include <gtkmm/spinbutton.h>
--#include <gtkmm/radiobutton.h>
--#include <gtkmm/radiobuttongroup.h>
--#include <gtkmm/frame.h>
--#include <gtkmm/image.h>
--#include <gtkmm/comboboxtext.h>
--#include <gtkmm/button.h>
--#include <gtkmm/label.h>
-+#include <gtkmm.h>
-
- #include "ardour_dialog.h"
-
-diff -up ardour-2.8.16/gtk2_ardour/route_params_ui.h~ ardour-2.8.16/gtk2_ardour/route_params_ui.h
---- ardour-2.8.16/gtk2_ardour/route_params_ui.h~ 2011-09-12 21:22:34.000000000 +0200
-+++ ardour-2.8.16/gtk2_ardour/route_params_ui.h 2013-05-10 13:09:41.350091886 +0200
-@@ -22,15 +22,7 @@
-
- #include <list>
-
--#include <gtkmm/box.h>
--#include <gtkmm/button.h>
--#include <gtkmm/eventbox.h>
--#include <gtkmm/frame.h>
--#include <gtkmm/label.h>
--#include <gtkmm/paned.h>
--#include <gtkmm/scrolledwindow.h>
--#include <gtkmm/togglebutton.h>
--#include <gtkmm/treeview.h>
-+#include <gtkmm.h>
-
- #include <pbd/stateful.h>
-
-diff -up ardour-2.8.16/gtk2_ardour/route_time_axis.h~ ardour-2.8.16/gtk2_ardour/route_time_axis.h
---- ardour-2.8.16/gtk2_ardour/route_time_axis.h~ 2009-06-26 19:00:42.000000000 +0200
-+++ ardour-2.8.16/gtk2_ardour/route_time_axis.h 2013-05-10 13:09:50.150092567 +0200
-@@ -20,15 +20,7 @@
- #ifndef __ardour_route_time_axis_h__
- #define __ardour_route_time_axis_h__
-
--#include <gtkmm/table.h>
--#include <gtkmm/button.h>
--#include <gtkmm/box.h>
--#include <gtkmm/menu.h>
--#include <gtkmm/menuitem.h>
--#include <gtkmm/radiomenuitem.h>
--#include <gtkmm/checkmenuitem.h>
--#include <gtkmm/adjustment.h>
--
-+#include <gtkmm.h>
- #include <gtkmm2ext/selector.h>
- #include <gtkmm2ext/slider_controller.h>
- #include <list>
-diff -up ardour-2.8.16/gtk2_ardour/sfdb_freesound_mootcher.h~ ardour-2.8.16/gtk2_ardour/sfdb_freesound_mootcher.h
---- ardour-2.8.16/gtk2_ardour/sfdb_freesound_mootcher.h~ 2012-07-02 15:21:59.000000000 +0200
-+++ ardour-2.8.16/gtk2_ardour/sfdb_freesound_mootcher.h 2013-05-10 13:09:55.862093009 +0200
-@@ -20,7 +20,7 @@
- #include <string>
- #include <sstream>
- #include <vector>
--#include <gtkmm/progressbar.h>
-+#include <gtkmm.h>
- //#include <ctime>
-
- #include "sfdb_ui.h"
-diff -up ardour-2.8.16/gtk2_ardour/sfdb_ui.h~ ardour-2.8.16/gtk2_ardour/sfdb_ui.h
---- ardour-2.8.16/gtk2_ardour/sfdb_ui.h~ 2012-07-02 15:21:59.000000000 +0200
-+++ ardour-2.8.16/gtk2_ardour/sfdb_ui.h 2013-05-10 13:10:02.406093516 +0200
-@@ -26,20 +26,7 @@
-
- #include <sigc++/signal.h>
-
--#include <gtkmm/box.h>
--#include <gtkmm/button.h>
--#include <gtkmm/checkbutton.h>
--#include <gtkmm/comboboxtext.h>
--#include <gtkmm/dialog.h>
--#include <gtkmm/entry.h>
--#include <gtkmm/filechooserwidget.h>
--#include <gtkmm/frame.h>
--#include <gtkmm/label.h>
--#include <gtkmm/table.h>
--#include <gtkmm/liststore.h>
--#include <gtkmm/textview.h>
--#include <gtkmm/spinbutton.h>
--#include <gtkmm/notebook.h>
-+#include <gtkmm.h>
-
- #include <ardour/session.h>
- #include <ardour/audiofilesource.h>
-diff -up ardour-2.8.16/gtk2_ardour/simpleline.h~ ardour-2.8.16/gtk2_ardour/simpleline.h
---- ardour-2.8.16/gtk2_ardour/simpleline.h~ 2009-02-24 13:37:42.000000000 +0100
-+++ ardour-2.8.16/gtk2_ardour/simpleline.h 2013-05-10 13:10:12.934094331 +0200
-@@ -27,6 +27,7 @@
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-+#include <libgnomecanvasmm.h>
- #include <libgnomecanvasmm/item.h>
- #include <libgnomecanvas/gnome-canvas-util.h>
- #include <libgnomecanvas/libgnomecanvas.h>
-diff -up ardour-2.8.16/gtk2_ardour/simpleline_p.h~ ardour-2.8.16/gtk2_ardour/simpleline_p.h
---- ardour-2.8.16/gtk2_ardour/simpleline_p.h~ 2009-02-24 13:37:42.000000000 +0100
-+++ ardour-2.8.16/gtk2_ardour/simpleline_p.h 2013-05-10 13:10:21.750095013 +0200
-@@ -22,7 +22,7 @@
- #define _LIBGNOMECANVASMM_SIMPLELINE_P_H
- #include <libgnomecanvasmm/private/item_p.h>
-
--#include <glibmm/class.h>
-+#include <glibmm.h>
-
- namespace Gnome
- {
-diff -up ardour-2.8.16/gtk2_ardour/simplerect.h~ ardour-2.8.16/gtk2_ardour/simplerect.h
---- ardour-2.8.16/gtk2_ardour/simplerect.h~ 2009-02-24 13:37:42.000000000 +0100
-+++ ardour-2.8.16/gtk2_ardour/simplerect.h 2013-05-10 13:10:29.190095589 +0200
-@@ -27,9 +27,8 @@
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-+#include <libgnomecanvasmm.h>
- #include <libgnomecanvasmm/item.h>
--#include <libgnomecanvasmm/group.h>
--#include <libgnomecanvasmm/shape.h>
- #include "canvas-simplerect.h"
-
-
-diff -up ardour-2.8.16/gtk2_ardour/simplerect_p.h~ ardour-2.8.16/gtk2_ardour/simplerect_p.h
---- ardour-2.8.16/gtk2_ardour/simplerect_p.h~ 2009-02-24 13:37:42.000000000 +0100
-+++ ardour-2.8.16/gtk2_ardour/simplerect_p.h 2013-05-10 13:10:33.654095934 +0200
-@@ -21,7 +21,7 @@
- #ifndef _LIBGNOMECANVASMM_SIMPLERECT_P_H
- #define _LIBGNOMECANVASMM_SIMPLERECT_P_H
-
--#include <glibmm/class.h>
-+#include <glibmm.h>
-
- namespace Gnome
- {
-diff -up ardour-2.8.16/gtk2_ardour/splash.h~ ardour-2.8.16/gtk2_ardour/splash.h
---- ardour-2.8.16/gtk2_ardour/splash.h~ 2009-02-24 13:37:42.000000000 +0100
-+++ ardour-2.8.16/gtk2_ardour/splash.h 2013-05-10 13:10:41.782096563 +0200
-@@ -20,11 +20,7 @@
- #ifndef __ardour_gtk_splash_h__
- #define __ardour_gtk_splash_h__
-
--#include <gtkmm/window.h>
--#include <gtkmm/drawingarea.h>
--#include <gtkmm/box.h>
--#include <gtkmm/label.h>
--#include <gdkmm/pixbuf.h>
-+#include <gtkmm.h>
-
- class ARDOUR_UI;
-
-diff -up ardour-2.8.16/gtk2_ardour/tempo_dialog.h~ ardour-2.8.16/gtk2_ardour/tempo_dialog.h
---- ardour-2.8.16/gtk2_ardour/tempo_dialog.h~ 2009-02-24 13:37:42.000000000 +0100
-+++ ardour-2.8.16/gtk2_ardour/tempo_dialog.h 2013-05-10 13:10:50.070097205 +0200
-@@ -20,15 +20,7 @@
- #ifndef __ardour_gtk_tempo_dialog_h__
- #define __ardour_gtk_tempo_dialog_h__
-
--#include <gtkmm/entry.h>
--#include <gtkmm/frame.h>
--#include <gtkmm/box.h>
--#include <gtkmm/button.h>
--#include <gtkmm/label.h>
--#include <gtkmm/table.h>
--#include <gtkmm/entry.h>
--#include <gtkmm/spinbutton.h>
--#include <gtkmm/comboboxtext.h>
-+#include <gtkmm.h>
-
- #include <ardour/types.h>
- #include <ardour/tempo.h>
-diff -up ardour-2.8.16/gtk2_ardour/theme_manager.h~ ardour-2.8.16/gtk2_ardour/theme_manager.h
---- ardour-2.8.16/gtk2_ardour/theme_manager.h~ 2011-09-12 21:22:34.000000000 +0200
-+++ ardour-2.8.16/gtk2_ardour/theme_manager.h 2013-05-10 13:10:59.014097897 +0200
-@@ -20,13 +20,7 @@
- #ifndef __ardour_gtk_color_manager_h__
- #define __ardour_gtk_color_manager_h__
-
--#include <gtkmm/treeview.h>
--#include <gtkmm/liststore.h>
--#include <gtkmm/scrolledwindow.h>
--#include <gtkmm/colorselection.h>
--#include <gtkmm/radiobutton.h>
--#include <gtkmm/button.h>
--#include <gtkmm/rc.h>
-+#include <gtkmm.h>
- #include "ardour_dialog.h"
- #include "ui_config.h"
-
-diff -up ardour-2.8.16/gtk2_ardour/time_axis_view.h~ ardour-2.8.16/gtk2_ardour/time_axis_view.h
---- ardour-2.8.16/gtk2_ardour/time_axis_view.h~ 2010-05-21 17:15:17.000000000 +0200
-+++ ardour-2.8.16/gtk2_ardour/time_axis_view.h 2013-05-10 13:11:13.398099010 +0200
-@@ -23,14 +23,7 @@
- #include <vector>
- #include <list>
-
--#include <gtkmm/box.h>
--#include <gtkmm/frame.h>
--#include <gtkmm/drawingarea.h>
--#include <gtkmm/eventbox.h>
--#include <gtkmm/table.h>
--#include <gtkmm/entry.h>
--#include <gtkmm/label.h>
--
-+#include <gtkmm.h>
- #include <gtkmm2ext/focus_entry.h>
-
- #include <pbd/stateful.h>
-diff -up ardour-2.8.16/gtk2_ardour/time_axis_view_item.h~ ardour-2.8.16/gtk2_ardour/time_axis_view_item.h
---- ardour-2.8.16/gtk2_ardour/time_axis_view_item.h~ 2011-09-12 21:22:34.000000000 +0200
-+++ ardour-2.8.16/gtk2_ardour/time_axis_view_item.h 2013-05-10 13:11:17.798099351 +0200
-@@ -23,7 +23,7 @@
- #include <jack/jack.h>
- #include <string>
-
--#include <libgnomecanvasmm/pixbuf.h>
-+#include <libgnomecanvasmm.h>
-
- #include "selectable.h"
- #include "simplerect.h"
-diff -up ardour-2.8.16/gtk2_ardour/utils.h~ ardour-2.8.16/gtk2_ardour/utils.h
---- ardour-2.8.16/gtk2_ardour/utils.h~ 2011-09-12 21:22:34.000000000 +0200
-+++ ardour-2.8.16/gtk2_ardour/utils.h 2013-05-10 13:11:28.934100213 +0200
-@@ -24,8 +24,8 @@
- #include <cmath>
- #include <vector>
- #include <ardour/types.h>
--#include <libgnomecanvasmm/line.h>
--#include <gdkmm/types.h>
-+#include <gtkmm.h>
-+#include <libgnomecanvasmm.h>
-
- #include "canvas.h"
- #include "public_editor.h"
-diff -up ardour-2.8.16/gtk2_ardour/visual_time_axis.h~ ardour-2.8.16/gtk2_ardour/visual_time_axis.h
---- ardour-2.8.16/gtk2_ardour/visual_time_axis.h~ 2009-02-24 13:37:42.000000000 +0100
-+++ ardour-2.8.16/gtk2_ardour/visual_time_axis.h 2013-05-10 13:11:35.062100687 +0200
-@@ -20,9 +20,7 @@
- #ifndef __ardour_visual_time_axis_h__
- #define __ardour_visual_time_axis_h__
-
--#include <gtkmm/box.h>
--#include <gtkmm/button.h>
--
-+#include <gtkmm.h>
- #include <gtkmm2ext/selector.h>
-
- #include "ardour_dialog.h"
-diff -up ardour-2.8.16/gtk2_ardour/waveview.h~ ardour-2.8.16/gtk2_ardour/waveview.h
---- ardour-2.8.16/gtk2_ardour/waveview.h~ 2009-02-24 13:37:42.000000000 +0100
-+++ ardour-2.8.16/gtk2_ardour/waveview.h 2013-05-10 13:11:56.822102371 +0200
-@@ -27,6 +27,7 @@
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-+#include <libgnomecanvasmm.h>
- #include <libgnomecanvasmm/item.h>
- #include "canvas-waveview.h"
- #include <libgnomecanvas/gnome-canvas-util.h>
-diff -up ardour-2.8.16/gtk2_ardour/waveview_p.h~ ardour-2.8.16/gtk2_ardour/waveview_p.h
---- ardour-2.8.16/gtk2_ardour/waveview_p.h~ 2009-02-24 13:37:42.000000000 +0100
-+++ ardour-2.8.16/gtk2_ardour/waveview_p.h 2013-05-10 13:12:06.613103129 +0200
-@@ -22,7 +22,7 @@
- #define _LIBGNOMECANVASMM_WAVEVIEW_P_H
-
- #include <libgnomecanvasmm/private/item_p.h>
--#include <glibmm/class.h>
-+#include <glibmm.h>
-
- namespace Gnome
- {
diff --git a/ardour-lilv016fix.patch b/ardour-lilv016fix.patch
deleted file mode 100644
index 2f4545b..0000000
--- a/ardour-lilv016fix.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff -rupN ardour-2.8.16.old/libs/ardour/ardour/lv2_plugin.h ardour-2.8.16/libs/ardour/ardour/lv2_plugin.h
---- ardour-2.8.16.old/libs/ardour/ardour/lv2_plugin.h 2012-04-19 14:51:59.000000000 -0400
-+++ ardour-2.8.16/libs/ardour/ardour/lv2_plugin.h 2013-08-03 16:18:15.556223746 -0400
-@@ -154,7 +154,7 @@ class LV2Plugin : public ARDOUR::Plugin
- /** Find the LV2 input port with the given designation.
- * If found, bufptrs[port_index] will be set to bufptr.
- */
-- LilvPort* designated_input (const char* uri, void** bufptrs[], void** bufptr);
-+ const LilvPort* designated_input (const char* uri, void** bufptrs[], void** bufptr);
- };
-
-
-diff -rupN ardour-2.8.16.old/libs/ardour/lv2_plugin.cc ardour-2.8.16/libs/ardour/lv2_plugin.cc
---- ardour-2.8.16.old/libs/ardour/lv2_plugin.cc 2012-04-19 14:51:59.000000000 -0400
-+++ ardour-2.8.16/libs/ardour/lv2_plugin.cc 2013-08-03 16:17:03.564508732 -0400
-@@ -644,10 +644,10 @@ LV2Plugin::latency_compute_run ()
- deactivate ();
- }
-
--LilvPort*
-+const LilvPort*
- LV2Plugin::designated_input (const char* uri, void** bufptrs[], void** bufptr)
- {
-- LilvPort* port = NULL;
-+ const LilvPort* port = NULL;
- #ifdef HAVE_NEW_LILV
- LilvNode* designation = lilv_new_uri(_world.world, uri);
- port = lilv_plugin_get_port_by_designation(
diff --git a/ardour-no-grep-options.patch b/ardour-no-grep-options.patch
deleted file mode 100644
index c6145e5..0000000
--- a/ardour-no-grep-options.patch
+++ /dev/null
@@ -1,10 +0,0 @@
-diff -rupN ardour-2.8.13.old/gtk2_ardour/ardour.sh.in ardour-2.8.13/gtk2_ardour/ardour.sh.in
---- ardour-2.8.13.old/gtk2_ardour/ardour.sh.in 2012-07-09 22:12:15.834833285 -0400
-+++ ardour-2.8.13/gtk2_ardour/ardour.sh.in 2012-07-09 22:11:45.957934297 -0400
-@@ -1,5 +1,6 @@
- #!/bin/sh
-
-+unset GREP_OPTIONS
- export GTK_PATH=%INSTALL_PREFIX%/%LIBDIR%/ardour2${GTK_PATH:+:$GTK_PATH}
-
- export LD_LIBRARY_PATH=%INSTALL_PREFIX%/%LIBDIR%/ardour2${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
diff --git a/ardour.sh b/ardour.sh
deleted file mode 100755
index f560328..0000000
--- a/ardour.sh
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/bin/sh
-
-A2DIR=~/.ardour2
-
-if ! test -d $A2DIR; then
- mkdir -p $A2DIR
- touch $A2DIR/ardourver2.2
- touch $A2DIR/ardourver2.5
-else
- if ! test -a $A2DIR/ardourver2.2; then
- if test -a $A2DIR/ardour2_ui.rc; then
- mv -f $A2DIR/ardour2_ui.rc $A2DIR/ardour2_ui.rc.bak
- fi
- if test -a $A2DIR/ardour2_ui.conf; then
- mv -f $A2DIR/ardour2_ui.conf $A2DIR/ardour2_ui.conf.bak
- fi
- if test -a $A2DIR/ardour.bindings; then
- mv -f $A2DIR/ardour.bindings $A2DIR/ardour.bindings.bak
- fi
- touch $A2DIR/ardourver2.2
- fi
- if ! test -a $A2DIR/ardourver2.5; then
- if test -a $A2DIR/ardour.bindings; then
- mv -f $A2DIR/ardour.bindings $A2DIR/ardour.bindings.bak
- fi
- touch $A2DIR/ardourver2.5
- fi
-fi
-
-exec /usr/libexec/ardour2 "$@"
diff --git a/ardour2.spec b/ardour2.spec
deleted file mode 100644
index 02e25ae..0000000
--- a/ardour2.spec
+++ /dev/null
@@ -1,293 +0,0 @@
-Summary: Digital Audio Workstation
-Name: ardour2
-Version: 2.8.16
-Release: 30%{?dist}
-# No more direct links. Download from
-# http://ardour.org/download
-Source: ardour-%{version}.tar.bz2
-Source2: ardour.sh
-Patch0: ardour-SConscript.patch
-# Colored grep output makes the script print errors:
-Patch1: ardour-no-grep-options.patch
-Patch3: ardour-2.5-HOST_NOT_FOUND.patch
-# Filed upstream: http://tracker.ardour.org/view.php?id=5476
-Patch4: ardour-fix-mm-includes.patch
-# lilv-0.16 compatibility. Fixed in trunk
-Patch5: ardour-lilv016fix.patch
-# Need to link various plugins against boost (rhbz#1156179)
-Patch6: 0001-Add-boost-linking-to-tranzport-and-generic-midi-surf.patch
-Patch7: 0002-Add-boost-linking-to-wiimote.patch
-# C++11 needs this
-Patch8: ardour-2.8.16-c++11-namespaces.patch
-Patch9: ardour-2.8.16-c++11-xpm.patch
-Patch10: ardour-2.8.16-c++11-bool-from-pointer.patch
-# libsigc++ >= 2.6 needs this
-Patch11: ardour-2.8.16-libsigc++26.patch
-# aubio >= 0.4.0 needs this
-Patch12: ardour-2.8.16-aubio04.patch
-# include a freely licensed version of dmalloc.c
-# this code is not actually used, but eh.
-# Taken from http://dmalloc.com/releases/ v5.5.2
-Patch13: ardour-2.8.16-free-dmalloc.patch
-# fix to compile with gcc6
-# There are almost certainly other cleanups that could be made here
-# but this code is legacy, so just get it building again.
-Patch14: ardour-2.8.16-gcc6.patch
-# Fix to compile with glibmm 2.50.x
-Patch15: ardour-2.8.16-glibmm250.patch
-# Fix to compile with gcc7
-Patch16: ardour-2.8.16-gcc7.patch
-URL: http://ardour.org
-License: GPLv2+
-Group: Applications/Multimedia
-
-BuildRequires: alsa-lib-devel
-BuildRequires: aubio-devel
-BuildRequires: boost-devel
-BuildRequires: cwiid-devel
-BuildRequires: desktop-file-utils
-BuildRequires: fftw-devel
-BuildRequires: gettext >= 0.11.5
-BuildRequires: gtkmm24-devel >= 2.8
-BuildRequires: jack-audio-connection-kit-devel
-BuildRequires: libcurl-devel
-BuildRequires: libgnomecanvas-devel
-BuildRequires: libgnomecanvasmm26-devel >= 2.12
-BuildRequires: liblo-devel
-BuildRequires: liblrdf-devel >= 0.3.1
-BuildRequires: libsamplerate-devel >= 0.0.13
-BuildRequires: libsndfile-devel >= 1.0.18
-BuildRequires: libtool
-BuildRequires: libusb-devel
-BuildRequires: libxslt-devel
-BuildRequires: lilv-devel
-BuildRequires: pkgconfig
-BuildRequires: scons
-BuildRequires: soundtouch-devel
-BuildRequires: suil-devel
-# For up2date config.guess for new architectures (ie aarch64) support
-BuildRequires: redhat-rpm-config
-
-Requires: hicolor-icon-theme
-
-Obsoletes: ardour < 2.8.16-16
-
-%description
-This package contains the legacy version 2 of Ardour. It is provided as a way
-to work on sessions created by this version. Please use the current version of
-Ardour for new projects.
-
-Ardour is a multichannel hard disk recorder (HDR) and digital audio workstation
-(DAW). It is capable of simultaneously recording 24 or more channels of 32 bit
-audio at 48kHz.
-
-%prep
-%setup -q -n ardour-%{version}
-%patch0 -p1 -b .SConscript
-%patch1 -p1 -b .no.grep.opts
-%patch3 -p0 -b .host.not.found
-%patch4 -p1 -b .fix-mm-includes
-%patch5 -p1 -b .lilv016
-%patch6 -p1 -b .boost-tranzport-generic-midi
-%patch7 -p1 -b .boost-linking-wiimote
-%patch8 -p1 -b .c++11-namespaces
-%patch9 -p1 -b .c++11-xpm
-%patch10 -p1 -b .c++11-bool-from-pointer
-%patch11 -p1 -b .libsigc++26
-%patch12 -p1 -b .aubio04
-%patch13 -p1 -b .free-dmalloc
-%patch14 -p1 -b .gcc6
-%patch15 -p1 -b .glibmm250
-%patch16 -p1 -b .gcc7
-
-# Update config.guess for new architectures (ie aarch64) support
-cp /usr/lib/rpm/redhat/config.guess tools
-
-# Fix encodings:
-iconv -f ISO-8859-1 -t UTF8 ardour.1.fr > ardour.1.fr.tmp
-touch -r ardour.1.fr ardour.1.fr.tmp
-mv -f ardour.1.fr.tmp ardour.1.fr
-iconv -f KOI8-R -t UTF8 ardour.1.ru > ardour.1.ru.tmp
-touch -r ardour.1.ru ardour.1.ru.tmp
-mv -f ardour.1.ru.tmp ardour.1.ru
-
-%build
-echo "GenericName=Digital Audio Workstation" >> gtk2_ardour/ardour2.desktop.in
-# <sigh> ardours SConstruct script is a mess when it comes to determining
-# opt_flags, so we override the lot using the ARCH= and DIST_TARGET= options
-
-TARGETCPU="none"
-
-%ifarch %{ix86}
-ARCH_FLAGS="-DARCH_X86 -DBUILD_SSE_OPTIMIZATIONS -msse -mfpmath=sse -DUSE_XMMINTRIN"
-TARGETCPU="i386"
-%endif
-%ifarch x86_64
-ARCH_FLAGS="-DARCH_X86 -DBUILD_SSE_OPTIMIZATIONS -DUSE_X86_64_ASM -msse -mfpmath=sse -DUSE_XMMINTRIN"
-TARGETCPU="x86_64"
-%endif
-
-# Parallel build fails
-scons PREFIX=%{_prefix} LIBDIR=%{_lib} SYSLIBS=1 \
- FREESOUND=1 \
- DIST_TARGET="${TARGETCPU}" \
- ARCH="$RPM_OPT_FLAGS $ARCH_FLAGS -std=c++11" \
- AUSTATE=1 \
- DIST_LIBDIR=%{_lib} \
- WIIMOTE=1
-
-%install
-scons DESTDIR=$RPM_BUILD_ROOT install
-
-# Current Ardour versions have their own appdata file:
-# https://github.com/Ardour/ardour/pull/158
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/appdata
-cat > $RPM_BUILD_ROOT%{_datadir}/appdata/ardour2.appdata.xml <<EOF
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright 2014 Richard Hughes <richard(a)hughsie.com> -->
-<application>
- <id type="desktop">ardour2.desktop</id>
- <metadata_license>CC0-1.0</metadata_license>
- <summary>Digital Audio Workstation (Legacy Version)</summary>
- <description>
- <p>
- This package contains the legacy version 2 of Ardour. It is provided as a
- way to work on sessions created by this version. Please use the current
- version of Ardour for new projects.
- </p>
- <p>
- Ardour is a digital audio workstation that permits you to record and
- create music.
- Ardour supports multi-track recording, and allows you to use plug-ins to
- create music in a virtual studio.
- </p>
- </description>
- <url type="homepage">http://ardour.org</url>
- <screenshots>
- <screenshot type="default">http://ardour.org/images/lsdedits.png</screenshot>
- <screenshot>http://ardour.org/images/eno.png</screenshot>
- <screenshot>http://ardour.org/images/lsd-mixer.jpg</screenshot>
- </screenshots>
- <updatecontact>ardour-users(a)lists.ardour.org</updatecontact>
-</application>
-EOF
-
-# Replace ardour2 with a script
-install -dm 755 $RPM_BUILD_ROOT%{_libexecdir}
-mv $RPM_BUILD_ROOT%{_bindir}/ardour2 $RPM_BUILD_ROOT%{_libexecdir}
-install -pm 755 %{SOURCE2} $RPM_BUILD_ROOT%{_bindir}/ardour2
-
-# copy icons to freedesktop locations
-for s in 16 22 32 48 ; do
- mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/${s}x${s}/apps
- cp -p $RPM_BUILD_ROOT%{_datadir}/ardour2/icons/ardour_icon_${s}px.png \
- $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/${s}x${s}/apps/ardour2.png
-done
-
-# install the desktop entry
-cp -dpf gtk2_ardour/ardour2.desktop{.in,}
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
-desktop-file-install --dir ${RPM_BUILD_ROOT}%{_datadir}/applications \
- gtk2_ardour/ardour2.desktop
-
-# install mime entry
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/mime/packages/
-install -p -m 0644 gtk2_ardour/ardour2.xml $RPM_BUILD_ROOT%{_datadir}/mime/packages/
-
-# install the man pages
-install -dm 755 $RPM_BUILD_ROOT%{_mandir}/man1/
-install -p -m 0644 ardour.1 $RPM_BUILD_ROOT%{_mandir}/man1/ardour2.1
-for lang in es fr ru ; do
- install -dm 755 $RPM_BUILD_ROOT%{_mandir}/${lang}/man1/
- install -p -m 0644 ardour.1.${lang} $RPM_BUILD_ROOT%{_mandir}/${lang}/man1/ardour2.1
-done
-
-%find_lang gtk2_ardour
-cat gtk2_ardour.lang > ardour.lang
-%find_lang libardour2
-cat libardour2.lang >> ardour.lang
-%find_lang libgtkmm2ext
-cat libgtkmm2ext.lang >> ardour.lang
-
-%files -f ardour.lang
-%license COPYING
-%doc README
-%config(noreplace) %{_sysconfdir}/ardour2
-%{_bindir}/ardour2
-%{_libexecdir}/ardour2
-%{_libdir}/ardour2/
-%{_datadir}/ardour2/
-%{_datadir}/icons/hicolor/*/apps/ardour2.png
-%{_datadir}/appdata/*.appdata.xml
-%{_datadir}/applications/ardour2.desktop
-%{_datadir}/mime/packages/ardour2.xml
-%{_mandir}/man1/ardour2.1*
-%{_mandir}/es/man1/ardour2.1*
-%{_mandir}/fr/man1/ardour2.1*
-%{_mandir}/ru/man1/ardour2.1*
-
-%changelog
-* Wed Feb 07 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 2.8.16-30
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
-
-* Sun Jan 07 2018 Igor Gnatenko <ignatenkobrain(a)fedoraproject.org> - 2.8.16-29
-- Remove obsolete scriptlets
-
-* Sat Sep 30 2017 Jerry James <loganjerry(a)gmail.com> - 2.8.16-28
-- Rebuild for soundtouch 2.0.0
-
-* Wed Aug 02 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 2.8.16-27
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
-
-* Wed Jul 26 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 2.8.16-26
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
-
-* Mon May 15 2017 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 2.8.16-25
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_27_Mass_Rebuild
-
-* Fri Feb 10 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 2.8.16-24
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
-
-* Tue Jan 31 2017 Jonathan Wakely <jwakely(a)redhat.com> - 2.8.16-23
-- Rebuilt for Boost 1.63 and patched for glibmm 2.50.x and GCC 7
-
-* Tue Mar 8 2016 Tom Callaway <spot(a)fedoraproject.org> - 2.8.16-22
-- replace non-free dmalloc.cc with a freely licensed version (bz1313285)
-- fix FTBFS with gcc6 (bz1307324)
-
-* Wed Feb 03 2016 Fedora Release Engineering <releng(a)fedoraproject.org> - 2.8.16-21
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
-
-* Sat Jan 16 2016 Jonathan Wakely <jwakely(a)redhat.com> - 2.8.16-20
-- Rebuilt for Boost 1.60
-
-* Sun Nov 29 2015 Nils Philippsen <nils(a)redhat.com> - 2.8.16-19
-- patch for and build with -std=c++11
-- patch for libsigc++20 >= 2.6
-- patch for aubio >= 0.4.0
-- mention legacy version in appdata file
-- miscellaneous fixes
-
-* Thu Aug 27 2015 Jonathan Wakely <jwakely(a)redhat.com> - 2.8.16-18
-- Rebuilt for Boost 1.59
-
-* Wed Jul 29 2015 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 2.8.16-17
-- Rebuilt for https://fedoraproject.org/wiki/Changes/F23Boost159
-
-* Wed Jul 22 2015 David Tardon <dtardon(a)redhat.com> - 2.8.16-16
-- rebuild for Boost 1.58
-
-* Wed Jun 17 2015 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 2.8.16-15
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
-
-* Thu Jun 11 2015 Nils Philippsen <nils(a)redhat.com> 2.8.16-14
-- make release higher than ardour to break obsoletes loop (#1230469)
-
-* Mon May 11 2015 Nils Philippsen <nils(a)redhat.com> 2.8.16-1
-- rename ardour.script to ardour.sh to appease rpmlint
-- trim description
-
-* Fri May 08 2015 Nils Philippsen <nils(a)redhat.com> 2.8.16-1
-- rename package to ardour2
-- mention legacy status in %%changelog
-- fix file names of man pages
diff --git a/dead.package b/dead.package
new file mode 100644
index 0000000..1a0cff8
--- /dev/null
+++ b/dead.package
@@ -0,0 +1 @@
+Obsoleted by ardour5.
diff --git a/sources b/sources
deleted file mode 100644
index 368454d..0000000
--- a/sources
+++ /dev/null
@@ -1 +0,0 @@
-5bafe41df00d25e7a357baaa1038f16d ardour-2.8.16.tar.bz2
6 years, 1 month
Architecture specific change in rpms/qemu.git
by githook-noreply@fedoraproject.org
The package rpms/qemu.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/qemu.git/commit/?id=55054b88c9424....
Change:
-%ifnarch aarch64
Thanks.
Full change:
============
commit 55054b88c942419c84d71e53ce00ffb8050fe9a6
Author: Daniel P. Berrangé <berrange(a)redhat.com>
Date: Mon Mar 19 18:30:49 2018 +0000
Re-enable normal Fedora hardening macros
We previously disabled the hardened build macros because they broke
static linking. This is now resolved, so we can use them as is, which in
turn ensures ksmctl gets linked correctly.
While doing this it is not neccessary to pass -pie in ldflags, as we are
already giving the --enable-pie configure option. This lets us move
setting of linker/compiler flags into the common run_configure
function, rather than duplicating them for static & dynamic builds
Finally, even though QEMU sets _FORTIFY_SOURCE itself, there's no reason
to strip it from the RPM provided build flags - it is harmless for it to
appear twice on compiler args. This ensures ksmctl.c gets fortified.
Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com>
diff --git a/qemu.spec b/qemu.spec
index 2e1e0d9..651dcaf 100644
--- a/qemu.spec
+++ b/qemu.spec
@@ -89,10 +89,6 @@ Requires: %{name}-block-nfs = %{epoch}:%{version}-%{release} \
Requires: %{name}-block-ssh = %{epoch}:%{version}-%{release}
%endif
-# Temp hack for https://bugzilla.redhat.com/show_bug.cgi?id=1343892
-# We'll manually turn on hardened build later in this spec
-%undefine _hardened_build
-
# Release candidate version tracking
# global rcver rc3
%if 0%{?rcver:1}
@@ -104,7 +100,7 @@ Requires: %{name}-block-ssh = %{epoch}:%{version}-%{release}
Summary: QEMU is a FAST! processor emulator
Name: qemu
Version: 2.11.1
-Release: 1%{?rcrel}%{?dist}
+Release: 2%{?rcrel}%{?dist}
Epoch: 2
License: GPLv2 and BSD and MIT and CC-BY
URL: http://www.qemu.org/
@@ -941,9 +937,6 @@ This package provides the system emulator for NIOS2.
%build
-# QEMU already knows how to set _FORTIFY_SOURCE
-%global optflags %(echo %{optflags} | sed 's/-Wp,-D_FORTIFY_SOURCE=2//')
-
# drop -g flag to prevent memory exhaustion by linker
%ifarch s390
%global optflags %(echo %{optflags} | sed 's/-g//')
@@ -1064,6 +1057,12 @@ run_configure() {
--enable-tcg-interpreter \
%endif
--enable-trace-backend=$tracebackends \
+%ifnarch aarch64
+ --extra-ldflags="$extraldflags -Wl,-z,relro -Wl,-z,now" \
+%else
+ --extra-ldflags="$extraldflags" \
+%endif
+ --extra-cflags="%{optflags}" \
"$@" || cat config.log
}
@@ -1071,12 +1070,6 @@ mkdir build-dynamic
pushd build-dynamic
run_configure \
-%ifnarch aarch64
- --extra-ldflags="$extraldflags -specs=/usr/lib/rpm/redhat/redhat-hardened-ld -pie -Wl,-z,relro -Wl,-z,now" \
-%else
- --extra-ldflags="$extraldflags -specs=/usr/lib/rpm/redhat/redhat-hardened-ld" \
-%endif
- --extra-cflags="%{optflags} -specs=/usr/lib/rpm/redhat/redhat-hardened-cc1" \
--target-list="$dynamic_targets" \
--enable-pie \
--enable-modules \
@@ -1101,12 +1094,6 @@ mkdir build-static
pushd build-static
run_configure \
-%ifnarch aarch64
- --extra-ldflags="$extraldflags -Wl,-z,relro -Wl,-z,now" \
-%else
- --extra-ldflags="$extraldflags" \
-%endif
- --extra-cflags="%{optflags}" \
--target-list="$static_targets" \
--static \
--disable-pie \
@@ -1983,6 +1970,11 @@ getent passwd qemu >/dev/null || \
%changelog
+* Mon Mar 19 2018 Daniel P. Berrangé <berrange(a)redhat.com> - 2:2.11.1-2
+- Re-enable normal hardened build macros to fix ksmctl.c hardening
+- Don't strip _FORTIFY_SOURCE from compiler flags
+- Don't pass -pie as an extra ldflags when we use --enable-pie
+
* Wed Feb 28 2018 Cole Robinson <crobinso(a)redhat.com> - 2:2.11.1-1
- Rebase to qemu 2.11.1 bugfix release
commit 6b1a7d80a53959e401926169fc3a1d06ed8d769d
Author: Cole Robinson <crobinso(a)redhat.com>
Date: Tue Mar 13 09:32:49 2018 -0400
git rm kvm.modules
Was dropped from the spec in 2015
Reported-by: Danilo C. L. de Paula <ddepaula(a)redhat.com>
diff --git a/kvm.modules b/kvm.modules
deleted file mode 100755
index b9d9646..0000000
--- a/kvm.modules
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/sh
-
-case $(uname -m) in
- ppc64)
- grep OPAL /proc/cpuinfo >/dev/null 2>&1 && opal=1
-
- modprobe -b kvm >/dev/null 2>&1
- modprobe -b kvm-pr >/dev/null 2>&1 && kvm=1
- if [ "$opal" ]; then
- modprobe -b kvm-hv >/dev/null 2>&1
- fi
- ;;
- s390x)
- modprobe -b kvm >/dev/null 2>&1 && kvm=1
- ;;
-esac
-
-exit 0
6 years, 1 month
Architecture specific change in rpms/libalkimia.git
by githook-noreply@fedoraproject.org
The package rpms/libalkimia.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/libalkimia.git/commit/?id=ff9de31....
Change:
+%ifnarch ppc64le
Thanks.
Full change:
============
commit 9bb0e2dc685d7dd553f3d62ad010dfc61081bf7f
Author: Rex Dieter <rdieter(a)gmail.com>
Date: Mon Mar 19 15:01:02 2018 -0500
-devel: Requires: (gmp,mpir)-devel
diff --git a/libalkimia.spec b/libalkimia.spec
index a4f13bd..a2b0adf 100644
--- a/libalkimia.spec
+++ b/libalkimia.spec
@@ -10,7 +10,7 @@
Name: libalkimia
Summary: Financial library
Version: 7.0.1
-Release: 1%{?dist}
+Release: 2%{?dist}
License: LGPLv2+
URL: https://kmymoney.org/
@@ -33,8 +33,10 @@ BuildRequires: pkgconfig(QtTest)
%ifnarch ppc64le
# mpir not built on ppc64le... yet
BuildRequires: mpir-devel
+%global gmp mpir
%else
BuildRequires: gmp-devel
+%global gmp gmp
%endif
%if 0%{?docs}
@@ -47,6 +49,7 @@ BuildRequires: doxygen
%package devel
Summary: Development files for %{name}
Requires: %{name}%{?_isa} = %{version}-%{release}
+Requires: %{gmp}-devel
%description devel
%{summary}.
@@ -58,6 +61,7 @@ Summary: Accounts framework Qt5 bindings
%package qt5-devel
Summary: Development files for %{name}-qt5
Requires: %{name}-qt5%{?_isa} = %{version}-%{release}
+Requires: %{gmp}-devel
%description qt5-devel
%{summary}.
@@ -157,6 +161,9 @@ make test ARGS="--output-on-failure --timeout 20" -C %{_target_platform}-qt5 ||:
%changelog
+* Mon Mar 19 2018 Rex Dieter <rdieter(a)fedoraproject.org> - 7.0.1-2
+- -devel: Requires: (gmp,mpir)-devel
+
* Sun Mar 18 2018 Rex Dieter <rdieter(a)fedoraproject.org> - 7.0.1-1
- 7.0.1
- -qt5 support
commit ff9de31ea452c6778db57b62da7ed6d5a427220d
Author: Rex Dieter <rdieter(a)gmail.com>
Date: Mon Mar 19 14:39:26 2018 -0500
7.0.1
-qt5 support
diff --git a/.gitignore b/.gitignore
index 5d62064..2fcde98 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
/137323-libalkimia-4.3.2.tar.bz2
/libalkimia-5.0.0.tar.xz
+/alkimia-7.0.1.tar.xz
diff --git a/libalkimia.spec b/libalkimia.spec
index b57daa0..a4f13bd 100644
--- a/libalkimia.spec
+++ b/libalkimia.spec
@@ -1,15 +1,45 @@
+# uncomment to enable bootstrap mode
+#global bootstrap 1
+
+%if ! 0%{?bootstrap}
+%global docs 1
+%global tests 1
+%endif
+
Name: libalkimia
Summary: Financial library
-Version: 5.0.0
-Release: 6%{?dist}
+Version: 7.0.1
+Release: 1%{?dist}
License: LGPLv2+
URL: https://kmymoney.org/
-Source0: http://download.kde.org/stable/alkimia/%{version}/src/libalkimia-%{versio...
-
+Source0: http://download.kde.org/stable/alkimia/%{version}/src/alkimia-%{version}....
+
+BuildRequires: cmake
+BuildRequires: gcc-c++
+BuildRequires: pkg-config
+# KF5
+BuildRequires: extra-cmake-modules
+# Qt5
+BuildRequires: cmake(Qt5Core)
+BuildRequires: cmake(Qt5DBus)
+BuildRequires: cmake(Qt5Test)
+# Qt4
+BuildRequires: pkgconfig(QtCore)
+BuildRequires: pkgconfig(QtDBus)
+BuildRequires: pkgconfig(QtTest)
+
+%ifnarch ppc64le
+# mpir not built on ppc64le... yet
+BuildRequires: mpir-devel
+%else
BuildRequires: gmp-devel
-BuildRequires: kdelibs4-devel
+%endif
+
+%if 0%{?docs}
+BuildRequires: doxygen
+%endif
%description
%{summary}
@@ -17,47 +47,120 @@ BuildRequires: kdelibs4-devel
%package devel
Summary: Development files for %{name}
Requires: %{name}%{?_isa} = %{version}-%{release}
-Requires: kdelibs4-devel
%description devel
%{summary}.
+%package qt5
+Summary: Accounts framework Qt5 bindings
+%description qt5
+%{summary}.
+
+%package qt5-devel
+Summary: Development files for %{name}-qt5
+Requires: %{name}-qt5%{?_isa} = %{version}-%{release}
+%description qt5-devel
+%{summary}.
+
+%package doc
+Summary: API Documentation for %{name}
+Requires: %{name} = %{version}-%{release}
+BuildArch: noarch
+%description doc
+%{summary}.
+
%prep
-%setup -q
+%autosetup -n alkimia-%{version} -p1
%build
-mkdir %{_target_platform}
-pushd %{_target_platform}
-%{cmake_kde4} ..
+## Qt5
+mkdir %{_target_platform}-qt5
+pushd %{_target_platform}-qt5
+%{cmake} .. \
+ -DBUILD_TESTING:BOOL=%{?tests:ON}%{!?tests:OFF}
popd
-make %{?_smp_mflags} -C %{_target_platform}
+%make_build -C %{_target_platform}-qt5
+
+## docs
+%if 0%{?docs}
+# auto-update doxygen configuration
+doxygen -u %{_target_platform}-qt5/src/libalkimia.doxygen
+make libalkimia_apidoc -C %{_target_platform}-qt5
+%endif
+
+## Qt4
+mkdir %{_target_platform}-qt4
+pushd %{_target_platform}-qt4
+%{cmake} .. \
+ -DBUILD_QT4:BOOL=ON \
+ -DBUILD_TESTING:BOOL=%{?tests:ON}%{!?tests:OFF}
+popd
+
+%make_build -C %{_target_platform}-qt4
+
%install
-make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
+make install/fast DESTDIR=%{buildroot} -C %{_target_platform}-qt4
+make install/fast DESTDIR=%{buildroot} -C %{_target_platform}-qt5
+
+%if 0%{?docs}
+mkdir -p %{buildroot}%{_pkgdocdir}
+cp -a %{_target_platform}-qt5/src/apidocs/html/ %{buildroot}%{_pkgdocdir}/
+%endif
%check
export PKG_CONFIG_PATH=%{buildroot}%{_libdir}/pkgconfig
+test "$(pkg-config --modversion libalkimia5)" = "%{version}"
test "$(pkg-config --modversion libalkimia)" = "%{version}"
+%if 0%{?tests}
+time \
+make test ARGS="--output-on-failure --timeout 20" -C %{_target_platform}-qt4 ||:
+time \
+make test ARGS="--output-on-failure --timeout 20" -C %{_target_platform}-qt5 ||:
+%endif
-%post -p /sbin/ldconfig
-%postun -p /sbin/ldconfig
+%ldconfig_scriptlets
%files
-%{_kde4_libdir}/libalkimia.so.5*
+%doc README.md
+%license COPYING*
+%{_libdir}/libalkimia.so.7*
%files devel
-%{_kde4_includedir}/alkimia/
-%{_kde4_libdir}/libalkimia.so
-%{_kde4_libdir}/pkgconfig/libalkimia.pc
-%{_libdir}/cmake/LibAlkimia/
+%{_libdir}/libalkimia.so
+%{_includedir}/alkimia/Qt4/
+%{_libdir}/cmake/LibAlkimia-7.0/
+%{_libdir}//pkgconfig/libalkimia.pc
+
+%ldconfig_scriptlets qt5
+
+%files qt5
+%doc README.md
+%license COPYING*
+%{_libdir}/libalkimia5.so.7*
+
+%files qt5-devel
+%dir %{_includedir}/alkimia/
+%{_includedir}/alkimia/Qt5/
+%{_libdir}/libalkimia5.so
+%{_libdir}/pkgconfig/libalkimia5.pc
+%{_libdir}/cmake/LibAlkimia5-7.0/
+
+%files doc
+%dir %{_pkgdocdir}/
+%doc %{_pkgdocdir}/html
%changelog
+* Sun Mar 18 2018 Rex Dieter <rdieter(a)fedoraproject.org> - 7.0.1-1
+- 7.0.1
+- -qt5 support
+
* Wed Feb 07 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 5.0.0-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
diff --git a/sources b/sources
index cfaf40b..f701fc1 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-910c153bc6a15aed678fcafb773dd389 libalkimia-5.0.0.tar.xz
+SHA512 (alkimia-7.0.1.tar.xz) = 7f72eaf69ad38c5478498a212f6f644ab76a27aec588ff8817414c7e36190568012cd2faff7ae31978beec670539ac93e55f3637a331e90738bddc11a423138c
6 years, 1 month
Architecture specific change in rpms/ghdl.git
by githook-noreply@fedoraproject.org
The package rpms/ghdl.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/ghdl.git/commit/?id=838a8795e219b....
Change:
+%ifarch %{ix86} x86_64 ppc ppc64 ppc64le ppc64p7
Thanks.
Full change:
============
commit 838a8795e219b7092364520362bb8ead10746ad7
Author: Thomas Sailer <t.sailer(a)alumni.ethz.ch>
Date: Mon Mar 19 21:18:10 2018 +0100
update and reenable llvm
diff --git a/ghdl.spec b/ghdl.spec
index fb7818c..7bdc850 100644
--- a/ghdl.spec
+++ b/ghdl.spec
@@ -2,7 +2,7 @@
%global SVNREV 244565
%global gcc_version 6.3.1
%global ghdlver 0.35dev
-%global ghdlgitrev .20180311git46c5015
+%global ghdlgitrev .20180315git0edf0a1
%ifarch %{ix86} x86_64
%bcond_without mcode
@@ -13,12 +13,12 @@
#workaround for another compiler error
#bcond_without llvm
-#ifarch %{ix86} x86_64 ppc ppc64 ppc64le ppc64p7
+%ifarch %{ix86} x86_64 ppc ppc64 ppc64le ppc64p7
#ifarch x86_64 ppc ppc64 ppc64le ppc64p7
-#bcond_without llvm
-#else
+%bcond_without llvm
+%else
%bcond_with llvm
-#endif
+%endif
%ifarch x86_64
%bcond_with m32
@@ -725,6 +725,9 @@ popd
%endif
%changelog
+* Thu Mar 15 2018 Thomas Sailer <t.sailer(a)alumni.ethz.ch> - 0.35dev-0.20180315git0edf0a1.0
+- update to 0.35dev (git0edf0a1)
+
* Thu Mar 15 2018 Thomas Sailer <t.sailer(a)alumni.ethz.ch> - 0.35dev-0.20180311git46c5015.0
- update to 0.34dev (git46c5015)
diff --git a/sources b/sources
index 1c4c90d..f1efd11 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
SHA512 (isl-0.14.tar.xz) = cf43868d466d6ff08c5e15345d222ad153e8c4e86831f9854df716eb914c6c15f4c44b73aa6e0b16eb556d1a4d3c26af6f71e85421bf464cbbd053d5f3c515ee
SHA512 (cloog-0.18.3.tar.gz) = e1bb557b69d38dde7a6b7acde661005bec2c3b5ffa75df32514bff70c8bfe6a12befe24c0448b85e87cf818f3a83cdec2b54066592b7d300c818611085ce17fb
SHA512 (gcc-6.3.1-20170118.tar.bz2) = a2c6261687dc44e980c81c3be04162873195f7e5ed3ceacdde0544f6e4f2d081eef12fe5f73f2f5ac7007dbd823c0e6d1ff5a5e0e7135c46fcc30efce3960def
-SHA512 (ghdl.20180311git46c5015.tar.bz2) = 9dd2a9097883a77f6da9cea5328eac0f2a10bbf0c51158a1ee22b06831be18eadc98945f5b266588900e267070e134f152cd0746faf85bfc0da35d66dc08bba3
+SHA512 (ghdl.20180315git0edf0a1.tar.bz2) = 7e0bee68ea439b3e6b897cefc301e5953077475cecf8667901381b63d9dc4ff3dbcad9f7457a57700075d6dc2ad6efe7701e880a2a50510e303c4a866825f1ef
6 years, 1 month