diff --git a/media-sound/qmmp/additional-files/qmmp.rdef.in b/media-sound/qmmp/additional-files/qmmp.rdef.in index 53e382479..0dcea3550 100644 --- a/media-sound/qmmp/additional-files/qmmp.rdef.in +++ b/media-sound/qmmp/additional-files/qmmp.rdef.in @@ -21,54 +21,62 @@ resource file_types message { }; resource vector_icon { - $"6E636966030514059105F606000BBEE6B3E7BEE6B3E7C12AB3BAC57CB53FC378" - $"B436C822B698CB3D36CA3BB8F9CC0BBDF2CB9AC29DCC2CC05DCAECC55BC6E4C9" - $"70C936C7D3C421CB63BD3CCB5DC089CC20BA75CAC3B62FC6E1B7E6C927B513C5" - $"6BB3F9C1E5B44DC3B3B37DBF7DB4E8BABAB3DBBCF0B61AB830BACAB4F9B83BB6" - $"1DBC15B460BEE6B3E7BD7CB40CBEE6B3E7022EBF61B611C0B9B56CBEB8B66FBE" - $"15B7DEBE13B70EBE24B8C5BF2ABA3FBEB5B981BF23BA49BF0DBA66BF14BA5CBF" - $"33BAD4BF94BBA9BF74BB38BF6FBBE4BF28BC5ABF4BBC1FBEF3BC59BE8BBC51BE" - $"BEBC5FBE2BBC23BD81BBA3BDE0BBD4BCF4BB4CBBACBB72BC48BB75BA02BB93B6" - $"C4BC7AB847BBB4B60DBCDDB559BE68B55ABD8AB576BEEFB672BF6EB605BF30B6" - $"E5BFB2B7D5C028B775BFC7B7EAC077B811C114B7D4C0D4B84AC171B914C1A9B8" - $"C4C16BB96EC1F4BA53C1EAB9E8C1DCBA5BC232BA20C2B3BA3DC273B9F1C310BA" - $"4FC3CFBA0DC383BB04C4A0BCABC5FFBBEFC537BCEAC63CBCCEC6E6BCCFC699BC" - $"BBC7A5BCBEC923BCC1C864BCCBC946BCF9C985BCD1C974BD6DC98BBE0FC8D8BD" - $"DDC93EBE2EC89CBDEBC829BE19C856BDCAC7DABDCAC731BDC1C785BE1EC72FBE" - $"C6C73EBE73C74BBF32C702BFC2C63CBF69C68DBFD8C63AC005C63BBFEFC63AC0" - $"3BC69DC0E0C739C081C6FDC138C745C1EBC737C192C739C1EEC780C1D2C810C1" - $"F6C7CDC1B1C859C1D1C8F6C17EC8B8C237C8B9C2F2C823C294C86DC2FFC77DC2" - $"ECC632C2E0C6D7C3B5C531C59DC37CC4EBC492C5EEC2F5C56DC1F0C564C279C5" - $"D3C1D6C6A1C1A8C649C1ECC6F5C165C7B1C108C77AC170C7F4C0B9C81CBFF8C7" - $"B4C02AC8CEBF95CA2CBEC0C99EBF59CA78BE74CA2FBDA9CA58BDFEC9CCBCDBC8" - $"29BC1EC8F7BC67C70EBBC7C4C1BB7BC5EABB89C52ABB0E50BA61C5C0BAD8C6BE" - $"B9B5C641B7DEC6C6B89BC5B3B6EDC3B4B5F8C4B6B655C251B581020DBF61B611" - $"BEB8B66FC0B9B56CC3B4B5F8C251B581C4B6B655C641B7DEC5B3B6EDC6C6B89B" - $"50BA61C6BEB9B5C5C0BAD8C4C1BB7BC52ABB0EC420BB7CC2DDBB78C37FBB71C2" - $"4ABB7DC16BBC3BC1DDBBEBC12CBC6DC084BC59C0CEBC7DC059BC1FC025BB95C0" - $"2ABBDEC046BB21C0A8BA45C090BABDC034BA9BBFDFBBABC01FBB33BFA4BB31BF" - $"2ABA3FBF73BAB2BEB5B981BE15B7DEBE24B8C5BE13B70E0212C829BC1EC7E3BC" - $"BAC8F7BC67CA2FBDA9C9CCBCDBCA58BDFECA2CBEC0CA78BE74C99EBF59C81CBF" - $"F8C8CEBF95C7B4C02AC7B1C108C7F4C0B9C77AC170C6A1C1A8C6F5C165C649C1" - $"ECC56DC1F0C5D3C1D6C564C279C59DC37CC5EEC2F5C4EBC492C2ECC632C3B5C5" - $"31C2E0C6D7C2F2C823C2FFC77DC294C86DC1D1C8F6C237C8B9C17EC8B8C1D2C8" - $"10C1B1C859C1F6C7CDC1EBC737C1EEC780C192C739C0E0C739C138C745C081C6" - $"FDC005C63BC03BC69DC120C54FC329C344C22DC451C3F3C27DC53BC0AFC493C1" - $"92C5DCBFBBC721BDD3C688BECCC781BD460204BDEBC829BD90C886BE19C856BE" - $"0FC8D8BE2EC89CBDDDC93EBCF9C985BD6DC98BBCD1C974BCBEC923BCCBC946BD" - $"28C8D60223BF0DBA66BF33BAD4BF14BA5CBF2ABA3FBF23BA49BF73BAB2BFDFBB" - $"ABBFA4BB31C01FBB33C0A8BA45C034BA9BC090BABDC025BB95C046BB21C02ABB" - $"DEC084BC59C059BC1FC0CEBC7DC16BBC3BC12CBC6DC1DDBBEBC2DDBB78C24ABB" - $"7DC37FBB71C4C1BB7BC420BB7CC5EABB89C829BC1EC70EBBC7C7E3BCBAC721BD" - $"D3C781BD46C688BECCC53BC0AFC5DCBFBBC493C192C329C344C3F3C27DC22DC4" - $"51C005C63BC120C54FBFEFC63ABFC2C63CBFD8C63ABF69C68DBEC6C73EBF32C7" - $"02BE73C74BBDCAC731BE1EC72FBDC1C785BDEBC829BDCAC7DABD90C886BCBEC9" - $"23BD28C8D6BCC1C864BCCEC6E6BCBBC7A5BCCFC699BCABC5FFBCEAC63CBBEFC5" - $"37BA4FC3CFBB04C4A0BA0DC383BA20C2B3B9F1C310BA3DC273BA53C1EABA5BC2" - $"32B9E8C1DCB914C1A9B96EC1F4B8C4C16BB811C114B84AC171B7D4C0D4B7D5C0" - $"28B7EAC077B775BFC7B672BF6EB6E5BFB2B605BF30B559BE68B576BEEFB55ABD" - $"8AB6C4BC7AB60DBCDDB847BBB4BBACBB72BA02BB93BC48BB75BD81BBA3BCF4BB" - $"4CBDE0BBD4BE8BBC51BE2BBC23BEBEBC5FBF28BC5ABEF3BC59BF4BBC1FBF94BB" - $"A9BF6FBBE4BF74BB38050A00020001000A010102000A010103000A010104000A" - $"02010500" + $"6E6369660C05000200060239E9B9B5254EB4F49AB9AD244B0DE94A932600FFAA" + $"00FFFF0000020006023A18063A1C19389124B88C2F488C6D482FC900FF00A8FF" + $"FFAA000201160238C060000000000000387EB24CEFB24921190078FF31020116" + $"02338EC400000000000039A3994CB0DA47CA1E0078FF3102000602B7FBBD370A" + $"833747B33825F14A1D094A7DB500FFAA00FF00FF000200060238974CB8025339" + $"CF2E3A74D14802F149ACDD00A9FF00FFFFAA0002011602AF6C4DAF3B2AB8F253" + $"391F224C0C334B6E0B0078FF310201160231C97700000000000031C9774CA131" + $"437CC20078FF310201160231C97700000000000031C9774DA86748472E0078FF" + $"3104FF8C04015D0F0226B973B9FCB973B9FCB973BAE8BA2FBCBFB9B2BBD3B9B2" + $"3AB9923EB9923CB992BF61B9A2C02DB9A2BFCFB9A2C02DB9A2C07CB9A2C07CB9" + $"A2C0EAB859C1B6B8D6C167B7CBC214B6F0C35DB6F0C2A1B6F0C38CB71FC3EBB6" + $"FF4AB71FC3EBB7BCC468B7BCC468B8394CB9924AB8B7C449B9F1C38CBACCC30F" + $"BA7EC32EBB2AC35DBC06C38CBB89C37DBCA3C38CBDCDC2FFBD40C35DBDCDC30F" + $"BDCDC33EBDCDC31FBDCDC3DBBE7AC468BE0CC439BEA9C478BF07C478BED84CBF" + $"17C4E6BF65C583BF26C534BF85C5A2BFD3C5E1BFA4C5C1BFD3C62FBFB4C6FBBF" + $"C3C6ADBFA4C769BF94C816BF94C7C7BF94C874BFE3C8F1BFA4C8B3C021C920C0" + $"BEC920C070C930C18AC8E2C1D9C71BC1AAC806C1F8C66EC276C534C218C583C2" + $"76C534C2B5C505C2B5C505C390C458C4DAC282C47CC38CC4E9C253C4F9C1E5C4" + $"F9C214C5B5C196C6FFC06CC662C109C878BED4CA00B9DDCA00BBE3CA00B96FC9" + $"C1B8B3C9F0B901C982B845C897B7E7C915B7F7C6D0B7B8C371BB46C42DBA6AC3" + $"71BB46C2E4BBE3C303BBB4C2D4BB94C256BB36C295BB56C237BB27C1E9BB27C2" + $"08BB27C1E9BB17C1E9BA1CC1E9BA1CC1E9B6ADBE1C20C08F20BB9820B992BA1C" + $"B992B6ECB992BA1C0204C031BFDFC031BFDFC041BFDFC0DEC02DC080BFFEC080" + $"C01EC031C00EC031C00EC031BFFEC041BFDFC031BFFEC041BFDF0205C643BF90" + $"C643BF90C45CC1B6C10DC06CC1AAC187C070BF52C3FEBB94C208BDBAC5F4B96F" + $"C8F5B8D2C849B7B8C992B9EDC652BF90C839BD6BC652BF900204BA3FB9CDBA3F" + $"B6DCBA3FBCCEBF46BF42BD6FBF42C11DBF42C0DEB9CDC0DEBCCEC0DEB6CCBDED" + $"B38DBFC3B38DBC16B38D0605FE03C266BB36C285BB46C285BB46C3B0B9AEC80A" + $"B65FC6E0B5A2C80AB65FC819B63FC819B63FC6A1B534C266BB27C295BAE8C266" + $"BB270605FF02C23722C23722C390B41AC237BB27C2A5B930C237BB27C256BB36" + $"C256BB36C266BAE8C237B3ACC3FEB41AC237B3ACC227220207C070C806C070C8" + $"06C10DC7D7C1D9C449C0BEC534C2B5C39CC3EEC1F4C3B0C2E0C46CC07CC1F8BF" + $"42C2E4BF52C10DBF32C051C148C09FC07CBFD3C2C0C060C4F5BF55C505C0EDC4" + $"E6C060C806C012C825C060C8060207B7DBC35DB7DBC35DB76DC291BA7EC03DBA" + $"9DC1E5BA6EBF03BAECBCFDBA3FBDAABC06BBD3BFD3BE08BEC8BCFDC0DEBF13BF" + $"46C0ABBFE3BFFEBE2BC1D5BB3A46BC25C33EBABDC187B7EBC35DB81A4AB7EBC3" + $"5D0204BFB4BF52C08FBD2CBED8C177BEB9C36DBE6AC34EBF07C38CC0DEBFCFC0" + $"02C1F4C1B9BDAAC1D9BBB4C227BBD3C18ABB940204C1E9B3BCC1E9B39CC1E9B3" + $"DBC227B3FBC208B3FBC247B3FBC266B3BCC266B3DBC266B39CC227B37DC247B3" + $"7DC208B37D0204C7CBB65FC7CBB63FC7CBB67EC80AB69DC7EAB69DC829B69DC8" + $"49B65FC849B67EC849B63FC80AB620C829B620C7EAB6200203BF75B459BD8EB2" + $"63BF75B459BCB3B3FBBE3BB2B1BA9DB5C2BA5EBAC8BA20B8E2BA9D260203C16B" + $"BE86C16BBE86C3FEBB36C8E5B8D2C7CBB73AC77DB864C15BBE95C509BA7AC15B" + $"BE950203C208BC12C208BC12C1B9BB94BEA9C2E0BEF7C0BBBF26BF90C1AABBC3" + $"C13CBC22C208BB650206BE6ABD1DBD7FBCCEBD6FBC80BABDBD1DBB69BC41BA10" + $"BDF8BA7E42BA7EBFB0BA7EC167B7FAC2E0B81AC282B8D6C243BAADC0F9BA6EC1" + $"B6BAECC03DBB2ABD6BBAADBE47BBB8380F0A0B0200010240559B000000000000" + $"3E2148C453864A10000A00020001024095D0000000000000401269C6F9153FFF" + $"FF0A010102024095D0000000000000401269C6F9153FFFFF0A020103024095D0" + $"000000000000401269C6F9153FFFFF0A030104124095D0000000000000401269" + $"C6F9153FFFFF01178100040A040105124095D0000000000000401269C6F9153F" + $"FFFF01178100040A050106024095D0000000000000401269C6F9153FFFFF0A06" + $"0107024095D0000000000000401269C6F9153FFFFF0A070108024095D0000000" + $"000000401269C6F9153FFFFF0A080109024095D0000000000000401269C6F915" + $"3FFFFF0A09010A024095D0000000000000401269C6F9153FFFFF0A0A010B0240" + $"95D0000000000000401269C6F9153FFFFF0A0A010C024095D000000000000040" + $"1269C6F9153FFFFF0A0A010D024095D0000000000000401269C6F9153FFFFF0A" + $"0A010E024095D0000000000000401269C6F9153FFFFF" }; diff --git a/media-sound/qmmp/patches/qmmp-1.1.12.patchset b/media-sound/qmmp/patches/qmmp-1.2.0.patchset similarity index 90% rename from media-sound/qmmp/patches/qmmp-1.1.12.patchset rename to media-sound/qmmp/patches/qmmp-1.2.0.patchset index f8911cbfc..3f0307d0e 100644 --- a/media-sound/qmmp/patches/qmmp-1.1.12.patchset +++ b/media-sound/qmmp/patches/qmmp-1.2.0.patchset @@ -1,57 +1,66 @@ -From 62ab55037c834ee901189b87f5d65248f8ae3365 Mon Sep 17 00:00:00 2001 +From 03d33373f4542751aef3c00076fc56b48d397dc8 Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> -Date: Wed, 22 Nov 2017 16:41:34 +1000 +Date: Tue, 28 Nov 2017 00:42:45 +1000 Subject: Fix build for Haiku diff --git a/qmmp.pri b/qmmp.pri -index 1146cad..f46c649 100644 +index 823eaa9..a8c8f90 100644 --- a/qmmp.pri +++ b/qmmp.pri -@@ -7,7 +7,9 @@ OBJECTS_DIR=./.build/obj - RCC_DIR=./.build/rcc +@@ -13,7 +13,9 @@ RCC_DIR=./.build/rcc + #Defines - QT += widgets + DEFINES += QT_NO_CAST_FROM_BYTEARRAY QT_STRICT_ITERATORS +unix:!haiku { DEFINES += QMMP_WS_X11 +} - DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x050400 + #Configuration diff --git a/src/app/app.pro b/src/app/app.pro -index 2598cf8..cb5b47a 100644 +index 3f7ba55..87e38a9 100644 --- a/src/app/app.pro +++ b/src/app/app.pro -@@ -16,6 +16,7 @@ OBJECTS_DIR = ./.build/obj - QT += network +@@ -4,6 +4,7 @@ TEMPLATE = app + unix:TARGET = ../../bin/qmmp win32:TARGET = ../../../bin/qmmp +haiku:TARGET = ../../Qmmp - CONFIG += thread \ - warn_on - QMAKE_LIBDIR += ../../lib \ + + QT += network + diff --git a/src/plugins/Effect/Effect.pro b/src/plugins/Effect/Effect.pro -index 417c06b..82a0c4f 100644 +index 5a1cc69..800ad00 100644 --- a/src/plugins/Effect/Effect.pro +++ b/src/plugins/Effect/Effect.pro -@@ -3,9 +3,11 @@ TEMPLATE = subdirs +@@ -2,11 +2,12 @@ include (../../../qmmp.pri) + TEMPLATE = subdirs SUBDIRS += crossfade stereo - +- +!haiku { contains(CONFIG, BS2B_PLUGIN):SUBDIRS += bs2b contains(CONFIG, SOXR_PLUGIN):SUBDIRS += soxr +} + contains(CONFIG, FILEWRITER_PLUGIN):SUBDIRS += filewriter -unix { +unix:!haiku { contains(CONFIG, LADSPA_PLUGIN):SUBDIRS += ladspa } diff --git a/src/plugins/General/General.pro b/src/plugins/General/General.pro -index 03727ba..923aaf1 100644 +index 03727ba..e5a9ecd 100644 --- a/src/plugins/General/General.pro +++ b/src/plugins/General/General.pro -@@ -8,20 +8,20 @@ SUBDIRS += statusicon \ +@@ -1,27 +1,27 @@ + include(../../../qmmp.pri) + + SUBDIRS += statusicon \ +- notifier \ + lyrics \ + scrobbler \ + fileops \ covermanager \ streambrowser \ trackchange \ @@ -60,6 +69,7 @@ index 03727ba..923aaf1 100644 rgscan -unix:SUBDIRS += mpris \ +unix:!haiku:SUBDIRS += mpris \ ++ notifier \ + hotkey \ kdenotify \ converter \ @@ -77,7 +87,7 @@ index 03727ba..923aaf1 100644 TEMPLATE = subdirs diff --git a/src/plugins/Input/Input.pro b/src/plugins/Input/Input.pro -index 887f126..c771588 100644 +index eef4806..1262644 100644 --- a/src/plugins/Input/Input.pro +++ b/src/plugins/Input/Input.pro @@ -19,6 +19,7 @@ contains(CONFIG, FFMPEG_PLUGIN){ @@ -96,7 +106,7 @@ index 887f126..c771588 100644 unix{ -@@ -42,8 +44,10 @@ contains(CONFIG, AAC_PLUGIN){ +@@ -42,9 +44,11 @@ contains(CONFIG, AAC_PLUGIN){ } @@ -106,9 +116,10 @@ index 887f126..c771588 100644 } +} - } + contains(CONFIG, ARCHIVE_PLUGIN){ + TAGLIB_VERSION = $$system("pkg-config --modversion taglib") diff --git a/src/plugins/Output/Output.pro b/src/plugins/Output/Output.pro -index c60ea4c..ff8cf91 100644 +index 1d745e4..194b25b 100644 --- a/src/plugins/Output/Output.pro +++ b/src/plugins/Output/Output.pro @@ -7,7 +7,7 @@ win32:SUBDIRS += wasapi @@ -120,8 +131,8 @@ index c60ea4c..ff8cf91 100644 contains(CONFIG, JACK_PLUGIN){ SUBDIRS += jack -@@ -31,9 +31,13 @@ contains(CONFIG, OSS4_PLUGIN){ - +@@ -34,9 +34,13 @@ contains(CONFIG, SHOUT_PLUGIN){ + } } +haiku{ @@ -136,20 +147,20 @@ index c60ea4c..ff8cf91 100644 } } diff --git a/src/plugins/Ui/skinned/skinned.pro b/src/plugins/Ui/skinned/skinned.pro -index bdad79b..f2a8843 100644 +index 9e55ab2..4565cf3 100644 --- a/src/plugins/Ui/skinned/skinned.pro +++ b/src/plugins/Ui/skinned/skinned.pro -@@ -128,7 +128,7 @@ win32:LIBS += -lqmmp0 -lqmmpui0 +@@ -121,7 +121,7 @@ RESOURCES = resources/resources.qrc \ - RESOURCES = resources/resources.qrc glare/glare.qrc + LIBS += $$QMMPUI_LIB --unix{ -+unix:!haiku{ - isEmpty(LIB_DIR){ - LIB_DIR = /lib - } +-unix { ++unix:!haiku { + target.path = $$LIB_DIR/qmmp/Ui + INSTALLS += target + PKGCONFIG += x11 diff --git a/src/plugins/Ui/skinned/symboldisplay.cpp b/src/plugins/Ui/skinned/symboldisplay.cpp -index 2fd5893..ea6f231 100644 +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) @@ -173,18 +184,35 @@ index e3f6d5e..1150b9a 100644 + !haiku:SUBDIRS += projectm } diff --git a/src/plugins/plugins.pri b/src/plugins/plugins.pri -index 1805bf5..3eae194 100644 +index f56e33e..a9e449c 100644 --- a/src/plugins/plugins.pri +++ b/src/plugins/plugins.pri -@@ -1,5 +1,6 @@ - include(../../qmmp.pri) - unix:PLUGINS_PREFIX=../../../../lib/qmmp - win32:PLUGINS_PREFIX=../../../../../bin/plugins -+haiku:PLUGINS_PREFIX=../../../../plugins - INCLUDEPATH += ../../../qmmp - CONFIG += hide_symbols +@@ -9,7 +9,7 @@ win32 { + QMMPUI_LIB = -lqmmpui0 + } + +-unix { ++unix:!haiku { + isEmpty(LIB_DIR){ + LIB_DIR = /lib + } +@@ -18,6 +18,14 @@ unix { + QMMPUI_LIB = -lqmmpui + } + ++haiku { ++ isEmpty(LIB_DIR){ ++ LIB_DIR = /lib ++ } ++ PLUGINS_PREFIX=../../../../plugins ++ LIBS += -lqmmp ++ QMMPUI_LIB = -lqmmpui ++} + + CONFIG += warn_on plugin lib thread link_pkgconfig hide_symbols + TEMPLATE = lib diff --git a/src/qmmp/qmmp.cpp b/src/qmmp/qmmp.cpp -index 777a290..92323d0 100644 +index 44f404e..9b20982 100644 --- a/src/qmmp/qmmp.cpp +++ b/src/qmmp/qmmp.cpp @@ -56,6 +56,8 @@ const QString Qmmp::configDir() @@ -206,15 +234,17 @@ index 777a290..92323d0 100644 #else QDir dir(qApp->applicationDirPath() + "/../" LIB_DIR "/qmmp"); diff --git a/src/qmmpui/configdialog.cpp b/src/qmmpui/configdialog.cpp -index 894191e..9aefb3a 100644 +index de0e271..a8173f8 100644 --- a/src/qmmpui/configdialog.cpp +++ b/src/qmmpui/configdialog.cpp -@@ -61,6 +61,9 @@ ConfigDialog::ConfigDialog (QWidget *parent) : QDialog (parent) +@@ -56,6 +56,11 @@ ConfigDialog::ConfigDialog (QWidget *parent) : QDialog (parent) m_insert_row = 0; setAttribute(Qt::WA_QuitOnClose, false); setAttribute(Qt::WA_DeleteOnClose, false); +#if defined(Q_OS_HAIKU) ++ hide(); + setWindowModality(Qt::NonModal); ++ show(); +#endif m_ui->preferencesButton->setEnabled(false); m_ui->informationButton->setEnabled(false); @@ -223,10 +253,10 @@ index 894191e..9aefb3a 100644 2.15.0 -From 729994441ffae6ed2cd890069c9b658f7d1b77d0 Mon Sep 17 00:00:00 2001 +From 7a227b91321efe994837f69705594382188c0463 Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> -Date: Wed, 22 Nov 2017 17:12:04 +1000 -Subject: Add MidiaKit output plugin +Date: Tue, 28 Nov 2017 00:46:04 +1000 +Subject: Add mediakit output plugin diff --git a/src/plugins/Output/mediakit/CMakeLists.txt b/src/plugins/Output/mediakit/CMakeLists.txt @@ -691,27 +721,3 @@ index 0000000..f678c61 -- 2.15.0 - -From aaa5c57cb74e8a3bb3284d36e8894799eec9002e Mon Sep 17 00:00:00 2001 -From: Gerasim Troeglazov <3dEyes@gmail.com> -Date: Wed, 22 Nov 2017 18:07:11 +1000 -Subject: Disable ConfigDialog modality - - -diff --git a/src/qmmpui/configdialog.cpp b/src/qmmpui/configdialog.cpp -index 9aefb3a..de9c651 100644 ---- a/src/qmmpui/configdialog.cpp -+++ b/src/qmmpui/configdialog.cpp -@@ -62,7 +62,9 @@ ConfigDialog::ConfigDialog (QWidget *parent) : QDialog (parent) - setAttribute(Qt::WA_QuitOnClose, false); - setAttribute(Qt::WA_DeleteOnClose, false); - #if defined(Q_OS_HAIKU) -+ hide(); - setWindowModality(Qt::NonModal); -+ show(); - #endif - m_ui->preferencesButton->setEnabled(false); - m_ui->informationButton->setEnabled(false); --- -2.15.0 - diff --git a/media-sound/qmmp/qmmp-1.1.12.recipe b/media-sound/qmmp/qmmp-1.2.0.recipe similarity index 71% rename from media-sound/qmmp/qmmp-1.1.12.recipe rename to media-sound/qmmp/qmmp-1.2.0.recipe index ebcd4c877..8e9c36582 100644 --- a/media-sound/qmmp/qmmp-1.1.12.recipe +++ b/media-sound/qmmp/qmmp-1.2.0.recipe @@ -5,8 +5,8 @@ HOMEPAGE="http://qmmp.ylsoftware.com/" COPYRIGHT="2006-2017 Qmmp Development Team" LICENSE="GNU GPL v2" REVISION="1" -SOURCE_URI="http://qmmp.ylsoftware.com/files/qmmp-$portVersion.tar.bz2" -CHECKSUM_SHA256="4601898490167560e189a736ae619f6161cefd12a46252a9f151ec1bf7aac6da" +SOURCE_URI="https://sourceforge.net/projects/qmmp-dev/files/qmmp/qmmp-$portVersion.tar.bz2" +CHECKSUM_SHA256="8020c92e5dd75ed9ab34fd5d1bb524e01f2f361dafd2fe9a3073ae97f5896c9e" ADDITIONAL_FILES="qmmp.rdef.in" PATCHES="qmmp-$portVersion.patchset" ARCHITECTURES="!x86_gcc2 x86 x86_64" @@ -15,9 +15,12 @@ SECONDARY_ARCHITECTURES="x86" PROVIDES=" qmmp$secondaryArchSuffix = $portVersion app:Qmmp$secondaryArchSuffix = $portVersion + lib:libqmmp$secondaryArchSuffix = $portVersion + lib:libqmmpui$secondaryArchSuffix = $portVersion " REQUIRES=" haiku$secondaryArchSuffix + lib:libarchive$secondaryArchSuffix lib:libavcodec$secondaryArchSuffix lib:libavformat$secondaryArchSuffix lib:libavutil$secondaryArchSuffix @@ -42,10 +45,19 @@ REQUIRES=" lib:libvorbis$secondaryArchSuffix lib:libwavpack$secondaryArchSuffix " +PROVIDES_devel=" + qmmp${secondaryArchSuffix}_devel = $portVersion + devel:libqmmp$secondaryArchSuffix = 0.0.0 compat >= 0 + devel:libqmmpui$secondaryArchSuffix = 0.0.0 compat >= 0 + " +REQUIRES_devel=" + qmmp$secondaryArchSuffix == $portVersion base + " BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel - devel:libaudcore$secondaryArchSuffix + devel:libarchive$secondaryArchSuffix devel:libavcodec$secondaryArchSuffix + devel:libavformat$secondaryArchSuffix devel:libenca$secondaryArchSuffix devel:libcurl$secondaryArchSuffix devel:libfaad$secondaryArchSuffix @@ -83,11 +95,24 @@ BUILD() INSTALL() { - mkdir -p $appsDir/Qmmp/lib - cp -rf plugins $appsDir/Qmmp/ - cp -rf lib/*.so* $appsDir/Qmmp/lib - cp -f Qmmp $appsDir/Qmmp/ - + mkdir -p $appsDir/Qmmp + make install INSTALL_ROOT=$appsDir/Qmmp + mv -f $appsDir/Qmmp/bin/Qmmp $appsDir/Qmmp/ + cp -rf plugins $appsDir/Qmmp/plugins + mkdir -p $libDir + mv -f $appsDir/Qmmp/lib/*.so* $libDir + mv -f $appsDir/Qmmp/lib/pkgconfig $libDir + mkdir -p $includeDir + mv -f $appsDir/Qmmp/include/* $includeDir + rm -rf $appsDir/Qmmp/bin \ + $appsDir/Qmmp/include \ + $appsDir/Qmmp/lib \ + $appsDir/Qmmp/share + + fixPkgconfig + prepareInstalledDevelLibs libqmmp libqmmpui + packageEntries devel $developDir + local APP_SIGNATURE="application/x-vnd.qt5-qmmp" local MAJOR="`echo "$portVersion" | cut -d. -f1`" local MIDDLE="`echo "$portVersion" | cut -d. -f2`"