[arch-commits] Commit in carla/trunk (PKGBUILD carla-qt5.13.patch)

[Antonio Rojas]

    Date: Tuesday, July 2, 2019 @ 19:13:33
  Author: arojas
Revision: 487310

Fix build with Qt 5.13

Added:
  carla/trunk/carla-qt5.13.patch
Modified:
  carla/trunk/PKGBUILD

--------------------+
 PKGBUILD           |    9 +++++++--
 carla-qt5.13.patch |   26 ++++++++++++++++++++++++++
 2 files changed, 33 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-07-02 18:51:18 UTC (rev 487309)
+++ PKGBUILD	2019-07-02 19:13:33 UTC (rev 487310)
@@ -14,11 +14,16 @@
 depends=('ffmpeg' 'file' 'fluidsynth' 'gtk2' 'gtk3' 'python-pyqt5'
 'python-pyliblo' 'python-rdflib' 'qt5-svg')
 makedepends=('qt5-tools')
-source=("${pkgname}-${pkgver}.tar.gz::https://github.com/falkTX/${pkgname}/archive/v${pkgver}.tar.gz")
-sha512sums=('7cb1a8a6376e2fbb58a75fc2f60693984b5a8d03e47fe695f59f8a602ccd776ec3a578d93858faa704623fd3bf0521cb2f5e87600f6c55ff2df67f5451c35d5a')
+source=("${pkgname}-${pkgver}.tar.gz::https://github.com/falkTX/${pkgname}/archive/v${pkgver}.tar.gz"
+        carla-qt5.13.patch)
+sha512sums=('7cb1a8a6376e2fbb58a75fc2f60693984b5a8d03e47fe695f59f8a602ccd776ec3a578d93858faa704623fd3bf0521cb2f5e87600f6c55ff2df67f5451c35d5a'
+            '7b3fb89e3d8470d27a213fd130cccb57e02bd26f1ddd48f5525f39023fae538902c07eaf682086643a2e45593ca6964918c2f12472a287c70b14276175dcc0d5')
 
 prepare() {
   mv -v "${_name}-${pkgver}" "${pkgname}-${pkgver}"
+
+  cd $pkgname-$pkgver
+  patch -p1 -i ../carla-qt5.13.patch # Fix build with Qt 5.13
 }
 
 build() {

Added: carla-qt5.13.patch
===================================================================
--- carla-qt5.13.patch	                        (rev 0)
+++ carla-qt5.13.patch	2019-07-02 19:13:33 UTC (rev 487310)
@@ -0,0 +1,26 @@
+--- carla-2.0.0/source/bridges-ui/CarlaBridgeToolkitQt.cpp.orig	2019-07-02 19:08:36.959433872 +0000
++++ carla-2.0.0/source/bridges-ui/CarlaBridgeToolkitQt.cpp	2019-07-02 19:09:24.813406097 +0000
+@@ -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)
+@@ -285,4 +279,10 @@
+ # include "resources.qt4.cpp"
+ #endif
+ 
++#if (QT_VERSION >= QT_VERSION_CHECK(5, 0, 0))
++# include "CarlaBridgeToolkitQt5.moc"
++#else
++# include "CarlaBridgeToolkitQt4.moc"
++#endif
++
+ // -------------------------------------------------------------------------