From: hongxu Date: Wed, 27 Nov 2024 23:35:59 +0000 (-0800) Subject: gpgme: upgrade 1.23.2 -> 1.24.0 X-Git-Tag: yocto-5.2~1134 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=181205d5ccb3ba0473813cd62b19d95ba034ab0a;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git gpgme: upgrade 1.23.2 -> 1.24.0 Reabse patches: - 0001-pkgconfig.patch - 0001-autogen.sh-remove-unknown-in-version.patch Drop backport patch: - 0004-python-import.patch Drop obsolete patch: - 0008-do-not-auto-check-var-PYTHON.patch Signed-off-by: Hongxu Jia Signed-off-by: Richard Purdie --- diff --git a/meta/recipes-support/gpgme/gpgme/0001-autogen.sh-remove-unknown-in-version.patch b/meta/recipes-support/gpgme/gpgme/0001-autogen.sh-remove-unknown-in-version.patch index 6d67e6d6c94..920df3d4c3d 100644 --- a/meta/recipes-support/gpgme/gpgme/0001-autogen.sh-remove-unknown-in-version.patch +++ b/meta/recipes-support/gpgme/gpgme/0001-autogen.sh-remove-unknown-in-version.patch @@ -1,6 +1,6 @@ -From acc4750ffa79a5c2ef3c95cf31ef51352a68837b Mon Sep 17 00:00:00 2001 -From: Chen Qi -Date: Tue, 28 Feb 2023 13:43:51 +0800 +From 0d76b00111a112032eb8522791b70664100d4e0a Mon Sep 17 00:00:00 2001 +From: Hongxu Jia +Date: Tue, 26 Nov 2024 23:23:42 -0800 Subject: [PATCH] autogen.sh: remove '-unknown' in version python setuptools >=66.0.0 treats '-unknown' as an invalid version. @@ -13,20 +13,25 @@ Upstream-Status: Submitted [https://lists.gnupg.org/pipermail/gnupg-devel/2023-F Signed-off-by: Chen Qi +Rebase to 1.24.0 +Signed-off-by: Hongxu Jia --- autogen.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/autogen.sh b/autogen.sh -index 4e1665b..a55326d 100755 +index 9f912972..9f7559b4 100755 --- a/autogen.sh +++ b/autogen.sh -@@ -269,7 +269,7 @@ if [ "$myhost" = "find-version" ]; then +@@ -271,7 +271,7 @@ if [ "$myhost" = "find-version" ]; then else ingit=no beta=yes - tmp="-unknown" + tmp="" + cid="0000000" rev="0000000" rvd="0" - fi +-- +2.25.1 + diff --git a/meta/recipes-support/gpgme/gpgme/0001-pkgconfig.patch b/meta/recipes-support/gpgme/gpgme/0001-pkgconfig.patch index 831771ca2dd..2fddf4c5530 100644 --- a/meta/recipes-support/gpgme/gpgme/0001-pkgconfig.patch +++ b/meta/recipes-support/gpgme/gpgme/0001-pkgconfig.patch @@ -1,6 +1,6 @@ -From 7b3a00cb0fc27c896dd85c9afc474bd9c2aea30d Mon Sep 17 00:00:00 2001 -From: Richard Purdie -Date: Fri, 10 May 2019 14:23:55 +0800 +From e4e75bee348d297bd8288e6fd7e99ab033cbb90c Mon Sep 17 00:00:00 2001 +From: Hongxu Jia +Date: Tue, 26 Nov 2024 23:04:52 -0800 Subject: [PATCH] pkgconfig Update gpgme to use pkgconfig instead of -config files since its @@ -15,30 +15,31 @@ Rebase to 1.13.0 Signed-off-by: Hongxu Jia Rebase to 1.17.0 Signed-off-by: Wang Mingyu - +Rebase to 1.24.0 +Signed-off-by: Hongxu Jia --- configure.ac | 1 + src/Makefile.am | 4 +- src/gpgme-pthread.pc.in | 15 +++++ - src/gpgme.m4 | 119 +++------------------------------------- + src/gpgme.m4 | 118 +++------------------------------------- src/gpgme.pc.in | 4 +- - 5 files changed, 29 insertions(+), 114 deletions(-) + 5 files changed, 28 insertions(+), 114 deletions(-) create mode 100644 src/gpgme-pthread.pc.in diff --git a/configure.ac b/configure.ac -index ae4c7da..df892c9 100644 +index 933fb150..08589a6b 100644 --- a/configure.ac +++ b/configure.ac -@@ -1112,6 +1112,7 @@ AC_CONFIG_FILES(Makefile src/Makefile +@@ -1160,6 +1160,7 @@ AC_CONFIG_FILES(Makefile src/Makefile src/gpgme-glib.pc src/gpgme.h) AC_CONFIG_FILES(src/gpgme-config, chmod +x src/gpgme-config) +AC_CONFIG_FILES(src/gpgme-pthread.pc) AC_CONFIG_FILES(lang/cpp/Makefile lang/cpp/src/Makefile) AC_CONFIG_FILES(lang/cpp/tests/Makefile) - AC_CONFIG_FILES(lang/cpp/src/GpgmeppConfig-w32.cmake.in) + AC_CONFIG_FILES(lang/cpp/src/gpgmepp.pc) diff --git a/src/Makefile.am b/src/Makefile.am -index ca70950..bda5498 100644 +index 03708620..e716ce4d 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -20,11 +20,11 @@ @@ -57,7 +58,7 @@ index ca70950..bda5498 100644 noinst_SCRIPTS = gpgme-config diff --git a/src/gpgme-pthread.pc.in b/src/gpgme-pthread.pc.in new file mode 100644 -index 0000000..074bbf6 +index 00000000..074bbf6e --- /dev/null +++ b/src/gpgme-pthread.pc.in @@ -0,0 +1,15 @@ @@ -77,19 +78,18 @@ index 0000000..074bbf6 +Cflags: -I${includedir} +Requires: libassuan gpg-error diff --git a/src/gpgme.m4 b/src/gpgme.m4 -index 8cc2898..0ff550e 100644 +index 5f689e18..249e8c98 100644 --- a/src/gpgme.m4 +++ b/src/gpgme.m4 -@@ -168,7 +168,7 @@ dnl config script does not match the host specification the script - dnl is added to the gpg_config_script_warn variable. +@@ -166,7 +166,6 @@ dnl is added to the gpg_config_script_warn variable. dnl AC_DEFUN([AM_PATH_GPGME], --[ AC_REQUIRE([_AM_PATH_GPGME_CONFIG])dnl -+[ + [ AC_REQUIRE([AC_CANONICAL_HOST])dnl +- AC_REQUIRE([_AM_PATH_GPGME_CONFIG])dnl tmp=ifelse([$1], ,1:0.4.2,$1) if echo "$tmp" | grep ':' >/dev/null 2>/dev/null ; then req_gpgme_api=`echo "$tmp" | sed 's/\(.*\):\(.*\)/\1/'` -@@ -178,36 +178,12 @@ AC_DEFUN([AM_PATH_GPGME], +@@ -176,36 +175,12 @@ AC_DEFUN([AM_PATH_GPGME], min_gpgme_version="$tmp" fi @@ -128,7 +128,7 @@ index 8cc2898..0ff550e 100644 if test "$tmp" -gt 0 ; then if test "$req_gpgme_api" -ne "$tmp" ; then ok=no -@@ -216,19 +192,11 @@ AC_DEFUN([AM_PATH_GPGME], +@@ -214,19 +189,11 @@ AC_DEFUN([AM_PATH_GPGME], fi fi if test $ok = yes; then @@ -148,7 +148,7 @@ index 8cc2898..0ff550e 100644 ]) dnl AM_PATH_GPGME_PTHREAD([MINIMUM-VERSION, -@@ -236,9 +204,8 @@ dnl [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND ]]]) +@@ -234,9 +201,8 @@ dnl [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND ]]]) dnl Test for libgpgme and define GPGME_PTHREAD_CFLAGS dnl and GPGME_PTHREAD_LIBS. dnl @@ -160,7 +160,7 @@ index 8cc2898..0ff550e 100644 tmp=ifelse([$1], ,1:0.4.2,$1) if echo "$tmp" | grep ':' >/dev/null 2>/dev/null ; then req_gpgme_api=`echo "$tmp" | sed 's/\(.*\):\(.*\)/\1/'` -@@ -248,40 +215,12 @@ AC_DEFUN([AM_PATH_GPGME_PTHREAD],[ +@@ -246,40 +212,12 @@ AC_DEFUN([AM_PATH_GPGME_PTHREAD],[ min_gpgme_version="$tmp" fi @@ -203,7 +203,7 @@ index 8cc2898..0ff550e 100644 if test "$tmp" -gt 0 ; then if test "$req_gpgme_api" -ne "$tmp" ; then ok=no -@@ -290,19 +229,11 @@ AC_DEFUN([AM_PATH_GPGME_PTHREAD],[ +@@ -288,19 +226,11 @@ AC_DEFUN([AM_PATH_GPGME_PTHREAD],[ fi fi if test $ok = yes; then @@ -223,7 +223,7 @@ index 8cc2898..0ff550e 100644 ]) -@@ -321,36 +252,12 @@ AC_DEFUN([AM_PATH_GPGME_GLIB], +@@ -319,36 +249,12 @@ AC_DEFUN([AM_PATH_GPGME_GLIB], min_gpgme_version="$tmp" fi @@ -262,7 +262,7 @@ index 8cc2898..0ff550e 100644 if test "$tmp" -gt 0 ; then if test "$req_gpgme_api" -ne "$tmp" ; then ok=no -@@ -359,17 +266,9 @@ AC_DEFUN([AM_PATH_GPGME_GLIB], +@@ -357,17 +263,9 @@ AC_DEFUN([AM_PATH_GPGME_GLIB], fi fi if test $ok = yes; then @@ -281,7 +281,7 @@ index 8cc2898..0ff550e 100644 - AC_SUBST(GPGME_GLIB_LIBS) ]) diff --git a/src/gpgme.pc.in b/src/gpgme.pc.in -index 9ddef5c..932645b 100644 +index 9ddef5cd..932645be 100644 --- a/src/gpgme.pc.in +++ b/src/gpgme.pc.in @@ -9,6 +9,6 @@ Name: gpgme @@ -293,3 +293,6 @@ index 9ddef5c..932645b 100644 +Cflags: -I${includedir} +Libs: -L${libdir} -lgpgme URL: https://www.gnupg.org/software/gpgme/index.html +-- +2.25.1 + diff --git a/meta/recipes-support/gpgme/gpgme/0004-python-import.patch b/meta/recipes-support/gpgme/gpgme/0004-python-import.patch deleted file mode 100644 index fa0eccfce32..00000000000 --- a/meta/recipes-support/gpgme/gpgme/0004-python-import.patch +++ /dev/null @@ -1,34 +0,0 @@ -From f51bf1114bee6d56a950dcc6ebb46d6138b3faed Mon Sep 17 00:00:00 2001 -From: Ross Burton -Date: Wed, 16 Aug 2017 02:06:45 -0400 -Subject: [PATCH 4/7] python import - -Don't check for output on stderr to know if an import worked, host inputrc and -sysroot readline can cause warnings on stderr. - -Upstream-Status: Backport (from autoconf-archive 883a2abd) -Signed-off-by: Ross Burton - -Rebase to 1.9.0 - -Signed-off-by: Hongxu Jia ---- - m4/ax_python_devel.m4 | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/m4/ax_python_devel.m4 b/m4/ax_python_devel.m4 -index b990d5b..318b089 100644 ---- a/m4/ax_python_devel.m4 -+++ b/m4/ax_python_devel.m4 -@@ -137,7 +137,7 @@ variable to configure. See ``configure --help'' for reference. - # - AC_MSG_CHECKING([for the distutils Python package]) - ac_distutils_result=`$PYTHON -c "import distutils" 2>&1` -- if test -z "$ac_distutils_result"; then -+ if test $? -eq 0; then - AC_MSG_RESULT([yes]) - else - AC_MSG_RESULT([no]) --- -2.7.4 - diff --git a/meta/recipes-support/gpgme/gpgme/0008-do-not-auto-check-var-PYTHON.patch b/meta/recipes-support/gpgme/gpgme/0008-do-not-auto-check-var-PYTHON.patch deleted file mode 100644 index a11621ed645..00000000000 --- a/meta/recipes-support/gpgme/gpgme/0008-do-not-auto-check-var-PYTHON.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 84c389705e7742d2b68e144a5733e618441d293e Mon Sep 17 00:00:00 2001 -From: Hongxu Jia -Date: Fri, 10 May 2019 16:19:54 +0800 -Subject: [PATCH] do not auto check var-PYTHON - -Upstream auto check the version of python rather than specify option -[ff6ff61 python: Auto-check for all installed python versions.] - -In oe-core, don't check var-PYTHON, use the setting from recipe, -only check specific python 2.7 and 3.7 - -Upstream-Status: Inappropriate [oe-core specific] - -Signed-off-by: Hongxu Jia - ---- - configure.ac | 5 ++--- - 1 file changed, 2 insertions(+), 3 deletions(-) - -diff --git a/configure.ac b/configure.ac -index df892c9..8c6194e 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -590,9 +590,8 @@ if test "$found_py" = "1"; then - if test "$found_py" = "1" -o "$found_py3" = "1"; then - # Reset everything, so that we can look for another Python. - m4_foreach([mym4pythonver], -- [[2.7],[3.4],[3.5],[3.6],[3.7],[3.8],[3.9],[3.10], -- [3.11],[3.12],[all]], -- [unset PYTHON -+ [[2.7],[3.7]], -+ [ - unset PYTHON_VERSION - unset PYTHON_CPPFLAGS - unset PYTHON_LDFLAGS diff --git a/meta/recipes-support/gpgme/gpgme_1.23.2.bb b/meta/recipes-support/gpgme/gpgme_1.24.0.bb similarity index 94% rename from meta/recipes-support/gpgme/gpgme_1.23.2.bb rename to meta/recipes-support/gpgme/gpgme_1.24.0.bb index 55f164e4a95..d717c0cbb76 100644 --- a/meta/recipes-support/gpgme/gpgme_1.23.2.bb +++ b/meta/recipes-support/gpgme/gpgme_1.24.0.bb @@ -22,16 +22,14 @@ SRC_URI = "${GNUPG_MIRROR}/gpgme/${BP}.tar.bz2 \ file://0001-pkgconfig.patch \ file://0002-gpgme-lang-python-gpg-error-config-should-not-be-use.patch \ file://0003-Correctly-install-python-modules.patch \ - 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://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] = "9499e8b1f33cccb6815527a1bc16049d35a6198a6c5fae0185f2bd561bce5224" +SRC_URI[sha256sum] = "61e3a6ad89323fecfaff176bc1728fb8c3312f2faa83424d9d5077ba20f5f7da" PYTHON_DEPS = "${@bb.utils.contains('LANGUAGES', 'python', 'swig-native', '', d)}"