From c422a0671a000695f8465b77373e481a5bf7c4c5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 30 Jan 2020 21:24:17 +0700
Subject: [PATCH] Carla: add patch for gcc 9

---
 srcpkgs/Carla/patches/gcc-9.2.0.patch | 29 +++++++++++++++++++++++++++
 srcpkgs/Carla/template                |  2 +-
 2 files changed, 30 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/Carla/patches/gcc-9.2.0.patch

diff --git a/srcpkgs/Carla/patches/gcc-9.2.0.patch b/srcpkgs/Carla/patches/gcc-9.2.0.patch
new file mode 100644
index 00000000000..b20cc9a6852
--- /dev/null
+++ b/srcpkgs/Carla/patches/gcc-9.2.0.patch
@@ -0,0 +1,29 @@
+--- source/bridges-ui/CarlaBridgeToolkitQt.cpp
++++ source/bridges-ui/CarlaBridgeToolkitQt.cpp
+@@ -256,12 +256,6 @@
+ #endif
+ };
+ 
+-#if (QT_VERSION >= QT_VERSION_CHECK(5, 0, 0))
+-# include "CarlaBridgeToolkitQt5.moc"
+-#else
+-# include "CarlaBridgeToolkitQt4.moc"
+-#endif
+-
+ // -------------------------------------------------------------------------
+ 
+ CarlaBridgeToolkit* CarlaBridgeToolkit::createNew(CarlaBridgeFormat* const format)
+@@ -279,9 +273,13 @@
+ int qInitResources();
+ int qCleanupResources();
+ 
++CARLA_BRIDGE_UI_USE_NAMESPACE
++
+ #if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
++# include "CarlaBridgeToolkitQt5.moc"
+ # include "resources.qt5.cpp"
+ #else
++# include "CarlaBridgeToolkitQt4.moc"
+ # include "resources.qt4.cpp"
+ #endif
+ 
diff --git a/srcpkgs/Carla/template b/srcpkgs/Carla/template
index d4d36a4923d..cf6523ffc5e 100644
--- a/srcpkgs/Carla/template
+++ b/srcpkgs/Carla/template
@@ -27,7 +27,7 @@ case $XBPS_TARGET_MACHINE in
 	   make_install_args+=" NOOPT=true";;
 esac
 
-if [ "$CROSS_BUILD" ]; then
+if [ -n "$CROSS_BUILD" ]; then
 	hostmakedepends+=" Carla-devel"
 fi