From 1829235ab3f3062f5924ece1f531c93a722bde72 Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> Date: Sun, 9 Jan 2022 00:41:50 +1000 Subject: [PATCH] QMMP: bump version --- ...mmp-2.0.2.patchset => qmmp-2.0.3.patchset} | 65 ++----------------- .../{qmmp-2.0.2.recipe => qmmp-2.0.3.recipe} | 4 +- 2 files changed, 7 insertions(+), 62 deletions(-) rename media-sound/qmmp/patches/{qmmp-2.0.2.patchset => qmmp-2.0.3.patchset} (88%) rename media-sound/qmmp/{qmmp-2.0.2.recipe => qmmp-2.0.3.recipe} (97%) diff --git a/media-sound/qmmp/patches/qmmp-2.0.2.patchset b/media-sound/qmmp/patches/qmmp-2.0.3.patchset similarity index 88% rename from media-sound/qmmp/patches/qmmp-2.0.2.patchset rename to media-sound/qmmp/patches/qmmp-2.0.3.patchset index 6fce17343..ba6baaae7 100644 --- a/media-sound/qmmp/patches/qmmp-2.0.2.patchset +++ b/media-sound/qmmp/patches/qmmp-2.0.3.patchset @@ -1,31 +1,9 @@ -From b6f01054a2777ffdf3f7f26394e2b588500e9525 Mon Sep 17 00:00:00 2001 +From bf79cb1967debdfc0b034190b5272be3826754bb Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> -Date: Sun, 7 Nov 2021 23:12:30 +1000 +Date: Sun, 9 Jan 2022 00:21:32 +1000 Subject: Add haiku support -diff --git a/CMakeLists.txt b/CMakeLists.txt -index a55672a..1f0f261 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -62,7 +62,7 @@ set(CMAKE_AUTOMOC ON) - set(CMAKE_AUTORCC ON) - set(CMAKE_AUTOUIC ON) - --ADD_DEFINITIONS(-DQMMP_WS_X11 -DQT_DISABLE_DEPRECATED_BEFORE=0x060100 -DQT_DEPRECATED_WARNINGS) -+ADD_DEFINITIONS(-DQT_DISABLE_DEPRECATED_BEFORE=0x060100 -DQT_DEPRECATED_WARNINGS) - ADD_COMPILE_OPTIONS(-Wall -Wextra) - - find_package(Qt6 6.1.0 CONFIG REQUIRED COMPONENTS Widgets LinguistTools Network) -@@ -248,7 +248,7 @@ PRINT_SUMMARY ("Two-panel File File Dialog ............" USE_TWO_PANEL_DIALOG 1) - - MESSAGE("") - MESSAGE("Advanced:") --PRINT_SUMMARY ("Skinned user interface ................" USE_SKINNED X11_FOUND AND Qt6BuildInternals_FOUND) -+PRINT_SUMMARY ("Skinned user interface ................" USE_SKINNED 1) - PRINT_SUMMARY ("Simple user interface (QSUI) .........." USE_QSUI 1) - PRINT_SUMMARY ("Automatic charset detection ..........." USE_ENCA ENCA_FOUND) - PRINT_SUMMARY ("MPEG plugin with LibRCD support ......." USE_LIBRCD LIBRCD_FOUND) diff --git a/src/plugins/Input/gme/CMakeLists.txt b/src/plugins/Input/gme/CMakeLists.txt index 9fd9cb0..7b1f703 100644 --- a/src/plugins/Input/gme/CMakeLists.txt @@ -500,22 +478,6 @@ index 0000000..f678c61 + + + -diff --git a/src/plugins/Ui/CMakeLists.txt b/src/plugins/Ui/CMakeLists.txt -index 4ca8cbc..7670cdb 100644 ---- a/src/plugins/Ui/CMakeLists.txt -+++ b/src/plugins/Ui/CMakeLists.txt -@@ -1,9 +1,9 @@ - SET(USE_SKINNED TRUE CACHE BOOL "enable/disable skinned user interface") - SET(USE_QSUI TRUE CACHE BOOL "enable/disable simple user interface (qsui)") - --IF(USE_SKINNED AND Qt6BuildInternals_FOUND) -+IF(USE_SKINNED) - add_subdirectory(skinned) --ENDIF(USE_SKINNED AND Qt6BuildInternals_FOUND) -+ENDIF(USE_SKINNED) - - IF(USE_QSUI) - add_subdirectory(qsui) diff --git a/src/plugins/Ui/qsui/CMakeLists.txt b/src/plugins/Ui/qsui/CMakeLists.txt index 133df96..21d15d5 100644 --- a/src/plugins/Ui/qsui/CMakeLists.txt @@ -542,7 +504,7 @@ index a40b99e..b27d5cd 100644 simpleSettings->writeSettings(); confDialog->deleteLater(); diff --git a/src/plugins/Ui/skinned/CMakeLists.txt b/src/plugins/Ui/skinned/CMakeLists.txt -index 8f1d99a..be28299 100644 +index 71e998e..6b65b94 100644 --- a/src/plugins/Ui/skinned/CMakeLists.txt +++ b/src/plugins/Ui/skinned/CMakeLists.txt @@ -1,15 +1,10 @@ @@ -562,23 +524,6 @@ index 8f1d99a..be28299 100644 SET(skinned_SRCS fft.c balancebar.cpp -@@ -79,14 +74,12 @@ SET(skinned_SRCS - include_directories(${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}) - SET(CMAKE_AUTOUIC_SEARCH_PATHS ${CMAKE_AUTOUIC_SEARCH_PATHS} ${CMAKE_CURRENT_SOURCE_DIR}/forms) - --IF(X11_FOUND) - ADD_LIBRARY(skinned MODULE ${skinned_SRCS} ${skinned_UIS_H}) - add_dependencies(skinned libqmmpui libqmmp) - IF(Qt6Widgets_VERSION VERSION_GREATER_EQUAL 6.2.0) -- target_link_libraries(skinned PRIVATE Qt6::Widgets libqmmpui libqmmp ${X11_LDFLAGS}) -+ target_link_libraries(skinned PRIVATE Qt6::Widgets libqmmpui libqmmp) - ELSE() -- target_link_libraries(skinned PRIVATE Qt6::Widgets Qt6::GuiPrivate libqmmpui libqmmp ${X11_LDFLAGS}) -+ target_link_libraries(skinned PRIVATE Qt6::Widgets Qt6::GuiPrivate libqmmpui libqmmp) - ENDIF() - install(TARGETS skinned DESTINATION ${PLUGIN_DIR}/Ui) - 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 3f89d9f..7ba992e 100644 --- a/src/plugins/Ui/skinned/display.cpp @@ -606,12 +551,12 @@ index 94afe4f..4bca5ee 100644 skinnedSettings->writeSettings(); confDialog->deleteLater(); diff --git a/src/plugins/Ui/skinned/skinreader.cpp b/src/plugins/Ui/skinned/skinreader.cpp -index 89dc58c..c667995 100644 +index 75d58d0..b7446ad 100644 --- a/src/plugins/Ui/skinned/skinreader.cpp +++ b/src/plugins/Ui/skinned/skinreader.cpp @@ -50,7 +50,7 @@ void SkinReader::generateThumbs() QDir dir(Qmmp::configDir() + "/skins"); - dir.setFilter( QDir::Files | QDir::Hidden | QDir::NoSymLinks); + dir.setFilter( QDir::Files | QDir::Hidden); QFileInfoList f = dir.entryInfoList(); -#if defined(Q_OS_WIN) && !defined(Q_OS_CYGWIN) +#if (defined(Q_OS_WIN) && !defined(Q_OS_CYGWIN)) || defined(Q_OS_HAIKU) diff --git a/media-sound/qmmp/qmmp-2.0.2.recipe b/media-sound/qmmp/qmmp-2.0.3.recipe similarity index 97% rename from media-sound/qmmp/qmmp-2.0.2.recipe rename to media-sound/qmmp/qmmp-2.0.3.recipe index 5fb0b9254..4ddef6bbd 100644 --- a/media-sound/qmmp/qmmp-2.0.2.recipe +++ b/media-sound/qmmp/qmmp-2.0.3.recipe @@ -2,11 +2,11 @@ SUMMARY="Qt-based audio player with winamp/xmms skins support" DESCRIPTION="This program is an audio-player, written with the help of the Qt library. \ The user interface is similar to winamp or xmms." HOMEPAGE="http://qmmp.ylsoftware.com/" -COPYRIGHT="2006-2021 Qmmp Development Team" +COPYRIGHT="2006-2022 Qmmp Development Team" LICENSE="GNU GPL v2" REVISION="1" SOURCE_URI="https://qmmp.ylsoftware.com/files/qmmp/2.0/qmmp-$portVersion.tar.bz2" -CHECKSUM_SHA256="fc41cf37040f583de8be43d7154d1bd6221fcd445d0fd880e31ec899787f433a" +CHECKSUM_SHA256="a0c22071bedfcc44deb37428faeeecafb095b7a0ce28ade8907adb300453542e" PATCHES="qmmp-$portVersion.patchset" ADDITIONAL_FILES=" qmmp.rdef.in