summaryrefslogtreecommitdiff
path: root/audio/cantata
diff options
context:
space:
mode:
authormef <mef@pkgsrc.org>2020-11-29 01:40:56 +0000
committermef <mef@pkgsrc.org>2020-11-29 01:40:56 +0000
commitc4d7dae336035bb741c285d6d98b99201fcc86fb (patch)
tree0e5558cdc1326973e64b6397212cb29d5adc2887 /audio/cantata
parent15cc2b3ae5983569ff3492f78fc10b2ee5ea4a2c (diff)
downloadpkgsrc-c4d7dae336035bb741c285d6d98b99201fcc86fb.tar.gz
(audio/cantata) distfile seems changed with the same name, set DIST_SUBDIR
Diffstat (limited to 'audio/cantata')
-rw-r--r--audio/cantata/Makefile3
-rw-r--r--audio/cantata/distinfo10
-rw-r--r--audio/cantata/patches/patch-playlists_dynamicplaylists.cpp17
3 files changed, 7 insertions, 23 deletions
diff --git a/audio/cantata/Makefile b/audio/cantata/Makefile
index 6512a56e757..021c56985dd 100644
--- a/audio/cantata/Makefile
+++ b/audio/cantata/Makefile
@@ -1,10 +1,11 @@
-# $NetBSD: Makefile,v 1.18 2020/11/25 21:34:57 nia Exp $
+# $NetBSD: Makefile,v 1.19 2020/11/29 01:40:56 mef Exp $
DISTNAME= cantata-2.4.2
CATEGORIES= audio
MASTER_SITES= ${MASTER_SITE_GITHUB:=CDrummond/}
GITHUB_RELEASE= v${PKGVERSION_NOREV}
EXTRACT_SUFX= .tar.bz2
+DIST_SUBDIR= cantata-2.4.2
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= https://github.com/CDrummond/cantata
diff --git a/audio/cantata/distinfo b/audio/cantata/distinfo
index b448dc4f44a..49978233639 100644
--- a/audio/cantata/distinfo
+++ b/audio/cantata/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.5 2020/11/25 20:59:37 wiz Exp $
+$NetBSD: distinfo,v 1.6 2020/11/29 01:40:56 mef Exp $
-SHA1 (cantata-2.4.2.tar.bz2) = 98e1fc8b5ac20ed9e2a243ec120dec151aff45a3
-RMD160 (cantata-2.4.2.tar.bz2) = 323a2ebe0e332ecd752eda2afbf064d8abcdc157
-SHA512 (cantata-2.4.2.tar.bz2) = e0164082e2effe85807e8779a0d44d1634de12e5f9b9d907ccb225184177a1fadeacda66ebeeeffcf16f795cd975cbd5b0f1620677470b4262d1e03e6db0b176
-Size (cantata-2.4.2.tar.bz2) = 2498195 bytes
+SHA1 (cantata-2.4.2/cantata-2.4.2.tar.bz2) = 1fc0fd90b5f7fb2e23fa17f83567b2bc382e5860
+RMD160 (cantata-2.4.2/cantata-2.4.2.tar.bz2) = 41b9e8df749df18d1b2d4fb3af0f0b2dedf31b37
+SHA512 (cantata-2.4.2/cantata-2.4.2.tar.bz2) = c2459a53d86e12df7e6a8f7c19880f1c353c13893401a0906ec730c34ccbf1ef070c226b55c4e772e9a54a94e7cf3a2f96b0e9223ff20057045c888c4f91d87b
+Size (cantata-2.4.2/cantata-2.4.2.tar.bz2) = 2498460 bytes
SHA1 (patch-CMakeLists.txt) = 44a81fa0361ea4d1cb52b1701e296a8eb3aaec61
SHA1 (patch-playlists_dynamicplaylists.cpp) = 4b2767658696d7d9d3f1a838310ca36fd3b554b9
diff --git a/audio/cantata/patches/patch-playlists_dynamicplaylists.cpp b/audio/cantata/patches/patch-playlists_dynamicplaylists.cpp
deleted file mode 100644
index d62db3b05c4..00000000000
--- a/audio/cantata/patches/patch-playlists_dynamicplaylists.cpp
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-playlists_dynamicplaylists.cpp,v 1.1 2020/11/25 20:59:37 wiz Exp $
-
-Add missing semicolon.
-
---- playlists/dynamicplaylists.cpp.orig 2020-08-23 10:14:57.000000000 +0000
-+++ playlists/dynamicplaylists.cpp
-@@ -361,8 +361,8 @@ int DynamicPlaylists::getPid() const
- }
-
- static QString helperScript() {
-- QString script = QLatin1String("cantata-dynamic")
-- QString local = fixPath(QCoreApplication::applicationDirPath())+script;
-+ QString script = QLatin1String("cantata-dynamic");
-+ QString local = Utils::fixPath(QCoreApplication::applicationDirPath())+script;
- if (QFile::exists(local)) {
- return local;
- }