p11-kit: update 0.25.3 -> 0.25.5

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

diff --git a/meta/recipes-support/p11-kit/files/fix-parallel-build-failures.patch b/meta/recipes-support/p11-kit/files/fix-parallel-build-failures.patch
deleted file mode 100644 (file)
index 47df027..0000000
--- a/meta/recipes-support/p11-kit/files/fix-parallel-build-failures.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-It fails occasionally with missing generated header files:
-
-| ../git/common/asn1.c:42:10: fatal error: openssl.asn.h: No such file or directory
-|    42 | #include "openssl.asn.h"
-|       |          ^~~~~~~~~~~~~~~
-| compilation terminated.
-
-According to meson manual page:
-
-https://mesonbuild.com/Wrap-best-practices-and-tips.html#declare-generated-headers-explicitly
-
-'asn_h_dep' should be a dependency of static_library target 'libp11_asn1' to
-make sure that required header files generated before compile common/asn1.c.
-
-Upstream-Status: Submitted [https://github.com/p11-glue/p11-kit/pull/619]
-
-Signed-off-by: Kai Kang <kai.kang@windriver.com>
----
- common/meson.build | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/common/meson.build b/common/meson.build
-index dc86d7b..cc3ec48 100644
---- a/common/meson.build
-+++ b/common/meson.build
-@@ -113,6 +113,7 @@ if with_asn1
-     'p11-asn1', libp11_asn1_sources,
-     gnu_symbol_visibility: 'hidden',
-     include_directories: configinc,
-+    dependencies: asn_h_dep,
-   )
- 
-   libp11_asn1_dep = declare_dependency(

diff --git a/meta/recipes-support/p11-kit/p11-kit_0.25.3.bb b/meta/recipes-support/p11-kit/p11-kit_0.25.5.bb
similarity index 95%
rename from meta/recipes-support/p11-kit/p11-kit_0.25.3.bb
rename to meta/recipes-support/p11-kit/p11-kit_0.25.5.bb
index 2ede38deba23c877c8b0f1ba101fc953e9d728a4..8c2f56be44d960011329aa7b9020e4afe27891d9 100644 (file)
--- a/meta/recipes-support/p11-kit/p11-kit_0.25.3.bb
+++ b/meta/recipes-support/p11-kit/p11-kit_0.25.5.bb
@@ -11,9 +11,8 @@ DEPENDS = "libtasn1 libtasn1-native libffi"
 DEPENDS:append = "${@' glib-2.0' if d.getVar('GTKDOC_ENABLED') == 'True' else ''}"
 
 SRC_URI = "gitsm://github.com/p11-glue/p11-kit;branch=master;protocol=https \
-           file://fix-parallel-build-failures.patch \
            "
-SRCREV = "917e02a3211dabbdea4b079cb598581dce84fda1"
+SRCREV = "0dd113361057e477f40ff4d8788f3e7e400af5f9"
 S = "${WORKDIR}/git"
 
 PACKAGECONFIG ??= ""