summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/recipes-support/gpgme/gpgme/0001-Revert-build-Make-gpgme.m4-use-gpgrt-config-with-.pc.patch11
-rw-r--r--meta/recipes-support/gpgme/gpgme_2.0.1.bb (renamed from meta/recipes-support/gpgme/gpgme_2.0.0.bb)2
2 files changed, 8 insertions, 5 deletions
diff --git a/meta/recipes-support/gpgme/gpgme/0001-Revert-build-Make-gpgme.m4-use-gpgrt-config-with-.pc.patch b/meta/recipes-support/gpgme/gpgme/0001-Revert-build-Make-gpgme.m4-use-gpgrt-config-with-.pc.patch
index 2a906a6c73..4b8d1ceecd 100644
--- a/meta/recipes-support/gpgme/gpgme/0001-Revert-build-Make-gpgme.m4-use-gpgrt-config-with-.pc.patch
+++ b/meta/recipes-support/gpgme/gpgme/0001-Revert-build-Make-gpgme.m4-use-gpgrt-config-with-.pc.patch
@@ -1,6 +1,6 @@
1From 95d0bae453b2b5a7d25b92d99565d27407fffa1b Mon Sep 17 00:00:00 2001 1From 6ad1ac8c03ae3acc0539fc1566070e2468c7df0a Mon Sep 17 00:00:00 2001
2From: Hongxu Jia <hongxu.jia@windriver.com> 2From: Hongxu Jia <hongxu.jia@windriver.com>
3Date: Fri, 10 May 2019 14:18:04 +0800 3Date: Tue, 14 Oct 2025 14:12:55 +0800
4Subject: [PATCH] Revert "build: Make gpgme.m4 use gpgrt-config with *.pc." 4Subject: [PATCH] Revert "build: Make gpgme.m4 use gpgrt-config with *.pc."
5 5
6This reverts commit 60828a505a1c74fd34476c181df2a588ea6f9c83. 6This reverts commit 60828a505a1c74fd34476c181df2a588ea6f9c83.
@@ -15,7 +15,7 @@ Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
15 1 file changed, 8 insertions(+), 46 deletions(-) 15 1 file changed, 8 insertions(+), 46 deletions(-)
16 16
17diff --git a/src/gpgme.m4 b/src/gpgme.m4 17diff --git a/src/gpgme.m4 b/src/gpgme.m4
18index 4cfe899..5f689e1 100644 18index acbfc1c..5f689e1 100644
19--- a/src/gpgme.m4 19--- a/src/gpgme.m4
20+++ b/src/gpgme.m4 20+++ b/src/gpgme.m4
21@@ -122,24 +122,10 @@ AC_REQUIRE([_AM_PATH_GPGRT_CONFIG])dnl 21@@ -122,24 +122,10 @@ AC_REQUIRE([_AM_PATH_GPGRT_CONFIG])dnl
@@ -23,7 +23,7 @@ index 4cfe899..5f689e1 100644
23 fi 23 fi
24 24
25- use_gpgrt_config="" 25- use_gpgrt_config=""
26- if test x"$GPGRT_CONFIG" != x -a "$GPGRT_CONFIG" != "no"; then 26- if test x"$GPGRT_CONFIG" != x && test "$GPGRT_CONFIG" != "no"; then
27- if $GPGRT_CONFIG gpgme --exists; then 27- if $GPGRT_CONFIG gpgme --exists; then
28- GPGME_CONFIG="$GPGRT_CONFIG gpgme" 28- GPGME_CONFIG="$GPGRT_CONFIG gpgme"
29- AC_MSG_NOTICE([Use gpgrt-config as gpgme-config]) 29- AC_MSG_NOTICE([Use gpgrt-config as gpgme-config])
@@ -113,3 +113,6 @@ index 4cfe899..5f689e1 100644
113 AC_MSG_RESULT(yes) 113 AC_MSG_RESULT(yes)
114 ifelse([$2], , :, [$2]) 114 ifelse([$2], , :, [$2])
115 _AM_PATH_GPGME_CONFIG_HOST_CHECK 115 _AM_PATH_GPGME_CONFIG_HOST_CHECK
116--
1172.34.1
118
diff --git a/meta/recipes-support/gpgme/gpgme_2.0.0.bb b/meta/recipes-support/gpgme/gpgme_2.0.1.bb
index c6887a0ebd..364147fad5 100644
--- a/meta/recipes-support/gpgme/gpgme_2.0.0.bb
+++ b/meta/recipes-support/gpgme/gpgme_2.0.1.bb
@@ -24,7 +24,7 @@ SRC_URI = "${GNUPG_MIRROR}/gpgme/${BP}.tar.bz2 \
24 file://0001-autogen.sh-remove-unknown-in-version.patch \ 24 file://0001-autogen.sh-remove-unknown-in-version.patch \
25 " 25 "
26 26
27SRC_URI[sha256sum] = "ddf161d3c41ff6a3fcbaf4be6c6e305ca4ef1cc3f1ecdfce0c8c2a167c0cc36d" 27SRC_URI[sha256sum] = "821ab0695c842eab51752a81980c92b0410c7eadd04103f791d5d2a526784966"
28 28
29DEPENDS = "libgpg-error libassuan" 29DEPENDS = "libgpg-error libassuan"
30 30