From cc90d358cb0341e8d5ac42db21753d6f5365d19c Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Fri, 19 Apr 2019 20:10:24 +0200 Subject: [PATCH] gpgme: move cmake files to the devel package. * devel package depends on libassuan devel package. * fix path in cmake files. --- app-crypt/gpgme/gpgme-1.12.0.recipe | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/app-crypt/gpgme/gpgme-1.12.0.recipe b/app-crypt/gpgme/gpgme-1.12.0.recipe index f525b6471..5a3e5c430 100644 --- a/app-crypt/gpgme/gpgme-1.12.0.recipe +++ b/app-crypt/gpgme/gpgme-1.12.0.recipe @@ -15,7 +15,7 @@ LICENSE=" GNU GPL v2 GNU LGPL v2.1 " -REVISION="2" +REVISION="3" SOURCE_URI="https://www.gnupg.org/ftp/gcrypt/gpgme/gpgme-$portVersion.tar.bz2" CHECKSUM_SHA256="b4dc951c3743a60e2e120a77892e9e864fb936b2e58e7c77e8581f4d050e8cd8" PATCHES="gpgme-$portVersion.patchset" @@ -53,16 +53,17 @@ PROVIDES_devel=" " REQUIRES_devel=" gpgme${secondaryArchSuffix} == $portVersion base + devel:libassuan${secondaryArchSuffix} " BUILD_REQUIRES=" + haiku${secondaryArchSuffix}_devel devel:libassuan${secondaryArchSuffix} devel:libglib_2.0$secondaryArchSuffix devel:libgpg_error${secondaryArchSuffix} devel:libQt5Core${secondaryArchSuffix} " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel cmd:autoconf cmd:automake cmd:awk @@ -100,18 +101,26 @@ INSTALL() { make install + local develPackageName="${portName}_devel-$portFullVersion" + local packageLinksDir=$(dirname $portPackageLinksDir) + local assuanLinksDir="$packageLinksDir/${develPackageName}/devel~libassuan$secondaryArchSuffix/$relativeDevelopLibDir" + # remove libtool files rm $libDir/lib*.la # fix lib path in cmake files - sed -i "s|$libDir|$developLibDir|" $libDir/cmake/QGpgme/QGpgmeConfig.cmake - sed -i "s|$libDir|$developLibDir|" $libDir/cmake/Gpgmepp/GpgmeppConfig.cmake + sed -i "s|$libDir|$developLibDir|" \ + $libDir/cmake/QGpgme/QGpgmeConfig.cmake \ + $libDir/cmake/Gpgmepp/GpgmeppConfig.cmake + sed -i "s|/packages/libassuan.*/lib|$assuanLinksDir|" \ + $libDir/cmake/QGpgme/QGpgmeConfig.cmake \ + $libDir/cmake/Gpgmepp/GpgmeppConfig.cmake prepareInstalledDevelLibs libgpgme libgpgmepp libqgpgme fixPkgconfig packageEntries devel \ - $developDir $binDir/gpgme-config + $developDir $libDir/cmake $binDir/gpgme-config } TEST()