diff options
| author | Rodrigo Osorio <rodrigo@FreeBSD.org> | 2023-06-17 18:33:18 +0200 |
|---|---|---|
| committer | Rodrigo Osorio <rodrigo@FreeBSD.org> | 2023-06-17 18:42:06 +0200 |
| commit | 8827164af8acf5fb7255f51a175b2d39d0ce76ff (patch) | |
| tree | 2a8484f3f320d298a698b9515b9c2e86abc16404 /audio/lmms/files/patch-src_gui_MainWindow.cpp | |
| parent | net/storj: update Storj programs to version 1.79.4 (diff) | |
audio/lmms: Fix issue caused by kwidgetsaddons
Add temporary patch to fix a crash at startup if kwidgetsaddons
5.101.0 is installed. The patch was obtained from LMMS ticket
related with this issue[1].
[1] https://github.com/LMMS/lmms/issues/6587
Since I'm here reorder Makefile to make linters happy.
PR: 270470
Reported by: Manuel <gnuandbsdguy@gmail.com>
MFH: 2023Q2
Diffstat (limited to 'audio/lmms/files/patch-src_gui_MainWindow.cpp')
| -rw-r--r-- | audio/lmms/files/patch-src_gui_MainWindow.cpp | 44 |
1 files changed, 44 insertions, 0 deletions
diff --git a/audio/lmms/files/patch-src_gui_MainWindow.cpp b/audio/lmms/files/patch-src_gui_MainWindow.cpp new file mode 100644 index 000000000000..0f4b4c105844 --- /dev/null +++ b/audio/lmms/files/patch-src_gui_MainWindow.cpp @@ -0,0 +1,44 @@ +--- src/gui/MainWindow.cpp.orig 2023-06-17 16:07:46 UTC ++++ src/gui/MainWindow.cpp +@@ -33,7 +33,6 @@ + #include <QMenuBar> + #include <QMessageBox> + #include <QShortcut> +-#include <QLibrary> + #include <QSplitter> + #include <QUrl> + #include <QWhatsThis> +@@ -65,23 +64,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<DisablerFunc>(kf5WidgetsAddon.resolve("_ZN19KAcceleratorManager10setNoAccelEP7QWidget")); +- if(setNoAccelerators) +- { +- setNoAccelerators(mainWindow); +- } +- kf5WidgetsAddon.unload(); +-} +-#endif +- +- + MainWindow::MainWindow() : + m_workspace( NULL ), + m_templatesMenu( NULL ), +@@ -92,9 +74,6 @@ + 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 ); |