Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package musique for openSUSE:Factory checked in at 2024-03-20 21:19:12 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/musique (Old) and /work/SRC/openSUSE:Factory/.musique.new.1905 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "musique" Wed Mar 20 21:19:12 2024 rev:3 rq:1159914 version:1.10.1 Changes: -------- --- /work/SRC/openSUSE:Factory/musique/musique.changes 2020-12-01 14:23:07.173614929 +0100 +++ /work/SRC/openSUSE:Factory/.musique.new.1905/musique.changes 2024-03-20 21:22:31.880089909 +0100 @@ -1,0 +2,6 @@ +Wed Mar 20 07:04:50 UTC 2024 - Martin Winter <m...@letsfindaway.de> + +- Compatibility with TagLib 2.0 + * add patch fix-taglib2-compatibility.patch + +------------------------------------------------------------------- New: ---- fix-taglib2-compatibility.patch BETA DEBUG BEGIN: New:- Compatibility with TagLib 2.0 * add patch fix-taglib2-compatibility.patch BETA DEBUG END: ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ musique.spec ++++++ --- /var/tmp/diff_new_pack.6Gxbf0/_old 2024-03-20 21:22:32.312105779 +0100 +++ /var/tmp/diff_new_pack.6Gxbf0/_new 2024-03-20 21:22:32.316105926 +0100 @@ -1,7 +1,7 @@ # # spec file for package musique # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2024 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -24,6 +24,7 @@ Group: Productivity/Multimedia/Sound/Players URL: https://flavio.tordini.org/musique Source: %{name}-%{version}.tar.xz +Patch0: fix-taglib2-compatibility.patch BuildRequires: fdupes BuildRequires: hicolor-icon-theme BuildRequires: libqt5-linguist @@ -52,7 +53,7 @@ %lang_package %prep -%setup -q +%autosetup -p1 %if 0%{?suse_version} < 1500 SOURCE_DATE="$(sed -n '/^----/n;s/ - .*$//;p;q' "%{_sourcedir}/%{name}.changes")" ++++++ fix-taglib2-compatibility.patch ++++++ >From dc111dcc6ba4eadc4f04c4bf0ad8340589b058fd Mon Sep 17 00:00:00 2001 From: letsfindaway <m...@letsfindaway.de> Date: Wed, 20 Mar 2024 07:19:11 +0100 Subject: [PATCH] fix: compatibility with TagLib 2.0 - replace MP4::ItemListMap by TagLib::MP4::ItemMap - replace MP4::Tag::itemListMap() by MP4::Tag::itemMap() - add version requirement for TagLib >= 1.10 in README.md --- src/coverutils.cpp | 2 +- src/mainwindow.cpp | 3 +++ src/tags/mp4utils.h | 4 ++-- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/coverutils.cpp b/src/coverutils.cpp index 9ea7728..9b99f0b 100644 --- a/src/coverutils.cpp +++ b/src/coverutils.cpp @@ -159,7 +159,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/mainwindow.cpp b/src/mainwindow.cpp index 4e4ed27..d1e861e 100644 --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -24,6 +24,9 @@ along with Musique. If not, see <http://www.gnu.org/licenses/>. #include "database.h" #include "iconutils.h" #include "spacer.h" +#include <iostream> + + #if defined(APP_MAC_SEARCHFIELD) && !defined(APP_MAC_QMACTOOLBAR) #include "searchlineedit_mac.h" #else 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())
