[neon/neon-packaging/mauikit-documents/Neon/release] debian/patches: iterate some more

[Carlos De Maine]

Git commit 180b81e54df144df9906d650aed8a03ef4f104e6 by Carlos De Maine.
Committed on 14/07/2024 at 12:37.
Pushed by carlosdem into branch 'Neon/release'.

iterate some more

(cherry picked from commit 0cdd6e362d75599e47ec49068e45c2b0a928c65a)

Co-authored-by: Carlos De Maine <carlosdemaine at gmail.com>

M  +4    -4    debian/patches/fixbuild

https://invent.kde.org/neon/neon-packaging/mauikit-documents/-/commit/180b81e54df144df9906d650aed8a03ef4f104e6

diff --git a/debian/patches/fixbuild b/debian/patches/fixbuild
index aa1ba44..15ed465 100644
--- a/debian/patches/fixbuild
+++ b/debian/patches/fixbuild
@@ -12,7 +12,7 @@ index 84cd7744f947c3cba658398b99d714f5e55c37fc..d7de3d6ee8ed271234d2472d62c7ad22
      CoreAddons)
  
 diff --git a/MauiKitDocumentsConfig.cmake.in.6 b/MauiKitDocumentsConfig.cmake.in.6
-index c46e910c22ab2296c7d9fc8335a254724782e031..b74cdcad644526bd64d1a7d3806fa1e16c190d0c 100644
+index c46e910c22ab2296c7d9fc8335a254724782e031..206634b3ba0ea90af211808aea2ef6ecd1bd5b04 100644
 --- a/MauiKitDocumentsConfig.cmake.in.6
 +++ b/MauiKitDocumentsConfig.cmake.in.6
 @@ -1,7 +1,7 @@
@@ -20,12 +20,12 @@ index c46e910c22ab2296c7d9fc8335a254724782e031..b74cdcad644526bd64d1a7d3806fa1e1
  
  include(CMakeFindDependencyMacro)
 -find_dependency(Qt5Core @REQUIRED_QT_VERSION@)
-+find_dependency(QtCore @REQUIRED_QT_VERSION@)
++find_dependency(Qt6Core @REQUIRED_QT_VERSION@)
  
  # Any changes in this ".cmake" file will be overwritten by CMake, the source is the ".cmake.in" file.
  
 diff --git a/src/code/cbz/CMakeLists.txt b/src/code/cbz/CMakeLists.txt
-index c24a49684c7d362dd1d83e668aab6da421740b33..6661de505304f348dc3abd2b30a20f0b4564059d 100644
+index c24a49684c7d362dd1d83e668aab6da421740b33..7da29904edf7de2e046c31b543eee403ccd5218b 100644
 --- a/src/code/cbz/CMakeLists.txt
 +++ b/src/code/cbz/CMakeLists.txt
 @@ -42,7 +42,7 @@ target_include_directories(CBZLib
@@ -33,7 +33,7 @@ index c24a49684c7d362dd1d83e668aab6da421740b33..6661de505304f348dc3abd2b30a20f0b
  
  if(UNIX AND NOT ANDROID)
 -    find_package(KF5 ${REQUIRED_KF5_VERSION} REQUIRED COMPONENTS FileMetaData)
-+    find_package(KF${REQUIRED_KF_VERSION} REQUIRED COMPONENTS FileMetaData)
++    find_package(KF${KF_MAJOR_VERSION} ${REQUIRED_KF_VERSION} REQUIRED COMPONENTS FileMetaData)
      target_link_libraries (CBZLib
          PUBLIC
          KF${KF_MAJOR_VERSION}::FileMetaData)