From 2fa3703d0e59408cc2f65eb995807152d620b173 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D9=85=D9=87=D8=AF=D9=8A=20=D8=B4=D9=8A=D9=86=D9=88=D9=86?= =?UTF-8?q?=20=28Mehdi=20Chinoune=29?= Date: Thu, 9 Jan 2025 17:05:19 +0100 Subject: [PATCH] gpgme: Fix CMake files. --- mingw-w64-gpgme/PKGBUILD | 12 +++++++----- mingw-w64-gpgme/relocatable-cmake.patch | 22 +++++++++++----------- 2 files changed, 18 insertions(+), 16 deletions(-) diff --git a/mingw-w64-gpgme/PKGBUILD b/mingw-w64-gpgme/PKGBUILD index 5e17ceceda..37f74c302f 100644 --- a/mingw-w64-gpgme/PKGBUILD +++ b/mingw-w64-gpgme/PKGBUILD @@ -10,7 +10,7 @@ pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}" "${MINGW_PACKAGE_PREFIX}-qgpgme-qt6" \ "${MINGW_PACKAGE_PREFIX}-python-gpgme")) pkgver=1.23.2 -pkgrel=9 +pkgrel=10 pkgdesc="A C wrapper library for GnuPG (mingw-w64)" arch=('any') mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clangarm64') @@ -21,7 +21,7 @@ msys2_references=( "cpe: cpe:/a:gnu:gpgme" "cpe: cpe:/a:gnupg:gpgme" ) -license=('spdx: LGPL-2.1-or-later OR GPL-2.0-or-later') +license=('spdx:LGPL-2.1-or-later OR GPL-2.0-or-later') depends=("${MINGW_PACKAGE_PREFIX}-glib2" "${MINGW_PACKAGE_PREFIX}-gnupg" "${MINGW_PACKAGE_PREFIX}-libassuan" @@ -66,7 +66,7 @@ sha256sums=('9499e8b1f33cccb6815527a1bc16049d35a6198a6c5fae0185f2bd561bce5224' '0b0d511f9d47844d3fd806864310d9abbeb1285d43f6ffa33babf55a4a410458' 'ace3d5166372e0422a625f76a2890d70f2916d9239ade74e58bd23077e9c1c6b' '5e8e7e773a09ed1e1724c9d7216eaaecce52af49152513366026a2fa3245d762' - '2a390489e8d192ca1b182458f29cbc5d0b78524b041afeee91bde6001150b5c2' + '9b0bae58939c8976a7d70b5620c8bc2cc3cc59c9e7cd4e3e5c93eb9c15f8fc41' 'a110b40d146a7c561140b68831027f61d2132e1069d2476b2e0a4034bc54fae1') _apply_patch_with_msg() { @@ -167,8 +167,10 @@ package_gpgme() { cd "${srcdir}"/build-${MSYSTEM} make DESTDIR="${pkgdir}" install - install -Dm644 "${srcdir}/${_realname}-${pkgver}/COPYING" "${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/COPYING" - install -Dm644 "${srcdir}/${_realname}-${pkgver}/COPYING.LESSER" "${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/COPYING.LESSER" + install -Dm644 "${srcdir}/${_realname}-${pkgver}/COPYING" \ + "${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/COPYING" + install -Dm644 "${srcdir}/${_realname}-${pkgver}/COPYING.LESSER" \ + "${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/COPYING.LESSER" local PREFIX_WIN=$(cygpath -wm ${MINGW_PREFIX}) sed -s "s|${PREFIX_WIN}|${MINGW_PREFIX}|g" -i "${pkgdir}${MINGW_PREFIX}/bin/gpgme-config" diff --git a/mingw-w64-gpgme/relocatable-cmake.patch b/mingw-w64-gpgme/relocatable-cmake.patch index 460d210a9a..e219b426f6 100644 --- a/mingw-w64-gpgme/relocatable-cmake.patch +++ b/mingw-w64-gpgme/relocatable-cmake.patch @@ -1,5 +1,3 @@ -diff --git a/lang/cpp/src/GpgmeppConfig-w32.cmake.in.in b/lang/cpp/src/GpgmeppConfig-w32.cmake.in.in -index 12826760..df1d4c9a 100644 --- a/lang/cpp/src/GpgmeppConfig-w32.cmake.in.in +++ b/lang/cpp/src/GpgmeppConfig-w32.cmake.in.in @@ -58,18 +58,27 @@ unset(_targetsDefined) @@ -35,11 +33,9 @@ index 12826760..df1d4c9a 100644 if(CMAKE_VERSION VERSION_LESS 2.8.12) message(FATAL_ERROR "This file relies on consumers using CMake 2.8.12 or greater.") -diff --git a/lang/qt/src/QGpgmeConfig-w32.cmake.in.in b/lang/qt/src/QGpgmeConfig-w32.cmake.in.in -index b8978053..8f7a2d43 100644 --- a/lang/qt/src/QGpgmeConfig-w32.cmake.in.in +++ b/lang/qt/src/QGpgmeConfig-w32.cmake.in.in -@@ -58,14 +58,22 @@ +@@ -58,16 +58,24 @@ unset(_targetsNotDefined) unset(_expectedTargets) @@ -57,14 +53,17 @@ index b8978053..8f7a2d43 100644 set_target_properties(QGpgme PROPERTIES - IMPORTED_IMPLIB_RELEASE "@resolved_libdir@/libqgpgme.dll.a" - INTERFACE_INCLUDE_DIRECTORIES "@resolved_includedir@/qgpgme;@resolved_includedir@" -+ IMPORTED_IMPLIB_RELEASE "${_IMPORT_PREFIX}/lib/libqgpgme.dll.a" ++ IMPORTED_IMPLIB "${_IMPORT_PREFIX}/lib/libqgpgme.dll.a" + INTERFACE_INCLUDE_DIRECTORIES "${_IMPORT_PREFIX}/include/qgpgme;${_IMPORT_PREFIX}/include" INTERFACE_LINK_LIBRARIES "Gpgmepp;Qt5::Core" - IMPORTED_LOCATION "@resolved_bindir@/libqgpgme-15.dll" + IMPORTED_LOCATION "${_IMPORT_PREFIX}/bin/libqgpgme-15.dll" ) - get_target_property(_libpath QGpgme IMPORTED_IMPLIB_RELEASE) +-get_target_property(_libpath QGpgme IMPORTED_IMPLIB_RELEASE) ++get_target_property(_libpath QGpgme IMPORTED_IMPLIB) get_target_property(_dllpath QGpgme IMPORTED_LOCATION) + + list(APPEND _IMPORT_CHECK_TARGETS QGpgme ) @@ -73,6 +81,8 @@ list(APPEND _IMPORT_CHECK_TARGETS QGpgme ) list(APPEND _IMPORT_CHECK_FILES_FOR_QGpgme "${_libpath}" "${_dllpath}" ) @@ -74,11 +73,9 @@ index b8978053..8f7a2d43 100644 if(CMAKE_VERSION VERSION_LESS 2.8.12) message(FATAL_ERROR "This file relies on consumers using CMake 2.8.12 or greater.") endif() -diff --git a/lang/qt/src/QGpgmeQt6Config-w32.cmake.in.in b/lang/qt/src/QGpgmeQt6Config-w32.cmake.in.in -index 290f211..bb2df7a 100644 --- a/lang/qt/src/QGpgmeQt6Config-w32.cmake.in.in +++ b/lang/qt/src/QGpgmeQt6Config-w32.cmake.in.in -@@ -58,14 +58,22 @@ +@@ -58,16 +58,24 @@ unset(_targetsNotDefined) unset(_expectedTargets) @@ -102,8 +99,11 @@ index 290f211..bb2df7a 100644 - IMPORTED_LOCATION "@resolved_bindir@/libqgpgmeqt6-15.dll" + IMPORTED_LOCATION "${_IMPORT_PREFIX}/bin/libqgpgmeqt6-15.dll" ) - get_target_property(_libpath QGpgmeQt6 IMPORTED_IMPLIB_RELEASE) +-get_target_property(_libpath QGpgmeQt6 IMPORTED_IMPLIB_RELEASE) ++get_target_property(_libpath QGpgmeQt6 IMPORTED_IMPLIB) get_target_property(_dllpath QGpgmeQt6 IMPORTED_LOCATION) + + list(APPEND _IMPORT_CHECK_TARGETS QGpgmeQt6 ) @@ -73,6 +81,8 @@ list(APPEND _IMPORT_CHECK_TARGETS QGpgmeQt6 ) list(APPEND _IMPORT_CHECK_FILES_FOR_QGpgmeQt6 "${_libpath}" "${_dllpath}" )