[PR PATCH] lmms: remove broken KCheckAccelerators workaround

[PR PATCH] lmms: remove broken KCheckAccelerators workaround

[oreo639]

[-- Attachment #1: Type: text/plain, Size: 1484 bytes --]

There is a new pull request by oreo639 against master on the void-packages repository

https://github.com/oreo639/void-packages lmms
https://github.com/void-linux/void-packages/pull/41313

lmms: remove broken KCheckAccelerators workaround
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **briefly**

Fixes the following crash:
https://github.com/LMMS/lmms/issues/6587

Afaict the original issue should already be fixed by:
https://invent.kde.org/frameworks/kxmlgui/-/commit/02b523bad09aab062355e46771889b0f3709692f

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/41313.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-lmms-41313.patch --]
[-- Type: text/x-diff, Size: 2280 bytes --]

From 2666224f73365f9d92c30bd487d3f85fd965950e Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
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<DisablerFunc>(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"

Re: [PR PATCH] [Merged]: lmms: remove broken KCheckAccelerators workaround

[paper42]

[-- Attachment #1: Type: text/plain, Size: 1344 bytes --]

There's a merged pull request on the void-packages repository

lmms: remove broken KCheckAccelerators workaround
https://github.com/void-linux/void-packages/pull/41313

Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **briefly**

Fixes the following segfault:
https://github.com/LMMS/lmms/issues/6587

Afaict the original workaround should already be fixed by:
https://invent.kde.org/frameworks/kxmlgui/-/commit/02b523bad09aab062355e46771889b0f3709692f

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->