Qmmp: bump version

This commit is contained in:
Gerasim Troeglazov
2018-07-29 00:10:24 +10:00
parent 8504290ecf
commit 33704ab097
2 changed files with 16 additions and 16 deletions

View File

@@ -5,16 +5,15 @@ Subject: Fix build for Haiku
diff --git a/qmmp.pri b/qmmp.pri diff --git a/qmmp.pri b/qmmp.pri
index 823eaa9..a8c8f90 100644 index 47db18a..3dec1a5 100644
--- a/qmmp.pri --- a/qmmp.pri
+++ b/qmmp.pri +++ b/qmmp.pri
@@ -13,7 +13,9 @@ RCC_DIR=./.build/rcc @@ -13,7 +13,7 @@ RCC_DIR=./.build/rcc
#Defines #Defines
DEFINES += QT_NO_CAST_FROM_BYTEARRAY QT_STRICT_ITERATORS DEFINES += QT_NO_CAST_FROM_BYTEARRAY QT_STRICT_ITERATORS
+unix:!haiku { -unix:DEFINES += QMMP_WS_X11
DEFINES += QMMP_WS_X11 +unix:!haiku:DEFINES += QMMP_WS_X11
+}
DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x050400 DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x050400
#Configuration #Configuration
@@ -50,10 +49,10 @@ index 5a1cc69..800ad00 100644
contains(CONFIG, LADSPA_PLUGIN):SUBDIRS += ladspa contains(CONFIG, LADSPA_PLUGIN):SUBDIRS += ladspa
} }
diff --git a/src/plugins/General/General.pro b/src/plugins/General/General.pro diff --git a/src/plugins/General/General.pro b/src/plugins/General/General.pro
index 03727ba..e5a9ecd 100644 index a1f1129..47c3d69 100644
--- a/src/plugins/General/General.pro --- a/src/plugins/General/General.pro
+++ b/src/plugins/General/General.pro +++ b/src/plugins/General/General.pro
@@ -1,27 +1,27 @@ @@ -1,7 +1,6 @@
include(../../../qmmp.pri) include(../../../qmmp.pri)
SUBDIRS += statusicon \ SUBDIRS += statusicon \
@@ -61,16 +60,17 @@ index 03727ba..e5a9ecd 100644
lyrics \ lyrics \
scrobbler \ scrobbler \
fileops \ fileops \
covermanager \ @@ -9,19 +8,20 @@ SUBDIRS += statusicon \
streambrowser \ streambrowser \
trackchange \ trackchange \
- hotkey \
copypaste \ copypaste \
rgscan - rgscan \
- hotkey
-unix:SUBDIRS += mpris \ -unix:SUBDIRS += mpris \
+ rgscan
+unix:!haiku:SUBDIRS += mpris \ +unix:!haiku:SUBDIRS += mpris \
+ notifier \ + notifier \
+ hotkey \ + hotkey \
kdenotify \ kdenotify \
converter \ converter \
gnomehotkey gnomehotkey
@@ -184,11 +184,11 @@ index e3f6d5e..1150b9a 100644
+ !haiku:SUBDIRS += projectm + !haiku:SUBDIRS += projectm
} }
diff --git a/src/plugins/plugins.pri b/src/plugins/plugins.pri diff --git a/src/plugins/plugins.pri b/src/plugins/plugins.pri
index f56e33e..a9e449c 100644 index 8e79777..9108023 100644
--- a/src/plugins/plugins.pri --- a/src/plugins/plugins.pri
+++ b/src/plugins/plugins.pri +++ b/src/plugins/plugins.pri
@@ -9,7 +9,7 @@ win32 { @@ -9,7 +9,7 @@ win32 {
QMMPUI_LIB = -lqmmpui0 QMMPUI_LIB = -lqmmpui1
} }
-unix { -unix {

View File

@@ -4,9 +4,9 @@ The user interface is similar to winamp or xmms."
HOMEPAGE="http://qmmp.ylsoftware.com/" HOMEPAGE="http://qmmp.ylsoftware.com/"
COPYRIGHT="2006-2018 Qmmp Development Team" COPYRIGHT="2006-2018 Qmmp Development Team"
LICENSE="GNU GPL v2" LICENSE="GNU GPL v2"
REVISION="3" REVISION="1"
SOURCE_URI="https://sourceforge.net/projects/qmmp-dev/files/qmmp/qmmp-$portVersion.tar.bz2" SOURCE_URI="https://sourceforge.net/projects/qmmp-dev/files/qmmp/qmmp-$portVersion.tar.bz2"
CHECKSUM_SHA256="e9dc5723f7f2a04d36167585ce1b4223c09f36c6dad1215de877dc51d1f3d606" CHECKSUM_SHA256="32a162b273a61b5d7a568f266d0cc3c3dab63c310d89046280ace42d84ac9816"
PATCHES="qmmp-$portVersion.patchset" PATCHES="qmmp-$portVersion.patchset"
ARCHITECTURES="!x86_gcc2 x86 x86_64" ARCHITECTURES="!x86_gcc2 x86 x86_64"
SECONDARY_ARCHITECTURES="x86" SECONDARY_ARCHITECTURES="x86"