gentoo resync : 25.08.2020

6 files changed, 500 insertions, 203 deletions

diff --git a/media-sound/ardour/Manifest b/media-sound/ardour/Manifest
index 2dbc422e835d..ee7399ec51d6 100644
--- a/media-sound/ardour/Manifest
+++ b/media-sound/ardour/Manifest
@@ -1,7 +1,5 @@
-AUX ardour-4.x-revision-naming.patch 1107 BLAKE2B 18378f1cbc3bb7871ed599dd03c963e7d808796477838b84e9a1010bf31d175edcbba62dc076a37ff3cdf20868f32fc42c2fb2a687616be27a0ecf00b97afc3e SHA512 f9c742345b4f89bc0cabc7a7fe86c4084c99f962c3b3770a0e14b259fa4ca9a3f2cdac35c3b9214816f895fd083befab16e38d2b753cbe6ab94ca7da7b251580
-DIST Ardour-6.0.0.tar.bz2 10999598 BLAKE2B d403a76bb95a7c8dc411b45b54d9b1afb64ab0ba104c283c6890ec5bb152c9f67b825222460bb7b29a28724e7581023e5d3c7ce3b7ff9c88f3d584fab8cb03f7 SHA512 42cd5ea69200aefc60fc93ca7347f08fc511a9821a03023c4362d626f0957570ba0a7b174af67016f7fa27a29eed3c932d502e090d780125c63b5690faa642a3
-DIST ardour-5.12.tar.bz2 8852834 BLAKE2B 0409d920ab0abc9e52a40cc343c5481d53292bea6e5c89c58328f95c53f7f09f30ce421f2ed0da0e3fdb4eaeeb5a25da0d07ed1d4c382b5b607f3b89324eca1b SHA512 c4b4332bddb2406924119c181622801725f4a7dd7741c1a66ddbc2236542764b786337da2f0a751f3bbe6e0389b5da765eb19b14a6a90c8f8a7fd68231e5067d
-EBUILD ardour-5.12.ebuild 3827 BLAKE2B 7f80117bd65829746161d7bc06397e3356213a03d180218a1d0791bd2d7a7054455d2eaa12e57d3d6a2fc49f6cc49e30f2729fa88da8047c9bf189afd228ef80 SHA512 1fcd75469e64d3b55d34198ca430d966f24fbc00a0f2f17ddbafd156100b16e576760f9630921b2f6747d92257737f8fc5acaa2c78865e86f82fa864cd422535
-EBUILD ardour-6.0.ebuild 4264 BLAKE2B 1e95704755c6e2f4f90745380eef759d9c010b00088ea6dcd4f9ef21d23c08882b4b2ba4defa4c86571714326d71395d43aecf2709746e072d8717a42bd5bf59 SHA512 aa51000af3536c25a38effdd439fe9967737a1bc9eb4f8c1e391196d519676f457dcba01f495298a8bd7feb5c7c17321dafed4444cfe1b0fb72009cc64ea9a33
-EBUILD ardour-9999.ebuild 4264 BLAKE2B 1e95704755c6e2f4f90745380eef759d9c010b00088ea6dcd4f9ef21d23c08882b4b2ba4defa4c86571714326d71395d43aecf2709746e072d8717a42bd5bf59 SHA512 aa51000af3536c25a38effdd439fe9967737a1bc9eb4f8c1e391196d519676f457dcba01f495298a8bd7feb5c7c17321dafed4444cfe1b0fb72009cc64ea9a33
+AUX ardour-6.2-fix-no-nls.patch 13153 BLAKE2B e246105d9c4b43c109155716903de02051bde2e1c77035e6c1295ec44fa7483e2a1cb0a92cfd7d26ebb7df9919390e462a50e269a38174d6ff54c6c5e358eb51 SHA512 98b3d10d6b7ee371ce2b32c2ec730555739188b555f273198b6e096972d58f37d49d205e6de97299b8cfcaa8ad5c27d461207fa6ea02999dc0ddc7e375c5fd9e
+DIST Ardour-6.2.0.tar.bz2 11042230 BLAKE2B 7039b0ea7a8550d5372ce795bc978f3d6129828cc6e93d98ce8ba74c6fab3db0e4343142d75e9684f9dffdaebf1ee634f8ab0165f510eb658d32d890f6417b63 SHA512 d4c20968738ec2fef382fc1109f1b17560863c4eb0f7cf5c42b79e9a610916e57e6c01985a2ca2a66b8647e99c10bd98c16e05eb81a7811e73e482f7af11e4a8
+EBUILD ardour-6.2-r1.ebuild 4159 BLAKE2B d4be7982a9335ef22798d0368c87706723159be068f900ccf1559bd61d5c2aa2234024d7035618462d805b489354575be14e4162ea7bcd270e2413b5c11e512b SHA512 c88db3ea4f1904e84a1a4e221c3f987419287e6bb64e7ef849669afbb6bb1d7a1177051eb73358f5eaae164b77c988def9c79b07735fe7aeccdd3fa7f04d3923
+EBUILD ardour-9999.ebuild 4103 BLAKE2B 8f9d9dd9726c416cfeca182d72fdf3de6d666e7954c887b451d6b0436224ea6caa5dccd04aaf753c1d25e2ff188017b9c61b22d5603a1dbd79a2d48ce1967e8e SHA512 9ff953c51285b0f978fd9b885a39de70a8758807bf22bb62e37853c6ffe0ced0fde17e7849b9e9b24fc4acf30de507e76a9b8cedb7c9404215d4f2096434d047
 MISC metadata.xml 450 BLAKE2B 1b17e6d54f2b963b5fe406bb724735dee2c71b982e35acc8e22f6f9737a3519b42d6c9fa20af80359468a57c1596df2b83f525078603d3416a8b66b15df1db75 SHA512 480478c33714996c12180962aa503ca1fbb6d44195abc83203e8be60be5477a9815e9a5ebac7e475f83a731629213d517565b217087c39c4e4f03d02cdb5e68e
diff --git a/media-sound/ardour/ardour-5.12.ebuild b/media-sound/ardour/ardour-5.12.ebuild
deleted file mode 100644
index e29d333138f4..000000000000
--- a/media-sound/ardour/ardour-5.12.ebuild
+++ /dev/null
@@ -1,137 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE='threads(+)'
-#EPYTHON='python2.7'
-inherit eutils toolchain-funcs flag-o-matic python-any-r1 waf-utils
-
-DESCRIPTION="Digital Audio Workstation"
-HOMEPAGE="http://ardour.org/"
-
-if [[ ${PV} == *9999* ]]; then
-	EGIT_REPO_URI="https://git.ardour.org/ardour/ardour.git"
-	inherit git-r3
-else
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="mirror://gentoo/${P}.tar.bz2"
-	S="${WORKDIR}/Ardour-${PV}.0"
-fi
-
-LICENSE="GPL-2"
-SLOT="5"
-IUSE="altivec doc jack cpu_flags_x86_sse cpu_flags_x86_mmx cpu_flags_x86_3dnow"
-
-RDEPEND="
-	>=dev-cpp/glibmm-2.32.0
-	>=dev-cpp/gtkmm-2.16:2.4
-	>=dev-cpp/libgnomecanvasmm-2.26:2.6
-	dev-libs/boost:=
-	>=dev-libs/glib-2.10.1:2
-	dev-libs/libsigc++:2
-	>=dev-libs/libxml2-2.6:2
-	dev-libs/libxslt
-	>=gnome-base/libgnomecanvas-2
-	media-libs/alsa-lib
-	media-libs/aubio
-	media-libs/flac
-	media-libs/freetype:2
-	media-libs/libart_lgpl
-	media-libs/liblo
-	>=media-libs/liblrdf-0.4.0-r20
-	>=media-libs/libsamplerate-0.1
-	>=media-libs/libsndfile-1.0.18
-	>=media-libs/libsoundtouch-1.6.0
-	media-libs/raptor:2
-	>=media-libs/rubberband-1.6.0
-	>=media-libs/taglib-1.7
-	media-libs/vamp-plugin-sdk
-	net-misc/curl
-	sys-libs/readline:0=
-	sci-libs/fftw:3.0[threads]
-	virtual/libusb:1
-	x11-libs/cairo
-	>=x11-libs/gtk+-2.8.1:2
-	x11-libs/pango
-	jack? ( virtual/jack )
-	media-libs/lilv
-	media-libs/sratom
-	dev-libs/sord
-	>=media-libs/suil-0.6.10
-	>=media-libs/lv2-1.4.0"
-
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	jack? ( virtual/jack )
-	sys-devel/gettext
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen[dot] )"
-
-pkg_setup() {
-	if has_version \>=dev-libs/libsigc++-2.6 ; then
-		append-cxxflags -std=c++11
-	fi
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	eapply_user
-	if ! [[ ${PV} == *9999* ]]; then
-		eapply "${FILESDIR}"/${PN}-4.x-revision-naming.patch
-		touch "${S}/libs/ardour/revision.cc"
-	fi
-	sed 's/'full-optimization\'\ :\ \\[.*'/'full-optimization\'\ :\ \'\','/' -i "${S}"/wscript || die
-	MARCH=$(get-flag march)
-	OPTFLAGS=""
-	if use cpu_flags_x86_sse; then
-		if [[ ${MARCH} == "i686" ]] || [[ ${MARCH} == "i486" ]]; then
-			elog "You enabled sse but use an march that does not support sse!"
-			elog "We add -msse to the flags now, but please consider switching your march in make.conf!"
-		fi
-		OPTFLAGS="sse"
-	fi
-	if use cpu_flags_x86_mmx; then
-		if [[ ${MARCH} == "i486" ]]; then
-		    elog "You enabled mmx with i486 set as march! You have been warned!"
-		fi
-		OPTFLAGS="${OPTFLAGS} mmx"
-	fi
-	if use cpu_flags_x86_3dnow; then
-		OPTFLAGS="${OPTFLAGS} 3dnow"
-	fi
-	sed 's/flag_line\ =\ o.*/flag_line\ =\ \": '"${OPTFLAGS}"' just some place holders\"/' \
-		-i "${S}"/wscript || die
-	sed 's/cpu\ ==\ .*/cpu\ ==\ "LeaveMarchAsIs":/' -i "${S}"/wscript || die
-	append-flags "-lboost_system"
-	python_fix_shebang "${S}"/wscript
-	python_fix_shebang "${S}"/waf
-}
-
-src_configure() {
-	tc-export CC CXX
-	mkdir -p "${D}"
-	waf-utils_src_configure \
-                $(usex doc "--docs" '') \
-                $({ use altivec || use cpu_flags_x86_sse; } && echo "--fpu-optimization" || echo "--no-fpu-optimization") \
-                $(usex jack "--with-backends=alsa,jack" "--with-backends=alsa  --libjack=weak") \
-                --destdir="${D}" \
-                --prefix=/usr \
-                --configdir=/etc \
-                --nls \
-                --optimize
-}
-
-src_install() {
-	waf-utils_src_install
-	mv ${PN}.1 ${PN}${SLOT}.1
-	doman ${PN}${SLOT}.1
-	newicon "${S}/gtk2_ardour/resources/Ardour-icon_48px.png" ${PN}${SLOT}.png
-	make_desktop_entry ardour5 ardour5 ardour5 AudioVideo
-}
-
-pkg_postinst() {
-	elog "Please do _not_ report problems with the package to ${PN} upstream."
-	elog "If you think you've found a bug, check the upstream binary package"
-	elog "before you report anything to upstream."
-}
diff --git a/media-sound/ardour/ardour-6.0.ebuild b/media-sound/ardour/ardour-6.2-r1.ebuild
index 304e08fcb604..9935afaf3d5d 100644
--- a/media-sound/ardour/ardour-6.0.ebuild
+++ b/media-sound/ardour/ardour-6.2-r1.ebuild
@@ -2,9 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
 PYTHON_REQ_USE='threads(+)'
-#EPYTHON='python2.7'
 PLOCALES="cs de el en_GB es eu fr it ja nn pl pt pt_PT ru sv zh"
 inherit eutils toolchain-funcs flag-o-matic l10n python-any-r1 waf-utils
 
@@ -16,7 +15,7 @@ if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
 else
 	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://community.ardour.org/src/Ardour-${PV}.0.tar.bz2"
+	SRC_URI="https://dev.gentoo.org/~fordfrog/distfiles/Ardour-${PV}.0.tar.bz2"
 	S="${WORKDIR}/Ardour-${PV}.0"
 fi
 
@@ -70,6 +69,10 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	doc? ( app-doc/doxygen[dot] )"
 
+PATCHES=(
+	"${FILESDIR}/${P}-fix-no-nls.patch"
+)
+
 pkg_setup() {
 	if has_version \>=dev-libs/libsigc++-2.6 ; then
 		append-cxxflags -std=c++11
@@ -78,7 +81,7 @@ pkg_setup() {
 }
 
 src_prepare() {
-	eapply_user
+	default
 	sed 's/'full-optimization\'\ :\ \\[.*'/'full-optimization\'\ :\ \'\','/' -i "${S}"/wscript || die
 	MARCH=$(get-flag march)
 	OPTFLAGS=""
@@ -114,15 +117,14 @@ src_configure() {
 	tc-export CC CXX
 	mkdir -p "${D}"
 	waf-utils_src_configure \
-                $(usex doc "--docs" '') \
-                $({ use altivec || use cpu_flags_x86_sse; } && echo "--fpu-optimization" || echo "--no-fpu-optimization") \
-                $(usex jack "--with-backends=alsa,jack" "--with-backends=alsa  --libjack=weak") \
-		$( use phonehome && echo "--phone-home" ) || echo "--no-phone-home" \
-                $( use nls && echo "--nls" ) || echo --no-nls \
 		--destdir="${D}" \
-                --prefix=/usr \
-                --configdir=/etc \
-                --optimize
+		--configdir=/etc \
+		--optimize \
+		$(usex doc "--docs" '') \
+		$({ use altivec || use cpu_flags_x86_sse; } && echo "--fpu-optimization" || echo "--no-fpu-optimization") \
+		$(usex jack "--with-backends=alsa,jack" "--with-backends=alsa  --libjack=weak") \
+		$(usex phonehome "--phone-home" "--no-phone-home") \
+		$(usex nls "--nls" "--no-nls")
 #not possible right now		--use-external-libs
 }
 src_compile() {
diff --git a/media-sound/ardour/ardour-9999.ebuild b/media-sound/ardour/ardour-9999.ebuild
index 304e08fcb604..43c1789b324f 100644
--- a/media-sound/ardour/ardour-9999.ebuild
+++ b/media-sound/ardour/ardour-9999.ebuild
@@ -2,9 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
 PYTHON_REQ_USE='threads(+)'
-#EPYTHON='python2.7'
 PLOCALES="cs de el en_GB es eu fr it ja nn pl pt pt_PT ru sv zh"
 inherit eutils toolchain-funcs flag-o-matic l10n python-any-r1 waf-utils
 
@@ -114,15 +113,14 @@ src_configure() {
 	tc-export CC CXX
 	mkdir -p "${D}"
 	waf-utils_src_configure \
-                $(usex doc "--docs" '') \
-                $({ use altivec || use cpu_flags_x86_sse; } && echo "--fpu-optimization" || echo "--no-fpu-optimization") \
-                $(usex jack "--with-backends=alsa,jack" "--with-backends=alsa  --libjack=weak") \
-		$( use phonehome && echo "--phone-home" ) || echo "--no-phone-home" \
-                $( use nls && echo "--nls" ) || echo --no-nls \
 		--destdir="${D}" \
-                --prefix=/usr \
-                --configdir=/etc \
-                --optimize
+		--configdir=/etc \
+		--optimize \
+		$(usex doc "--docs" '') \
+		$({ use altivec || use cpu_flags_x86_sse; } && echo "--fpu-optimization" || echo "--no-fpu-optimization") \
+		$(usex jack "--with-backends=alsa,jack" "--with-backends=alsa  --libjack=weak") \
+		$(usex phonehome "--phone-home" "--no-phone-home") \
+		$(usex nls "--nls" "--no-nls")
 #not possible right now		--use-external-libs
 }
 src_compile() {
diff --git a/media-sound/ardour/files/ardour-4.x-revision-naming.patch b/media-sound/ardour/files/ardour-4.x-revision-naming.patch
deleted file mode 100644
index d558f4792a84..000000000000
--- a/media-sound/ardour/files/ardour-4.x-revision-naming.patch
+++ /dev/null
@@ -1,38 +0,0 @@
---- ardour-4.2/wscript
-+++ ardour-4.2/wscript
-@@ -162,7 +162,7 @@
- if os.path.isdir (os.path.join(os.getcwd(), '.git')):
-     rev = fetch_git_revision ()
- else:
--    rev = fetch_tarball_revision ()
-+    rev = os.environ['PV']
- 
- #
- # rev is now of the form MAJOR.MINOR[-rcX]-rev-commit
-@@ -238,16 +238,16 @@
-     return version
- 
- def create_stored_revision():
--    rev = ""
--    if os.path.exists('.git'):
--        rev = fetch_git_revision();
--        print("Git version: " + rev + "\n")
--    elif os.path.exists('libs/ardour/revision.cc'):
--        print("Using packaged revision")
--        return
--    else:
--        print("Missing libs/ardour/revision.cc.  Blame the packager.")
--        sys.exit(-1)
-+    rev = os.environ['PV'] + "-gentoo"
-+#    if os.path.exists('.git'):
-+#        rev = fetch_git_revision();
-+#        print("Git version: " + rev + "\n")
-+#    elif os.path.exists('libs/ardour/revision.cc'):
-+#        print("Using packaged revision")
-+#        return
-+#    else:
-+#        print("Missing libs/ardour/revision.cc.  Blame the packager.")
-+#        sys.exit(-1)
- 
-     try:
-         #
diff --git a/media-sound/ardour/files/ardour-6.2-fix-no-nls.patch b/media-sound/ardour/files/ardour-6.2-fix-no-nls.patch
new file mode 100644
index 000000000000..cc03d0baff50
--- /dev/null
+++ b/media-sound/ardour/files/ardour-6.2-fix-no-nls.patch
@@ -0,0 +1,474 @@
+From fcd347fe0c11e8e04aebc086da328921f54b947f Mon Sep 17 00:00:00 2001
+From: Robin Gareus <robin@gareus.org>
+Date: Wed, 19 Aug 2020 17:39:32 +0200
+Subject: [PATCH 1/2] Fix --no-nls, i18n include order in libs -- #8361
+
+Ardour's "pbd/i18n.h" needs to be included last,
+after any include that may indirectly pull in getext or libintl.
+
+For that reason "pbd/i18n.h" must not be used in header files either.
+---
+ libs/ardour/ardour/disk_reader.h                           | 7 +------
+ libs/ardour/ardour/disk_writer.h                           | 4 +---
+ libs/ardour/ardour/transport_master.h                      | 3 +--
+ libs/ardour/disk_reader.cc                                 | 6 ++++++
+ libs/ardour/disk_writer.cc                                 | 6 ++++++
+ libs/ardour/port.cc                                        | 3 ++-
+ libs/ardour/port_engine_shared.cc                          | 3 ++-
+ libs/ardour/region.cc                                      | 3 ++-
+ libs/ardour/transport_fsm.cc                               | 3 ++-
+ libs/ardour/transport_master.cc                            | 2 +-
+ libs/surfaces/contourdesign/button_config_widget.cc        | 3 ++-
+ libs/surfaces/contourdesign/contourdesign_gui.cc           | 4 ++--
+ libs/surfaces/contourdesign/jump_distance_widget.cc        | 2 +-
+ .../surfaces/generic_midi/generic_midi_control_protocol.cc | 3 ++-
+ 14 files changed, 31 insertions(+), 21 deletions(-)
+
+diff --git a/libs/ardour/ardour/disk_reader.h b/libs/ardour/ardour/disk_reader.h
+index 724c091b3..d9773bbeb 100644
+--- a/libs/ardour/ardour/disk_reader.h
++++ b/libs/ardour/ardour/disk_reader.h
+@@ -22,8 +22,6 @@
+ 
+ #include <boost/optional.hpp>
+ 
+-#include "pbd/i18n.h"
+-
+ #include "evoral/Curve.h"
+ 
+ #include "ardour/disk_io.h"
+@@ -46,10 +44,7 @@ public:
+ 
+ 	bool set_name (std::string const& str);
+ 
+-	std::string display_name () const
+-	{
+-		return std::string (_("player"));
+-	}
++	std::string display_name () const;
+ 
+ 	static samplecnt_t chunk_samples ()
+ 	{
+diff --git a/libs/ardour/ardour/disk_writer.h b/libs/ardour/ardour/disk_writer.h
+index 2bd753a00..511b6bc4f 100644
+--- a/libs/ardour/ardour/disk_writer.h
++++ b/libs/ardour/ardour/disk_writer.h
+@@ -23,8 +23,6 @@
+ #include <list>
+ #include <vector>
+ 
+-#include "pbd/i18n.h"
+-
+ #include "ardour/disk_io.h"
+ #include "ardour/midi_buffer.h"
+ 
+@@ -42,7 +40,7 @@ public:
+ 	~DiskWriter ();
+ 
+ 	bool set_name (std::string const& str);
+-	std::string display_name () const { return std::string (_ ("recorder")); }
++	std::string display_name () const;
+ 
+ 	bool recordable () const { return _flags & Recordable; }
+ 
+diff --git a/libs/ardour/ardour/transport_master.h b/libs/ardour/ardour/transport_master.h
+index d6b554ef8..af98c0b3a 100644
+--- a/libs/ardour/ardour/transport_master.h
++++ b/libs/ardour/ardour/transport_master.h
+@@ -29,7 +29,6 @@
+ 
+ #include <ltc.h>
+ 
+-#include "pbd/i18n.h"
+ #include "pbd/properties.h"
+ #include "pbd/signals.h"
+ #include "pbd/statefuldestructible.h"
+@@ -123,7 +122,7 @@ struct LIBARDOUR_API SafeTime {
+ 
+ 		do {
+ 			if (tries == 10) {
+-				std::cerr << X_("SafeTime: atomic read of current time failed, sleeping!") << std::endl;
++				std::cerr << "SafeTime: atomic read of current time failed, sleeping!" << std::endl;
+ 				Glib::usleep (20);
+ 				tries = 0;
+ 			}
+diff --git a/libs/ardour/disk_reader.cc b/libs/ardour/disk_reader.cc
+index 252a84a65..5fa694485 100644
+--- a/libs/ardour/disk_reader.cc
++++ b/libs/ardour/disk_reader.cc
+@@ -76,6 +76,12 @@ DiskReader::~DiskReader ()
+ 	DEBUG_TRACE (DEBUG::Destruction, string_compose ("DiskReader %1 @ %2 deleted\n", _name, this));
+ }
+ 
++std::string
++DiskReader::display_name () const
++{
++	return std::string (_("player"));
++}
++
+ void
+ DiskReader::ReaderChannelInfo::resize (samplecnt_t bufsize)
+ {
+diff --git a/libs/ardour/disk_writer.cc b/libs/ardour/disk_writer.cc
+index aee4f9301..34aa3f1e9 100644
+--- a/libs/ardour/disk_writer.cc
++++ b/libs/ardour/disk_writer.cc
+@@ -85,6 +85,12 @@ DiskWriter::default_chunk_samples ()
+ 	return 65536;
+ }
+ 
++std::string
++DiskWriter::display_name () const
++{
++	return std::string (_ ("recorder"));
++}
++
+ void
+ DiskWriter::WriterChannelInfo::resize (samplecnt_t bufsize)
+ {
+diff --git a/libs/ardour/port.cc b/libs/ardour/port.cc
+index 9bc318a14..8be47efbd 100644
+--- a/libs/ardour/port.cc
++++ b/libs/ardour/port.cc
+@@ -26,7 +26,6 @@
+ #include "pbd/compose.h"
+ #include "pbd/error.h"
+ #include "pbd/failed_constructor.h"
+-#include "pbd/i18n.h"
+ 
+ #include "ardour/audioengine.h"
+ #include "ardour/debug.h"
+@@ -34,6 +33,8 @@
+ #include "ardour/port_engine.h"
+ #include "ardour/rc_configuration.h"
+ 
++#include "pbd/i18n.h"
++
+ using namespace std;
+ using namespace ARDOUR;
+ using namespace PBD;
+diff --git a/libs/ardour/port_engine_shared.cc b/libs/ardour/port_engine_shared.cc
+index f8ab0e204..ad32762f0 100644
+--- a/libs/ardour/port_engine_shared.cc
++++ b/libs/ardour/port_engine_shared.cc
+@@ -21,10 +21,11 @@
+ #include <regex.h>
+ 
+ #include "pbd/error.h"
+-#include "pbd/i18n.h"
+ 
+ #include "ardour/port_engine_shared.h"
+ 
++#include "pbd/i18n.h"
++
+ using namespace ARDOUR;
+ 
+ BackendPort::BackendPort (PortEngineSharedImpl &b, const std::string& name, PortFlags flags)
+diff --git a/libs/ardour/region.cc b/libs/ardour/region.cc
+index cb42f1d2c..ab6042af3 100644
+--- a/libs/ardour/region.cc
++++ b/libs/ardour/region.cc
+@@ -30,7 +30,6 @@
+ 
+ #include <glibmm/threads.h>
+ 
+-#include "pbd/i18n.h"
+ #include "pbd/types_convert.h"
+ #include "pbd/xml++.h"
+ 
+@@ -47,6 +46,8 @@
+ #include "ardour/transient_detector.h"
+ #include "ardour/types_convert.h"
+ 
++#include "pbd/i18n.h"
++
+ using namespace std;
+ using namespace ARDOUR;
+ using namespace PBD;
+diff --git a/libs/ardour/transport_fsm.cc b/libs/ardour/transport_fsm.cc
+index 484106785..59de3d1de 100644
+--- a/libs/ardour/transport_fsm.cc
++++ b/libs/ardour/transport_fsm.cc
+@@ -22,7 +22,6 @@
+ #include <boost/none.hpp>
+ 
+ #include "pbd/error.h"
+-#include "pbd/i18n.h"
+ #include "pbd/pthread_utils.h"
+ #include "pbd/stacktrace.h"
+ 
+@@ -31,6 +30,8 @@
+ #include "ardour/session.h"
+ #include "ardour/transport_fsm.h"
+ 
++#include "pbd/i18n.h"
++
+ using namespace ARDOUR;
+ using namespace PBD;
+ 
+diff --git a/libs/ardour/transport_master.cc b/libs/ardour/transport_master.cc
+index ea56a860b..e76fd5eb6 100644
+--- a/libs/ardour/transport_master.cc
++++ b/libs/ardour/transport_master.cc
+@@ -21,7 +21,6 @@
+ 
+ #include "pbd/boost_debug.h"
+ #include "pbd/debug.h"
+-#include "pbd/i18n.h"
+ 
+ #include "ardour/audioengine.h"
+ #include "ardour/debug.h"
+@@ -32,6 +31,7 @@
+ #include "ardour/types_convert.h"
+ #include "ardour/utils.h"
+ 
++#include "pbd/i18n.h"
+ 
+ namespace ARDOUR {
+ 	namespace Properties {
+diff --git a/libs/surfaces/contourdesign/button_config_widget.cc b/libs/surfaces/contourdesign/button_config_widget.cc
+index 785c8c6b1..f46f80f12 100644
+--- a/libs/surfaces/contourdesign/button_config_widget.cc
++++ b/libs/surfaces/contourdesign/button_config_widget.cc
+@@ -24,12 +24,13 @@
+ #include "gtkmm2ext/actions.h"
+ #include "gtkmm2ext/action_model.h"
+ 
+-#include "pbd/i18n.h"
+ #include "pbd/strsplit.h"
+ #include "pbd/signals.h"
+ 
+ #include "button_config_widget.h"
+ 
++#include "pbd/i18n.h"
++
+ using namespace std;
+ using namespace Gtk;
+ using namespace ArdourSurface;
+diff --git a/libs/surfaces/contourdesign/contourdesign_gui.cc b/libs/surfaces/contourdesign/contourdesign_gui.cc
+index 3d061b060..ed58c787d 100644
+--- a/libs/surfaces/contourdesign/contourdesign_gui.cc
++++ b/libs/surfaces/contourdesign/contourdesign_gui.cc
+@@ -37,12 +37,12 @@
+ 
+ #include "widgets/ardour_button.h"
+ 
+-#include "pbd/i18n.h"
+-
+ #include "contourdesign.h"
+ #include "jump_distance_widget.h"
+ #include "button_config_widget.h"
+ 
++#include "pbd/i18n.h"
++
+ using namespace ArdourSurface;
+ 
+ class ContourDesignGUI : public Gtk::VBox, public PBD::ScopedConnectionList
+diff --git a/libs/surfaces/contourdesign/jump_distance_widget.cc b/libs/surfaces/contourdesign/jump_distance_widget.cc
+index 8469658a1..dacc3a752 100644
+--- a/libs/surfaces/contourdesign/jump_distance_widget.cc
++++ b/libs/surfaces/contourdesign/jump_distance_widget.cc
+@@ -21,10 +21,10 @@
+ #include <gtkmm/spinbutton.h>
+ 
+ #include "gtkmm2ext/utils.h"
+-#include "pbd/i18n.h"
+ 
+ #include "jump_distance_widget.h"
+ 
++#include "pbd/i18n.h"
+ 
+ using namespace std;
+ using namespace Gtk;
+diff --git a/libs/surfaces/generic_midi/generic_midi_control_protocol.cc b/libs/surfaces/generic_midi/generic_midi_control_protocol.cc
+index c5ba0b794..31e5383dc 100644
+--- a/libs/surfaces/generic_midi/generic_midi_control_protocol.cc
++++ b/libs/surfaces/generic_midi/generic_midi_control_protocol.cc
+@@ -41,7 +41,6 @@
+ #include "pbd/error.h"
+ #include "pbd/failed_constructor.h"
+ #include "pbd/file_utils.h"
+-#include "pbd/i18n.h"
+ #include "pbd/strsplit.h"
+ #include "pbd/types_convert.h"
+ #include "pbd/xml++.h"
+@@ -66,6 +65,8 @@
+ 
+ #include "pbd/abstract_ui.cc" // instantiate template
+ 
++#include "pbd/i18n.h"
++
+ using namespace ARDOUR;
+ using namespace PBD;
+ using namespace Glib;
+-- 
+2.28.0
+
+
+From a7a20e03ffc61e444c188411da0d3afa1d14548a Mon Sep 17 00:00:00 2001
+From: Robin Gareus <robin@gareus.org>
+Date: Wed, 19 Aug 2020 17:40:02 +0200
+Subject: [PATCH 2/2] Fix --no-nls, i18n include order in UI -- #8361
+
+---
+ gtk2_ardour/ardour_ui_access_web.cc | 3 ++-
+ gtk2_ardour/ardour_ui_dependents.cc | 3 ++-
+ gtk2_ardour/pt_import_selector.cc   | 3 ++-
+ gtk2_ardour/startup_fsm.cc          | 3 ++-
+ gtk2_ardour/template_dialog.cc      | 4 ++--
+ gtk2_ardour/transport_control.cc    | 4 ++--
+ session_utils/fix_bbtppq.cc         | 3 ++-
+ 7 files changed, 14 insertions(+), 9 deletions(-)
+
+diff --git a/gtk2_ardour/ardour_ui_access_web.cc b/gtk2_ardour/ardour_ui_access_web.cc
+index 7986e2ca3..781b65262 100644
+--- a/gtk2_ardour/ardour_ui_access_web.cc
++++ b/gtk2_ardour/ardour_ui_access_web.cc
+@@ -36,12 +36,13 @@
+ #include "gtk2ardour-version.h"
+ #endif
+ 
+-#include "pbd/i18n.h"
+ #include "pbd/openuri.h"
+ 
+ #include "ardour_message.h"
+ #include "ardour_ui.h"
+ 
++#include "pbd/i18n.h"
++
+ using namespace ARDOUR;
+ using namespace PBD;
+ using namespace Gtk;
+diff --git a/gtk2_ardour/ardour_ui_dependents.cc b/gtk2_ardour/ardour_ui_dependents.cc
+index d28ae7c14..24810d3e7 100644
+--- a/gtk2_ardour/ardour_ui_dependents.cc
++++ b/gtk2_ardour/ardour_ui_dependents.cc
+@@ -33,7 +33,6 @@
+ #include <cstdio>
+ 
+ #include "pbd/error.h"
+-#include "pbd/i18n.h"
+ 
+ #include "ardour/session.h"
+ #include "ardour/lv2_plugin.h"
+@@ -62,6 +61,8 @@
+ #include <gdk/gdkx.h>
+ #endif
+ 
++#include "pbd/i18n.h"
++
+ using namespace Gtk;
+ using namespace PBD;
+ 
+diff --git a/gtk2_ardour/pt_import_selector.cc b/gtk2_ardour/pt_import_selector.cc
+index da65bcb72..318da1e35 100644
+--- a/gtk2_ardour/pt_import_selector.cc
++++ b/gtk2_ardour/pt_import_selector.cc
+@@ -22,7 +22,6 @@
+ #include <iostream>
+ 
+ #include "pbd/gstdio_compat.h"
+-#include "pbd/i18n.h"
+ #include "pbd/file_utils.h"
+ 
+ #include "ptformat/ptformat.h"
+@@ -33,6 +32,8 @@
+ 
+ #include "pt_import_selector.h"
+ 
++#include "pbd/i18n.h"
++
+ using namespace Gtk;
+ using namespace ARDOUR;
+ using namespace PBD;
+diff --git a/gtk2_ardour/startup_fsm.cc b/gtk2_ardour/startup_fsm.cc
+index c52b0ecea..dfdd01ce4 100644
+--- a/gtk2_ardour/startup_fsm.cc
++++ b/gtk2_ardour/startup_fsm.cc
+@@ -26,7 +26,6 @@
+ #include "pbd/basename.h"
+ #include "pbd/file_archive.h"
+ #include "pbd/file_utils.h"
+-#include "pbd/i18n.h"
+ 
+ #include "ardour/audioengine.h"
+ #include "ardour/filename_extensions.h"
+@@ -58,6 +57,8 @@
+ #include "gtk2ardour-version.h"
+ #endif
+ 
++#include "pbd/i18n.h"
++
+ using namespace ARDOUR;
+ using namespace Gtk;
+ using namespace Gtkmm2ext;
+diff --git a/gtk2_ardour/template_dialog.cc b/gtk2_ardour/template_dialog.cc
+index e0c5590ee..c9c37d00e 100644
+--- a/gtk2_ardour/template_dialog.cc
++++ b/gtk2_ardour/template_dialog.cc
+@@ -40,7 +40,6 @@
+ #include "pbd/error.h"
+ #include "pbd/file_archive.h"
+ #include "pbd/file_utils.h"
+-#include "pbd/i18n.h"
+ #include "pbd/xml++.h"
+ 
+ #include "gtkmm2ext/gui_thread.h"
+@@ -52,9 +51,10 @@
+ #include "ardour/template_utils.h"
+ 
+ #include "progress_reporter.h"
+-
+ #include "template_dialog.h"
+ 
++#include "pbd/i18n.h"
++
+ using namespace std;
+ using namespace Gtk;
+ using namespace PBD;
+diff --git a/gtk2_ardour/transport_control.cc b/gtk2_ardour/transport_control.cc
+index a7be5903d..0828febb6 100644
+--- a/gtk2_ardour/transport_control.cc
++++ b/gtk2_ardour/transport_control.cc
+@@ -16,8 +16,6 @@
+  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  */
+ 
+-#include "pbd/i18n.h"
+-
+ #include "ardour/location.h"
+ #include "ardour/session.h"
+ 
+@@ -25,6 +23,8 @@
+ #include "ardour_ui.h"
+ #include "transport_control.h"
+ 
++#include "pbd/i18n.h"
++
+ using namespace Gtk;
+ 
+ TransportControlProvider::TransportControlProvider ()
+diff --git a/session_utils/fix_bbtppq.cc b/session_utils/fix_bbtppq.cc
+index e3767c8cd..81b148bcc 100644
+--- a/session_utils/fix_bbtppq.cc
++++ b/session_utils/fix_bbtppq.cc
+@@ -25,7 +25,6 @@
+ #include <glibmm.h>
+ 
+ #include "pbd/file_utils.h"
+-#include "pbd/i18n.h"
+ #include "pbd/stateful.h"
+ 
+ #include "ardour/region_factory.h"
+@@ -44,6 +43,8 @@
+ 
+ #include "common.h"
+ 
++#include "pbd/i18n.h"
++
+ using namespace std;
+ using namespace ARDOUR;
+ using namespace SessionUtils;
+-- 
+2.28.0
+