Update to KDE Frameworks 5.56.0

recipes-kf5/tier2/kauth.inc

@@ -10,7 +10,6 @@ DEPENDS_class-target = "qtbase kcoreaddons kauth-native polkit-qt-1"
 
 SRC_URI = " \
     git://anongit.kde.org/kauth;nobranch=1 \
-    file://0001-find_file_namespacing.diff \
 "
 S = "${WORKDIR}/git"
 

recipes-kf5/tier2/kauth/0001-find_file_namespacing.diff

@@ -1,25 +0,0 @@
-commit 24de0c1d512a323264b56f4e0a664208a6627754
-Author: Volker Krause <vkrause@kde.org>
-Date:   Fri Feb 15 19:21:01 2019 +0100
-
-    Namespace find_file result
-    
-    KCoreAddons uses the same name, which causes this to use the cached result
-    for the KCoreAddons find_file call, making this fail when KCoreAddons is
-    present.
-
-diff --git a/KF5AuthConfig.cmake.in b/KF5AuthConfig.cmake.in
-index 0895e60..0bb15ff 100644
---- a/KF5AuthConfig.cmake.in
-+++ b/KF5AuthConfig.cmake.in
-@@ -17,8 +17,8 @@ include("${CMAKE_CURRENT_LIST_DIR}/KF5AuthMacros.cmake")
- 
- if(NOT "${KAUTH_BACKEND_NAME}" STREQUAL "FAKE")
-     if(CMAKE_CROSSCOMPILING AND KF5_HOST_TOOLING)
--        find_file(TARGETSFILE KF5Auth/KF5AuthToolsTargets.cmake PATHS ${KF5_HOST_TOOLING} ${CMAKE_CURRENT_LIST_DIR} NO_DEFAULT_PATH)
--        include("${TARGETSFILE}")
-+        find_file(KAUTH_TARGETSFILE KF5Auth/KF5AuthToolsTargets.cmake PATHS ${KF5_HOST_TOOLING} ${CMAKE_CURRENT_LIST_DIR} NO_DEFAULT_PATH)
-+        include("${KAUTH_TARGETSFILE}")
-     else()
-         include("${CMAKE_CURRENT_LIST_DIR}/KF5AuthToolsTargets.cmake")
-     endif()

recipes-kf5/tier2/kdoctools.inc

@@ -19,7 +19,6 @@ DEPENDS = " \
 
 SRC_URI = " \
     git://anongit.kde.org/kdoctools;nobranch=1 \
-    file://0001-kf5-host-tooling-port.diff \
 "
 S = "${WORKDIR}/git"
 

recipes-kf5/tier2/kdoctools/0001-kf5-host-tooling-port.diff

@@ -1,96 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index f1ee767..96d6343 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -107,6 +107,7 @@ if (BUILD_TESTING)
- endif()
- 
- install(EXPORT KF5DocToolsTargets DESTINATION "${CMAKECONFIG_INSTALL_DIR}" FILE KF5DocToolsTargets.cmake NAMESPACE KF5:: )
-+install(EXPORT KF5DocToolsToolsTargets DESTINATION "${CMAKECONFIG_INSTALL_DIR}" FILE KF5DocToolsToolsTargets.cmake NAMESPACE KF5:: )
- 
- if (BUILD_QCH)
-     ecm_install_qch_export(
-@@ -128,6 +129,7 @@ configure_package_config_file(
- configure_file(${CMAKE_CURRENT_SOURCE_DIR}/KF5DocToolsMacros.cmake ${CMAKE_BINARY_DIR}/cmake/KF5DocToolsMacros.cmake COPYONLY)
- # we need a separate copy with local pathes for install autotests
- export(EXPORT KF5DocToolsTargets FILE ${CMAKE_BINARY_DIR}/cmake/KF5DocToolsTargets.cmake NAMESPACE KF5::)
-+export(EXPORT KF5DocToolsToolsTargets FILE ${CMAKE_BINARY_DIR}/cmake/KF5DocToolsToolsTargets.cmake NAMESPACE KF5::)
- 
- install(FILES
-   "${CMAKE_BINARY_DIR}/cmake/KF5DocToolsConfig.cmake"
-diff --git a/KF5DocToolsConfig.cmake.in b/KF5DocToolsConfig.cmake.in
-index 361d21a..8a41163 100644
---- a/KF5DocToolsConfig.cmake.in
-+++ b/KF5DocToolsConfig.cmake.in
-@@ -7,19 +7,27 @@ endif()
- 
- include("${CMAKE_CURRENT_LIST_DIR}/KF5DocToolsTargets.cmake")
- 
--if(CMAKE_CROSSCOMPILING AND MEINPROC5_EXECUTABLE)
--    set_target_properties(KF5::meinproc5 PROPERTIES IMPORTED_LOCATION_NONE ${MEINPROC5_EXECUTABLE})
--    set_target_properties(KF5::meinproc5 PROPERTIES IMPORTED_LOCATION ${MEINPROC5_EXECUTABLE})
--endif()
--
--if(CMAKE_CROSSCOMPILING AND DOCBOOKL10NHELPER_EXECUTABLE)
--    set_target_properties(KF5::docbookl10nhelper PROPERTIES IMPORTED_LOCATION_NONE ${DOCBOOKL10NHELPER_EXECUTABLE})
--    set_target_properties(KF5::docbookl10nhelper PROPERTIES IMPORTED_LOCATION ${DOCBOOKL10NHELPER_EXECUTABLE})
--endif()
--
--if(CMAKE_CROSSCOMPILING AND CHECKXML5_EXECUTABLE)
--    set_target_properties(KF5::checkXML5 PROPERTIES IMPORTED_LOCATION_NONE ${CHECKXML5_EXECUTABLE})
--    set_target_properties(KF5::checkXML5 PROPERTIES IMPORTED_LOCATION ${CHECKXML5_EXECUTABLE})
-+    if (CMAKE_CROSSCOMPILING AND KF5_HOST_TOOLING)
-+    find_file(KDOCTOOLS_TARGETSFILE KF5DocTools/KF5DocToolsToolsTargets.cmake PATHS ${KF5_HOST_TOOLING} ${CMAKE_CURRENT_LIST_DIR} NO_DEFAULT_PATH)
-+    include("${KDOCTOOLS_TARGETSFILE}")
-+else()
-+    include("${CMAKE_CURRENT_LIST_DIR}/KF5DocToolsToolsTargets.cmake")
-+
-+    # TODO KF6: deprecated, remove the below
-+    if(CMAKE_CROSSCOMPILING AND MEINPROC5_EXECUTABLE)
-+        set_target_properties(KF5::meinproc5 PROPERTIES IMPORTED_LOCATION_NONE ${MEINPROC5_EXECUTABLE})
-+        set_target_properties(KF5::meinproc5 PROPERTIES IMPORTED_LOCATION ${MEINPROC5_EXECUTABLE})
-+    endif()
-+
-+    if(CMAKE_CROSSCOMPILING AND DOCBOOKL10NHELPER_EXECUTABLE)
-+        set_target_properties(KF5::docbookl10nhelper PROPERTIES IMPORTED_LOCATION_NONE ${DOCBOOKL10NHELPER_EXECUTABLE})
-+        set_target_properties(KF5::docbookl10nhelper PROPERTIES IMPORTED_LOCATION ${DOCBOOKL10NHELPER_EXECUTABLE})
-+    endif()
-+
-+    if(CMAKE_CROSSCOMPILING AND CHECKXML5_EXECUTABLE)
-+        set_target_properties(KF5::checkXML5 PROPERTIES IMPORTED_LOCATION_NONE ${CHECKXML5_EXECUTABLE})
-+        set_target_properties(KF5::checkXML5 PROPERTIES IMPORTED_LOCATION ${CHECKXML5_EXECUTABLE})
-+    endif()
- endif()
- 
- include(${CMAKE_CURRENT_LIST_DIR}/KF5DocToolsMacros.cmake)
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 24f75a4..cebddfc 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -108,7 +108,7 @@ add_executable(meinproc5 meinproc.cpp meinproc_common.cpp xslt.cpp ${meinproc_ad
- ecm_mark_nongui_executable(meinproc5)
- target_link_libraries(meinproc5 Qt5::Core ${LIBXML2_LIBRARIES} ${LIBXSLT_LIBRARIES} ${LIBXSLT_EXSLT_LIBRARIES} ${meinproc_additional_LIBS})
- target_compile_definitions(meinproc5 PRIVATE -DKDOCTOOLS_EXPORT=)
--install(TARGETS meinproc5 EXPORT KF5DocToolsTargets ${KF5_INSTALL_TARGETS_DEFAULT_ARGS})
-+install(TARGETS meinproc5 EXPORT KF5DocToolsToolsTargets ${KF5_INSTALL_TARGETS_DEFAULT_ARGS})
- 
- if(CMAKE_CROSSCOMPILING AND MEINPROC5_EXECUTABLE)
-     add_executable(KF5::meinproc5 IMPORTED GLOBAL)
-@@ -206,7 +206,7 @@ add_executable( docbookl10nhelper ${docbookl10nhelper_SRCS} )
- ecm_mark_nongui_executable( docbookl10nhelper )
- target_link_libraries( docbookl10nhelper Qt5::Core )
- if(INSTALL_INTERNAL_TOOLS)
--    install(TARGETS docbookl10nhelper EXPORT KF5DocToolsTargets ${KF5_INSTALL_TARGETS_DEFAULT_ARGS})
-+    install(TARGETS docbookl10nhelper EXPORT KF5DocToolsToolsTargets ${KF5_INSTALL_TARGETS_DEFAULT_ARGS})
- endif()
- 
- if(CMAKE_CROSSCOMPILING AND DOCBOOKL10NHELPER_EXECUTABLE)
-@@ -232,7 +232,7 @@ set( checkXML5_SRCS checkXML5.cpp ${kdoctoolslog_core_SRCS})
- add_executable( checkXML5 ${checkXML5_SRCS} )
- ecm_mark_nongui_executable( checkXML5 )
- target_link_libraries( checkXML5 Qt5::Core )
--install(TARGETS checkXML5 EXPORT KF5DocToolsTargets ${KF5_INSTALL_TARGETS_DEFAULT_ARGS})
-+install(TARGETS checkXML5 EXPORT KF5DocToolsToolsTargets ${KF5_INSTALL_TARGETS_DEFAULT_ARGS})
- 
- if(CMAKE_CROSSCOMPILING AND CHECKXML5_EXECUTABLE)
-     add_executable(KF5::checkXML5 IMPORTED GLOBAL)

recipes-kf5/tier2/kfilemetadata.inc

@@ -4,7 +4,11 @@ LICENSE = "LGPL-2.1"
 LIC_FILES_CHKSUM = "file://COPYING.LGPL-2.1;md5=4fbd65380cdd255951079008b364516c"
 PR = "r0"
 
-DEPENDS = "qtbase"
+DEPENDS = " \
+    qtbase \
+    kcoreaddons \
+    kcoreaddons-native \
+"
 
 SRC_URI = "git://anongit.kde.org/kfilemetadata;nobranch=1"
 S = "${WORKDIR}/git"