[neon/backports-jammy/appstream-jammy2/Neon/unstable] debian/patches: update patch

Carlos De Maine null at kde.org
Thu Sep 14 09:28:18 BST 2023


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

update patch

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

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

diff --git a/debian/patches/0001_qt.diff b/debian/patches/0001_qt.diff
index 8bcae40..a1644f0 100644
--- a/debian/patches/0001_qt.diff
+++ b/debian/patches/0001_qt.diff
@@ -1,8 +1,8 @@
 diff --git a/meson.build b/meson.build
-index 49c9c2ff..13c0194b 100644
+index 2325457e..381e16ff 100644
 --- a/meson.build
 +++ b/meson.build
-@@ -198,6 +198,6 @@ subdir('data/')
+@@ -195,6 +195,6 @@ subdir('data/')
  subdir('contrib/')
  subdir('docs/')
  subdir('tests/')
@@ -30,9 +30,34 @@ 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 100%
+similarity index 86%
 rename from qt/cmake/AppStreamQt5Config.cmake.in
 rename to qt/cmake/AppStreamQt6Config.cmake.in
+index 0bef7e80..84642f0f 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}/../../../..
+ # Use original install prefix when loaded through a "/usr move"
+ # cross-prefix symbolic link such as /lib -> /usr/lib.
+ get_filename_component(_realCurr "${CMAKE_CURRENT_LIST_DIR}" REALPATH)
+-get_filename_component(_realOrig "@LIBDIR_FULL@/cmake/AppStreamQt5" REALPATH)
++get_filename_component(_realOrig "@LIBDIR_FULL@/cmake/AppStreamQt6" REALPATH)
+ if(_realCurr STREQUAL _realOrig)
+   set(PACKAGE_PREFIX_DIR "@PREFIX@")
+ endif()
+@@ -31,9 +31,9 @@ endmacro()
+ add_library(AppStreamQt SHARED IMPORTED)
+ set_target_properties(AppStreamQt PROPERTIES
+   INTERFACE_INCLUDE_DIRECTORIES "${PACKAGE_PREFIX_DIR}/include/"
+-  INTERFACE_LINK_LIBRARIES "Qt5::Core"
+-  IMPORTED_LOCATION "@LIBDIR_FULL@/libAppStreamQt5.so.${AppStreamQt_VERSION}"
+-  IMPORTED_SONAME "libAppStreamQt5.${AppStreamQt_VERSION_MAJOR}"
++  INTERFACE_LINK_LIBRARIES "Qt6::Core"
++  IMPORTED_LOCATION "@LIBDIR_FULL@/libAppStreamQt6.so.${AppStreamQt_VERSION}"
++  IMPORTED_SONAME "libAppStreamQt6.${AppStreamQt_VERSION_MAJOR}"
+ )
+
+ ####################################################################################
 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