[neon/backports-jammy/appstream-jammy2/Neon/unstable] debian/patches: all in on 6

[Carlos De Maine]

Git commit 1b69ed3fc5e02d17d756f8bd42c7871d94ddb505 by Carlos De Maine.
Committed on 14/09/2023 at 11:18.
Pushed by carlosdem into branch 'Neon/unstable'.

all in on 6

M  +10   -5    debian/patches/0001_qt.diff

https://invent.kde.org/neon/backports-jammy/appstream-jammy2/-/commit/1b69ed3fc5e02d17d756f8bd42c7871d94ddb505

diff --git a/debian/patches/0001_qt.diff b/debian/patches/0001_qt.diff
index 0e54d27..6c8cded 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 84%
+similarity index 78%
 rename from qt/cmake/AppStreamQt5Config.cmake.in
 rename to qt/cmake/AppStreamQt6Config.cmake.in
-index 0bef7e80..97f0f7c6 100644
+index 0bef7e80..a66568ac 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,9 +45,14 @@ index 0bef7e80..97f0f7c6 100644
  if(_realCurr STREQUAL _realOrig)
    set(PACKAGE_PREFIX_DIR "@PREFIX@")
  endif()
-@@ -31,11 +31,11 @@ endmacro()
- add_library(AppStreamQt SHARED IMPORTED)
- set_target_properties(AppStreamQt PROPERTIES
+@@ -28,14 +28,14 @@ macro(check_required_components _NAME)
+   endforeach()
+ endmacro()
+
+-add_library(AppStreamQt SHARED IMPORTED)
+-set_target_properties(AppStreamQt PROPERTIES
++add_library(AppStreamQt6 SHARED IMPORTED)
++set_target_properties(AppStreamQt6 PROPERTIES
    INTERFACE_INCLUDE_DIRECTORIES "${PACKAGE_PREFIX_DIR}/include/"
 -  INTERFACE_LINK_LIBRARIES "Qt5::Core"
 -  IMPORTED_LOCATION "@LIBDIR_FULL@/libAppStreamQt5.so.${AppStreamQt_VERSION}"