[PATCH 1/3] gpgme; 2.0.0 -> 2.0.1

[PATCH 1/3] gpgme; 2.0.0 -> 2.0.1

[Hongxu Jia]

- 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 --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"
 
-- 
2.34.1

[PATCH 2/3] libgpg-error: 1.55 -> 1.56

[Hongxu Jia]

- Refresh pkgconfig.patch

Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
---
 .../libgpg-error/libgpg-error/pkgconfig.patch         | 11 +++++++----
 .../{libgpg-error_1.55.bb => libgpg-error_1.56.bb}    |  2 +-
 2 files changed, 8 insertions(+), 5 deletions(-)
 rename meta/recipes-support/libgpg-error/{libgpg-error_1.55.bb => libgpg-error_1.56.bb} (95%)

diff --git a/meta/recipes-support/libgpg-error/libgpg-error/pkgconfig.patch b/meta/recipes-support/libgpg-error/libgpg-error/pkgconfig.patch
index dbf728b2de..38c55ad342 100644
--- a/meta/recipes-support/libgpg-error/libgpg-error/pkgconfig.patch
+++ b/meta/recipes-support/libgpg-error/libgpg-error/pkgconfig.patch
@@ -1,4 +1,4 @@
-From 3529df77cd20253ce2a9c1962d7a72058a04fd98 Mon Sep 17 00:00:00 2001
+From fdc0b6f84bae7cd6eea18712049da62cdfd5e630 Mon Sep 17 00:00:00 2001
 From: Hongxu Jia <hongxu.jia@windriver.com>
 Date: Wed, 21 Aug 2024 20:03:29 -0700
 Subject: [PATCH] support pkgconfig
@@ -20,7 +20,7 @@ Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
  1 file changed, 5 insertions(+), 195 deletions(-)
 
 diff --git a/src/gpg-error.m4 b/src/gpg-error.m4
-index 2d24071..c561725 100644
+index 263f21b..e54ab38 100644
 --- a/src/gpg-error.m4
 +++ b/src/gpg-error.m4
 @@ -15,196 +15,14 @@
@@ -167,11 +167,11 @@ index 2d24071..c561725 100644
 -[ AC_REQUIRE([AC_CANONICAL_HOST])dnl
 -  AC_REQUIRE([_AM_PATH_POSSIBLE_GPG_ERROR_CONFIG])dnl
 -  AC_REQUIRE([_AM_PATH_GPGRT_CONFIG])dnl
--  if test x"$GPGRT_CONFIG" != x -a "$GPGRT_CONFIG" != "no"; then
+-  if test x"$GPGRT_CONFIG" != x && test "$GPGRT_CONFIG" != "no"; then
 -    GPG_ERROR_CONFIG="$GPGRT_CONFIG gpg-error"
 -    AC_MSG_NOTICE([Use gpgrt-config with $gpgrt_libdir as gpg-error-config])
 -    gpg_error_config_version=`$GPG_ERROR_CONFIG --modversion`
--  elif test x"$GPG_ERROR_CONFIG" != x -a "$GPG_ERROR_CONFIG" != "no"; then
+-  elif test x"$GPG_ERROR_CONFIG" != x && test "$GPG_ERROR_CONFIG" != "no"; then
 -    gpg_error_config_version=`$GPG_ERROR_CONFIG --version`
 -  else
 -    gpg_error_config_version="0.0"
@@ -241,3 +241,6 @@ index 2d24071..c561725 100644
 -  AC_SUBST(GPG_ERROR_MT_LIBS)
  ])
 +
+-- 
+2.34.1
+
diff --git a/meta/recipes-support/libgpg-error/libgpg-error_1.55.bb b/meta/recipes-support/libgpg-error/libgpg-error_1.56.bb
similarity index 95%
rename from meta/recipes-support/libgpg-error/libgpg-error_1.55.bb
rename to meta/recipes-support/libgpg-error/libgpg-error_1.56.bb
index 7de52314a4..d3cc88f971 100644
--- a/meta/recipes-support/libgpg-error/libgpg-error_1.55.bb
+++ b/meta/recipes-support/libgpg-error/libgpg-error_1.56.bb
@@ -19,7 +19,7 @@ SRC_URI = "${GNUPG_MIRROR}/libgpg-error/libgpg-error-${PV}.tar.bz2 \
            file://run-ptest \
            "
 
-SRC_URI[sha256sum] = "95b178148863f07d45df0cea67e880a79b9ef71f5d230baddc0071128516ef78"
+SRC_URI[sha256sum] = "82c3d2deb4ad96ad3925d6f9f124fe7205716055ab50e291116ef27975d169c0"
 
 BINCONFIG = "${bindir}/gpg-error-config"
 
-- 
2.34.1

[PATCH 3/3] libxml2: upgrade 2.14.6 -> 2.15.0

[Hongxu Jia]

Due to upstream [Remove LZMA support][1], drop option --without-lzma

[1] https://gitlab.gnome.org/GNOME/libxml2/-/commit/1763281cd65ded4067ddf123eb7358690c214b0b

Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
---
 .../libxml/{libxml2_2.14.6.bb => libxml2_2.15.0.bb}    | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)
 rename meta/recipes-core/libxml/{libxml2_2.14.6.bb => libxml2_2.15.0.bb} (95%)

diff --git a/meta/recipes-core/libxml/libxml2_2.14.6.bb b/meta/recipes-core/libxml/libxml2_2.15.0.bb
similarity index 95%
rename from meta/recipes-core/libxml/libxml2_2.14.6.bb
rename to meta/recipes-core/libxml/libxml2_2.15.0.bb
index 6ed8760f4c..8ff5320c47 100644
--- a/meta/recipes-core/libxml/libxml2_2.14.6.bb
+++ b/meta/recipes-core/libxml/libxml2_2.15.0.bb
@@ -21,7 +21,7 @@ SRC_URI += "http://www.w3.org/XML/Test/xmlts20130923.tar;subdir=${BP};name=testt
            file://CVE-2025-6021.patch \
            "
 
-SRC_URI[archive.sha256sum] = "7ce458a0affeb83f0b55f1f4f9e0e55735dbfc1a9de124ee86fb4a66b597203a"
+SRC_URI[archive.sha256sum] = "5abc766497c5b1d6d99231f662e30c99402a90d03b06c67b62d6c1179dedd561"
 SRC_URI[testtar.sha256sum] = "c6b2d42ee50b8b236e711a97d68e6c4b5c8d83e69a2be4722379f08702ea7273"
 
 CVE_STATUS[CVE-2025-6170] = "fixed-version: fixed in version 2.14.5"
@@ -49,10 +49,10 @@ RDEPENDS:${PN}-ptest:append:libc-glibc = " glibc-gconv-ebcdic-us \
                                          "
 
 # WARNING: zlib is required for RPM use
-EXTRA_OECONF = "--without-debug --without-legacy --with-catalog --with-c14n --without-lzma"
-EXTRA_OECONF:class-native = "--without-legacy --with-c14n --without-lzma --with-zlib"
-EXTRA_OECONF:class-nativesdk = "--without-legacy --with-c14n --without-lzma --with-zlib"
-EXTRA_OECONF:linuxstdbase = "--with-debug --with-legacy --with-c14n --without-lzma --with-zlib"
+EXTRA_OECONF = "--without-debug --without-legacy --with-catalog --with-c14n"
+EXTRA_OECONF:class-native = "--without-legacy --with-c14n --with-zlib"
+EXTRA_OECONF:class-nativesdk = "--without-legacy --with-c14n --with-zlib"
+EXTRA_OECONF:linuxstdbase = "--with-debug --with-legacy --with-c14n --with-zlib"
 
 python populate_packages:prepend () {
     # autonamer would call this libxml2-2, but we don't want that
-- 
2.34.1

Re: [OE-core] [PATCH 3/3] libxml2: upgrade 2.14.6 -> 2.15.0

[Mathieu Dubois-Briand]

On Tue Oct 14, 2025 at 8:58 AM CEST, hongxu via lists.openembedded.org wrote:
> Due to upstream [Remove LZMA support][1], drop option --without-lzma
>
> [1] https://gitlab.gnome.org/GNOME/libxml2/-/commit/1763281cd65ded4067ddf123eb7358690c214b0b
>
> Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
> ---

Hi Hongxu,

Thanks for the update.

It looks like this is breaking the build of itstool:

ERROR: itstool-native-2.0.7-r0 do_configure: Execution of '/srv/pokybuild/yocto-worker/musl-qemux86/build/build/tmp/work/x86_64-linux/itstool-native/2.0.7/temp/run.do_configure.2360372' failed with exit code 1
...
| configure: error: Python module libxml2 is needed to run this package

Can you have a look at this please?

Thanks,
Mathieu

-- 
Mathieu Dubois-Briand, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com