From b7acf7a8188dc139b2b038078e5da7450246a687 Mon Sep 17 00:00:00 2001
From: uglyside <uglyside@yandex.ru>
Date: Sat, 28 Dec 2024 22:47:18 +0300
Subject: [PATCH] yarock player new Qt6 upstream.

---
 multimedia/sound/yarock/actions.py | 29 +++++-------
 multimedia/sound/yarock/pspec.xml  | 71 +++++++++++++++---------------
 2 files changed, 46 insertions(+), 54 deletions(-)

diff --git a/multimedia/sound/yarock/actions.py b/multimedia/sound/yarock/actions.py
index 58569e7e82..f74ee70e0b 100644
--- a/multimedia/sound/yarock/actions.py
+++ b/multimedia/sound/yarock/actions.py
@@ -4,29 +4,22 @@
 # Licensed under the GNU General Public License, version 3.
 # See the file https://www.gnu.org/licenses/gpl-3.0.txt
 
-from pisi.actionsapi import cmaketools
-from pisi.actionsapi import shelltools
-from pisi.actionsapi import pisitools
+from pisi.actionsapi import cmaketools, mesontools, pisitools
 
-j = "-DCMAKE_INSTALL_PREFIX=/usr \
-     -DCMAKE_BUILD_TYPE=Release \
-     -DENABLE_PHONON=ON \
-     -DENABLE_MPV=ON \
-     -DENABLE_VLC=OFF \
-    "
+j = ''.join([
+    ' -DCMAKE_INSTALL_PREFIX=/usr',
+    ' -DCMAKE_BUILD_TYPE=RelWithDebInfo',
+    ' -DENABLE_{MPV,VLC}=OFF',
+    ' -Bbuild -G Ninja -L '
+    ])
 
 def setup():
-	shelltools.makedirs("build")
-	shelltools.cd("build")
-	cmaketools.configure(j, sourceDir = '..')
+	cmaketools.configure(j)
 
 def build():
-	shelltools.cd("build")
-	cmaketools.make()
+	mesontools.build()
 
 def install():
-	shelltools.cd("build")
-	cmaketools.install()
-
-	pisitools.dodoc("../CHANGES.md", "../COPYING", "../README.md")
+	mesontools.install()
 
+	pisitools.dodoc("COPYING")
diff --git a/multimedia/sound/yarock/pspec.xml b/multimedia/sound/yarock/pspec.xml
index 608cd2d44b..3f2f08d54f 100644
--- a/multimedia/sound/yarock/pspec.xml
+++ b/multimedia/sound/yarock/pspec.xml
@@ -3,64 +3,63 @@
 <PISI>
 	<Source>
 		<Name>yarock</Name>
-		<Homepage>https://seb-apps.github.io/yarock/</Homepage>
+		<Homepage>https://github.com/sebaro/Yarock</Homepage>
 		<Packager>
-			<Name>Stefan Gronewold</Name>
-			<Email>groni@pisilinux.org</Email>
+			<Name>Pisilinux Community</Name>
+			<Email>admin@pisilinux.org</Email>
 		</Packager>
 		<License>GPLv3</License>
-		<Summary>
-			Qt Modern Music Player with collection browse based on cover art.
-		</Summary>
-		<Description>
-			Yarock is a music player in c++/Qt designed to provide a clean, simple and beautiful music collection based on album coverart.
-		</Description>
-		<Archive sha1sum="a311b55d87fdd547e336a06c4be5e4c6a0039dc7" type="targz">
-			https://launchpadlibrarian.net/416223454/Yarock_1.4.0_Sources.tar.gz
-		</Archive>
+		<Summary>Yarock is a modern looking music player.</Summary>
+		<Description>A modern looking music player, packed with features, that doesn’t depend on any specific desktop environment.</Description>
+		<Archive sha1sum="ca2a5dcbf0226c1b6b5449b9f75984a0e82ed0ed" type="targz">https://github.com/sebaro/Yarock/archive/1.5.0/Yarock-1.5.0.tar.gz</Archive>
 		<BuildDependencies>
 			<Dependency>cmake</Dependency>
-			<Dependency>qt5-sql-odbc</Dependency>
-			<Dependency>qt5-linguist</Dependency>
-			<Dependency>qt5-sql-mysql</Dependency>
-			<Dependency>qt5-sql-sqlite</Dependency>
-			<Dependency>qt5-base-devel</Dependency>
-			<Dependency>qt5-sql-postgresql</Dependency>
-			<Dependency>qt5-x11extras-devel</Dependency>
-			<Dependency>mpv-player-devel</Dependency>
-			<Dependency>qt5-phonon-devel</Dependency>
-			<Dependency>htmlcxx-devel</Dependency>
+			<Dependency>ninja</Dependency>
 			<Dependency>taglib-devel</Dependency>
+			<Dependency>qt6-sql-odbc</Dependency>
+			<Dependency>qt6-linguist</Dependency>
+			<Dependency>htmlcxx-devel</Dependency>
+			<Dependency>qt6-sql-mysql</Dependency>
+			<Dependency>qt6-base-devel</Dependency>
+			<Dependency>qt6-sql-sqlite</Dependency>
+			<Dependency>qt6-phonon-devel</Dependency>
+			<Dependency>qt6-sql-postgresql</Dependency>
+			<Dependency>qt6-multimedia-devel</Dependency>
 		</BuildDependencies>
 		<Patches>
-			<!-- <Patch level="1">phonon.patch</Patch> -->
+			<!-- <Patch level="1"></Patch> -->
 		</Patches>
 	</Source>
 
 	<Package>
 		<Name>yarock</Name>
 		<RuntimeDependencies>
-			<Dependency>qt5-linguist</Dependency>
-			<Dependency>qt5-base</Dependency>
-			<Dependency>qt5-x11extras</Dependency>
-			<Dependency>mpv-player</Dependency>
-			<Dependency>qt5-phonon</Dependency>
-			<Dependency>htmlcxx</Dependency>
 			<Dependency>taglib</Dependency>
+			<Dependency>htmlcxx</Dependency>
+			<Dependency>qt6-base</Dependency>
+			<Dependency>qt6-phonon</Dependency>
+			<Dependency>qt6-sql-odbc</Dependency>
+			<Dependency>qt6-sql-mysql</Dependency>
+			<Dependency>qt6-sql-sqlite</Dependency>
+			<Dependency>qt6-multimedia</Dependency>
+			<Dependency>qt6-sql-postgresql</Dependency>
 		</RuntimeDependencies>
 		<Files>
 			<Path fileType="executable">/usr/bin</Path>
-			<Path fileType="library">/usr/lib/yarock</Path>
-			<Path fileType="data">/usr/share/appdata</Path>
-			<Path fileType="data">/usr/share/applications</Path>
-			<Path fileType="data">/usr/share/icons</Path>
-			<Path fileType="data">/usr/share/pixmaps</Path>
-			<Path fileType="data">/usr/share/yarock/translations</Path>
-			<Path fileType="doc">/usr/share/doc/yarock</Path>
+			<Path fileType="library">/usr/lib</Path>
+			<Path fileType="data">/usr/share</Path>
+			<Path fileType="doc">/usr/share/doc</Path>
 		</Files>
 	</Package>
 
 	<History>
+		<Update release="6">
+			<Date>2024-12-28</Date>
+			<Version>1.5.0</Version>
+			<Comment>New upstream.</Comment>
+			<Name>Pisilinux Community</Name>
+			<Email>admin@pisilinux.org</Email>
+		</Update>
 		<Update release="5">
 			<Date>2020-09-17</Date>
 			<Version>1.4.0</Version>