diff --git a/media-sound/qmmp/patches/qmmp-1.4.4.patchset b/media-sound/qmmp/patches/qmmp-1.4.4.patchset index 581100d1b..6d80b26f8 100644 --- a/media-sound/qmmp/patches/qmmp-1.4.4.patchset +++ b/media-sound/qmmp/patches/qmmp-1.4.4.patchset @@ -1,4 +1,4 @@ -From 41d179c7903975836ad22d7d55517a286adbe865 Mon Sep 17 00:00:00 2001 +From 11df22625f7d952126b6e3ee6504ceb2a6fe4c08 Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> Date: Fri, 5 Feb 2021 11:00:36 +1000 Subject: Add haiku support @@ -623,22 +623,30 @@ index 8151fd4..739a005 100644 QDir dir(qApp->applicationDirPath() + "/plugins"); #else QDir dir(fallbackPath); -diff --git a/src/qmmpui/configdialog.cpp b/src/qmmpui/configdialog.cpp -index 60c701d..0725580 100644 ---- a/src/qmmpui/configdialog.cpp -+++ b/src/qmmpui/configdialog.cpp -@@ -55,6 +55,11 @@ ConfigDialog::ConfigDialog (QWidget *parent) : QDialog (parent) - m_ui->setupUi (this); - setAttribute(Qt::WA_QuitOnClose, false); - setAttribute(Qt::WA_DeleteOnClose, false); -+#if defined(Q_OS_HAIKU) -+ hide(); -+ setWindowModality(Qt::NonModal); -+ show(); -+#endif - m_ui->preferencesButton->setEnabled(false); - m_ui->informationButton->setEnabled(false); - m_ui->treeWidget->setItemDelegate(new RadioItemDelegate(this)); +diff --git a/src/plugins/Ui/qsui/mainwindow.cpp b/src/plugins/Ui/qsui/mainwindow.cpp +index a1347fa..bf190cd 100644 +--- a/src/plugins/Ui/qsui/mainwindow.cpp ++++ b/src/plugins/Ui/qsui/mainwindow.cpp +@@ -317,6 +317,7 @@ void MainWindow::showSettings() + QSUiSettings *simpleSettings = new QSUiSettings(this); + confDialog->addPage(tr("Appearance"), simpleSettings, QIcon(":/qsui/qsui_settings.png")); + confDialog->addPage(tr("Shortcuts"), new HotkeyEditor(this), QIcon(":/qsui/qsui_shortcuts.png")); ++ confDialog->setModal(false); + confDialog->exec(); + simpleSettings->writeSettings(); + confDialog->deleteLater(); +diff --git a/src/plugins/Ui/skinned/mainwindow.cpp b/src/plugins/Ui/skinned/mainwindow.cpp +index 5bef7a1..8571253 100644 +--- a/src/plugins/Ui/skinned/mainwindow.cpp ++++ b/src/plugins/Ui/skinned/mainwindow.cpp +@@ -361,6 +361,7 @@ void MainWindow::showSettings() + SkinnedSettings *skinnedSettings = new SkinnedSettings(this); + confDialog->addPage(tr("Appearance"), skinnedSettings, QIcon(":/skinned/interface.png")); + confDialog->addPage(tr("Shortcuts"), new HotkeyEditor(this), QIcon(":/skinned/shortcuts.png")); ++ confDialog->setModal(false); + confDialog->exec(); + skinnedSettings->writeSettings(); + confDialog->deleteLater(); -- -2.30.0 +2.30.2 diff --git a/media-sound/qmmp/qmmp-1.4.4.recipe b/media-sound/qmmp/qmmp-1.4.4.recipe index 627f90f60..60aa0bb8a 100644 --- a/media-sound/qmmp/qmmp-1.4.4.recipe +++ b/media-sound/qmmp/qmmp-1.4.4.recipe @@ -4,7 +4,7 @@ The user interface is similar to winamp or xmms." HOMEPAGE="http://qmmp.ylsoftware.com/" COPYRIGHT="2006-2021 Qmmp Development Team" LICENSE="GNU GPL v2" -REVISION="1" +REVISION="2" SOURCE_URI="https://qmmp.ylsoftware.com/files/qmmp-$portVersion.tar.bz2" CHECKSUM_SHA256="b1945956109fd9c7844ee5780142c0d24564b88327dc2f9a61d29386abcf9d54" PATCHES="qmmp-$portVersion.patchset" @@ -61,6 +61,7 @@ REQUIRES=" lib:libtag$secondaryArchSuffix lib:libvorbis$secondaryArchSuffix lib:libwavpack$secondaryArchSuffix + lib:libwildmidi$secondaryArchSuffix " PROVIDES_devel=" @@ -105,6 +106,7 @@ BUILD_REQUIRES=" devel:libtag$secondaryArchSuffix devel:libvorbis$secondaryArchSuffix devel:libwavpack$secondaryArchSuffix + devel:libwildmidi$secondaryArchSuffix " BUILD_PREREQUIRES=" cmd:cmake