From: Alexander Kanavin Date: Wed, 6 Sep 2023 16:56:26 +0000 (+0200) Subject: gpgme: upgrade 1.20.0 -> 1.22.0 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b82836dd4bcfe017c66b26c44430f6aa7671e7ce;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git gpgme: upgrade 1.20.0 -> 1.22.0 Drop patch and --disable-lang-python-test option (upstream fixed the issue). Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- diff --git a/meta/recipes-support/gpgme/gpgme/0007-python-Add-variables-to-tests.patch b/meta/recipes-support/gpgme/gpgme/0007-python-Add-variables-to-tests.patch deleted file mode 100644 index 4c97f63cc21..00000000000 --- a/meta/recipes-support/gpgme/gpgme/0007-python-Add-variables-to-tests.patch +++ /dev/null @@ -1,52 +0,0 @@ -From 093c88817397425ee4c2333c469467229a46c9e1 Mon Sep 17 00:00:00 2001 -From: Yuan Chao -Date: Mon, 5 Aug 2019 01:00:58 +0900 -Subject: [PATCH 7/7] python: Add variables to tests - -* configure.ac, lang/python/Makefile.am: - New variable to `lang/python', set to `lang/python' if RUN_LANG_PYTHON_TESTS - -Upstream-Status: Submitted [gnupg-devel@gnupg.org] - -Signed-off-by: Hongxu Jia - -Signed-off-by: Yuan Chao ---- - configure.ac | 5 +++++ - lang/python/Makefile.am | 3 +++ - 2 files changed, 8 insertions(+) - -diff --git a/configure.ac b/configure.ac -index bd85886..b5ae42e 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -533,6 +533,11 @@ AC_ARG_ENABLE(g13-test, - run_g13_test=$enableval) - AM_CONDITIONAL(RUN_G13_TESTS, test "$run_g13_test" = "yes") - -+run_lang_python_test="yes" -+AC_ARG_ENABLE(lang-python-test, -+ AC_HELP_STRING([--disable-lang-python-test], [disable Python regression test]), -+ run_lang_python_test=$enableval) -+AM_CONDITIONAL(RUN_LANG_PYTHON_TESTS, test "$run_lang_python_test" = "yes") - - # Checks for header files. - AC_CHECK_HEADERS_ONCE([locale.h sys/select.h sys/uio.h argp.h stdint.h -diff --git a/lang/python/Makefile.am b/lang/python/Makefile.am -index 551deee..0fd555e 100644 ---- a/lang/python/Makefile.am -+++ b/lang/python/Makefile.am -@@ -23,7 +23,10 @@ EXTRA_DIST = \ - gpgme.i \ - helpers.c helpers.h private.h - -+SUBDIRS = . examples doc src -+if RUN_LANG_PYTHON_TESTS - SUBDIRS = . tests examples doc src -+endif - - .PHONY: prepare - prepare: copystamp --- -2.7.4 - diff --git a/meta/recipes-support/gpgme/gpgme_1.20.0.bb b/meta/recipes-support/gpgme/gpgme_1.22.0.bb similarity index 94% rename from meta/recipes-support/gpgme/gpgme_1.20.0.bb rename to meta/recipes-support/gpgme/gpgme_1.22.0.bb index dc5b58d7c33..84c8fa9f8a5 100644 --- a/meta/recipes-support/gpgme/gpgme_1.20.0.bb +++ b/meta/recipes-support/gpgme/gpgme_1.22.0.bb @@ -18,14 +18,13 @@ SRC_URI = "${GNUPG_MIRROR}/gpgme/${BP}.tar.bz2 \ file://0004-python-import.patch \ file://0005-gpgme-config-skip-all-lib-or-usr-lib-directories-in-.patch \ file://0006-fix-build-path-issue.patch \ - file://0007-python-Add-variables-to-tests.patch \ file://0008-do-not-auto-check-var-PYTHON.patch \ file://0001-use-closefrom-on-linux-and-glibc-2.34.patch \ file://0001-posix-io.c-Use-off_t-instead-of-off64_t.patch \ file://0001-autogen.sh-remove-unknown-in-version.patch \ " -SRC_URI[sha256sum] = "25a5785a5da356689001440926b94e967d02e13c49eb7743e35ef0cf22e42750" +SRC_URI[sha256sum] = "9551e37081ad3bde81018a0d24f245c3f8206990549598fb31a97a68380a7b71" PYTHON_DEPS = "${@bb.utils.contains('LANGUAGES', 'python', 'swig-native', '', d)}" @@ -53,7 +52,6 @@ EXTRA_OECONF += '--enable-languages="${LANGUAGES}" \ --disable-gpg-test \ --disable-gpgsm-test \ --disable-g13-test \ - --disable-lang-python-test \ ' inherit autotools texinfo binconfig-disabled pkgconfig ${PYTHON_INHERIT} python3native multilib_header