group-base: Unmask unstable media-sound/ncmpcpp

The unstable version contains the fix we were carrying in patches/, so
that one can be removed.

2 files changed, 4 insertions, 58 deletions

diff --git a/group-base/package.accept_keywords/00-group-base b/group-base/package.accept_keywords/00-group-base
index 4f04c3e..20b7e44 100644
--- a/group-base/package.accept_keywords/00-group-base
+++ b/group-base/package.accept_keywords/00-group-base
@@ -9,6 +9,7 @@ app-text/mandoc
 dev-vcs/git
 dev-vcs/mercurial
 mail-client/neomutt
+media-sound/ncmpcpp
 media-video/ffmpeg
 media-video/mpv
 net-misc/youtube-dl
@@ -25,3 +26,6 @@ app-arch/lzlib
 
 # needed for app-text/mandoc
 virtual/man
+
+# needed for dev-vcs/git
+virtual/perl-libnet
diff --git a/group-base/patches/media-sound/ncmpcpp/0001-Stop-using-deprecated-removeField-method.patch b/group-base/patches/media-sound/ncmpcpp/0001-Stop-using-deprecated-removeField-method.patch
deleted file mode 100644
index 56c8f8d..0000000
--- a/group-base/patches/media-sound/ncmpcpp/0001-Stop-using-deprecated-removeField-method.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From 5e54cf2ca3e18de05df82bb0cd00292e8924ce24 Mon Sep 17 00:00:00 2001
-From: Wynn Wolf Arbor <wolf@oriole.systems>
-Date: Sat, 11 Jan 2020 15:30:08 +0100
-Subject: [PATCH] Stop using deprecated removeField method
-
-taglib deprecated removeField internally in [1], but did not add the
-deprecation warning until about four years later. The original bug
-report [2] and pull request commit both mention not wanting to change
-the original method's behaviour, but this was done anyway (perhaps by
-mistake) in [3].
-
-With that change, removeField(type) will not remove all tags of the
-given type anymore, as the default for value has changed from
-String::null to String().
-
-This commit replaces explicit calls to removeField(type) with
-removeFields(type), which has the correct behaviour. In writeXiph,
-removeField is removed entirely, as addField(key, value) will replace
-the tag by default.
-
-[1] https://github.com/taglib/taglib/pull/681
-[2] https://github.com/taglib/taglib/issues/651
-[3] https://github.com/taglib/taglib/commit/c05fa78406fd8ce7382a11c1f63a17c4bfbe83fa
----
- src/tags.cpp | 11 +++++------
- 1 file changed, 5 insertions(+), 6 deletions(-)
-
-diff --git a/src/tags.cpp b/src/tags.cpp
-index 1c771cb..d8823a5 100644
---- a/src/tags.cpp
-+++ b/src/tags.cpp
-@@ -173,18 +173,17 @@ void writeID3v2Tags(const MPD::MutableSong &s, TagLib::ID3v2::Tag *tag)
- void writeXiphComments(const MPD::MutableSong &s, TagLib::Ogg::XiphComment *tag)
- {
- 	auto writeXiph = [&](const TagLib::String &type, const TagLib::StringList &list) {
--		tag->removeField(type);
- 		for (auto it = list.begin(); it != list.end(); ++it)
--			tag->addField(type, *it, false);
-+			tag->addField(type, *it);
- 	};
- 	// remove field previously used as album artist
--	tag->removeField("ALBUM ARTIST");
-+	tag->removeFields("ALBUM ARTIST");
- 	// remove field TRACK, some taggers use it as TRACKNUMBER
--	tag->removeField("TRACK");
-+	tag->removeFields("TRACK");
- 	// remove field DISC, some taggers use it as DISCNUMBER
--	tag->removeField("DISC");
-+	tag->removeFields("DISC");
- 	// remove field DESCRIPTION, it's displayed as COMMENT
--	tag->removeField("DESCRIPTION");
-+	tag->removeFields("DESCRIPTION");
- 	writeXiph("TITLE", tagList(s, &MPD::Song::getTitle));
- 	writeXiph("ARTIST", tagList(s, &MPD::Song::getArtist));
- 	writeXiph("ALBUMARTIST", tagList(s, &MPD::Song::getAlbumArtist));
--- 
-2.24.1
-