diff mbox series

[1/3] gpgme; 2.0.0 -> 2.0.1

Message ID 20251014065842.2919308-1-hongxu.jia@windriver.com
State New
Headers show
Series [1/3] gpgme; 2.0.0 -> 2.0.1 | expand

Commit Message

Hongxu Jia Oct. 14, 2025, 6:58 a.m. UTC 
- Refresh 0001-Revert-build-Make-gpgme.m4-use-gpgrt-config-with-.pc.patch

Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
---
 ...uild-Make-gpgme.m4-use-gpgrt-config-with-.pc.patch | 11 +++++++----
 .../gpgme/{gpgme_2.0.0.bb => gpgme_2.0.1.bb}          |  2 +-
 2 files changed, 8 insertions(+), 5 deletions(-)
 rename meta/recipes-support/gpgme/{gpgme_2.0.0.bb => gpgme_2.0.1.bb} (96%)
diff mbox series

Patch

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 @@ 
-From 95d0bae453b2b5a7d25b92d99565d27407fffa1b Mon Sep 17 00:00:00 2001
+From 6ad1ac8c03ae3acc0539fc1566070e2468c7df0a Mon Sep 17 00:00:00 2001
 From: Hongxu Jia <hongxu.jia@windriver.com>
-Date: Fri, 10 May 2019 14:18:04 +0800
+Date: Tue, 14 Oct 2025 14:12:55 +0800
 Subject: [PATCH] Revert "build: Make gpgme.m4 use gpgrt-config with *.pc."
 
 This reverts commit 60828a505a1c74fd34476c181df2a588ea6f9c83.
@@ -15,7 +15,7 @@  Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
  1 file changed, 8 insertions(+), 46 deletions(-)
 
 diff --git a/src/gpgme.m4 b/src/gpgme.m4
-index 4cfe899..5f689e1 100644
+index acbfc1c..5f689e1 100644
 --- a/src/gpgme.m4
 +++ b/src/gpgme.m4
 @@ -122,24 +122,10 @@ AC_REQUIRE([_AM_PATH_GPGRT_CONFIG])dnl
@@ -23,7 +23,7 @@  index 4cfe899..5f689e1 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 gpgme --exists; then
 -      GPGME_CONFIG="$GPGRT_CONFIG gpgme"
 -      AC_MSG_NOTICE([Use gpgrt-config as gpgme-config])
@@ -113,3 +113,6 @@  index 4cfe899..5f689e1 100644
      AC_MSG_RESULT(yes)
      ifelse([$2], , :, [$2])
      _AM_PATH_GPGME_CONFIG_HOST_CHECK
+-- 
+2.34.1
+
diff --git a/meta/recipes-support/gpgme/gpgme_2.0.0.bb b/meta/recipes-support/gpgme/gpgme_2.0.1.bb
similarity index 96%
rename from meta/recipes-support/gpgme/gpgme_2.0.0.bb
rename to 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 \
            file://0001-autogen.sh-remove-unknown-in-version.patch \
            "
 
-SRC_URI[sha256sum] = "ddf161d3c41ff6a3fcbaf4be6c6e305ca4ef1cc3f1ecdfce0c8c2a167c0cc36d"
+SRC_URI[sha256sum] = "821ab0695c842eab51752a81980c92b0410c7eadd04103f791d5d2a526784966"
 
 DEPENDS = "libgpg-error libassuan"