haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-04-23 04:00:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

gpgme, bump version (#10368)

Browse Source
This commit is contained in:
Schrijvers Luc
2024-04-25 12:40:22 +02:00
committed by GitHub
parent 64ad671900
commit 3b7748a9de
2 changed files with 42 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

78
app-crypt/gpgme/gpgme-1.17.1.recipe → app-crypt/gpgme/gpgme-1.23.2.recipe
View File

@@ -6,79 +6,73 @@ Currently it uses GnuPG as its backend but the API isn't restricted to \
this engine; in fact we have already developed a backend for CMS (S/MIME)."
HOMEPAGE="http://www.gnupg.org/gpgme.html"
COPYRIGHT="1998-2020 Free Software Foundation, Inc.
2001-2021 g10 Code GmbH"
2001-2023 g10 Code GmbH"
LICENSE="GNU GPL v2
GNU LGPL v2.1"
REVISION="1"
SOURCE_URI="https://www.gnupg.org/ftp/gcrypt/gpgme/gpgme-$portVersion.tar.bz2"
CHECKSUM_SHA256="711eabf5dd661b9b04be9edc9ace2a7bc031f6bd9d37a768d02d0efdef108f5f"
CHECKSUM_SHA256="9499e8b1f33cccb6815527a1bc16049d35a6198a6c5fae0185f2bd561bce5224"
PATCHES="gpgme-$portVersion.patchset"
ARCHITECTURES="all !x86_gcc2"
SECONDARY_ARCHITECTURES="x86"
libgpgmeVersion="11.21.0"
libgpgmeppVersion="6.8.0"
libqgpgmeVersion="7.3.2"
libgpgmeVersion="11.32.0"
libgpgmeppVersion="6.20.1"
libqgpgmeVersion="15.5.1"
libgpgmeVersionCompat="$libgpgmeVersion compat >= ${libgpgmeVersion%%.*}"
libgpgmeppVersionCompat="$libgpgmeppVersion compat >= ${libgpgmeppVersion%%.*}"
libqgpgmeVersionCompat="$libqgpgmeVersion compat >= ${libqgpgmeVersion%%.*}"
#TODO: fix gpgme-config hardcoded package paths
PROVIDES="
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
gpgme$secondaryArchSuffix = $portVersion compat >= 1.17
cmd:gpgme_json$secondaryArchSuffix = $portVersion compat >= 1.17
cmd:gpgme_tool$secondaryArchSuffix = $portVersion compat >= 1.17
lib:libgpgme$secondaryArchSuffix = $libgpgmeVersionCompat
lib:libgpgmepp$secondaryArchSuffix = $libgpgmeppVersionCompat
lib:libqgpgme$secondaryArchSuffix = $libqgpgmeVersionCompat
"
REQUIRES="
haiku${secondaryArchSuffix}
lib:libassuan${secondaryArchSuffix}
haiku$secondaryArchSuffix
lib:libassuan$secondaryArchSuffix
lib:libglib_2.0$secondaryArchSuffix
lib:libgpg_error${secondaryArchSuffix}
lib:libQt5Core${secondaryArchSuffix}
lib:libgpg_error$secondaryArchSuffix
lib:libQt5Core$secondaryArchSuffix
"
PROVIDES_devel="
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
gpgme${secondaryArchSuffix}_devel = $portVersion compat >= 1.17
devel:libgpgme$secondaryArchSuffix = $libgpgmeVersionCompat
devel:libgpgmepp$secondaryArchSuffix = $libgpgmeppVersionCompat
devel:libqgpgme$secondaryArchSuffix = $libqgpgmeVersionCompat
"
REQUIRES_devel="
gpgme${secondaryArchSuffix} == $portVersion base
devel:libassuan${secondaryArchSuffix}
gpgme$secondaryArchSuffix == $portVersion base
devel:libassuan$secondaryArchSuffix
"
BUILD_REQUIRES="
haiku${secondaryArchSuffix}_devel
devel:libassuan${secondaryArchSuffix}
devel:libassuan$secondaryArchSuffix
devel:libglib_2.0$secondaryArchSuffix
devel:libgpg_error${secondaryArchSuffix}
devel:libQt5Core${secondaryArchSuffix}
devel:libgpg_error$secondaryArchSuffix
devel:libQt5Core$secondaryArchSuffix
"
BUILD_PREREQUIRES="
cmd:autoconf
cmd:automake
cmd:autoreconf
cmd:awk
cmd:bison
cmd:gcc${secondaryArchSuffix}
cmd:git
cmd:gcc$secondaryArchSuffix
cmd:gpg$secondaryArchSuffix
cmd:gpgconf$secondaryArchSuffix
cmd:gpg_error$secondaryArchSuffix
cmd:grep
cmd:kill
cmd:ld${secondaryArchSuffix}
cmd:libtoolize
cmd:libtoolize$secondaryArchSuffix
cmd:make
cmd:makeinfo
cmd:msgfmt
cmd:perl
cmd:ps
cmd:pkg_config$secondaryArchSuffix
cmd:qmake$secondaryArchSuffix >= 5.12
cmd:tar
cmd:xargs
"
@@ -87,8 +81,9 @@ BUILD()
autoreconf -fi
runConfigure ./configure
make $jobArgs
# kill gpg-agent processes
ps -o Id Team | grep 'gpg-agent' | grep -v "grep" | awk '{print $1}' | xargs kill -9 $1
ps -o Id Team | grep 'gpg-agent' | grep -v "grep" | awk '{print $1}' | xargs kill -9
}
INSTALL()
@@ -101,6 +96,7 @@ INSTALL()
# remove libtool files
rm $libDir/lib*.la
# fix lib path in cmake files
sed -i "s|$libDir|$developLibDir|" \
$libDir/cmake/QGpgme/QGpgmeConfig.cmake \
@@ -109,12 +105,14 @@ INSTALL()
$libDir/cmake/QGpgme/QGpgmeConfig.cmake \
$libDir/cmake/Gpgmepp/GpgmeppConfig.cmake
prepareInstalledDevelLibs libgpgme libgpgmepp libqgpgme
prepareInstalledDevelLibs libgpgme \
libgpgmepp \
libqgpgme
fixPkgconfig
packageEntries devel \
$developDir $libDir/cmake $binDir/gpgme-config
$developDir \
$libDir/cmake
}
TEST()

8
app-crypt/gpgme/patches/gpgme-1.17.1.patchset → app-crypt/gpgme/patches/gpgme-1.23.2.patchset
View File

@@ -1,4 +1,4 @@
From b406f41702fc8c12b65c5ff261843a94e5f97dfd Mon Sep 17 00:00:00 2001
From 59571cd36379211b0060bc35d073c5dacfc17027 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= <revol@free.fr>
Date: Sun, 16 Nov 2014 14:50:17 +0100
Subject: configure.ac: Haiku does have a thread-safe getenv
@@ -6,10 +6,10 @@ Subject: configure.ac: Haiku does have a thread-safe getenv
Also force HAVE_PTHREAD.
diff --git a/configure.ac b/configure.ac
index 43b18f6..72ec364 100644
index ae4c7da..4dfcbbf 100644
--- a/configure.ac
+++ b/configure.ac
@@ -230,6 +230,9 @@ case "${host}" in
@@ -268,6 +268,9 @@ case "${host}" in
*-apple-darwin*)
have_macos_system=yes
;;
@@ -20,5 +20,5 @@ index 43b18f6..72ec364 100644
case "${host}" in
*-mingw32*)
--
2.30.2
2.43.2