[neon/backports-jammy/appstream-jammy2/Neon/unstable] debian/patches: missed one

Carlos De Maine null at kde.org
Thu Sep 14 09:50:04 BST 2023


Git commit 9cf9bc7a09a51c6862bebaef90285a88d18963a9 by Carlos De Maine.
Committed on 14/09/2023 at 10:49.
Pushed by carlosdem into branch 'Neon/unstable'.

missed one

M  +6    -3    debian/patches/0001_qt.diff

https://invent.kde.org/neon/backports-jammy/appstream-jammy2/-/commit/9cf9bc7a09a51c6862bebaef90285a88d18963a9

diff --git a/debian/patches/0001_qt.diff b/debian/patches/0001_qt.diff
index a1644f0..0e54d27 100644
--- a/debian/patches/0001_qt.diff
+++ b/debian/patches/0001_qt.diff
@@ -30,10 +30,10 @@ index ca903a85..17d11f8b 100644
         value : false,
         description: 'Build libappstream-qt5 for Qt5'
 diff --git a/qt/cmake/AppStreamQt5Config.cmake.in b/qt/cmake/AppStreamQt6Config.cmake.in
-similarity index 86%
+similarity index 84%
 rename from qt/cmake/AppStreamQt5Config.cmake.in
 rename to qt/cmake/AppStreamQt6Config.cmake.in
-index 0bef7e80..84642f0f 100644
+index 0bef7e80..97f0f7c6 100644
 --- a/qt/cmake/AppStreamQt5Config.cmake.in
 +++ b/qt/cmake/AppStreamQt6Config.cmake.in
 @@ -4,7 +4,7 @@ get_filename_component(PACKAGE_PREFIX_DIR "${CMAKE_CURRENT_LIST_DIR}/../../../..
@@ -45,7 +45,7 @@ index 0bef7e80..84642f0f 100644
  if(_realCurr STREQUAL _realOrig)
    set(PACKAGE_PREFIX_DIR "@PREFIX@")
  endif()
-@@ -31,9 +31,9 @@ endmacro()
+@@ -31,11 +31,11 @@ endmacro()
  add_library(AppStreamQt SHARED IMPORTED)
  set_target_properties(AppStreamQt PROPERTIES
    INTERFACE_INCLUDE_DIRECTORIES "${PACKAGE_PREFIX_DIR}/include/"
@@ -58,6 +58,9 @@ index 0bef7e80..84642f0f 100644
  )
 
  ####################################################################################
+
+-check_required_components(Qt5Core)
++check_required_components(Qt6Core)
 diff --git a/qt/cmake/AppStreamQt5ConfigVersion.cmake.in b/qt/cmake/AppStreamQt6ConfigVersion.cmake.in
 similarity index 100%
 rename from qt/cmake/AppStreamQt5ConfigVersion.cmake.in


More information about the Neon-commits mailing list