QMMP: bump version

This commit is contained in:
Gerasim Troeglazov
2020-08-17 23:46:23 +10:00
parent 9baf9e45ac
commit f8b8b43669
2 changed files with 9 additions and 21 deletions

View File

@@ -1,22 +1,23 @@
From 0b8bbdf41681dda541f9fa887b69e73f6546a52c Mon Sep 17 00:00:00 2001 From a5763883c32c76a50e396fc3570fe21d0a97ba28 Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com> From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Fri, 1 May 2020 14:09:02 +1000 Date: Mon, 17 Aug 2020 23:30:33 +1000
Subject: Add haiku support Subject: Add haiku support
diff --git a/CMakeLists.txt b/CMakeLists.txt diff --git a/CMakeLists.txt b/CMakeLists.txt
index af9ede9..e273d18 100644 index cb44410..cd1a3a6 100644
--- a/CMakeLists.txt --- a/CMakeLists.txt
+++ b/CMakeLists.txt +++ b/CMakeLists.txt
@@ -63,7 +63,6 @@ find_package(Qt5DBus 5.4.0) @@ -63,7 +63,7 @@ find_package(Qt5DBus 5.4.0)
find_package(Qt5Multimedia 5.4.0) find_package(Qt5Multimedia 5.4.0)
find_package(Qt5Sql 5.4.0) find_package(Qt5Sql 5.4.0)
find_package(QtWinExtras 5.4.0) find_package(QtWinExtras 5.4.0)
-ADD_DEFINITIONS(-DQMMP_WS_X11) -ADD_DEFINITIONS(-DQMMP_WS_X11 -DQT_DISABLE_DEPRECATED_BEFORE=0x050400 -DQT_DEPRECATED_WARNINGS)
+ADD_DEFINITIONS(-DQT_DISABLE_DEPRECATED_BEFORE=0x050400 -DQT_DEPRECATED_WARNINGS)
set(CMAKE_CXX_VISIBILITY_PRESET hidden) set(CMAKE_CXX_VISIBILITY_PRESET hidden)
set(CMAKE_VISIBILITY_INLINES_HIDDEN 1) set(CMAKE_VISIBILITY_INLINES_HIDDEN 1)
set(CMAKE_CXX_STANDARD 11) set(CMAKE_CXX_STANDARD 11)
@@ -241,7 +240,7 @@ PRINT_SUMMARY ("Two-panel File File Dialog ............" USE_TWO_PANEL_DIALOG 1) @@ -241,7 +241,7 @@ PRINT_SUMMARY ("Two-panel File File Dialog ............" USE_TWO_PANEL_DIALOG 1)
MESSAGE("") MESSAGE("")
MESSAGE("Advanced:") MESSAGE("Advanced:")
@@ -597,19 +598,6 @@ index b3b63d8..03a27da 100644
dir.setPath(qApp->applicationDirPath()+"/skins"); dir.setPath(qApp->applicationDirPath()+"/skins");
#else #else
dir.setPath(Qmmp::dataPath()); dir.setPath(Qmmp::dataPath());
diff --git a/src/plugins/Ui/skinned/symboldisplay.cpp b/src/plugins/Ui/skinned/symboldisplay.cpp
index 49a6ce3..d5a6e33 100644
--- a/src/plugins/Ui/skinned/symboldisplay.cpp
+++ b/src/plugins/Ui/skinned/symboldisplay.cpp
@@ -32,7 +32,7 @@ SymbolDisplay::SymbolDisplay (QWidget *parent, int digits)
connect (m_skin, SIGNAL (skinChanged()), this, SLOT (draw()));
draw();
for (int i=0; i<m_digits; ++i)
-#if defined(Q_OS_FREEBSD) || defined(Q_OS_WIN) || defined (Q_OS_MAC)
+#if defined(Q_OS_FREEBSD) || defined(Q_OS_WIN) || defined (Q_OS_MAC) || defined (Q_OS_HAIKU)
m_max += 9 * (int) pow(10,i);
#else
m_max += 9 * (int) exp10(i);
diff --git a/src/qmmp/qmmp.cpp b/src/qmmp/qmmp.cpp diff --git a/src/qmmp/qmmp.cpp b/src/qmmp/qmmp.cpp
index 8151fd4..739a005 100644 index 8151fd4..739a005 100644
--- a/src/qmmp/qmmp.cpp --- a/src/qmmp/qmmp.cpp
@@ -652,5 +640,5 @@ index 60c701d..0725580 100644
m_ui->informationButton->setEnabled(false); m_ui->informationButton->setEnabled(false);
m_ui->treeWidget->setItemDelegate(new RadioItemDelegate(this)); m_ui->treeWidget->setItemDelegate(new RadioItemDelegate(this));
-- --
2.26.0 2.28.0

View File

@@ -6,7 +6,7 @@ COPYRIGHT="2006-2020 Qmmp Development Team"
LICENSE="GNU GPL v2" LICENSE="GNU GPL v2"
REVISION="1" REVISION="1"
SOURCE_URI="https://qmmp.ylsoftware.com/files/qmmp-$portVersion.tar.bz2" SOURCE_URI="https://qmmp.ylsoftware.com/files/qmmp-$portVersion.tar.bz2"
CHECKSUM_SHA256="a8b9cda1fe137f9b50acc54bc02ac1f3ba89051f828f40f5dc9a9056cab4308f" CHECKSUM_SHA256="2ad5e5ce790166a162b942fe64b734559c515ba06c1de5bef46b9713b3c8285c"
PATCHES="qmmp-$portVersion.patchset" PATCHES="qmmp-$portVersion.patchset"
ADDITIONAL_FILES=" ADDITIONAL_FILES="
qmmp.rdef.in qmmp.rdef.in