Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package ncmpcpp for openSUSE:Factory checked in at 2024-03-25 21:09:56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ncmpcpp (Old) and /work/SRC/openSUSE:Factory/.ncmpcpp.new.1905 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ncmpcpp" Mon Mar 25 21:09:56 2024 rev:7 rq:1161082 version:0.9.2 Changes: -------- --- /work/SRC/openSUSE:Factory/ncmpcpp/ncmpcpp.changes 2021-09-27 20:09:12.282481701 +0200 +++ /work/SRC/openSUSE:Factory/.ncmpcpp.new.1905/ncmpcpp.changes 2024-03-25 21:15:49.541986456 +0100 @@ -1,0 +2,6 @@ +Thu Mar 21 15:03:06 UTC 2024 - Christophe Marin <christophe@krop.fr> + +- Add upstream change to fix build with taglib 2.0: + * 0001-Fix-compilation-with-taglib-2.0.patch + +------------------------------------------------------------------- New: ---- 0001-Fix-compilation-with-taglib-2.0.patch BETA DEBUG BEGIN: New:- Add upstream change to fix build with taglib 2.0: * 0001-Fix-compilation-with-taglib-2.0.patch BETA DEBUG END: ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ncmpcpp.spec ++++++ --- /var/tmp/diff_new_pack.fVpV5k/_old 2024-03-25 21:15:50.630026406 +0100 +++ /var/tmp/diff_new_pack.fVpV5k/_new 2024-03-25 21:15:50.642026846 +0100 @@ -24,6 +24,8 @@ Group: Productivity/Multimedia/Sound/Players URL: https://rybczak.net/ncmpcpp Source: https://github.com/ncmpcpp/ncmpcpp/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz +# PATCH-FIX-UPSTREAM +Patch0: 0001-Fix-compilation-with-taglib-2.0.patch BuildRequires: autoconf BuildRequires: automake BuildRequires: curl-devel @@ -52,7 +54,7 @@ information fetcher and an alternative user interface. %prep -%autosetup +%autosetup -p1 %build autoreconf -fiv @@ -64,7 +66,7 @@ %install %make_install -rm -rf "%{buildroot}%{_datadir}/doc" +rm -r "%{buildroot}%{_datadir}/doc" %files %license COPYING ++++++ 0001-Fix-compilation-with-taglib-2.0.patch ++++++ From 5015cfd7727ca964d14acfaa694a07926e08a502 Mon Sep 17 00:00:00 2001 From: Andrzej Rybczak <andrzej@rybczak.net> Date: Wed, 7 Feb 2024 14:28:26 +0100 Subject: [PATCH] Fix compilation with taglib 2.0 --- src/tags.cpp | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src/tags.cpp b/src/tags.cpp index a8b34ab..d48ff7f 100644 --- a/src/tags.cpp +++ b/src/tags.cpp @@ -122,12 +122,12 @@ void writeCommonTags(const MPD::MutableSong &s, TagLib::Tag *tag) tag->setArtist(ToWString(s.getArtist())); tag->setAlbum(ToWString(s.getAlbum())); try { - tag->setYear(boost::lexical_cast<TagLib::uint>(s.getDate())); + tag->setYear(boost::lexical_cast<unsigned>(s.getDate())); } catch (boost::bad_lexical_cast &) { std::cerr << "writeCommonTags: couldn't write 'year' tag to '" << s.getURI() << "' as it's not a positive integer\n"; } try { - tag->setTrack(boost::lexical_cast<TagLib::uint>(s.getTrack())); + tag->setTrack(boost::lexical_cast<unsigned>(s.getTrack())); } catch (boost::bad_lexical_cast &) { std::cerr << "writeCommonTags: couldn't write 'track' tag to '" << s.getURI() << "' as it's not a positive integer\n"; } @@ -254,7 +254,7 @@ void read(mpd_song *s) if (f.isNull()) return; - setAttribute(s, "Time", boost::lexical_cast<std::string>(f.audioProperties()->length())); + setAttribute(s, "Time", boost::lexical_cast<std::string>(f.audioProperties()->lengthInSeconds())); if (auto mpeg_file = dynamic_cast<TagLib::MPEG::File *>(f.file())) { @@ -294,7 +294,10 @@ bool write(MPD::MutableSong &s) { writeID3v2Tags(s, mpeg_file->ID3v2Tag(true)); // write id3v2.4 tags only - if (!mpeg_file->save(TagLib::MPEG::File::ID3v2, true, 4, false)) + if (!mpeg_file->save(TagLib::MPEG::File::ID3v2, + TagLib::File::StripOthers, + TagLib::ID3v2::v4, + TagLib::File::DoNotDuplicate)) return false; // do not call generic save() as it will duplicate tags saved = true; -- 2.44.0