gentoo auto-resync : 28:12:2024 - 06:30:54

3 files changed, 99 insertions, 0 deletions

diff --git a/media-sound/musique/Manifest b/media-sound/musique/Manifest
index 356cf647689f..ddc6cfa727d0 100644
--- a/media-sound/musique/Manifest
+++ b/media-sound/musique/Manifest
@@ -1,4 +1,6 @@
+AUX musique-1.5-fix-build-taglib2.patch 1650 BLAKE2B 05c89b228716f647aaf15368ec9771b739180b0d9bd517099a88fc66f0d072dba424adad84677751d9495f7c70cab8f755c3c2fc79b462618442ca99cde06a38 SHA512 e01bd88185efc6a254a380b0f4536cf6684e414eb632c1f57196df5baf45b9d54c0cda16dfbdd23ad5fdafc9cddfe5247a7ad091c3b031570eae9ea59a18dae2
 AUX musique-1.5-unbundle-qtsingleapplication.patch 273 BLAKE2B f2150b1d54201e8d7bd64675dfc5a73a1c74abcea9c34d45f52f4d414f56c6b26d97a8c12f1d4823b5272fa32ea866b6c1d1c8052f8304a46823504203a207ed SHA512 d51389a43c5045c453aa516da4da6d50e2d7fb2b064e40df5cd3ff50469a414bf0ec4d44c716be8b83b8bbf1944f72474b3b917dfcd661eef25c2b7298440641
 DIST musique-1.5.tar.gz 377072 BLAKE2B 839b6096bd70171f807cd4177c2374f20089e1a8f22e59fb76d251c743cb3b9b8c86eb81131d15c6291bae1020df7380ae007689a23b67529978de9ee08ed1c2 SHA512 ea4ba84e6b1a69acf054c8ca001afcf3f0e9b17f3557209da649662b2940777babac454a5d4fa0a210e2e15c58bcf4cdfc8757f92b677d46217e3400fcbdc12e
 EBUILD musique-1.5-r1.ebuild 945 BLAKE2B 710190ee9a542204f61574a536ed74472e3579b8eb7cfcd2c30140623a609b94b155857f823eeed68b794e989596cb039425c5549ac2fa54fe7585af34bd9a4a SHA512 d4a46a77dc4d5645fb3d7320798d731b48f59a1c839e5d93fd4b994518de2a4ffafe19249c4a6025121d387d5c8f66467713f86489013c006d54a31523368312
+EBUILD musique-1.5-r2.ebuild 1037 BLAKE2B 6a23e01ae72e5b9232ddce78f187ae6a0769f0aba04d9e2269a3cf3433a7a2c26d5a56d564cbd0aba8d17e0044294ab447485664d942dce45b2850cf754b1cfe SHA512 2350e53f77a100b612d3e5b4b08ddae61df8f36f0d2380c39886b601484411d13c1bd9fee6712533b89ed8adf1dad601e61e9464dca14a478538cc5542b4d3be
 MISC metadata.xml 254 BLAKE2B dfb1aa113c3ec296cc09365965f6524f666dfcd4da1c88679a1c80c180e4d4b7ab1e189fabdae99a2b2cbb4f2d334f9aaee8be37ca1ac348a51dd915caa6db04 SHA512 ae47624a212dd9b5fca6b25c26fa565f033c4c71d49d2046274f6afd3c19e93e0dff2912512a00cc543dcab7edf481c733239c92738da99013cd29a5245a53c6
diff --git a/media-sound/musique/files/musique-1.5-fix-build-taglib2.patch b/media-sound/musique/files/musique-1.5-fix-build-taglib2.patch
new file mode 100644
index 000000000000..039f06c925e0
--- /dev/null
+++ b/media-sound/musique/files/musique-1.5-fix-build-taglib2.patch
@@ -0,0 +1,40 @@
+https://github.com/flaviotordini/musique/commit/7277d40defe9cde40f947a81d624195ddf683f44.patch
+
+- replace MP4::ItemListMap by TagLib::MP4::ItemMap
+- replace MP4::Tag::itemListMap() by MP4::Tag::itemMap()
+
+diff --git a/src/coverutils.cpp b/src/coverutils.cpp
+index ae89330..4ba717e 100644
+--- a/src/coverutils.cpp
++++ b/src/coverutils.cpp
+@@ -158,7 +158,7 @@ bool CoverUtils::coverFromMP4(const QString &filename, Album *album) {
+     TagLib::MP4::Tag *tag = static_cast<TagLib::MP4::Tag *>(f.tag());
+     if (!tag) return false;
+ 
+-    TagLib::MP4::ItemListMap itemsListMap = tag->itemListMap();
++    TagLib::MP4::ItemMap itemsListMap = tag->itemMap();
+     TagLib::MP4::Item coverItem = itemsListMap["covr"];
+     TagLib::MP4::CoverArtList coverArtList = coverItem.toCoverArtList();
+     TagLib::MP4::CoverArt coverArt = coverArtList.front();
+diff --git a/src/tags/mp4utils.h b/src/tags/mp4utils.h
+index 138c5b5..6b4bcef 100644
+--- a/src/tags/mp4utils.h
++++ b/src/tags/mp4utils.h
+@@ -9,7 +9,7 @@
+ namespace Mp4Utils {
+ 
+ void load(TagLib::MP4::Tag *tag, Tags *tags) {
+-    const TagLib::MP4::ItemListMap &map = tag->itemListMap();
++    const TagLib::MP4::ItemMap &map = tag->itemMap();
+ 
+     if (map.contains("trkn")) {
+         TagLib::MP4::Item::IntPair intPair = map["trkn"].toIntPair();
+@@ -31,7 +31,7 @@ void load(TagLib::MP4::Tag *tag, Tags *tags) {
+         tags->setComposerSort(v);
+     }
+ 
+-    TagLib::MP4::ItemListMap::ConstIterator it = map.find("aART");
++    TagLib::MP4::ItemMap::ConstIterator it = map.find("aART");
+     if (it != map.end()) {
+         TagLib::StringList sl = it->second.toStringList();
+         if (!sl.isEmpty())
diff --git a/media-sound/musique/musique-1.5-r2.ebuild b/media-sound/musique/musique-1.5-r2.ebuild
new file mode 100644
index 000000000000..820d66e665bf
--- /dev/null
+++ b/media-sound/musique/musique-1.5-r2.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit qmake-utils xdg-utils
+
+DESCRIPTION="Qt music player"
+HOMEPAGE="https://flavio.tordini.org/musique"
+SRC_URI="https://github.com/flaviotordini/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtdbus:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtsingleapplication[qt5(+),X]
+	dev-qt/qtsql:5[sqlite]
+	dev-qt/qtwidgets:5
+	>=media-libs/phonon-4.12.0[qt5(-)]
+	media-libs/taglib:=
+"
+DEPEND="${RDEPEND}"
+BDEPEND="dev-qt/linguist-tools:5"
+
+DOCS=( CHANGES TODO )
+
+PATCHES=(
+	"${FILESDIR}/${P}-unbundle-qtsingleapplication.patch"
+	"${FILESDIR}/${P}-fix-build-taglib2.patch"
+)
+
+src_prepare() {
+	rm -r src/qtsingleapplication || die
+	default
+}
+
+src_configure() {
+	eqmake5 ${PN}.pro PREFIX="/usr"
+}
+
+src_install() {
+	emake INSTALL_ROOT="${D}" install
+	einstalldocs
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}