diff options
Diffstat (limited to 'audio/kid3/files')
4 files changed, 6 insertions, 54 deletions
diff --git a/audio/kid3/files/patch-CMakeLists.txt b/audio/kid3/files/patch-CMakeLists.txt deleted file mode 100644 index 55c0b58940c8..000000000000 --- a/audio/kid3/files/patch-CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -Fix detection of Qt5 if both Qt5 and Qt6 are installed. - ---- CMakeLists.txt.orig 2023-07-10 19:51:30 UTC -+++ CMakeLists.txt -@@ -273,7 +273,7 @@ else() - if(BUILD_WITH_QT6) - find_package(QT NAMES Qt6 COMPONENTS Core REQUIRED) - else() -- find_package(QT NAMES Qt5 Qt6 COMPONENTS Core REQUIRED) -+ find_package(QT NAMES Qt5 COMPONENTS Core REQUIRED) - endif() - if(QT_VERSION_MAJOR EQUAL 6 AND QT_VERSION_MINOR LESS 2) - set(WITH_MULTIMEDIA OFF) diff --git a/audio/kid3/files/patch-src_app_kde_kdemainwindow.cpp b/audio/kid3/files/patch-src_app_kde_kdemainwindow.cpp index cd0eaad45f70..91ce12367838 100644 --- a/audio/kid3/files/patch-src_app_kde_kdemainwindow.cpp +++ b/audio/kid3/files/patch-src_app_kde_kdemainwindow.cpp @@ -5,7 +5,7 @@ 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 2022-08-05 16:27:08 UTC +--- src/app/kde/kdemainwindow.cpp.orig 2025-07-24 02:28:50 UTC +++ src/app/kde/kdemainwindow.cpp @@ -190,7 +190,7 @@ void KdeMainWindow::initActions() action = new QAction(QIcon::fromTheme(QLatin1String("document-open")), @@ -25,7 +25,7 @@ Shortcut for action "filelist_delete" "&Move to Trash" set with QAction::setSho collection->addAction(QLatin1String("reload"), action); connect(action, &QAction::triggered, impl(), &BaseMainWindowImpl::slotFileReload); -@@ -426,7 +426,7 @@ void KdeMainWindow::initActions() +@@ -424,7 +424,7 @@ void KdeMainWindow::initActions() collection->addAction(QLatin1String("filelist_focus"), action); connect(action, &QAction::triggered, form(), &Kid3Form::setFocusFileList); action = new QAction(tr("&Rename"), this); @@ -34,7 +34,7 @@ Shortcut for action "filelist_delete" "&Move to Trash" set with QAction::setSho action->setShortcutContext(Qt::WidgetShortcut); connect(action, &QAction::triggered, impl(), &BaseMainWindowImpl::renameFile); // This action is not made configurable because its shortcut F2 conflicts -@@ -435,7 +435,7 @@ void KdeMainWindow::initActions() +@@ -433,7 +433,7 @@ void KdeMainWindow::initActions() // collection->addAction(QLatin1String("filelist_rename"), action); form()->getFileList()->setRenameAction(action); action = new QAction(tr("&Move to Trash"), this); diff --git a/audio/kid3/files/patch-src_plugins_mp4v2metadata_m4afile.cpp b/audio/kid3/files/patch-src_plugins_mp4v2metadata_m4afile.cpp index 3b1504aa77ec..5d985524d313 100644 --- a/audio/kid3/files/patch-src_plugins_mp4v2metadata_m4afile.cpp +++ b/audio/kid3/files/patch-src_plugins_mp4v2metadata_m4afile.cpp @@ -1,6 +1,6 @@ cmID and xid atoms only supported in mp4v2 >= 2.0.0 ---- src/plugins/mp4v2metadata/m4afile.cpp.orig 2022-08-05 16:27:08 UTC +--- src/plugins/mp4v2metadata/m4afile.cpp.orig 2025-07-24 02:28:50 UTC +++ src/plugins/mp4v2metadata/m4afile.cpp @@ -124,6 +124,8 @@ const struct { { "geID", Frame::FT_Other }, @@ -25,7 +25,7 @@ cmID and xid atoms only supported in mp4v2 >= 2.0.0 if (size >= 4) { uint val = value[3] + (value[2] << 8) + (value[1] << 16) + (value[0] << 24); -@@ -889,11 +894,13 @@ bool M4aFile::writeTags(bool force, bool* renamed, boo +@@ -894,11 +899,13 @@ bool M4aFile::writeTags(bool force, bool* renamed, boo } else if (name == QLatin1String("geID")) { uint32_t val = str.toULong(); MP4TagsSetGenreID(tags, &val); @@ -39,7 +39,7 @@ cmID and xid atoms only supported in mp4v2 >= 2.0.0 } else { MP4ItmfItem* item; if (name.length() == 4 && -@@ -1579,7 +1586,10 @@ QStringList M4aFile::getFrameIds(Frame::TagNumber tagN +@@ -1595,7 +1602,10 @@ QStringList M4aFile::getFrameIds(Frame::TagNumber tagN QLatin1String("plID") << QLatin1String("purd") << QLatin1String("rtng") << QLatin1String("sfID") << QLatin1String("sosn") << QLatin1String("stik") << QLatin1String("tven") << QLatin1String("tves") << QLatin1String("tvnn") << QLatin1String("tvsh") << QLatin1String("tvsn") << diff --git a/audio/kid3/files/patch-src_plugins_oggflacmetadata_CMakeLists.txt b/audio/kid3/files/patch-src_plugins_oggflacmetadata_CMakeLists.txt deleted file mode 100644 index 6878afda2d2b..000000000000 --- a/audio/kid3/files/patch-src_plugins_oggflacmetadata_CMakeLists.txt +++ /dev/null @@ -1,35 +0,0 @@ -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) - |