diff --git a/app-crypt/gpgme/gpgme-1.9.0.recipe b/app-crypt/gpgme/gpgme-1.12.0.recipe similarity index 60% rename from app-crypt/gpgme/gpgme-1.9.0.recipe rename to app-crypt/gpgme/gpgme-1.12.0.recipe index a3b8dcf85..d2f79f5ab 100644 --- a/app-crypt/gpgme/gpgme-1.9.0.recipe +++ b/app-crypt/gpgme/gpgme-1.12.0.recipe @@ -8,40 +8,48 @@ this engine; in fact we have already developed a backend for CMS (S/MIME). " HOMEPAGE="http://www.gnupg.org/gpgme.html" COPYRIGHT=" - 1998-2010 Free Software Foundation, Inc. + 1998-2018 Free Software Foundation, Inc. 2001-2010 g10 Code GmbH " LICENSE=" GNU GPL v2 GNU LGPL v2.1 " -REVISION="2" +REVISION="1" SOURCE_URI="https://www.gnupg.org/ftp/gcrypt/gpgme/gpgme-$portVersion.tar.bz2" -CHECKSUM_SHA256="1b29fedb8bfad775e70eafac5b0590621683b2d9869db994568e6401f4034ceb" +CHECKSUM_SHA256="b4dc951c3743a60e2e120a77892e9e864fb936b2e58e7c77e8581f4d050e8cd8" PATCHES="gpgme-$portVersion.patchset" ARCHITECTURES="!x86_gcc2 x86 x86 x86_64" SECONDARY_ARCHITECTURES="x86" +libgpgmeVersion="11.21.0" +libgpgmeppVersion="6.8.0" +libqgpgmeVersion="7.3.2" + #TODO: fix gpgme-config hardcoded package paths PROVIDES=" - gpgme${secondaryArchSuffix} = $portVersion compat >= 1.5 - cmd:gpgme_tool${secondaryArchSuffix} = $portVersion compat >= 1.5 - lib:libgpgme${secondaryArchSuffix} = 11.18.0 compat >= 11 - lib:libgpgmepp${secondaryArchSuffix} = 6.4.0 compat >= 6 + gpgme${secondaryArchSuffix} = $portVersion compat >= 1.9 + cmd:gpgme_json${secondaryArchSuffix} = $portVersion compat >= 1.9 + cmd:gpgme_tool${secondaryArchSuffix} = $portVersion compat >= 1.9 + lib:libgpgme${secondaryArchSuffix} = $libgpgmeVersion compat >= 11 + lib:libgpgmepp${secondaryArchSuffix} = $libgpgmeppVersion compat >= 6 + lib:libqgpgme${secondaryArchSuffix} = $libqgpgmeVersion compat >= 7 " REQUIRES=" haiku${secondaryArchSuffix} lib:libassuan${secondaryArchSuffix} lib:libglib_2.0$secondaryArchSuffix lib:libgpg_error${secondaryArchSuffix} + lib:libQt5Core${secondaryArchSuffix} " PROVIDES_devel=" - gpgme${secondaryArchSuffix}_devel = $portVersion compat >= 1.5 - cmd:gpgme_config${secondaryArchSuffix} = $portVersion compat >= 1.5 - devel:libgpgme${secondaryArchSuffix} = 11.18.0 compat >= 11 - devel:libgpgmepp${secondaryArchSuffix} = 6.4.0 compat >= 6 + gpgme${secondaryArchSuffix}_devel = $portVersion compat >= 1.9 + cmd:gpgme_config${secondaryArchSuffix} = $portVersion compat >= 1.9 + devel:libgpgme${secondaryArchSuffix} = $libgpgmeVersion compat >= 11 + devel:libgpgmepp${secondaryArchSuffix} = $libgpgmeppVersion compat >= 6 + devel:libqgpgme${secondaryArchSuffix} = $libqgpgmeVersion compat >= 7 " REQUIRES_devel=" gpgme${secondaryArchSuffix} == $portVersion base @@ -51,6 +59,7 @@ BUILD_REQUIRES=" devel:libassuan${secondaryArchSuffix} devel:libglib_2.0$secondaryArchSuffix devel:libgpg_error${secondaryArchSuffix} + devel:libQt5Core${secondaryArchSuffix} " BUILD_PREREQUIRES=" haiku${secondaryArchSuffix}_devel @@ -67,6 +76,8 @@ BUILD_PREREQUIRES=" cmd:makeinfo cmd:msgfmt cmd:perl + cmd:pkg_config$secondaryArchSuffix + cmd:qmake$secondaryArchSuffix >= 5.12 cmd:tar " @@ -83,8 +94,13 @@ INSTALL() # 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 - prepareInstalledDevelLibs libgpgme libgpgmepp + prepareInstalledDevelLibs libgpgme libgpgmepp libqgpgme + + fixPkgconfig packageEntries devel \ $developDir $binDir/gpgme-config diff --git a/app-crypt/gpgme/patches/gpgme-1.9.0.patchset b/app-crypt/gpgme/patches/gpgme-1.12.0.patchset similarity index 100% rename from app-crypt/gpgme/patches/gpgme-1.9.0.patchset rename to app-crypt/gpgme/patches/gpgme-1.12.0.patchset