From 9a59797506a1c809ecef800f2647ad81b164aa50 Mon Sep 17 00:00:00 2001 From: John Date: Fri, 27 Dec 2024 16:07:49 +0100 Subject: [PATCH] gpgme-qt6: fix cmake include path --- srcpkgs/gpgme-qt6/template | 2 +- srcpkgs/gpgme/patches/cmake-crossbuild-support.patch | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/gpgme-qt6/template b/srcpkgs/gpgme-qt6/template index f7803041ce8..dcd28dc07b1 100644 --- a/srcpkgs/gpgme-qt6/template +++ b/srcpkgs/gpgme-qt6/template @@ -7,7 +7,7 @@ # -> colord -> sane -> poppler -> gpgme -> qt5 -> SDL2 pkgname=gpgme-qt6 version=1.24.1 -revision=3 +revision=4 build_style=gnu-configure configure_args="--enable-fd-passing --with-libgpg-error-prefix=$XBPS_CROSS_BASE/usr diff --git a/srcpkgs/gpgme/patches/cmake-crossbuild-support.patch b/srcpkgs/gpgme/patches/cmake-crossbuild-support.patch index a3ed8a25ea1..8cc2431d9e9 100644 --- a/srcpkgs/gpgme/patches/cmake-crossbuild-support.patch +++ b/srcpkgs/gpgme/patches/cmake-crossbuild-support.patch @@ -75,7 +75,7 @@ set_target_properties(QGpgme PROPERTIES - INTERFACE_INCLUDE_DIRECTORIES "@resolved_includedir@/qgpgme;@resolved_includedir@" -+ INTERFACE_INCLUDE_DIRECTORIES "${_IMPORT_PREFIX}/include/qgpgme" ++ INTERFACE_INCLUDE_DIRECTORIES "${_IMPORT_PREFIX}/include/qgpgme-qt5" INTERFACE_LINK_LIBRARIES "Gpgmepp;Qt5::Core" - IMPORTED_LOCATION "@resolved_libdir@/libqgpgme@libsuffix@" + IMPORTED_LOCATION "${_IMPORT_PREFIX}/lib/libqgpgme@libsuffix@" @@ -120,7 +120,7 @@ set_target_properties(QGpgmeQt6 PROPERTIES - INTERFACE_INCLUDE_DIRECTORIES "@resolved_includedir@/qgpgme;@resolved_includedir@" -+ INTERFACE_INCLUDE_DIRECTORIES "${_IMPORT_PREFIX}/include/qgpgme" ++ INTERFACE_INCLUDE_DIRECTORIES "${_IMPORT_PREFIX}/include/qgpgme-qt6" INTERFACE_LINK_LIBRARIES "Gpgmepp;Qt6::Core" - IMPORTED_LOCATION "@resolved_libdir@/libqgpgmeqt6@libsuffix@" + IMPORTED_LOCATION "${_IMPORT_PREFIX}/lib/libqgpgmeqt6@libsuffix@"