@@ -1,4 +1,4 @@
-From 46c0582d1087220e9404a14a851085b8f29773c4 Mon Sep 17 00:00:00 2001
+From 929f7670a6c1e9450f239ee374bb34ac13c13592 Mon Sep 17 00:00:00 2001
From: Chen Qi <Qi.Chen@windriver.com>
Date: Mon, 3 Dec 2012 18:17:31 +0800
Subject: [PATCH] libksba: add pkgconfig support
@@ -15,7 +15,7 @@ Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
1 file changed, 5 insertions(+), 88 deletions(-)
diff --git a/src/ksba.m4 b/src/ksba.m4
-index 80f0d38..8f8761a 100644
+index 835cacb..bc729a9 100644
--- a/src/ksba.m4
+++ b/src/ksba.m4
@@ -107,39 +107,7 @@ dnl this features allows to prevent build against newer versions of libksba
@@ -45,7 +45,7 @@ index 80f0d38..8f8761a 100644
- fi
-
- use_gpgrt_config=""
-- if test x"$GPGRT_CONFIG" != x -a "$GPGRT_CONFIG" != "no"; then
+- if test x"$GPGRT_CONFIG" != x && test "$GPGRT_CONFIG" != "no"; then
- if $GPGRT_CONFIG ksba --exists; then
- KSBA_CONFIG="$GPGRT_CONFIG ksba"
- AC_MSG_NOTICE([Use gpgrt-config as ksba-config])
similarity index 95%
rename from meta/recipes-support/libksba/libksba_1.6.7.bb
rename to meta/recipes-support/libksba/libksba_1.6.8.bb
@@ -28,7 +28,7 @@ SRC_URI = "${GNUPG_MIRROR}/${BPN}/${BPN}-${PV}.tar.bz2 \
file://run-ptest \
"
-SRC_URI[sha256sum] = "cf72510b8ebb4eb6693eef765749d83677a03c79291a311040a5bfd79baab763"
+SRC_URI[sha256sum] = "0f4510f1c7a679c3545990a31479f391ad45d84e039176309d42f80cf41743f5"
do_configure:prepend () {
# Else these could be used in preference to those in aclocal-copy
ChangeLog: https://github.com/gpg/libksba/blob/libksba-1.6.8/NEWS Signed-off-by: Yi Zhao <yi.zhao@windriver.com> --- .../libksba/libksba/ksba-add-pkgconfig-support.patch | 6 +++--- .../libksba/{libksba_1.6.7.bb => libksba_1.6.8.bb} | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) rename meta/recipes-support/libksba/{libksba_1.6.7.bb => libksba_1.6.8.bb} (95%)