Commit e253ef55 authored by Julius Künzel's avatar Julius Künzel 💬
Browse files

Dependency change! Make KFileMetaData required again

Related to 09541a48

KFileMetaData was made a option depency 6 year ago because of conflicts
with the CI. We use a completly different CI now so this is no problem
anymore.
parent ed387d0e
Pipeline #244073 failed with stage
in 10 minutes and 1 second
......@@ -84,10 +84,10 @@ find_package(KF5 ${KF_DEP_VERSION}
IconThemes
Declarative
Solid
FileMetaData
OPTIONAL_COMPONENTS
DocTools
FileMetaData
Crash
Purpose
)
......@@ -155,13 +155,6 @@ else()
set(DATA_INSTALL_PREFIX "/kdenlive")
endif()
if(KF5FileMetaData_FOUND)
message(STATUS "Found KF5 FileMetadata to extract file metadata")
set(KF5_FILEMETADATA TRUE)
else()
message(STATUS "KF5 FileMetadata not found, file metadata will not be available")
endif()
if(KF5Purpose_FOUND)
message(STATUS "Found KF5 Purpose, filesharing enabled")
set(KF5_PURPOSE TRUE)
......
......@@ -171,6 +171,7 @@ target_link_libraries(kdenliveLib
KF5::Declarative
KF5::IconThemes
KF5::Solid
KF5::FileMetaData
${OPENGL_LIBRARIES}
${OPENGLES_LIBRARIES}
${MLT_LIBRARIES}
......@@ -230,11 +231,6 @@ elseif(KF5Crash_FOUND)
target_link_libraries(kdenlive KF5::Crash)
endif()
if(KF5_FILEMETADATA)
target_compile_definitions(kdenliveLib PRIVATE -DKF5_USE_FILEMETADATA)
target_link_libraries(kdenliveLib KF5::FileMetaData)
endif()
if(KF5_PURPOSE)
target_compile_definitions(kdenliveLib PRIVATE -DKF5_USE_PURPOSE)
target_link_libraries(kdenliveLib KF5::Purpose KF5::PurposeWidgets)
......
......@@ -21,14 +21,11 @@ SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL
#include <KDualAction>
#include <KLocalizedString>
#ifdef KF5_USE_FILEMETADATA
#include "kdenlive_debug.h"
#include <KFileMetaData/ExtractionResult>
#include <KFileMetaData/Extractor>
#include <KFileMetaData/ExtractorCollection>
#include <KFileMetaData/PropertyInfo>
#endif
#include "kdenlive_debug.h"
#include <KIO/Global>
#include <KIO/OpenFileManagerWindowJob>
#include <KMessageBox>
......@@ -125,7 +122,6 @@ QMimeData *AnalysisTree::mimeData(const QList<QTreeWidgetItem *> list) const
return mime;
}
#ifdef KF5_USE_FILEMETADATA
class ExtractionResult : public KFileMetaData::ExtractionResult
{
public:
......@@ -194,7 +190,6 @@ private:
QTreeWidget *m_tree;
Q_DISABLE_COPY(ExtractionResult)
};
#endif
ClipPropertiesController::ClipPropertiesController(ClipController *controller, QWidget *parent)
: QWidget(parent)
......@@ -1284,7 +1279,6 @@ void ClipPropertiesController::fillProperties()
m_propertiesTree->setSortingEnabled(false);
#ifdef KF5_USE_FILEMETADATA
// Read File Metadata through KDE's metadata system
KFileMetaData::ExtractorCollection metaDataCollection;
QMimeDatabase mimeDatabase;
......@@ -1295,7 +1289,6 @@ void ClipPropertiesController::fillProperties()
ExtractionResult extractionResult(m_controller->clipUrl(), mimeType.name(), m_propertiesTree);
plugin->extract(&extractionResult);
}
#endif
// Get MLT's metadata
if (m_type == ClipType::Image) {
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment