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

Carlos De Maine null at kde.org
Sun Jul 14 13:22:30 BST 2024


Git commit 03c7d6fac5f5ccfc7e7b8be3913a7ac77e16b441 by Carlos De Maine.
Committed on 14/07/2024 at 12:22.
Pushed by carlosdem into branch 'Neon/release'.

iterate

(cherry picked from commit 49b433abd323b1f2dd0fa9cb593ef60f2993cbc2)

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

M  +40   -1    debian/patches/fixbuild

https://invent.kde.org/neon/neon-packaging/mauikit-documents/-/commit/03c7d6fac5f5ccfc7e7b8be3913a7ac77e16b441

diff --git a/debian/patches/fixbuild b/debian/patches/fixbuild
index c758454..aa1ba44 100644
--- a/debian/patches/fixbuild
+++ b/debian/patches/fixbuild
@@ -10,4 +10,43 @@ index 84cd7744f947c3cba658398b99d714f5e55c37fc..d7de3d6ee8ed271234d2472d62c7ad22
 +find_package(KF${KF_MAJOR_VERSION}  ${REQUIRED_KF_VERSION} REQUIRED COMPONENTS
      I18n
      CoreAddons)
- 
\ No newline at end of file
+ 
+diff --git a/MauiKitDocumentsConfig.cmake.in.6 b/MauiKitDocumentsConfig.cmake.in.6
+index c46e910c22ab2296c7d9fc8335a254724782e031..b74cdcad644526bd64d1a7d3806fa1e16c190d0c 100644
+--- a/MauiKitDocumentsConfig.cmake.in.6
++++ b/MauiKitDocumentsConfig.cmake.in.6
+@@ -1,7 +1,7 @@
+ @PACKAGE_INIT@
+ 
+ include(CMakeFindDependencyMacro)
+-find_dependency(Qt5Core @REQUIRED_QT_VERSION@)
++find_dependency(QtCore @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
+--- a/src/code/cbz/CMakeLists.txt
++++ b/src/code/cbz/CMakeLists.txt
+@@ -42,7 +42,7 @@ target_include_directories(CBZLib
+     ${Qt${QT_MAJOR_VERSION}Quick_PRIVATE_INCLUDE_DIRS})
+ 
+ if(UNIX AND NOT ANDROID)
+-    find_package(KF5 ${REQUIRED_KF5_VERSION} REQUIRED COMPONENTS FileMetaData)
++    find_package(KF${REQUIRED_KF_VERSION} REQUIRED COMPONENTS FileMetaData)
+     target_link_libraries (CBZLib
+         PUBLIC
+         KF${KF_MAJOR_VERSION}::FileMetaData)
+diff --git a/src/code/cbz/code/acbf/AdvancedComicBookFormatConfig.cmake.in b/src/code/cbz/code/acbf/AdvancedComicBookFormatConfig.cmake.in
+index 3e5b7be151a17ffc7ae5230dac746d037e3f68cc..e3fa8adf04163db4315294f24368630c0e6f1c21 100644
+--- a/src/code/cbz/code/acbf/AdvancedComicBookFormatConfig.cmake.in
++++ b/src/code/cbz/code/acbf/AdvancedComicBookFormatConfig.cmake.in
+@@ -1,7 +1,7 @@
+ @PACKAGE_INIT@
+ 
+ include(CMakeFindDependencyMacro)
+-find_dependency(Qt5Core "@QT5_DEP_VERSION@")
++find_dependency(Qt6Core "@QT6_DEP_VERSION@")
+ 
+ include("${CMAKE_CURRENT_LIST_DIR}/AdvancedComicBookFormatTargets.cmake")
+ @PACKAGE_INCLUDE_CORE_QCHTARGETS@


More information about the Neon-commits mailing list