diff --git a/media-sound/qmmp/patches/qmmp-1.2.2.patchset b/media-sound/qmmp/patches/qmmp-1.2.3.patchset similarity index 98% rename from media-sound/qmmp/patches/qmmp-1.2.2.patchset rename to media-sound/qmmp/patches/qmmp-1.2.3.patchset index 940098be3..7b78e1c0b 100644 --- a/media-sound/qmmp/patches/qmmp-1.2.2.patchset +++ b/media-sound/qmmp/patches/qmmp-1.2.3.patchset @@ -5,16 +5,15 @@ Subject: Fix build for Haiku diff --git a/qmmp.pri b/qmmp.pri -index 823eaa9..a8c8f90 100644 +index 47db18a..3dec1a5 100644 --- a/qmmp.pri +++ b/qmmp.pri -@@ -13,7 +13,9 @@ RCC_DIR=./.build/rcc +@@ -13,7 +13,7 @@ RCC_DIR=./.build/rcc #Defines DEFINES += QT_NO_CAST_FROM_BYTEARRAY QT_STRICT_ITERATORS -+unix:!haiku { - DEFINES += QMMP_WS_X11 -+} +-unix:DEFINES += QMMP_WS_X11 ++unix:!haiku:DEFINES += QMMP_WS_X11 DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x050400 #Configuration @@ -50,10 +49,10 @@ index 5a1cc69..800ad00 100644 contains(CONFIG, LADSPA_PLUGIN):SUBDIRS += ladspa } 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 +++ b/src/plugins/General/General.pro -@@ -1,27 +1,27 @@ +@@ -1,7 +1,6 @@ include(../../../qmmp.pri) SUBDIRS += statusicon \ @@ -61,16 +60,17 @@ index 03727ba..e5a9ecd 100644 lyrics \ scrobbler \ fileops \ - covermanager \ +@@ -9,19 +8,20 @@ SUBDIRS += statusicon \ streambrowser \ trackchange \ -- hotkey \ copypaste \ - rgscan +- rgscan \ +- hotkey -unix:SUBDIRS += mpris \ ++ rgscan +unix:!haiku:SUBDIRS += mpris \ -+ notifier \ -+ hotkey \ ++ notifier \ ++ hotkey \ kdenotify \ converter \ gnomehotkey @@ -184,11 +184,11 @@ index e3f6d5e..1150b9a 100644 + !haiku:SUBDIRS += projectm } 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 +++ b/src/plugins/plugins.pri @@ -9,7 +9,7 @@ win32 { - QMMPUI_LIB = -lqmmpui0 + QMMPUI_LIB = -lqmmpui1 } -unix { diff --git a/media-sound/qmmp/qmmp-1.2.2.recipe b/media-sound/qmmp/qmmp-1.2.3.recipe similarity index 97% rename from media-sound/qmmp/qmmp-1.2.2.recipe rename to media-sound/qmmp/qmmp-1.2.3.recipe index bc6653de9..aabb8ef18 100644 --- a/media-sound/qmmp/qmmp-1.2.2.recipe +++ b/media-sound/qmmp/qmmp-1.2.3.recipe @@ -4,9 +4,9 @@ The user interface is similar to winamp or xmms." HOMEPAGE="http://qmmp.ylsoftware.com/" COPYRIGHT="2006-2018 Qmmp Development Team" LICENSE="GNU GPL v2" -REVISION="3" +REVISION="1" SOURCE_URI="https://sourceforge.net/projects/qmmp-dev/files/qmmp/qmmp-$portVersion.tar.bz2" -CHECKSUM_SHA256="e9dc5723f7f2a04d36167585ce1b4223c09f36c6dad1215de877dc51d1f3d606" +CHECKSUM_SHA256="32a162b273a61b5d7a568f266d0cc3c3dab63c310d89046280ace42d84ac9816" PATCHES="qmmp-$portVersion.patchset" ARCHITECTURES="!x86_gcc2 x86 x86_64" SECONDARY_ARCHITECTURES="x86"