1
0
forked from brl/citadel

gcr update for 3.28

This commit is contained in:
Bruce Leidl 2018-03-24 13:30:41 -04:00
parent d66cab9d4a
commit 6e33b1df30
2 changed files with 60 additions and 0 deletions

View File

@ -0,0 +1,32 @@
From 6f22047a0c97c06d8d4069a7dbecaa567065a00b Mon Sep 17 00:00:00 2001
From: Bruce Leidl <bruce@subgraph.com>
Date: Wed, 21 Mar 2018 15:19:09 -0400
Subject: [PATCH] Use pkgconfig to find libgcrypt
---
configure.ac | 9 +--------
1 file changed, 1 insertion(+), 8 deletions(-)
diff --git a/configure.ac b/configure.ac
index 06dfc0c..c11526f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -193,14 +193,7 @@ AC_DEFINE_UNQUOTED([GPG_EXECUTABLE], ["$GNUPG"], [Path to gpg executable.])
#
GCRYPT_LIBVER=1
-
-AM_PATH_LIBGCRYPT($GCRYPT_LIBVER:$GCRYPT_VERSION,,
- AC_MSG_ERROR([[
-***
-*** libgcrypt was not found. You may want to get it from
-*** ftp://ftp.gnupg.org/gcrypt/libgcrypt/
-***
-]]))
+PKG_CHECK_MODULES(LIBGCRYPT, libgcrypt)
libgcrypt=yes
AC_DEFINE_UNQUOTED(LIBGCRYPT_VERSION, "$GCRYPT_VERSION", [Version of GCRYPT we expect])
--
2.16.2

View File

@ -0,0 +1,28 @@
SUMMARY = "A library for bits of crypto UI and parsing etc"
HOMEPAGE = "http://www.gnome.org/"
BUGTRACKER = "https://bugzilla.gnome.org/"
LICENSE = "GPLv2"
LIC_FILES_CHKSUM = "file://COPYING;md5=55ca817ccb7d5b5b66355690e9abc605"
DEPENDS = "intltool-native gtk+3 p11-kit glib-2.0 libgcrypt \
${@bb.utils.contains('GI_DATA_ENABLED', 'True', 'libxslt-native', '', d)}"
inherit autotools gnomebase gtk-icon-cache gtk-doc distro_features_check upstream-version-is-even vala gobject-introspection
# depends on gtk+3, but also x11 through gtk+-x11
REQUIRED_DISTRO_FEATURES = "x11"
SRC_URI = "${GNOME_MIRROR}/${GNOMEBN}/${@gnome_verdir("${PV}")}/${GNOMEBN}-${PV}.tar.${GNOME_COMPRESS_TYPE};name=archive \
file://0001-Use-pkgconfig-to-find-libgcrypt.patch \
"
# 3.28.0 sums
SRC_URI[archive.md5sum] = "5321319307dad34dca2fd52e7c9c01ab"
SRC_URI[archive.sha256sum] = "15e175d1da7ec486d59749ba34906241c442898118ce224a7b70bf2e849faf0b"
FILES_${PN} += " \
${datadir}/dbus-1 \
${datadir}/gcr-3 \
"
# http://errors.yoctoproject.org/Errors/Details/20229/
ARM_INSTRUCTION_SET = "arm"