gentoo auto-resync : 25:06:2024 - 00:12:20

3 files changed, 80 insertions, 3 deletions

diff --git a/media-sound/lmms/Manifest b/media-sound/lmms/Manifest
index 11b0e9fbc6f3..838310c5adab 100644
--- a/media-sound/lmms/Manifest
+++ b/media-sound/lmms/Manifest
@@ -1,8 +1,9 @@
+AUX lmms-1.2.2-kwidgetsaddons.patch 2444 BLAKE2B d254f7939536d3894a79b857e8039e5f7b517f91d9f36d9dcf9e416148c658c8dc61c8cd0fcf7dace5056f0d339fc1b98869113ee2c16a67b49e480acfc20dee SHA512 ca0bbac117d3363fbafd0f761ce7d1689c9aef1e062b0fef4d92934013e127fb3cbd130b3ba2b9b9ad8049d5944af976cf55d940bbafeb34716959e5eb8e44aa
 AUX lmms-1.2.2-no_compress_man.patch 1290 BLAKE2B 8d88782f2b17a1b2399e98559820e00e706d7f328eb140babde11ca239fd516b133e698c366fa34bf72c2047b64aa14108cc82a09d0869fffd5e3bea8c1936a5 SHA512 4a414e513a3257b5eb3f472ca321504e7037c314e3d218b612b9aa9391dd0d1b038b77467f112a069479abec1b1ab3372126e27db34ec22c2a89b902a66878bd
 AUX lmms-1.2.2-plugin-path.patch 850 BLAKE2B acc62a4400438df292fcf78633ba1bcf672baedccb239720e42843577b9d539942c32996587e89cd614ee136d93ff04725910cf28f5be7afaabcb0f9572672fd SHA512 d5373901db6a091f105a03d07f8f3850d69569a2e4890fa5fdd07d2e6fea3b8e9a424a45c8a8dd1aee73aade8ee98659c934e6b6c4eea5a02d982d43a022f5d8
 AUX lmms-9999-no_compress_man.patch 1708 BLAKE2B d84d15049ffd13e21c5b7bde4ea9e5f342ae5a36399edc60546ec8d27d560a73fb8b8ad9ae8ff4153af76829ef41aa5b953244f2cd381d3ed9e98fdd47f283ef SHA512 9d92bf9ff4a8de50cd8bbb944bab16b2806922594a9ef645495bc9e9691f414088b764426e5833d16c1229842e2064ae3b2ff27c6a6e116134284d5eaca9e134
 AUX lmms-9999-plugin-path.patch 866 BLAKE2B b083ed330c42738b5040488939418075c0d6ddf960a1cf79afb38dfdda86a223362c1325fc02cdbc27a61a2799c05173dc1250aa56ccbaac46b857a4ccdc07e1 SHA512 93865b80f76c4ae2feab91f99261e05626654ce7db82a15fdc9386e93a395ea701bc2558ae04bb8411d9bc1877c38794f5302a3312d6f020b6a5109353f648b7
 DIST lmms_1.2.2.tar.xz 22733960 BLAKE2B 8b561068194e9a4af8260675e784c25a92b6b2f731c29b677cbc16581306bbadcf27ea529adbcd735ff4adffedf3dd98ec7b2d89428a63ea600d022ecdae58e4 SHA512 df74d9e938f1c3807e9941b11db4ccfe9450e23b723c82774de15b7666ac39f1bfdd8519231e28849f994628190ecc92fa05d55bbc0b50a4421f2d183e729028
-EBUILD lmms-1.2.2-r1.ebuild 2212 BLAKE2B 5875b8d05a7764f551a0d3eb02375c1725b141a3cb332a3a3e9c467675af2c694527889c8d2d30eaf63faa612fdd816deb29ec6f50fa0f9e98c284e0e2b3f9ac SHA512 f44fbaa0d010968d7ad26a70aa2b67a20b4d738814bf75dbc0cfb8b8dc719e130efa67db9058ddf11112e81887e2d9ca8aadbab5f6db156d854af79ad53176c9
+EBUILD lmms-1.2.2-r2.ebuild 2260 BLAKE2B 156a78f95b42258da9cb8c791cde211b45e53b2322ecde9ddb59ddc2b4609b38f0dc77ba230b0cf2e65e70d4454f30ae22a48b924ade57788f36410cd8ff7f53 SHA512 10e1edaf753f9866d19986002186e5819171fe43b77ffea3bb2fbbe33ff1cd9de417d3ffd6d072073b9b21e5eb36c78fa59f7b11b206e6e08e752902e83afdbc
 EBUILD lmms-9999.ebuild 2187 BLAKE2B 1e033af31557ba7eb389016d9f61b99d650615d05ed141a268d0e4a984a041cda37f3a8e82c7a9c5941575a3453152f3f83f532cb28712723994088c3f47f279 SHA512 45dd256802a287dc651c77e406d12c1b95692e03bb9b9cd432b13e6f2a0a494c6160a7d796e223ce8bb5a95a3cac9efa9436e42ecf8bf484bf3c988ba9d558a1
 MISC metadata.xml 845 BLAKE2B 4b6d93d9fe8a7d26b145e949955cde9e7c09abc08737f69417e94fdd5bf36b35ab4ed5f4339203106af18b7b2b7f874fc8a6cc8873c50bdc89ce4e764211b5ba SHA512 6a84127fb0cd31d11bd8c82a4e92c94eccec4bab30726a16e4740663a520a0ac0e5778adfd29dc5012fbc0ac58fba532d9c6e7abaf71568682650c553ba8e4ae
diff --git a/media-sound/lmms/files/lmms-1.2.2-kwidgetsaddons.patch b/media-sound/lmms/files/lmms-1.2.2-kwidgetsaddons.patch
new file mode 100644
index 000000000000..723e76adfa73
--- /dev/null
+++ b/media-sound/lmms/files/lmms-1.2.2-kwidgetsaddons.patch
@@ -0,0 +1,75 @@
+This patch removes an outdated workaround that causes a segfault when a recent
+version of kwidgetsaddon is installed. It has been merged upstream, so there is
+no need to use this beyond version 1.2.2.
+
+https://github.com/LMMS/lmms/issues/6587#issuecomment-1399220056
+https://github.com/LMMS/lmms/pull/6612
+
+diff --git a/src/gui/MainApplication.cpp b/src/gui/MainApplication.cpp
+index 994ae2771..9afa20a71 100644
+--- a/src/gui/MainApplication.cpp
++++ b/src/gui/MainApplication.cpp
+@@ -35,6 +35,19 @@ MainApplication::MainApplication(int& argc, char** argv) :
+ 	QApplication(argc, argv),
+ 	m_queuedFile()
+ {
++#if !defined(LMMS_BUILD_WIN32) && !defined(LMMS_BUILD_APPLE) && !defined(LMMS_BUILD_HAIKU) && QT_VERSION >= 0x050000
++	// Work around a bug of KXmlGui < 5.55
++	// which breaks the recent files menu
++	// https://bugs.kde.org/show_bug.cgi?id=337491
++	for (auto child : children())
++	{
++		if (child->inherits("KCheckAcceleratorsInitializer"))
++		{
++			delete child;
++		}
++	}
++#endif
++
+ #if defined(LMMS_BUILD_WIN32) && QT_VERSION >= 0x050000
+ 	installNativeEventFilter(this);
+ #endif
+diff --git a/src/gui/MainWindow.cpp b/src/gui/MainWindow.cpp
+index e6971f96d..26532eb5b 100644
+--- a/src/gui/MainWindow.cpp
++++ b/src/gui/MainWindow.cpp
+@@ -33,7 +33,6 @@
+ #include <QMenuBar>
+ #include <QMessageBox>
+ #include <QShortcut>
+-#include <QLibrary>
+ #include <QSplitter>
+ #include <QUrl>
+ #include <QWhatsThis>
+@@ -65,21 +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() :
+@@ -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/media-sound/lmms/lmms-1.2.2-r1.ebuild b/media-sound/lmms/lmms-1.2.2-r2.ebuild
index 2f8132cd28a8..0ac4235a2ccb 100644
--- a/media-sound/lmms/lmms-1.2.2-r1.ebuild
+++ b/media-sound/lmms/lmms-1.2.2-r2.ebuild
@@ -16,6 +16,8 @@ else
 	S="${WORKDIR}/${P/_/-}"
 fi
 
+S="${WORKDIR}/${PN}"
+
 LICENSE="GPL-2 LGPL-2"
 SLOT="0"
 
@@ -66,11 +68,10 @@ RDEPEND="${COMMON_DEPEND}
 
 DOCS=( README.md doc/AUTHORS )
 
-S="${WORKDIR}/${PN}"
-
 PATCHES=(
 	"${FILESDIR}/${PN}-1.2.2-no_compress_man.patch" #733284
 	"${FILESDIR}/${PN}-1.2.2-plugin-path.patch" #907285
+	"${FILESDIR}/${PN}-1.2.2-kwidgetsaddons.patch"
 )
 
 src_configure() {