Copy audio/kid3-kde4 (removed in r488807) as audio/kid3-qt5 and cleanup Makefile.

1 files changed, 28 insertions, 0 deletions

diff --git a/audio/kid3-qt5/files/patch-src_test_testmusicbrainzreleaseimporter.cpp b/audio/kid3-qt5/files/patch-src_test_testmusicbrainzreleaseimporter.cpp
new file mode 100644
index 000000000000..f6fb632dea7e
--- /dev/null
+++ b/audio/kid3-qt5/files/patch-src_test_testmusicbrainzreleaseimporter.cpp
@@ -0,0 +1,28 @@
+Fix test to reflect the current data in the MusicBrainz database.
+
+--- src/test/testmusicbrainzreleaseimporter.cpp.orig	2018-04-18 18:01:00 UTC
++++ src/test/testmusicbrainzreleaseimporter.cpp
+@@ -38,7 +38,7 @@ void TestMusicBrainzReleaseImporter::testQueryAlbums()
+ {
+   queryAlbums(QLatin1String("Wizard"), QLatin1String("Odin"));
+   QStandardItemModel* albumModel = m_importer->getAlbumListModel();
+-  QCOMPARE(albumModel->rowCount(), 3);
++  QCOMPARE(albumModel->rowCount(), 4);
+   AlbumListItem* item = static_cast<AlbumListItem*>(albumModel->item(0, 0));
+   QVERIFY(item);
+   QVERIFY(item->type() == AlbumListItem::Type);
+@@ -53,12 +53,12 @@ void TestMusicBrainzReleaseImporter::testQueryTracks()
+ 
+   QStringList titles;
+   titles << QLatin1String("The Prophecy") << QLatin1String("Betrayer") << QLatin1String("Dead Hope") << QLatin1String("Dark God")
+-         << QLatin1String("Loki's Punishment") << QLatin1String("Beginning of the End") << QLatin1String("Thor's Hammer")
++         << QString::fromUtf8("Loki\u2019s Punishment") << QLatin1String("Beginning of the End") << QString::fromUtf8("Thor\u2019s Hammer")
+          << QLatin1String("Hall of Odin") << QLatin1String("The Powergod") << QLatin1String("March of the Einheriers")
+          << QLatin1String("End of All");
+   QStringList lengths;
+   lengths << QLatin1String("5:19") << QLatin1String("4:53") << QLatin1String("6:02") << QLatin1String("5:42") << QLatin1String("5:08") << QLatin1String("4:01") << QLatin1String("5:01")
+-          << QLatin1String("5:06") << QLatin1String("5:21") << QLatin1String("5:40") << QLatin1String("3:53");
++          << QLatin1String("5:06") << QLatin1String("5:21") << QLatin1String("5:40") << QLatin1String("3:55");
+   QCOMPARE(m_trackDataModel->rowCount(), 11);
+   for (int row = 0; row < 11; ++row) {
+     QCOMPARE(m_trackDataModel->index(row, 0).data().toString(), lengths.at(row));