From 7344a1249dae6e939e1af674432113a582b75cfe Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Tue, 31 Oct 2017 09:47:55 +0000 Subject: main/gpgme: modernize, split gpgmepp, enable tests --- main/gpgme/APKBUILD | 30 +++++++++++++++++++++--------- main/gpgme/fix-bashism.patch | 10 ++++++++++ 2 files changed, 31 insertions(+), 9 deletions(-) create mode 100644 main/gpgme/fix-bashism.patch diff --git a/main/gpgme/APKBUILD b/main/gpgme/APKBUILD index fa8fcaab4d..0d42a41aa7 100644 --- a/main/gpgme/APKBUILD +++ b/main/gpgme/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Natanael Copa pkgname=gpgme pkgver=1.9.0 -pkgrel=0 +pkgrel=1 pkgdesc="gnupg made easy" url="http://www.gnupg.org/related_software/gpgme/" arch="all" @@ -10,9 +10,9 @@ license="GPL" depends="gnupg" depends_dev="libgpg-error-dev libassuan-dev" makedepends="$depends_dev" -install="" -subpackages="$pkgname-dev $pkgname-doc" -source="ftp://ftp.gnupg.org/gcrypt/$pkgname/$pkgname-$pkgver.tar.bz2" +subpackages="$pkgname-dev $pkgname-doc gpgmepp" +source="ftp://ftp.gnupg.org/gcrypt/$pkgname/$pkgname-$pkgver.tar.bz2 + fix-bashism.patch" builddir="$srcdir"/gpgme-$pkgver build() { @@ -24,14 +24,26 @@ build() { --sysconfdir=/etc \ --mandir=/usr/share/man \ --infodir=/usr/share/info \ - --localstatedir=/var \ - || return 1 - make || return 1 + --localstatedir=/var + make } package() { cd "$builddir" - make DESTDIR="$pkgdir" install || return 1 + make DESTDIR="$pkgdir" install } -sha512sums="2a33343e907d9d70cc57dc1ef4e1c01995e1030bb0db937f44435643d6abfbb1bd55d52ba241701fa702783ebf035c09941131604fd8a811474b8bee41afccc8 gpgme-1.9.0.tar.bz2" +check() { + cd "$builddir" + make check +} + +gpgmepp() { + pkgdesc="C++ bindings for GPGME" + mkdir -p "$subpkgdir"/usr/lib + mv "$pkgdir"/usr/lib/libgpgmepp.so.* "$subpkgdir"/usr/lib/ +} + + +sha512sums="2a33343e907d9d70cc57dc1ef4e1c01995e1030bb0db937f44435643d6abfbb1bd55d52ba241701fa702783ebf035c09941131604fd8a811474b8bee41afccc8 gpgme-1.9.0.tar.bz2 +6d83139277026d280fa08827623196c90c6158ecb9a39b58f58f3b4211d8d1e9694aa255eb71a08e40028776f6cc9df9b8f6a71d918065479504de14619a11bd fix-bashism.patch" diff --git a/main/gpgme/fix-bashism.patch b/main/gpgme/fix-bashism.patch new file mode 100644 index 0000000000..19508c96eb --- /dev/null +++ b/main/gpgme/fix-bashism.patch @@ -0,0 +1,10 @@ +diff --git a/tests/gpg/pinentry b/tests/gpg/pinentry +index 3b99726..b12caae 100755 +--- a/tests/gpg/pinentry ++++ b/tests/gpg/pinentry +@@ -1,4 +1,4 @@ +-#! /bin/bash ++#! /bin/sh + # Dummy pinentry + # + # Copyright 2008 g10 Code GmbH -- cgit v1.2.3