Match latest upstream changes

1 files changed, 0 insertions, 26 deletions

diff --git a/020-ncmpcpp-taglib2-fix.patch b/020-ncmpcpp-taglib2-fix.patch
index ba79ed3626a9..7bdc0accbff5 100644
--- a/020-ncmpcpp-taglib2-fix.patch
+++ b/020-ncmpcpp-taglib2-fix.patch
@@ -9,29 +9,3 @@
  			return false;
  	return true;
  }
---- a/src/tags.cpp
-+++ b/src/tags.cpp
-@@ -123,12 +123,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<uint>(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<uint>(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";
- 	}
-@@ -306,7 +306,7 @@ 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::StripTags::StripNone, TagLib::ID3v2::Version::v4, TagLib::File::DuplicateTags::DoNotDuplicate))
- 			return false;
- 		// do not call generic save() as it will duplicate tags
- 		saved = true;