[mixxx/f30] Use XCB instead of the default Qt Wayland platform adapter

commit ea0a66423a5e50d3d743ca2437eba46267a2dae8 Author: Uwe Klotz <uklotz(a)mixxx.org&gt; Date: Thu Oct 31 23:15:54 2019 +0100 Use XCB instead of the default Qt Wayland platform adapter https://bugs.launchpad.net/mixxx/+bug/1850729 https://fedoraproject.org/wiki/Changes/Qt_Wayland_By_Default_On_Gnome launcher-platform-xcb.patch | 53 +++++++++++++++++++++++++++++++++++++++++++++ mixxx.spec | 7 +++++- 2 files changed, 59 insertions(+), 1 deletion(-) --- diff --git a/launcher-platform-xcb.patch b/launcher-platform-xcb.patch new file mode 100644 index 0000000..d9311bf --- /dev/null +++ b/launcher-platform-xcb.patch @@ -0,0 +1,53 @@ +From c4197fa4cf7e4bfa7f24850fd619a77e9e4f2f32 Mon Sep 17 00:00:00 2001 +From: Uwe Klotz <uklotz(a)mixxx.org&gt; +Date: Thu, 31 Oct 2019 21:16:51 +0100 +Subject: [PATCH 1/2] Disable QtWayland in desktop launcher + +https://bugs.launchpad.net/mixxx/+bug/1850729 +--- + build/debian/mixxx.desktop | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/build/debian/mixxx.desktop b/build/debian/mixxx.desktop +index fc89fa6da1..3bad29a170 100644 +--- a/build/debian/mixxx.desktop ++++ b/build/debian/mixxx.desktop +@@ -3,7 +3,7 @@ Version=1.0 + Name=Mixxx + GenericName=Digital DJ interface + Comment=A digital DJ interface +-Exec=pasuspender -- mixxx ++Exec=QT_QPA_PLATFORM=xcb pasuspender -- mixxx + Terminal=false + Icon=mixxx_icon + Type=Application +-- +2.23.0 + + +From 55d700f4894164b7b8f463eea319cdb9896d3b3d Mon Sep 17 00:00:00 2001 +From: Uwe Klotz <uklotz(a)mixxx.org&gt; +Date: Thu, 31 Oct 2019 22:55:20 +0100 +Subject: [PATCH 2/2] Use command-line argument to select the platform + abstraction + +--- + build/debian/mixxx.desktop | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/build/debian/mixxx.desktop b/build/debian/mixxx.desktop +index 3bad29a170..c7c96e7720 100644 +--- a/build/debian/mixxx.desktop ++++ b/build/debian/mixxx.desktop +@@ -3,7 +3,7 @@ Version=1.0 + Name=Mixxx + GenericName=Digital DJ interface + Comment=A digital DJ interface +-Exec=QT_QPA_PLATFORM=xcb pasuspender -- mixxx ++Exec=pasuspender -- mixxx -platform xcb + Terminal=false + Icon=mixxx_icon + Type=Application +-- +2.23.0 + diff --git a/mixxx.spec b/mixxx.spec index e51487d..7475bd8 100644 --- a/mixxx.spec +++ b/mixxx.spec @@ -17,12 +17,13 @@ Name: mixxx Version: 2.2.2 -Release: 1%{?extraver:.%{extraver}}%{?snapinfo:.%{snapinfo}}%{?dist} +Release: 2%{?extraver:.%{extraver}}%{?snapinfo:.%{snapinfo}}%{?dist} Summary: Mixxx is open source software for DJ'ing Group: Applications/Multimedia License: GPLv2+ URL: http://www.mixxx.org Source0: https://github.com/mixxxdj/%{name}/archive/%{sources}.tar.gz#/%{name}-%{s... +Patch0: launcher-platform-xcb.patch # Build Tools BuildRequires: desktop-file-utils @@ -162,6 +163,10 @@ rm -rf $RPM_BUILD_ROOT%{_docdir} %changelog +* Thu Oct 31 2019 Uwe Klotz <uklotz(a)mixxx.org&gt; - 2.2.2-2 +- Use XCB instead of the default Qt Wayland platform adapter +- Use system libebur128 + * Wed Aug 14 2019 Uwe Klotz <uklotz(a)mixxx.org&gt; - 2.2.2-1 - New upstream release 2.2.2