diff -Nru kfilemetadata-kf5-5.79.0/autotests/CMakeLists.txt kfilemetadata-kf5-5.80.0/autotests/CMakeLists.txt --- kfilemetadata-kf5-5.79.0/autotests/CMakeLists.txt 2021-02-06 18:16:23.000000000 +0000 +++ kfilemetadata-kf5-5.80.0/autotests/CMakeLists.txt 2021-03-06 16:23:45.000000000 +0000 @@ -126,7 +126,10 @@ # if(FFMPEG_FOUND) kde_enable_exceptions() - ecm_add_test(ffmpegextractortest.cpp ../src/extractors/ffmpegextractor.cpp + ecm_add_test( + ffmpegextractortest.cpp + ../src/extractors/ffmpegextractor.cpp + ../src/kfilemetadata_debug.cpp TEST_NAME "ffmpegextractortest" LINK_LIBRARIES Qt5::Test KF5::FileMetaData ${AVCODEC_LIBRARIES} ${AVFORMAT_LIBRARIES} ${AVUTIL_LIBRARIES} ) diff -Nru kfilemetadata-kf5-5.79.0/CMakeLists.txt kfilemetadata-kf5-5.80.0/CMakeLists.txt --- kfilemetadata-kf5-5.79.0/CMakeLists.txt 2021-02-06 18:16:23.000000000 +0000 +++ kfilemetadata-kf5-5.80.0/CMakeLists.txt 2021-03-06 16:23:45.000000000 +0000 @@ -1,11 +1,11 @@ cmake_minimum_required(VERSION 3.5) -set(KF_VERSION "5.79.0") # handled by release scripts -set(KF_DEP_VERSION "5.79.0") # handled by release scripts +set(KF_VERSION "5.80.0") # handled by release scripts +set(KF_DEP_VERSION "5.80.0") # handled by release scripts project(KFileMetaData VERSION ${KF_VERSION}) include(FeatureSummary) -find_package(ECM 5.79.0 NO_MODULE) +find_package(ECM 5.80.0 NO_MODULE) set_package_properties(ECM PROPERTIES TYPE REQUIRED DESCRIPTION "Extra CMake Modules." URL "https://commits.kde.org/extra-cmake-modules") feature_summary(WHAT REQUIRED_PACKAGES_NOT_FOUND FATAL_ON_MISSING_REQUIRED_PACKAGES) @@ -117,7 +117,7 @@ ) add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x050e00) -add_definitions(-DKF_DISABLE_DEPRECATED_BEFORE_AND_AT=0x054B00) +add_definitions(-DKF_DISABLE_DEPRECATED_BEFORE_AND_AT=0x054F00) add_definitions(-DTRANSLATION_DOMAIN=\"kfilemetadata5\") add_definitions(-DQT_NO_FOREACH) add_subdirectory(src) diff -Nru kfilemetadata-kf5-5.79.0/debian/changelog kfilemetadata-kf5-5.80.0/debian/changelog --- kfilemetadata-kf5-5.79.0/debian/changelog 2021-02-13 12:21:29.000000000 +0000 +++ kfilemetadata-kf5-5.80.0/debian/changelog 2021-03-18 11:07:35.000000000 +0000 @@ -1,3 +1,9 @@ +kfilemetadata-kf5 (5.80.0-0ubuntu1) hirsute; urgency=medium + + * New upstream release (5.80.0) + + -- José Manuel Santamaría Lema Thu, 18 Mar 2021 11:07:35 +0000 + kfilemetadata-kf5 (5.79.0-0ubuntu1) hirsute; urgency=medium * New upstream release (5.79.0) diff -Nru kfilemetadata-kf5-5.79.0/debian/control kfilemetadata-kf5-5.80.0/debian/control --- kfilemetadata-kf5-5.79.0/debian/control 2021-02-13 12:21:29.000000000 +0000 +++ kfilemetadata-kf5-5.80.0/debian/control 2021-03-18 11:07:35.000000000 +0000 @@ -7,7 +7,7 @@ Build-Depends: cmake (>= 3.5~), debhelper-compat (= 13), doxygen, - extra-cmake-modules (>= 5.79.0~), + extra-cmake-modules (>= 5.80.0~), graphviz, libappimage-dev (>= 0.1.10), libattr1-dev, @@ -17,10 +17,10 @@ libavutil-dev, libepub-dev, libexiv2-dev (>= 0.21), - libkf5archive-dev (>= 5.79.0~), - libkf5config-dev (>= 5.79.0~), - libkf5coreaddons-dev (>= 5.79.0~), - libkf5i18n-dev (>= 5.79.0~), + libkf5archive-dev (>= 5.80.0~), + libkf5config-dev (>= 5.80.0~), + libkf5coreaddons-dev (>= 5.80.0~), + libkf5i18n-dev (>= 5.80.0~), libpoppler-qt5-dev (>= 0.12.1), libpostproc-dev, libqt5sql5-sqlite:native, diff -Nru kfilemetadata-kf5-5.79.0/.gitignore kfilemetadata-kf5-5.80.0/.gitignore --- kfilemetadata-kf5-5.79.0/.gitignore 2021-02-06 18:16:23.000000000 +0000 +++ kfilemetadata-kf5-5.80.0/.gitignore 2021-03-06 16:23:45.000000000 +0000 @@ -22,3 +22,4 @@ *.rej .cmake/ /.clang-format +/compile_commands.json diff -Nru kfilemetadata-kf5-5.79.0/.gitlab-ci.yml kfilemetadata-kf5-5.80.0/.gitlab-ci.yml --- kfilemetadata-kf5-5.79.0/.gitlab-ci.yml 1970-01-01 00:00:00.000000000 +0000 +++ kfilemetadata-kf5-5.80.0/.gitlab-ci.yml 2021-03-06 16:23:45.000000000 +0000 @@ -0,0 +1,3 @@ +include: + - https://invent.kde.org/sysadmin/ci-tooling/raw/master/invent/ci-before.yml + - https://invent.kde.org/sysadmin/ci-tooling/raw/master/invent/ci-frameworks-linux.yml diff -Nru kfilemetadata-kf5-5.79.0/po/zh_CN/kfilemetadata5.po kfilemetadata-kf5-5.80.0/po/zh_CN/kfilemetadata5.po --- kfilemetadata-kf5-5.79.0/po/zh_CN/kfilemetadata5.po 2021-02-06 18:16:23.000000000 +0000 +++ kfilemetadata-kf5-5.80.0/po/zh_CN/kfilemetadata5.po 2021-03-06 16:23:45.000000000 +0000 @@ -10,7 +10,7 @@ "Project-Id-Version: kdeorg\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n" "POT-Creation-Date: 2020-06-09 02:02+0200\n" -"PO-Revision-Date: 2021-02-04 11:58\n" +"PO-Revision-Date: 2021-03-02 16:17\n" "Last-Translator: \n" "Language-Team: Chinese Simplified\n" "Language: zh_CN\n" diff -Nru kfilemetadata-kf5-5.79.0/src/extractors/CMakeLists.txt kfilemetadata-kf5-5.80.0/src/extractors/CMakeLists.txt --- kfilemetadata-kf5-5.79.0/src/extractors/CMakeLists.txt 2021-02-06 18:16:23.000000000 +0000 +++ kfilemetadata-kf5-5.80.0/src/extractors/CMakeLists.txt 2021-03-06 16:23:45.000000000 +0000 @@ -49,7 +49,10 @@ endif() if(FFMPEG_FOUND) - add_library(kfilemetadata_ffmpegextractor MODULE ffmpegextractor.cpp) + add_library(kfilemetadata_ffmpegextractor MODULE + ffmpegextractor.cpp + ../kfilemetadata_debug.cpp + ) target_include_directories(kfilemetadata_ffmpegextractor SYSTEM PRIVATE ${AVCODEC_INCLUDE_DIRS} ${AVFORMAT_INCLUDE_DIRS} ${AVUTIL_INCLUDE_DIRS}) target_link_libraries(kfilemetadata_ffmpegextractor KF5::FileMetaData diff -Nru kfilemetadata-kf5-5.79.0/src/extractors/ffmpegextractor.cpp kfilemetadata-kf5-5.80.0/src/extractors/ffmpegextractor.cpp --- kfilemetadata-kf5-5.79.0/src/extractors/ffmpegextractor.cpp 2021-02-06 18:16:23.000000000 +0000 +++ kfilemetadata-kf5-5.80.0/src/extractors/ffmpegextractor.cpp 2021-03-06 16:23:45.000000000 +0000 @@ -10,6 +10,7 @@ #include "ffmpegextractor.h" +#include "kfilemetadata_debug.h" #include "config-kfilemetadata.h" @@ -27,8 +28,6 @@ #include } -#include - using namespace KFileMetaData; FFmpegExtractor::FFmpegExtractor(QObject* parent) @@ -65,13 +64,13 @@ fmt_ctx = avformat_alloc_context(); if (int ret = avformat_open_input(&fmt_ctx, arr.data(), nullptr, nullptr)) { - qWarning() << "avformat_open_input error: " << ret; + qCWarning(KFILEMETADATA_LOG) << "avformat_open_input error: " << ret; return; } int ret = avformat_find_stream_info(fmt_ctx, nullptr); if (ret < 0) { - qWarning() << "avform_find_stream_info error: " << ret; + qCWarning(KFILEMETADATA_LOG) << "avform_find_stream_info error: " << ret; return; }