audio/kid3-*: Update to 3.8.3

This commit is contained in:
Jason E. Hale 2020-06-30 20:14:27 +00:00
parent 6d4b6bc964
commit 46d1cef65a
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=540915
6 changed files with 104 additions and 29 deletions

View File

@ -1,8 +1,8 @@
# $FreeBSD$
PORTNAME= kid3
PORTVERSION= 3.7.1
PORTREVISION?= 4
PORTVERSION= 3.8.3
PORTREVISION?= 0
CATEGORIES= audio kde
MASTER_SITES= SF
PKGNAMESUFFIX= -${SLAVE}
@ -65,6 +65,7 @@ CLI_VARS= KID3_APPS+=CLI
FLAC_LIB_DEPENDS= libFLAC.so:audio/flac
FLAC_CMAKE_BOOL= WITH_FLAC
FLAC_IMPLIES= VORBIS
MP3_LIB_DEPENDS= libid3.so:audio/id3lib
MP3_CMAKE_BOOL= WITH_ID3LIB
@ -86,12 +87,6 @@ VORBIS_CMAKE_BOOL= WITH_VORBIS
.include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MFLAC} || ${PORT_OPTIONS:MVORBIS}
PLIST_SUB+= OGGFLAC=""
.else
PLIST_SUB+= OGGFLAC="@comment "
.endif
pre-test:
@${CP} ${WRKSRC}/src/test/*.py ${TEST_WRKSRC}

View File

@ -1,3 +1,3 @@
TIMESTAMP = 1552963155
SHA256 (kid3-3.7.1.tar.gz) = a82db841d023a28636652086905f29678d8c041dc238099165e88fbcb2d47976
SIZE (kid3-3.7.1.tar.gz) = 1486532
TIMESTAMP = 1593542051
SHA256 (kid3-3.8.3.tar.gz) = 6a1aa06d2f225f6d8a139cfd3c3d382f82170fa17196517690d28caaeb220c44
SIZE (kid3-3.8.3.tar.gz) = 3091795

View File

@ -5,27 +5,27 @@ 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 2018-12-21 05:40:14 UTC
--- src/app/kde/kdemainwindow.cpp.orig 2020-05-09 12:12:37 UTC
+++ src/app/kde/kdemainwindow.cpp
@@ -180,7 +180,7 @@ void KdeMainWindow::initActions()
@@ -189,7 +189,7 @@ void KdeMainWindow::initActions()
action = new QAction(QIcon::fromTheme(QLatin1String("document-open")),
tr("O&pen Directory..."), this);
action->setStatusTip(tr("Opens a directory"));
tr("O&pen Folder..."), this);
action->setStatusTip(tr("Opens a folder"));
- action->setShortcut(QKeySequence(QLatin1String("Ctrl+D")));
+ collection->setDefaultShortcut(action, QKeySequence(Qt::CTRL + Qt::Key_D));
collection->addAction(QLatin1String("open_directory"), action);
connect(action, &QAction::triggered,
impl(), &BaseMainWindowImpl::slotFileOpenDirectory);
@@ -188,7 +188,7 @@ void KdeMainWindow::initActions()
@@ -197,7 +197,7 @@ void KdeMainWindow::initActions()
action = new QAction(QIcon::fromTheme(QLatin1String("view-refresh")),
tr("Re&load"), this);
action->setStatusTip(tr("Reload directory"));
action->setStatusTip(tr("Reload folder"));
- action->setShortcut(QKeySequence::Refresh);
+ collection->setDefaultShortcut(action, QKeySequence::Refresh);
collection->addAction(QLatin1String("reload"), action);
connect(action, &QAction::triggered,
impl(), &BaseMainWindowImpl::slotFileReload);
@@ -401,13 +401,13 @@ void KdeMainWindow::initActions()
@@ -415,13 +415,13 @@ void KdeMainWindow::initActions()
collection->addAction(QLatin1String("filelist_focus"), action);
connect(action, &QAction::triggered, form(), &Kid3Form::setFocusFileList);
action = new QAction(tr("&Rename"), this);

View File

@ -0,0 +1,35 @@
Make FLAC support optional
--- src/plugins/oggflacmetadata/CMakeLists.txt.orig 2019-08-23 09:52:05 UTC
+++ src/plugins/oggflacmetadata/CMakeLists.txt
@@ -1,8 +1,12 @@
-if(WITH_VORBIS)
+if(WITH_VORBIS OR WITH_FLAC)
set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules)
- find_package(Vorbis REQUIRED)
- find_package(FLAC)
+ if(WITH_VORBIS)
+ find_package(Vorbis REQUIRED)
+ endif()
+ if(WITH_FLAC)
+ find_package(FLAC REQUIRED)
+ endif()
configure_file(oggflacconfig.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/oggflacconfig.h)
@@ -28,7 +32,13 @@ if(WITH_VORBIS)
target_include_directories(${plugin_TARGET} PRIVATE ${CMAKE_CURRENT_BINARY_DIR})
- target_link_libraries(${plugin_TARGET} kid3-core VorbisFile::VorbisFile FLACPP::FLACPP Kid3Plugin)
+ target_link_libraries(${plugin_TARGET} kid3-core Kid3Plugin)
+ if(HAVE_VORBIS)
+ target_link_libraries(${plugin_TARGET} VorbisFile::VorbisFile)
+ endif()
+ if(HAVE_FLAC)
+ target_link_libraries(${plugin_TARGET} FLACPP::FLACPP)
+ endif()
target_compile_definitions(${plugin_TARGET} PRIVATE HAVE_CONFIG_H)

View File

@ -1,17 +1,17 @@
Fix test to reflect the current data in the MusicBrainz database.
--- src/test/testmusicbrainzreleaseimporter.cpp.orig 2018-12-21 05:40:14 UTC
--- 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"));
QStandardItemModel* albumModel = m_importer->getAlbumListModel();
AlbumListModel* albumModel = m_importer->getAlbumListModel();
- QCOMPARE(albumModel->rowCount(), 3);
+ QCOMPARE(albumModel->rowCount(), 4);
auto item = static_cast<AlbumListItem*>(albumModel->item(0, 0));
QVERIFY(item);
QVERIFY(item->type() == AlbumListItem::Type);
@@ -54,9 +54,9 @@ void TestMusicBrainzReleaseImporter::testQueryTracks()
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")
@ -23,7 +23,7 @@ Fix test to reflect the current data in the MusicBrainz database.
<< QLatin1String("Hall of Odin") << QLatin1String("The Powergod")
<< QLatin1String("March of the Einheriers")
<< QLatin1String("End of All");
@@ -66,7 +66,7 @@ void TestMusicBrainzReleaseImporter::testQueryTracks()
@@ -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")

View File

@ -11,22 +11,58 @@ lib/kid3/libfreedbimport.so
%%MP3%%lib/kid3/libid3libmetadata.so
%%MP4%%lib/kid3/libmp4v2metadata.so
lib/kid3/libmusicbrainzimport.so
%%OGGFLAC%%lib/kid3/liboggflacmetadata.so
%%VORBIS%%lib/kid3/liboggflacmetadata.so
%%TAGLIB%%lib/kid3/libtaglibmetadata.so
%%CLI%%man/ca/man1/kid3-cli.1.gz
%%QT%%man/ca/man1/kid3-qt.1.gz
man/ca/man1/kid3.1.gz
%%CLI%%man/de/man1/kid3-cli.1.gz
%%QT%%man/de/man1/kid3-qt.1.gz
man/de/man1/kid3.1.gz
%%CLI%%man/it/man1/kid3-cli.1.gz
%%QT%%man/it/man1/kid3-qt.1.gz
man/it/man1/kid3.1.gz
%%CLI%%man/man1/kid3-cli.1.gz
%%QT%%man/man1/kid3-qt.1.gz
man/man1/kid3.1.gz
share/applications/net.sourceforge.kid3%%QT_SUFX%%.desktop
%%KF5%%share/dbus-1/interfaces/net.sourceforge.Kid3.xml
%%CLI%%man/nl/man1/kid3-cli.1.gz
%%QT%%man/nl/man1/kid3-qt.1.gz
man/nl/man1/kid3.1.gz
%%CLI%%man/pt/man1/kid3-cli.1.gz
%%QT%%man/pt/man1/kid3-qt.1.gz
man/pt/man1/kid3.1.gz
%%CLI%%man/sv/man1/kid3-cli.1.gz
%%QT%%man/sv/man1/kid3-qt.1.gz
man/sv/man1/kid3.1.gz
%%CLI%%man/uk/man1/kid3-cli.1.gz
%%QT%%man/uk/man1/kid3-qt.1.gz
man/uk/man1/kid3.1.gz
share/applications/org.kde.kid3%%QT_SUFX%%.desktop
%%KF5%%share/dbus-1/interfaces/org.kde.Kid3.xml
%%KF5%%share/doc/HTML/ca/kid3/index.cache.bz2
%%KF5%%share/doc/HTML/ca/kid3/index.docbook
%%KF5%%share/doc/HTML/de/kid3/index.cache.bz2
%%KF5%%share/doc/HTML/de/kid3/index.docbook
%%KF5%%share/doc/HTML/en/kid3/index.cache.bz2
%%KF5%%share/doc/HTML/en/kid3/index.docbook
%%KF5%%share/doc/HTML/it/kid3/index.cache.bz2
%%KF5%%share/doc/HTML/it/kid3/index.docbook
%%KF5%%share/doc/HTML/nl/kid3/index.cache.bz2
%%KF5%%share/doc/HTML/nl/kid3/index.docbook
%%KF5%%share/doc/HTML/pt/kid3/index.cache.bz2
%%KF5%%share/doc/HTML/pt/kid3/index.docbook
%%KF5%%share/doc/HTML/sv/kid3/index.cache.bz2
%%KF5%%share/doc/HTML/sv/kid3/index.docbook
%%KF5%%share/doc/HTML/uk/kid3/index.cache.bz2
%%KF5%%share/doc/HTML/uk/kid3/index.docbook
%%QT%%share/doc/kid3-qt/kid3_ca.html
%%QT%%share/doc/kid3-qt/kid3_de.html
%%QT%%share/doc/kid3-qt/kid3_en.html
%%QT%%share/doc/kid3-qt/kid3_it.html
%%QT%%share/doc/kid3-qt/kid3_nl.html
%%QT%%share/doc/kid3-qt/kid3_pt.html
%%QT%%share/doc/kid3-qt/kid3_sv.html
%%QT%%share/doc/kid3-qt/kid3_uk.html
share/icons/hicolor/128x128/apps/kid3%%QT_SUFX%%.png
share/icons/hicolor/16x16/apps/kid3%%QT_SUFX%%.png
share/icons/hicolor/32x32/apps/kid3%%QT_SUFX%%.png
@ -35,22 +71,31 @@ share/icons/hicolor/64x64/apps/kid3%%QT_SUFX%%.png
%%QT%%share/icons/hicolor/scalable/apps/kid3-qt.svg
%%KF5%%share/icons/hicolor/scalable/apps/kid3.svgz
%%KF5%%share/kxmlgui5/kid3/kid3ui.rc
%%DATADIR%%/translations/kid3_ca.qm
%%DATADIR%%/translations/kid3_ca@valencia.qm
%%DATADIR%%/translations/kid3_cs.qm
%%DATADIR%%/translations/kid3_da.qm
%%DATADIR%%/translations/kid3_de.qm
%%DATADIR%%/translations/kid3_el.qm
%%DATADIR%%/translations/kid3_en.qm
%%DATADIR%%/translations/kid3_en_GB.qm
%%DATADIR%%/translations/kid3_es.qm
%%DATADIR%%/translations/kid3_et.qm
%%DATADIR%%/translations/kid3_fi.qm
%%DATADIR%%/translations/kid3_fr.qm
%%DATADIR%%/translations/kid3_it.qm
%%DATADIR%%/translations/kid3_ko.qm
%%DATADIR%%/translations/kid3_nl.qm
%%DATADIR%%/translations/kid3_pl.qm
%%DATADIR%%/translations/kid3_pt.qm
%%DATADIR%%/translations/kid3_ru.qm
%%DATADIR%%/translations/kid3_sr.qm
%%DATADIR%%/translations/kid3_sr@ijekavian.qm
%%DATADIR%%/translations/kid3_sr@ijekavianlatin.qm
%%DATADIR%%/translations/kid3_sr@latin.qm
%%DATADIR%%/translations/kid3_sv.qm
%%DATADIR%%/translations/kid3_tr.qm
%%DATADIR%%/translations/kid3_uk.qm
%%DATADIR%%/translations/kid3_zh_CN.qm
%%DATADIR%%/translations/kid3_zh_TW.qm
share/metainfo/net.sourceforge.kid3%%QT_SUFX%%.appdata.xml
share/metainfo/org.kde.kid3%%QT_SUFX%%.appdata.xml