From 2666224f73365f9d92c30bd487d3f85fd965950e Mon Sep 17 00:00:00 2001 From: oreo639 Date: Mon, 26 Dec 2022 23:47:53 -0800 Subject: [PATCH] lmms: remove broken KCheckAccelerators workaround --- .../fix-qt-crash-kwidgetsaddons-5.101.0.patch | 35 +++++++++++++++++++ srcpkgs/lmms/template | 2 +- 2 files changed, 36 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/lmms/patches/fix-qt-crash-kwidgetsaddons-5.101.0.patch diff --git a/srcpkgs/lmms/patches/fix-qt-crash-kwidgetsaddons-5.101.0.patch b/srcpkgs/lmms/patches/fix-qt-crash-kwidgetsaddons-5.101.0.patch new file mode 100644 index 000000000000..9e9ef8cf33d9 --- /dev/null +++ b/srcpkgs/lmms/patches/fix-qt-crash-kwidgetsaddons-5.101.0.patch @@ -0,0 +1,35 @@ +--- a/src/gui/MainWindow.cpp ++++ b/src/gui/MainWindow.cpp +@@ -65,22 +65,6 @@ + + #include "lmmsversion.h" + +-#if !defined(LMMS_BUILD_WIN32) && !defined(LMMS_BUILD_APPLE) && !defined(LMMS_BUILD_HAIKU) && QT_VERSION >= 0x050000 +-//Work around an issue on KDE5 as per https://bugs.kde.org/show_bug.cgi?id=337491#c21 +-void disableAutoKeyAccelerators(QWidget* mainWindow) +-{ +- using DisablerFunc = void(*)(QWidget*); +- QLibrary kf5WidgetsAddon("KF5WidgetsAddons", 5); +- DisablerFunc setNoAccelerators = +- reinterpret_cast(kf5WidgetsAddon.resolve("_ZN19KAcceleratorManager10setNoAccelEP7QWidget")); +- if(setNoAccelerators) +- { +- setNoAccelerators(mainWindow); +- } +- kf5WidgetsAddon.unload(); +-} +-#endif +- + + MainWindow::MainWindow() : + m_workspace( NULL ), +@@ -92,9 +76,6 @@ MainWindow::MainWindow() : + m_metronomeToggle( 0 ), + m_session( Normal ) + { +-#if !defined(LMMS_BUILD_WIN32) && !defined(LMMS_BUILD_APPLE) && !defined(LMMS_BUILD_HAIKU) && QT_VERSION >= 0x050000 +- disableAutoKeyAccelerators(this); +-#endif + setAttribute( Qt::WA_DeleteOnClose ); + + QWidget * main_widget = new QWidget( this ); diff --git a/srcpkgs/lmms/template b/srcpkgs/lmms/template index e79588d4992c..6a47daf9ae5a 100644 --- a/srcpkgs/lmms/template +++ b/srcpkgs/lmms/template @@ -1,7 +1,7 @@ # Template file for 'lmms' pkgname=lmms version=1.2.2 -revision=3 +revision=4 archs="~armv6*" build_style=cmake configure_args="-DWANT_QT5=ON -DWANT_WEAKJACK=OFF -DWANT_CARLA=OFF"