Date: Tue, 25 Nov 2025 17:02:09 +0000 From: Yuri Victorovich <yuri@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: c779ac454355 - main - multimedia/musique: Change to Qt6 Message-ID: <6925e111.824d.1dc64a90@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch main has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=c779ac4543553fd89af96f50b4073a957c604b2c commit c779ac4543553fd89af96f50b4073a957c604b2c Author: Yuri Victorovich <yuri@FreeBSD.org> AuthorDate: 2025-11-25 16:42:26 +0000 Commit: Yuri Victorovich <yuri@FreeBSD.org> CommitDate: 2025-11-25 17:02:00 +0000 multimedia/musique: Change to Qt6 --- multimedia/musique/Makefile | 11 +++++------ multimedia/musique/files/patch-src_coverutils.cpp | 4 ++-- multimedia/musique/files/patch-src_mainwindow.cpp | 18 ++++++------------ 3 files changed, 13 insertions(+), 20 deletions(-) diff --git a/multimedia/musique/Makefile b/multimedia/musique/Makefile index 08db899fd2d0..1818de6f08a5 100644 --- a/multimedia/musique/Makefile +++ b/multimedia/musique/Makefile @@ -1,11 +1,12 @@ 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 @@ -13,7 +14,7 @@ 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= \ @@ -26,7 +27,7 @@ GH_TUPLE= \ 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} @@ -36,8 +37,6 @@ 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 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 @@ -3,9 +3,9 @@ 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<TagLib::MP4::Tag *>(f.tag()); if (!tag) return false; 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 <iostream> -+ + #if defined(APP_MAC_SEARCHFIELD) && !defined(APP_MAC_QMACTOOLBAR) - SearchWrapper *searchWrapper = new SearchWrapper(this); - toolbarSearch = searchWrapper->getSearchLineEdit(); + #include "searchlineedit_mac.h" + #elsehome | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?6925e111.824d.1dc64a90>