diff --git a/multimedia/musique/Makefile b/multimedia/musique/Makefile index 08db899fd2d0..1818de6f08a5 100644 --- a/multimedia/musique/Makefile +++ b/multimedia/musique/Makefile @@ -1,44 +1,43 @@ PORTNAME= musique DISTVERSION= 1.11 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= multimedia MAINTAINER= yuri@FreeBSD.org COMMENT= Music player built for speed, simplicity and style -WWW= https://flavio.tordini.org/musique +WWW= https://flavio.tordini.org/musique \ + https://github.com/flaviotordini/musique LICENSE= GPLv3+ LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libmpv.so:multimedia/mpv \ libtag.so:audio/taglib -USES= compiler:c++11-lang desktop-file-utils gl pkgconfig qmake qt:5 +USES= compiler:c++11-lang desktop-file-utils gl pkgconfig qmake qt:6 USE_GITHUB= yes GH_ACCOUNT= flaviotordini GH_TUPLE= \ flaviotordini:http:39bfc6bb149d0b5a49ab966c824906e0523d161c:flaviotordini_http/lib/http \ flaviotordini:idle:6aa092da64a011e445bf31cf31c0cd8dda4c64ff:flaviotordini_idle/lib/idle \ flaviotordini:media:5443f81c52ac008a6de6593124d03ee41f772633:flaviotordini_media/lib/media \ flaviotordini:updater:bbbf833531cd80bbd8a190fa1ae98a1f068c8d16:flaviotordini_updater/lib/updater \ flaviotordini:js:deed5303b0b6a587c62be73a9bc198058964111c:flaviotordini_js/lib/js \ flaviotordini:sharedcache:eec981a4285c7b371aa9dc7f0074f03794e86a26:flaviotordini_sharedcache/lib/sharedcache \ itay-grudev:SingleApplication:14e9d14675156d3b55473a3b085de0e2a9f75578:itay_grudev_SingleApplication/lib/singleapplication USE_GL= gl -USE_QT= core dbus declarative gui network sql widgets buildtools:build +USE_QT= base declarative tools:build QMAKE_ARGS= QMAKE_LRELEASE=${LRELEASE} CXXFLAGS+= `pkg-config --cflags taglib` OPTIONS_DEFINE= NLS OPTIONS_DEFAULT= NLS OPTIONS_SUB= yes -NLS_USE= QT=linguisttools:build - post-patch-NLS-off: @${REINPLACE_CMD} -e '/include(locale\/locale.pri)/d' ${WRKSRC}/${PORTNAME}.pro .include diff --git a/multimedia/musique/files/patch-src_coverutils.cpp b/multimedia/musique/files/patch-src_coverutils.cpp index 1f74650156b8..3f8b594cdb2b 100644 --- a/multimedia/musique/files/patch-src_coverutils.cpp +++ b/multimedia/musique/files/patch-src_coverutils.cpp @@ -1,16 +1,16 @@ Fix build with Taglib 2.x Obtained from: https://github.com/flaviotordini/musique/commit/7277d40defe9cde40f947a81d624195ddf683f44 ---- src/coverutils.cpp.orig 2023-06-24 18:44:28 UTC +--- src/coverutils.cpp.orig 2023-11-24 00:47:47 UTC +++ src/coverutils.cpp -@@ -159,7 +159,7 @@ bool CoverUtils::coverFromMP4(const QString &filename, +@@ -158,7 +158,7 @@ bool CoverUtils::coverFromMP4(const QString &filename, TagLib::MP4::Tag *tag = static_cast(f.tag()); if (!tag) return false; - TagLib::MP4::ItemListMap itemsListMap = tag->itemListMap(); + TagLib::MP4::ItemMap itemsListMap = tag->itemMap(); TagLib::MP4::Item coverItem = itemsListMap["covr"]; TagLib::MP4::CoverArtList coverArtList = coverItem.toCoverArtList(); TagLib::MP4::CoverArt coverArt = coverArtList.front(); diff --git a/multimedia/musique/files/patch-src_mainwindow.cpp b/multimedia/musique/files/patch-src_mainwindow.cpp index c1410a1a6c5a..b1e8fb462855 100644 --- a/multimedia/musique/files/patch-src_mainwindow.cpp +++ b/multimedia/musique/files/patch-src_mainwindow.cpp @@ -1,17 +1,11 @@ -Fix build with Taglib 2.x - -Obtained from: -https://github.com/flaviotordini/musique/commit/7277d40defe9cde40f947a81d624195ddf683f44 - ---- src/mainwindow.cpp.orig 2023-06-24 18:44:28 UTC +--- src/mainwindow.cpp.orig 2025-11-25 16:33:26 UTC +++ src/mainwindow.cpp -@@ -575,6 +575,9 @@ void MainWindow::createToolBar() { - volumeSlider = new SeekSlider(this); - volumeSlider->setValue(volumeSlider->maximum()); +@@ -46,6 +46,8 @@ $END_LICENSE */ + #include "view.h" + #include "zoomableui.h" +#include -+ + #if defined(APP_MAC_SEARCHFIELD) && !defined(APP_MAC_QMACTOOLBAR) - SearchWrapper *searchWrapper = new SearchWrapper(this); - toolbarSearch = searchWrapper->getSearchLineEdit(); + #include "searchlineedit_mac.h" + #else