diff --git a/media-sound/qmmp/patches/qmmp-1.4.4.patchset b/media-sound/qmmp/patches/qmmp-1.4.5.patchset similarity index 98% rename from media-sound/qmmp/patches/qmmp-1.4.4.patchset rename to media-sound/qmmp/patches/qmmp-1.4.5.patchset index 6d80b26f8..46a5e35b4 100644 --- a/media-sound/qmmp/patches/qmmp-1.4.4.patchset +++ b/media-sound/qmmp/patches/qmmp-1.4.5.patchset @@ -1,4 +1,4 @@ -From 11df22625f7d952126b6e3ee6504ceb2a6fe4c08 Mon Sep 17 00:00:00 2001 +From b9068f455125b4139aef8b4ca4af5272506c49ec 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 @@ -267,7 +267,7 @@ index 0000000..baf7326 + m_player->Start(); + m_player->SetHasData(true); + -+ Output::configure(freq, map.count(), format); ++ Output::configure(freq, map, format); + + return true; +} @@ -543,6 +543,18 @@ index ca25b54..7670cdb 100644 IF(USE_QSUI) add_subdirectory(qsui) +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/CMakeLists.txt b/src/plugins/Ui/skinned/CMakeLists.txt index 6e2e14d..36916b3 100644 --- a/src/plugins/Ui/skinned/CMakeLists.txt @@ -585,8 +597,20 @@ index ca836dd..2da7c10 100644 +#endif PixmapWidget::mousePressEvent(e); } +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(); diff --git a/src/plugins/Ui/skinned/skinreader.cpp b/src/plugins/Ui/skinned/skinreader.cpp -index b3b63d8..03a27da 100644 +index 96df4d7..21eb68a 100644 --- a/src/plugins/Ui/skinned/skinreader.cpp +++ b/src/plugins/Ui/skinned/skinreader.cpp @@ -49,7 +49,7 @@ void SkinReader::generateThumbs() @@ -595,9 +619,9 @@ index b3b63d8..03a27da 100644 QFileInfoList f = dir.entryInfoList(); -#if defined(Q_OS_WIN) && !defined(Q_OS_CYGWIN) +#if (defined(Q_OS_WIN) && !defined(Q_OS_CYGWIN)) || defined(Q_OS_HAIKU) - dir.setPath(qApp->applicationDirPath()+"/skins"); + dir.setPath(qApp->applicationDirPath() + "/skins"); #else - dir.setPath(Qmmp::dataPath()); + dir.setPath(Qmmp::dataPath() + "/skins"); diff --git a/src/qmmp/qmmp.cpp b/src/qmmp/qmmp.cpp index 8151fd4..739a005 100644 --- a/src/qmmp/qmmp.cpp @@ -623,30 +647,6 @@ index 8151fd4..739a005 100644 QDir dir(qApp->applicationDirPath() + "/plugins"); #else QDir dir(fallbackPath); -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.2 +2.30.0 diff --git a/media-sound/qmmp/qmmp-1.4.4.recipe b/media-sound/qmmp/qmmp-1.4.5.recipe similarity index 98% rename from media-sound/qmmp/qmmp-1.4.4.recipe rename to media-sound/qmmp/qmmp-1.4.5.recipe index 59841df1b..a329b57c0 100644 --- a/media-sound/qmmp/qmmp-1.4.4.recipe +++ b/media-sound/qmmp/qmmp-1.4.5.recipe @@ -4,9 +4,9 @@ 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="3" +REVISION="1" SOURCE_URI="https://qmmp.ylsoftware.com/files/qmmp-$portVersion.tar.bz2" -CHECKSUM_SHA256="b1945956109fd9c7844ee5780142c0d24564b88327dc2f9a61d29386abcf9d54" +CHECKSUM_SHA256="54d02ae9e70602e555a29551138bf02df0f760a2e67bab98ba9ed7df0b3a1c1d" PATCHES="qmmp-$portVersion.patchset" ADDITIONAL_FILES=" qmmp.rdef.in