diff --git a/app-crypt/gpgme/gpgme-1.5.5.recipe b/app-crypt/gpgme/gpgme-1.6.0.recipe similarity index 64% rename from app-crypt/gpgme/gpgme-1.5.5.recipe rename to app-crypt/gpgme/gpgme-1.6.0.recipe index 912c710af..9d997376a 100644 --- a/app-crypt/gpgme/gpgme-1.5.5.recipe +++ b/app-crypt/gpgme/gpgme-1.6.0.recipe @@ -8,7 +8,7 @@ this engine; in fact we have already developed a backend for CMS (S/MIME). " HOMEPAGE="http://www.gnupg.org/gpgme.html" SOURCE_URI="ftp://ftp.gnupg.org/gcrypt/gpgme/gpgme-$portVersion.tar.bz2" -CHECKSUM_SHA256="0b3d3d5107680c594777aae65882a1ff6dd1ba629a83432e719c8b82a743c207" +CHECKSUM_SHA256="b09de4197ac280b102080e09eaec6211d081efff1963bf7821cf8f4f9916099d" REVISION="1" LICENSE=" GNU GPL v2 @@ -26,8 +26,8 @@ SECONDARY_ARCHITECTURES="x86" PROVIDES=" gpgme${secondaryArchSuffix} = $portVersion compat >= 1.5 cmd:gpgme_tool${secondaryArchSuffix} = $portVersion compat >= 1.5 - lib:libgpgme_pthread${secondaryArchSuffix} = 11.13.4 compat >= 11 - lib:libgpgme${secondaryArchSuffix} = 11.13.4 compat >= 11 + lib:libgpgme_pthread${secondaryArchSuffix} = 11.14.0 compat >= 11 + lib:libgpgme${secondaryArchSuffix} = 11.14.0 compat >= 11 " REQUIRES=" haiku${secondaryArchSuffix} @@ -71,22 +71,10 @@ INSTALL() { make install - prepareInstalledDevelLibs libgpgme libgpgme-pthread + # remove libtool files + rm $libDir/lib*.la - # The libtool files reference other libraries using the wrong paths, which - # creates a lot of confusion. Fix them so correct paths are used. - local develPackageName="${portName}_devel-$portFullVersion" - local packageLinksDir=$(dirname $portPackageLinksDir) - for l in libgpgme libgpgme-pthread; do - local linksDir="$packageLinksDir/${develPackageName}/devel~libassuan$secondaryArchSuffix/$relativeDevelopLibDir" - sed -i -e "s,\(-L/packages/libassuan[^ ]*\),-L$linksDir," \ - -e "s,[^ ]*/libassuan\.la,$linksDir/libassuan.la,g" \ - $developLibDir/$l.la - local linksDir="$packageLinksDir/${develPackageName}/devel~libgpg_error$secondaryArchSuffix/$relativeDevelopLibDir" - sed -i -e "s,\(-L/packages/libgpg_error[^ ]*\),-L$linksDir," \ - -e "s,[^ ]*/libgpg-error\.la,$linksDir/libgpg-error.la,g" \ - $developLibDir/$l.la - done + prepareInstalledDevelLibs libgpgme libgpgme-pthread packageEntries devel \ $developDir $binDir/gpgme-config @@ -102,8 +90,8 @@ TEST() PROVIDES_devel=" gpgme${secondaryArchSuffix}_devel = $portVersion compat >= 1.5 cmd:gpgme_config${secondaryArchSuffix} = $portVersion compat >= 1.5 - devel:libgpgme_pthread${secondaryArchSuffix} = 11.13.4 compat >= 11 - devel:libgpgme${secondaryArchSuffix} = 11.13.4 compat >= 11 + devel:libgpgme_pthread${secondaryArchSuffix} = 11.14.0 compat >= 11 + devel:libgpgme${secondaryArchSuffix} = 11.14.0 compat >= 11 " REQUIRES_devel=" gpgme${secondaryArchSuffix} == $portVersion base diff --git a/app-crypt/gpgme/patches/gpgme-1.5.5.patchset b/app-crypt/gpgme/patches/gpgme-1.6.0.patchset similarity index 100% rename from app-crypt/gpgme/patches/gpgme-1.5.5.patchset rename to app-crypt/gpgme/patches/gpgme-1.6.0.patchset