audio/kid3-*: Update to 3.8.4

6 files changed, 21 insertions, 65 deletions

diff --git a/audio/kid3-qt5/Makefile b/audio/kid3-qt5/Makefile
index b0f9417ca157..782268948e81 100644
--- a/audio/kid3-qt5/Makefile
+++ b/audio/kid3-qt5/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	kid3
-PORTVERSION=	3.8.3
+PORTVERSION=	3.8.4
 PORTREVISION?=	0
 CATEGORIES=	audio kde
 MASTER_SITES=	SF
@@ -38,8 +38,9 @@ KID3_APPS+=	QT
 .else
 # KF5
 USES+=		kde:5
-USE_KDE+=	auth codecs config configwidgets coreaddons \
-		widgetsaddons xmlgui doctools_build ecm_build
+USE_KDE+=	auth codecs config configwidgets coreaddons kio \
+		service widgetsaddons xmlgui doctools_build ecm_build
+USE_QT+=	concurrent
 PLIST_SUB+=	KF5="" QT="@comment " QT_SUFX=""
 KID3_APPS+=	KDE
 .endif
diff --git a/audio/kid3-qt5/distinfo b/audio/kid3-qt5/distinfo
index fb69223f596d..b4034a6ab0da 100644
--- a/audio/kid3-qt5/distinfo
+++ b/audio/kid3-qt5/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1593542051
-SHA256 (kid3-3.8.3.tar.gz) = 6a1aa06d2f225f6d8a139cfd3c3d382f82170fa17196517690d28caaeb220c44
-SIZE (kid3-3.8.3.tar.gz) = 3091795
+TIMESTAMP = 1602373492
+SHA256 (kid3-3.8.4.tar.gz) = 598b843aa32ed9530ebfa9a45424579e622714447f0d67cf36a62e693277bc07
+SIZE (kid3-3.8.4.tar.gz) = 3161673
diff --git a/audio/kid3-qt5/files/patch-src_app_kde_kdemainwindow.cpp b/audio/kid3-qt5/files/patch-src_app_kde_kdemainwindow.cpp
index a19dff896338..9b94f77796b2 100644
--- a/audio/kid3-qt5/files/patch-src_app_kde_kdemainwindow.cpp
+++ b/audio/kid3-qt5/files/patch-src_app_kde_kdemainwindow.cpp
@@ -5,9 +5,9 @@ Shortcut for action  "reload" "Re&load" set with QAction::setShortcut()! Use KAc
 Shortcut for action  "filelist_rename" "&Rename" set with QAction::setShortcut()! Use KActionCollection::setDefaultShortcut(s) instead.
 Shortcut for action  "filelist_delete" "&Move to Trash" set with QAction::setShortcut()! Use KActionCollection::setDefaultShortcut(s) instead.
 
---- src/app/kde/kdemainwindow.cpp.orig	2020-05-09 12:12:37 UTC
+--- src/app/kde/kdemainwindow.cpp.orig	2020-09-25 07:02:19 UTC
 +++ src/app/kde/kdemainwindow.cpp
-@@ -189,7 +189,7 @@ void KdeMainWindow::initActions()
+@@ -190,7 +190,7 @@ void KdeMainWindow::initActions()
    action = new QAction(QIcon::fromTheme(QLatin1String("document-open")),
                         tr("O&pen Folder..."), this);
    action->setStatusTip(tr("Opens a folder"));
@@ -16,16 +16,16 @@ Shortcut for action  "filelist_delete" "&Move to Trash" set with QAction::setSho
    collection->addAction(QLatin1String("open_directory"), action);
    connect(action, &QAction::triggered,
            impl(), &BaseMainWindowImpl::slotFileOpenDirectory);
-@@ -197,7 +197,7 @@ void KdeMainWindow::initActions()
-   action = new QAction(QIcon::fromTheme(QLatin1String("view-refresh")),
-                        tr("Re&load"), this);
-   action->setStatusTip(tr("Reload folder"));
--  action->setShortcut(QKeySequence::Refresh);
-+  collection->setDefaultShortcut(action, QKeySequence::Refresh);
+@@ -203,7 +203,7 @@ void KdeMainWindow::initActions()
+   // Avoid this by assigning Qt::Key_F5 instead of QKeySequence::Refresh.
+   // The section "Standard Shortcuts" in the QKeySequence documentation lists
+   // F5 as a key for "Refresh" on all platforms.
+-  action->setShortcut(Qt::Key_F5);
++  collection->setDefaultShortcut(action, QKeySequence(Qt::Key_F5));
    collection->addAction(QLatin1String("reload"), action);
    connect(action, &QAction::triggered,
            impl(), &BaseMainWindowImpl::slotFileReload);
-@@ -415,13 +415,13 @@ void KdeMainWindow::initActions()
+@@ -421,7 +421,7 @@ void KdeMainWindow::initActions()
    collection->addAction(QLatin1String("filelist_focus"), action);
    connect(action, &QAction::triggered, form(), &Kid3Form::setFocusFileList);
    action = new QAction(tr("&Rename"), this);
@@ -33,11 +33,13 @@ Shortcut for action  "filelist_delete" "&Move to Trash" set with QAction::setSho
 +  collection->setDefaultShortcut(action, QKeySequence(Qt::Key_F2));
    action->setShortcutContext(Qt::WidgetShortcut);
    connect(action, &QAction::triggered, impl(), &BaseMainWindowImpl::renameFile);
-   collection->addAction(QLatin1String("filelist_rename"), action);
+   // This action is not made configurable because its shortcut F2 conflicts
+@@ -430,7 +430,7 @@ void KdeMainWindow::initActions()
+   // collection->addAction(QLatin1String("filelist_rename"), action);
    form()->getFileList()->setRenameAction(action);
    action = new QAction(tr("&Move to Trash"), this);
 -  action->setShortcut(QKeySequence::Delete);
 +  collection->setDefaultShortcut(action, QKeySequence::Delete);
    action->setShortcutContext(Qt::WidgetShortcut);
    connect(action, &QAction::triggered, impl(), &BaseMainWindowImpl::deleteFile);
-   collection->addAction(QLatin1String("filelist_delete"), action);
+   // collection->addAction(QLatin1String("filelist_delete"), action);
diff --git a/audio/kid3-qt5/files/patch-src_test_testjsonparser.cpp b/audio/kid3-qt5/files/patch-src_test_testjsonparser.cpp
deleted file mode 100644
index c154ae092c9c..000000000000
--- a/audio/kid3-qt5/files/patch-src_test_testjsonparser.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
-The QDateTime object used to create the test value contains milliseconds, so
-the test fails because the returned value did not match the expected value.
-
---- src/test/testjsonparser.cpp.orig	2018-12-21 05:40:14 UTC
-+++ src/test/testjsonparser.cpp
-@@ -103,7 +103,7 @@ void TestJsonParser::serializeAndDeserializeTypes()
- 
-   QString str = JsonParser::serialize(map);
-   QCOMPARE(str, QString(QLatin1String(
--             "{\"val00\": \"2011-08-18T14:02:07\", \"val01\": -7654321, "
-+             "{\"val00\": \"2011-08-18T14:02:07.000\", \"val01\": -7654321, "
-              "\"val02\": 1234567890123456789, "
-              "\"val03\": false, \"val04\": true, \"val05\": null, \"val06\": "
-              "\"String with \\\"'\\\\{}[]\", \"val07\": 3.141592653, "
diff --git a/audio/kid3-qt5/files/patch-src_test_testmusicbrainzreleaseimporter.cpp b/audio/kid3-qt5/files/patch-src_test_testmusicbrainzreleaseimporter.cpp
deleted file mode 100644
index e8585ea42962..000000000000
--- a/audio/kid3-qt5/files/patch-src_test_testmusicbrainzreleaseimporter.cpp
+++ /dev/null
@@ -1,34 +0,0 @@
-Fix test to reflect the current data in the MusicBrainz database.
-
---- src/test/testmusicbrainzreleaseimporter.cpp.orig	2019-08-23 09:52:05 UTC
-+++ src/test/testmusicbrainzreleaseimporter.cpp
-@@ -38,7 +38,7 @@ void TestMusicBrainzReleaseImporter::testQueryAlbums()
- {
-   queryAlbums(QLatin1String("Wizard"), QLatin1String("Odin"));
-   AlbumListModel* albumModel = m_importer->getAlbumListModel();
--  QCOMPARE(albumModel->rowCount(), 3);
-+  QCOMPARE(albumModel->rowCount(), 4);
-   QString text, category, id;
-   albumModel->getItem(0, text, category, id);
-   QCOMPARE(text, QString(QLatin1String("Wizard - Odin")));
-@@ -53,9 +53,9 @@ void TestMusicBrainzReleaseImporter::testQueryTracks()
-   QStringList titles;
-   titles << QLatin1String("The Prophecy") << QLatin1String("Betrayer")
-          << QLatin1String("Dead Hope") << QLatin1String("Dark God")
--         << QLatin1String("Loki's Punishment")
-+         << QString::fromUtf8("Loki\u2019s Punishment")
-          << QLatin1String("Beginning of the End")
--         << QLatin1String("Thor's Hammer")
-+         << QString::fromUtf8("Thor\u2019s Hammer")
-          << QLatin1String("Hall of Odin") << QLatin1String("The Powergod")
-          << QLatin1String("March of the Einheriers")
-          << QLatin1String("End of All");
-@@ -65,7 +65,7 @@ void TestMusicBrainzReleaseImporter::testQueryTracks()
-           << QLatin1String("5:08") << QLatin1String("4:01")
-           << QLatin1String("5:01") << QLatin1String("5:06")
-           << QLatin1String("5:21") << QLatin1String("5:40")
--          << QLatin1String("3:53");
-+          << QLatin1String("3:55");
-   QCOMPARE(m_trackDataModel->rowCount(), 11);
-   for (int row = 0; row < 11; ++row) {
-     QCOMPARE(m_trackDataModel->index(row, 0).data().toString(),
diff --git a/audio/kid3-qt5/pkg-plist b/audio/kid3-qt5/pkg-plist
index 61fc3cbe0a60..169b8b5bdb88 100644
--- a/audio/kid3-qt5/pkg-plist
+++ b/audio/kid3-qt5/pkg-plist
@@ -88,6 +88,7 @@ share/icons/hicolor/64x64/apps/kid3%%QT_SUFX%%.png
 %%DATADIR%%/translations/kid3_nl.qm
 %%DATADIR%%/translations/kid3_pl.qm
 %%DATADIR%%/translations/kid3_pt.qm
+%%DATADIR%%/translations/kid3_pt_BR.qm
 %%DATADIR%%/translations/kid3_ru.qm
 %%DATADIR%%/translations/kid3_sr.qm
 %%DATADIR%%/translations/kid3_sr@ijekavian.qm