Update musique from 1.7 to 1.9
- Take maintainer
- Zap some tweaks/hacks
OK?
Index: Makefile
===================================================================
RCS file: /cvs/ports/audio/musique/Makefile,v
retrieving revision 1.24
diff -u -p -u -p -r1.24 Makefile
--- Makefile 13 Jun 2020 14:45:28 -0000 1.24
+++ Makefile 22 Aug 2020 12:57:31 -0000
@@ -1,14 +1,14 @@
# $OpenBSD: Makefile,v 1.24 2020/06/13 14:45:28 rsadowski Exp $
COMMENT = graphical music player focused on a clean ui
-V = 1.7
+V = 1.9
DISTNAME = musique-${V}
CATEGORIES = audio
-EXTRACT_SUFX = .tar.bz2
-REVISION = 1
HOMEPAGE = http://flavio.tordini.org/musique/
+MAINTAINER = Rafael Sadowski <[email protected]>
+
# GPLv3
PERMIT_PACKAGE = Yes
@@ -16,12 +16,7 @@ WANTLIB += ${COMPILER_LIBCXX} GL Qt5Core
WANTLIB += Qt5Sql Qt5Widgets c m mpv tag
MASTER_SITES = https://github.com/flaviotordini/musique/releases/download/$V/
-
-# musique-3.1.tar.bz2 is actually gzipped.
-# i would just use GH_* rather than EXTRACT_CASES, but the git tree uses
-# submodules (build fails with missing media.h) so this is easier.
-# https://github.com/flaviotordini/musique/issues/25
-EXTRACT_CASES += musique*.tar.bz2) ${GZIP_CMD} -d <${FULLDISTDIR}/$$archive |
${TAR} xf -;;
+EXTRACT_SUFX = .tar.bz2
MODULES = devel/qmake \
x11/qt5
@@ -41,7 +36,5 @@ 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>
Index: distinfo
===================================================================
RCS file: /cvs/ports/audio/musique/distinfo,v
retrieving revision 1.4
diff -u -p -u -p -r1.4 distinfo
--- distinfo 10 Jun 2020 19:29:53 -0000 1.4
+++ distinfo 22 Aug 2020 12:57:31 -0000
@@ -1,2 +1,2 @@
-SHA256 (musique-1.7.tar.bz2) = TjSnMhWAkJHULdQEd9cFLDP6T2cJE27P/yxGwUHtew0=
-SIZE (musique-1.7.tar.bz2) = 425143
+SHA256 (musique-1.9.tar.bz2) = yRTnaMhAMWWLWpdg60SvnyG8KQl6G1uCYbUFPqG4U6Q=
+SIZE (musique-1.9.tar.bz2) = 475273
Index: patches/patch-src_mainwindow_cpp
===================================================================
RCS file: patches/patch-src_mainwindow_cpp
diff -N patches/patch-src_mainwindow_cpp
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_mainwindow_cpp 22 Aug 2020 12:57:31 -0000
@@ -0,0 +1,17 @@
+$OpenBSD$
+
+https://github.com/flaviotordini/musique/pull/28
+
+Index: src/mainwindow.cpp
+--- src/mainwindow.cpp.orig
++++ src/mainwindow.cpp
+@@ -1310,8 +1310,8 @@ void MainWindow::runFinetune(const QString &filename)
+ return;
+ #endif
+
+-#ifdef APP_EXTRA
+ const QString baseUrl = QLatin1String("https://";) + Constants::ORG_DOMAIN;
++#ifdef APP_EXTRA
+ const QString filesUrl = baseUrl + QLatin1String("/files/");
+ QString url = filesUrl + "finetune/finetune.";
+
