From 5c771c32b2c393774b4971e6ff97e0308221c531 Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> Date: Fri, 1 May 2020 15:00:16 +1000 Subject: [PATCH] QMMP: bump version --- ...mmp-1.3.7.patchset => qmmp-1.4.0.patchset} | 90 +++++++++---------- .../{qmmp-1.3.7.recipe => qmmp-1.4.0.recipe} | 4 +- 2 files changed, 42 insertions(+), 52 deletions(-) rename media-sound/qmmp/patches/{qmmp-1.3.7.patchset => qmmp-1.4.0.patchset} (96%) rename media-sound/qmmp/{qmmp-1.3.7.recipe => qmmp-1.4.0.recipe} (98%) diff --git a/media-sound/qmmp/patches/qmmp-1.3.7.patchset b/media-sound/qmmp/patches/qmmp-1.4.0.patchset similarity index 96% rename from media-sound/qmmp/patches/qmmp-1.3.7.patchset rename to media-sound/qmmp/patches/qmmp-1.4.0.patchset index 155183a99..98ebb13c5 100644 --- a/media-sound/qmmp/patches/qmmp-1.3.7.patchset +++ b/media-sound/qmmp/patches/qmmp-1.4.0.patchset @@ -1,14 +1,14 @@ -From 008061e5c914089e65e08eaa48c145ebd41349f4 Mon Sep 17 00:00:00 2001 +From 0b8bbdf41681dda541f9fa887b69e73f6546a52c Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> -Date: Wed, 13 Feb 2019 20:35:27 +1000 +Date: Fri, 1 May 2020 14:09:02 +1000 Subject: Add haiku support diff --git a/CMakeLists.txt b/CMakeLists.txt -index 0d0c1b5..2eea057 100644 +index af9ede9..e273d18 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -62,7 +62,6 @@ find_package(Qt5DBus 5.4.0) +@@ -63,7 +63,6 @@ find_package(Qt5DBus 5.4.0) find_package(Qt5Multimedia 5.4.0) find_package(Qt5Sql 5.4.0) find_package(QtWinExtras 5.4.0) @@ -16,7 +16,7 @@ index 0d0c1b5..2eea057 100644 set(CMAKE_CXX_VISIBILITY_PRESET hidden) set(CMAKE_VISIBILITY_INLINES_HIDDEN 1) set(CMAKE_CXX_STANDARD 11) -@@ -235,7 +234,7 @@ PRINT_SUMMARY ("Two-panel File File Dialog ............" USE_TWO_PANEL_DIALOG 1) +@@ -241,7 +240,7 @@ PRINT_SUMMARY ("Two-panel File File Dialog ............" USE_TWO_PANEL_DIALOG 1) MESSAGE("") MESSAGE("Advanced:") @@ -25,6 +25,33 @@ index 0d0c1b5..2eea057 100644 PRINT_SUMMARY ("Simple user interface (QSUI) .........." USE_QSUI 1) PRINT_SUMMARY ("Automatic charset detection ..........." USE_ENCA ENCA_FOUND) PRINT_SUMMARY ("Directory association ................." USE_DIR_ASSOC 1) +diff --git a/src/app/main.cpp b/src/app/main.cpp +index 53c9e72..7d3eb51 100644 +--- a/src/app/main.cpp ++++ b/src/app/main.cpp +@@ -30,6 +30,10 @@ + #include + #include + #endif ++#ifdef __HAIKU__ ++#include ++#include ++#endif + #include + #include "qmmpstarter.h" + +@@ -70,5 +74,11 @@ int main(int argc, char *argv[]) + return starter.exitCode(); + + a.setQuitOnLastWindowClosed(false); ++#ifdef __HAIKU__ ++ int res = a.exec(); ++ kill(::getpid(), SIGKILL); ++ return res; ++#else + return a.exec(); ++#endif + } diff --git a/src/plugins/Input/gme/CMakeLists.txt b/src/plugins/Input/gme/CMakeLists.txt index 0134f73..8cbc33c 100644 --- a/src/plugins/Input/gme/CMakeLists.txt @@ -544,10 +571,10 @@ index 6e2e14d..36916b3 100644 -install(FILES scripts/kwin.sh DESTINATION ${CMAKE_INSTALL_DATADIR}/qmmp${APP_NAME_SUFFIX}/scripts) -ENDIF(X11_FOUND) diff --git a/src/plugins/Ui/skinned/display.cpp b/src/plugins/Ui/skinned/display.cpp -index 2ae37d3..04d90a2 100644 +index ca836dd..2da7c10 100644 --- a/src/plugins/Ui/skinned/display.cpp +++ b/src/plugins/Ui/skinned/display.cpp -@@ -345,7 +345,9 @@ void MainDisplay::mousePressEvent(QMouseEvent *e) +@@ -344,7 +344,9 @@ void MainDisplay::mousePressEvent(QMouseEvent *e) { if (e->button() == Qt::RightButton) m_mw->menu()->exec(e->globalPos()); @@ -558,7 +585,7 @@ index 2ae37d3..04d90a2 100644 PixmapWidget::mousePressEvent(e); } diff --git a/src/plugins/Ui/skinned/skinreader.cpp b/src/plugins/Ui/skinned/skinreader.cpp -index 0494af7..5b4bcbc 100644 +index b3b63d8..03a27da 100644 --- a/src/plugins/Ui/skinned/skinreader.cpp +++ b/src/plugins/Ui/skinned/skinreader.cpp @@ -49,7 +49,7 @@ void SkinReader::generateThumbs() @@ -584,7 +611,7 @@ index 49a6ce3..d5a6e33 100644 #else m_max += 9 * (int) exp10(i); diff --git a/src/qmmp/qmmp.cpp b/src/qmmp/qmmp.cpp -index 337936b..27d93fb 100644 +index 8151fd4..739a005 100644 --- a/src/qmmp/qmmp.cpp +++ b/src/qmmp/qmmp.cpp @@ -54,6 +54,8 @@ QString Qmmp::configDir() @@ -609,11 +636,11 @@ index 337936b..27d93fb 100644 #else QDir dir(fallbackPath); diff --git a/src/qmmpui/configdialog.cpp b/src/qmmpui/configdialog.cpp -index 88f12e1..8b69e59 100644 +index 60c701d..0725580 100644 --- a/src/qmmpui/configdialog.cpp +++ b/src/qmmpui/configdialog.cpp -@@ -56,6 +56,11 @@ ConfigDialog::ConfigDialog (QWidget *parent) : QDialog (parent) - m_insert_row = 0; +@@ -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) @@ -625,42 +652,5 @@ index 88f12e1..8b69e59 100644 m_ui->informationButton->setEnabled(false); m_ui->treeWidget->setItemDelegate(new RadioItemDelegate(this)); -- -2.19.1 - - -From 59b4362badc1144be44ed4069655a2e9ab0b03f5 Mon Sep 17 00:00:00 2001 -From: Gerasim Troeglazov <3dEyes@gmail.com> -Date: Wed, 13 Feb 2019 21:21:54 +1000 -Subject: Ugly hack for fix crush on exit - - -diff --git a/src/app/main.cpp b/src/app/main.cpp -index 815c748..6a2e5d7 100644 ---- a/src/app/main.cpp -+++ b/src/app/main.cpp -@@ -30,6 +30,10 @@ - #include - #include - #endif -+#ifdef __HAIKU__ -+#include -+#include -+#endif - #include - #include "qmmpstarter.h" - -@@ -67,5 +71,11 @@ int main(int argc, char *argv[]) - return starter.exitCode(); - - a.setQuitOnLastWindowClosed(false); -+#ifdef __HAIKU__ -+ int res = a.exec(); -+ kill(::getpid(), SIGKILL); -+ return res; -+#else - return a.exec(); -+#endif - } --- -2.19.1 +2.26.0 diff --git a/media-sound/qmmp/qmmp-1.3.7.recipe b/media-sound/qmmp/qmmp-1.4.0.recipe similarity index 98% rename from media-sound/qmmp/qmmp-1.3.7.recipe rename to media-sound/qmmp/qmmp-1.4.0.recipe index 90092e7f5..6c86244eb 100644 --- a/media-sound/qmmp/qmmp-1.3.7.recipe +++ b/media-sound/qmmp/qmmp-1.4.0.recipe @@ -4,9 +4,9 @@ The user interface is similar to winamp or xmms." HOMEPAGE="http://qmmp.ylsoftware.com/" COPYRIGHT="2006-2020 Qmmp Development Team" LICENSE="GNU GPL v2" -REVISION="3" +REVISION="1" SOURCE_URI="https://qmmp.ylsoftware.com/files/qmmp-$portVersion.tar.bz2" -CHECKSUM_SHA256="e7a996e11b9af2e3bc5634304c5a7144a1d56767177a7cb79a6e50b7ce45b38e" +CHECKSUM_SHA256="a8b9cda1fe137f9b50acc54bc02ac1f3ba89051f828f40f5dc9a9056cab4308f" PATCHES="qmmp-$portVersion.patchset" ADDITIONAL_FILES=" qmmp.rdef.in