From b5cfc4d94c135cf06e5242e4fd12c648b1a4665b Mon Sep 17 00:00:00 2001
From: Kevin Mihelich <kevin@archlinuxarm.org>
Date: Fri, 19 Mar 2021 12:32:06 +0000
Subject: [PATCH] community/qtractor to 0.9.21-1

---
 community/qtractor/PKGBUILD                   | 22 ++++++++-----------
 .../qtractor/qtractor-0.9.20-qwindow.patch    | 13 -----------
 2 files changed, 9 insertions(+), 26 deletions(-)
 delete mode 100644 community/qtractor/qtractor-0.9.20-qwindow.patch

diff --git a/community/qtractor/PKGBUILD b/community/qtractor/PKGBUILD
index 044852fba..ac4192f5a 100644
--- a/community/qtractor/PKGBUILD
+++ b/community/qtractor/PKGBUILD
@@ -8,35 +8,31 @@
 #  - set -DCONFIG_SSE=OFF
 
 pkgname=qtractor
-pkgver=0.9.20
+pkgver=0.9.21
 pkgrel=1
 pkgdesc="Audio/MIDI multitrack sequencer"
 arch=('x86_64')
 url="https://qtractor.sourceforge.io/"
 license=('GPL2')
 groups=('pro-audio')
-depends=('glibc' 'gcc-libs' 'hicolor-icon-theme' 'libmad' 'qt5-base'
-'qt5-x11extras' 'zlib')
+depends=('glibc' 'gcc-libs' 'hicolor-icon-theme' 'libmad' 'libxcb' 'qt6-base' 'zlib')
 makedepends=('alsa-lib' 'aubio' 'cmake' 'dssi' 'jack' 'ladspa' 'liblo' 'libogg'
-'libsamplerate' 'libsndfile' 'libvorbis' 'lilv' 'lv2' 'qt5-tools' 'rubberband'
+'libsamplerate' 'libsndfile' 'libvorbis' 'lilv' 'lv2' 'qt6-tools' 'rubberband'
 'suil' 'vst3sdk')
-optdepends=('new-session-manager: for session management')
+optdepends=(
+  'new-session-manager: for session management'
+  'qt6-wayland: for native wayland support'
+)
 provides=('dssi-host' 'ladspa-host' 'lv2-host' 'vst-host' 'vst3-host')
 source=("https://sourceforge.net/projects/${pkgname}/files/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz"
-        "${pkgname}-0.9.20-qwindow.patch"
         '04-q_atomic_ftbfs.patch')
-sha512sums=('663d43f0ca2a2ee8deb260c29c7dc39ac36d2a4f4f3b1b6e3074e66fe5bb60c37a93fde89c09ceedfd6848ba1519de8d38d613d68b2693356fbda97a5d1c2c00'
-            '09a4eb8666fed7099ef5ba24b2069b8c0edb12ff26e9d8c8fbbae46350c4f7243ebac68de813a7b6986e9e0653bce6893f42955385049592e618ac049aa6967c'
+sha512sums=('12d823c4efd557709d83e0e5ace6cb84ac066a0eddbfdbac0dbaf6b75e6bbe37c0e3548270e80fb89f318c58db4b0ebad95daac989eb7d6b8f82b8cc7ccc3a3c'
             'fe0e4d6adcd0eb64c39a194f16c026e6505d5f3b0537b7724ed9060443340559cc12a57665aec3e2a4d4c71ea05b1e575508cae334a8ca3a16543b5fdf55b4bf')
-b2sums=('7989e827bdfb72cf8402a87a2e219fc2767fa971ce8f958cd8fb5aa0536aa12d486fc854b2d3a407de9e2b0ac3d6737420163d39b194bcd1d08e831f26cfab0c'
-        '7baf13deb5b37eb4389d98269fea65056e96a4a491a7336eff57439dce4ec99a83bf12347d928ed0fcf5cb138cfae7d792a6689bab32709a5991c08a651d75f0'
+b2sums=('8c76966695e6054cd0d3743313f50de1bf4f741dfaad0d60f41ae87bd531ce394d11c7fc719c75ee159bf0bf7dd3037679cb93d7d4295132a7dc2fa6d89a786e'
         'ab86331b8cdc583cbe740c23e2a47280205cd20e80f23de1d8e189d6f2ea9a651caad14188656e5f85357cb444f9a51544871b2603ad54748db555ab6a9f4124')
 
 prepare() {
   cd "${pkgname}-${pkgver}"
-  # fix the build by making sure QWindow is included:
-  # https://github.com/rncbc/qtractor/issues/297
-  patch -Np1 -i ../"${pkgname}-0.9.20-qwindow.patch"
 
   patch -p1 -i ../04-q_atomic_ftbfs.patch
 }
diff --git a/community/qtractor/qtractor-0.9.20-qwindow.patch b/community/qtractor/qtractor-0.9.20-qwindow.patch
deleted file mode 100644
index c199f15c1..000000000
--- a/community/qtractor/qtractor-0.9.20-qwindow.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -ruN a/src/qtractorLv2Plugin.h b/src/qtractorLv2Plugin.h
---- a/src/qtractorLv2Plugin.h	2021-02-12 08:35:41.220805288 +0100
-+++ b/src/qtractorLv2Plugin.h	2021-02-12 22:06:40.296752753 +0100
-@@ -65,9 +65,7 @@
- #include "lv2_external_ui.h"
- #endif
- #if QT_VERSION >= QT_VERSION_CHECK(5, 1, 0)
--#ifdef CONFIG_LV2_UI_GTK2
- #include <QWindow>
--#endif	// CONFIG_LV2_UI_GTK2
- #endif
- // LV2 UI Request-value support (FAKE).
- #ifdef  CONFIG_LV2_UI_REQ_VALUE_FAKE