Re: [PR PATCH] [Updated] Carla: add patch for gcc 9

[voidlinux-github@inbox.vuxu.org]

[-- Attachment #1: Type: text/plain, Size: 318 bytes --]

There is an updated pull request by sgn against master on the void-packages repository

https://github.com/sgn/void-packages carla-gcc-9-patch
https://github.com/void-linux/void-packages/pull/18662

Carla: add patch for gcc 9


A patch file from https://github.com/void-linux/void-packages/pull/18662.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-carla-gcc-9-patch-18662.patch --]
[-- Type: text/x-diff, Size: 1403 bytes --]

From 2ce2df4bdaca2471624c09242979142be60ec001 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 +++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)
 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
+