From nobody Sat Jun 17 16:54:36 2023 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Qk2F85KDjz4f5J8; Sat, 17 Jun 2023 16:54:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Qk2F84t3Zz3Bwr; Sat, 17 Jun 2023 16:54:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687020876; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=N7BuUbn/JSwRvGU1gR3+ny4Yw6PXyH0qkp74mY83VkI=; b=lPWFlxNdyPJY7A0SZwdEA+56CgFeRjuLpa2UCfhY+w72WiAKfgT6doz7MkPi/b8AOMybex jnXM8I6VNX8q9ZhHr4lgk7gThwx5f5cwfnRwweet1k/5zAUjWBkbfBkHLyi7kpnqoGIpPe 9zGzdMUTAT/Idd02U+m8imQDPNdARkwGe2lTVHTrD+wixfUFqH0BSqNjEA1loLliUSuYTI 7t88O83b17F/5dduUqMayawD/ozHVj6OYi9SDd7FtQwGFYTDdfLXCsioaQ7shRFxDKkPcV fN9IzmbUsv1tbJYhCHKJ499+VKaYaOOpX9aqHJxCMYwMUE67YwTv6O0HiVlr5g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687020876; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=N7BuUbn/JSwRvGU1gR3+ny4Yw6PXyH0qkp74mY83VkI=; b=At3OyK+1e1RdhZ8jc7wZY5pW+NA+qyOPp5FY8Ak/rUfblxmZ4EJmw7ZuXm/MN80/E1Y0w8 3BsMHFIiXCweNEDoGWdYJBmMy276RS/QLIuetlydvCoA5PWJmUXXRGT0Hk/Pu0yRigkfFQ GqHYnAYaD1eAogpKf8yZx/xdz9Tm0WgXIFd65F9w36A9KDdRmS8MtJbl+Sg7aCUQVfKzkJ RGq7tRfqP3u/XWVOG+zyVPbkpWkBdNxS7kScEX9EuxNjV3OwhvoV3SBrIgBrakuCUWbVFf 87jqYoE3uANEQn/faBJRxaHLd6QozF7BbpCr8K8bslZeTxp7rvj/apAA7jCs0g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1687020876; a=rsa-sha256; cv=none; b=YPhATrri1kfd7Xtl9odO7YB1QYtK7rsRrbRQ4falduuGqy/nGVqrBgb+zGfml5sHi7cHy0 tib8dYJuSRI+h3vB0xQuLbS8eVJFKWrLrAhPbBknkS8WnsJFEX9PsygjpZFtvwCo1H/lNp +11KhzYBfEZ5sOihuenDaHH5mKTuhPHvvMaOkE1j44+nk7nELM8mipsnpZJfr6po22HAe0 JvLBooXozssjDws5wtaBUybjSRC9LfxioTGcrqBGqE59f1GMsHcLwid/B9tM/JCD7JIyIm c3yHiCc+RGCLMaI5WNnugYsyMpefJn7svPFBv218hUxAk5Uwp95pexOdQCKLFg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Qk2F83sCkz1Gr5; Sat, 17 Jun 2023 16:54:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 35HGsaMc065331; Sat, 17 Jun 2023 16:54:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35HGsadV065329; Sat, 17 Jun 2023 16:54:36 GMT (envelope-from git) Date: Sat, 17 Jun 2023 16:54:36 GMT Message-Id: <202306171654.35HGsadV065329@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Rodrigo Osorio Subject: git: 8827164af8ac - main - audio/lmms: Fix issue caused by kwidgetsaddons List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rodrigo X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8827164af8acf5fb7255f51a175b2d39d0ce76ff Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by rodrigo: URL: https://cgit.FreeBSD.org/ports/commit/?id=8827164af8acf5fb7255f51a175b2d39d0ce76ff commit 8827164af8acf5fb7255f51a175b2d39d0ce76ff Author: Rodrigo Osorio AuthorDate: 2023-06-17 16:33:18 +0000 Commit: Rodrigo Osorio CommitDate: 2023-06-17 16:42:06 +0000 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 MFH: 2023Q2 --- audio/lmms/Makefile | 20 ++++------ audio/lmms/files/patch-src_gui_MainApplication.cpp | 21 +++++++++++ audio/lmms/files/patch-src_gui_MainWindow.cpp | 44 ++++++++++++++++++++++ 3 files changed, 73 insertions(+), 12 deletions(-) diff --git a/audio/lmms/Makefile b/audio/lmms/Makefile index 87c0bb0e0d83..b271dfe6a47d 100644 --- a/audio/lmms/Makefile +++ b/audio/lmms/Makefile @@ -1,7 +1,7 @@ PORTNAME= lmms DISTVERSIONPREFIX= v DISTVERSION= 1.2.2 -PORTREVISION= 6 +PORTREVISION= 7 PORTEPOCH= 2 CATEGORIES= audio @@ -41,28 +41,24 @@ USE_LDCONFIG= yes USE_QT= core gui widgets x11extras xml buildtools:build linguisttools:build qmake:build USE_XORG= xcursor xext xfixes xft xinerama xrender +CMAKE_ON= WANT_QT5 CMAKE_OFF= WANT_ALSA WANT_CALF WANT_CAPS WANT_CMT WANT_SWH WANT_STK \ WANT_TAP WANT_VST -CMAKE_ON= WANT_QT5 OPTIONS_DEFINE= OSS JACK PULSEAUDIO PORTAUDIO SDL SNDIO OPTIONS_DEFAULT= OSS -JACK_CMAKE_BOOL= WANT_JACK JACK_LIB_DEPENDS= libjack.so:audio/jack - -PULSEAUDIO_CMAKE_BOOL= WANT_PULSEAUDIO -PULSEAUDIO_LIB_DEPENDS= libpulse.so:audio/pulseaudio - -PORTAUDIO_CMAKE_BOOL= WANT_PORTAUDIO +JACK_CMAKE_BOOL= WANT_JACK PORTAUDIO_LIB_DEPENDS= libportaudio.so:audio/portaudio - -SDL_CMAKE_OFF= WANT_SDL +PORTAUDIO_CMAKE_BOOL= WANT_PORTAUDIO +PULSEAUDIO_LIB_DEPENDS= libpulse.so:audio/pulseaudio +PULSEAUDIO_CMAKE_BOOL= WANT_PULSEAUDIO SDL_USES= sdl SDL_USE= SDL=sdl - -SNDIO_CMAKE_BOOL= WANT_SNDIO +SDL_CMAKE_OFF= WANT_SDL SNDIO_LIB_DEPENDS= libsndio.so:audio/sndio +SNDIO_CMAKE_BOOL= WANT_SNDIO .include diff --git a/audio/lmms/files/patch-src_gui_MainApplication.cpp b/audio/lmms/files/patch-src_gui_MainApplication.cpp new file mode 100644 index 000000000000..d94bc5bd4c30 --- /dev/null +++ b/audio/lmms/files/patch-src_gui_MainApplication.cpp @@ -0,0 +1,21 @@ +--- src/gui/MainApplication.cpp.orig 2023-06-17 16:02:33 UTC ++++ src/gui/MainApplication.cpp +@@ -35,6 +35,18 @@ + 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/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 + #include + #include +-#include + #include + #include + #include +@@ -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(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 );