Update musique to 1.7 - Switch to qt5 - Self hosted tarball, see: https://github.com/flaviotordini/musique/issues/25 - Remove patches. I see no icon issues outside of a Desktop env.
Tested on amd64. Play music, download album pictures, adjust volume, everything works. OK? diff --git a/audio/musique/Makefile b/audio/musique/Makefile index 814bb61260d..698a925d77f 100644 --- a/audio/musique/Makefile +++ b/audio/musique/Makefile @@ -1,30 +1,31 @@ # $OpenBSD: Makefile,v 1.21 2019/07/12 20:43:37 sthen Exp $ COMMENT = graphical music player focused on a clean ui -DISTNAME = musique-1.4 +DISTNAME = musique-1.7 CATEGORIES = audio -REVISION = 7 HOMEPAGE = http://flavio.tordini.org/musique/ # GPLv3 PERMIT_PACKAGE = Yes -MASTER_SITES = http://flavio.tordini.org/files/musique/ +WANTLIB += ${COMPILER_LIBCXX} GL Qt5Core Qt5DBus Qt5Gui Qt5Network +WANTLIB += Qt5Sql Qt5Widgets c m tag -WANTLIB += ICE QtDBus QtGui QtNetwork QtSql QtXml SM -WANTLIB += X11 Xext Xi Xinerama Xrender c fontconfig -WANTLIB += freetype m phonon pthread ${COMPILER_LIBCXX} tag +# https://github.com/flaviotordini/musique/issues/25 +MASTER_SITES = https://www.sizeofvoid.org/pub/OpenBSD/distfiles/ -COMPILER = base-clang ports-gcc base-gcc - -MODULES = devel/qmake x11/qt4 +MODULES = devel/qmake \ + x11/qt5 LIB_DEPENDS = audio/taglib +BUILD_DEPENDS = multimedia/qtav + RUN_DEPENDS = devel/desktop-file-utils \ - multimedia/gstreamer-0.10/plugins-good \ multimedia/gstreamer-0.10/plugins-ffmpeg \ + multimedia/gstreamer-0.10/plugins-good \ + multimedia/qtav \ x11/gtk+3,-guic WRKDIST = ${WRKDIR}/musique @@ -32,5 +33,7 @@ NO_TEST = Yes pre-configure: perl -pi -e 's,/usr/include,${LOCALBASE}/include,' ${WRKSRC}/musique.pro + perl -pi -e 's,imagedownloader.h,../imagedownloader.h,' \ + ${WRKSRC}/src/model/artist.cpp .include <bsd.port.mk> diff --git a/audio/musique/distinfo b/audio/musique/distinfo index 34e59391e91..85f01753ac6 100644 --- a/audio/musique/distinfo +++ b/audio/musique/distinfo @@ -1,2 +1,2 @@ -SHA256 (musique-1.4.tar.gz) = CN+0IBqg7cSz/k73eI5hj3VMOSHzp8HNzkDvOZl2BnA= -SIZE (musique-1.4.tar.gz) = 390031 +SHA256 (musique-1.7.tar.gz) = SQhlQyz9Y7QCoEppjJIbw+cQd+44CrCit1qUofEe//A= +SIZE (musique-1.7.tar.gz) = 2493157 diff --git a/audio/musique/patches/patch-src_iconutils_cpp b/audio/musique/patches/patch-src_iconutils_cpp deleted file mode 100644 index b393d17cc03..00000000000 --- a/audio/musique/patches/patch-src_iconutils_cpp +++ /dev/null @@ -1,25 +0,0 @@ -$OpenBSD: patch-src_iconutils_cpp,v 1.1 2014/12/01 14:35:59 dcoppa Exp $ - -Use the Adwaita icon theme unconditionally: fixes a problem with -minitube GUI not having icons when executed outside of a Desktop -Environment - -Do not use symbolic icons - ---- src/iconutils.cpp.orig Mon Dec 1 05:23:52 2014 -+++ src/iconutils.cpp Mon Dec 1 05:25:00 2014 -@@ -21,12 +21,8 @@ $END_LICENSE */ - #include "iconutils.h" - - QIcon IconUtils::fromTheme(const QString &name) { -- const QLatin1String symbolic("-symbolic"); -- if (name.endsWith(symbolic)) return QIcon::fromTheme(name); -- QIcon icon; -- icon = QIcon::fromTheme(name + symbolic); -- if (icon.isNull()) return QIcon::fromTheme(name); -- return icon; -+ QIcon::setThemeName("Adwaita"); -+ return QIcon::fromTheme(name); - } - - QIcon IconUtils::fromResources(const QString &name) { diff --git a/audio/musique/patches/patch-src_mainwindow_cpp b/audio/musique/patches/patch-src_mainwindow_cpp deleted file mode 100644 index 9771385de8f..00000000000 --- a/audio/musique/patches/patch-src_mainwindow_cpp +++ /dev/null @@ -1,15 +0,0 @@ -$OpenBSD: patch-src_mainwindow_cpp,v 1.2 2014/12/01 14:35:59 dcoppa Exp $ - -Fix "Info" icon - ---- src/mainwindow.cpp.orig Mon Dec 1 05:25:29 2014 -+++ src/mainwindow.cpp Mon Dec 1 05:26:10 2014 -@@ -192,7 +192,7 @@ void MainWindow::createActions() { - actions->insert("back", backAct); - connect(backAct, SIGNAL(triggered()), SLOT(goBack())); - -- QIcon icon = IconUtils::icon(QStringList() << "audio-headphones" << "gtk-info" << "help-about"); -+ QIcon icon = IconUtils::icon("help-about"); - contextualAct = new QAction(icon, tr("&Info"), this); - contextualAct->setStatusTip(tr("Show information about the current track")); - contextualAct->setShortcut(QKeySequence(Qt::CTRL + Qt::Key_I)); diff --git a/audio/musique/pkg/PLIST b/audio/musique/pkg/PLIST index 893c4194d8f..23fe636de44 100644 --- a/audio/musique/pkg/PLIST +++ b/audio/musique/pkg/PLIST @@ -15,6 +15,7 @@ share/musique/locale/ share/musique/locale/ast.qm share/musique/locale/be.qm share/musique/locale/bg.qm +share/musique/locale/br.qm share/musique/locale/ca.qm share/musique/locale/ca_ES.qm share/musique/locale/cs_CZ.qm @@ -33,7 +34,9 @@ share/musique/locale/gl.qm share/musique/locale/hu_HU.qm share/musique/locale/ia.qm share/musique/locale/it.qm +share/musique/locale/ko.qm share/musique/locale/ky.qm +share/musique/locale/lt_LT.qm share/musique/locale/ms_MY.qm share/musique/locale/nb.qm share/musique/locale/nl.qm @@ -45,7 +48,6 @@ share/musique/locale/ru.qm share/musique/locale/sk.qm share/musique/locale/sr.qm share/musique/locale/tr.qm -share/musique/locale/tt.qm share/musique/locale/uk.qm share/musique/locale/vi.qm share/musique/locale/zh_CN.qm
