[OE-core] [PATCH] gnutls: upgrade 3.7.0 -> 3.7.1

[OE-core] [PATCH] gnutls: upgrade 3.7.0 -> 3.7.1

[wangmy]

From: Wang Mingyu <wangmy@cn.fujitsu.com>

Signed-off-by: Wang Mingyu <wangmy@cn.fujitsu.com>
---
 .../recipes-support/gnutls/{gnutls_3.7.0.bb => gnutls_3.7.1.bb} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta/recipes-support/gnutls/{gnutls_3.7.0.bb => gnutls_3.7.1.bb} (96%)

diff --git a/meta/recipes-support/gnutls/gnutls_3.7.0.bb b/meta/recipes-support/gnutls/gnutls_3.7.1.bb
similarity index 96%
rename from meta/recipes-support/gnutls/gnutls_3.7.0.bb
rename to meta/recipes-support/gnutls/gnutls_3.7.1.bb
index 1aa94ece3a..51d472c828 100644
--- a/meta/recipes-support/gnutls/gnutls_3.7.0.bb
+++ b/meta/recipes-support/gnutls/gnutls_3.7.1.bb
@@ -23,7 +23,7 @@ SRC_URI = "https://www.gnupg.org/ftp/gcrypt/gnutls/v${SHRT_VER}/gnutls-${PV}.tar
            file://arm_eabi.patch \
            "
 
-SRC_URI[sha256sum] = "49e2a22691d252c9f24a9829b293a8f359095bc5a818351f05f1c0a5188a1df8"
+SRC_URI[sha256sum] = "3777d7963eca5e06eb315686163b7b3f5045e2baac5e54e038ace9835e5cac6f"
 
 inherit autotools texinfo pkgconfig gettext lib_package gtk-doc
 
-- 
2.25.1

[OE-core] [PATCH] libassuan: upgrade 2.5.4 -> 2.5.5

[wangmy]

From: Wang Mingyu <wangmy@cn.fujitsu.com>

refresh libassuan-add-pkgconfig-support.patch

Signed-off-by: Wang Mingyu <wangmy@cn.fujitsu.com>
---
 .../libassuan-add-pkgconfig-support.patch     | 42 ++++++++-----------
 ...{libassuan_2.5.4.bb => libassuan_2.5.5.bb} |  2 +-
 2 files changed, 19 insertions(+), 25 deletions(-)
 rename meta/recipes-support/libassuan/{libassuan_2.5.4.bb => libassuan_2.5.5.bb} (93%)

diff --git a/meta/recipes-support/libassuan/libassuan/libassuan-add-pkgconfig-support.patch b/meta/recipes-support/libassuan/libassuan/libassuan-add-pkgconfig-support.patch
index 0e81454c63..4a459e7662 100644
--- a/meta/recipes-support/libassuan/libassuan/libassuan-add-pkgconfig-support.patch
+++ b/meta/recipes-support/libassuan/libassuan/libassuan-add-pkgconfig-support.patch
@@ -8,17 +8,20 @@ Signed-off-by: Constantin Musca <constantinx.musca@intel.com>
 
 forward ported to 2.4.4
 Signed-off-by: Armin Kuster <akuster@mvista.com>
+---
+ src/libassuan.m4 | 77 ++----------------------------------------------
+ 1 file changed, 3 insertions(+), 74 deletions(-)
 
-Index: libassuan-2.5.2/src/libassuan.m4
-===================================================================
---- libassuan-2.5.2.orig/src/libassuan.m4
-+++ libassuan-2.5.2/src/libassuan.m4
-@@ -16,27 +16,6 @@ dnl Returns ok set to yes or no.
+diff --git a/src/libassuan.m4 b/src/libassuan.m4
+index df50484..0fa3766 100644
+--- a/src/libassuan.m4
++++ b/src/libassuan.m4
+@@ -17,27 +17,6 @@ dnl Returns ok set to yes or no.
  dnl
  AC_DEFUN([_AM_PATH_LIBASSUAN_COMMON],
  [ AC_REQUIRE([AC_CANONICAL_HOST])
 -  AC_ARG_WITH(libassuan-prefix,
--              AC_HELP_STRING([--with-libassuan-prefix=PFX],
+-              AS_HELP_STRING([--with-libassuan-prefix=PFX],
 -                             [prefix where LIBASSUAN is installed (optional)]),
 -     libassuan_config_prefix="$withval", libassuan_config_prefix="")
 -  if test x$libassuan_config_prefix != x ; then
@@ -41,10 +44,11 @@ Index: libassuan-2.5.2/src/libassuan.m4
  
    tmp=ifelse([$1], ,1:0.9.2,$1)
    if echo "$tmp" | grep ':' >/dev/null 2>/dev/null ; then
-@@ -47,58 +26,11 @@ AC_DEFUN([_AM_PATH_LIBASSUAN_COMMON],
+@@ -47,59 +26,11 @@ AC_DEFUN([_AM_PATH_LIBASSUAN_COMMON],
+     req_libassuan_api=0
      min_libassuan_version="$tmp"
    fi
- 
+-
 -  AC_MSG_CHECKING(for LIBASSUAN - version >= $min_libassuan_version)
 -  ok=no
 -  if test "$LIBASSUAN_CONFIG" != "no"; then
@@ -98,31 +102,21 @@ Index: libassuan-2.5.2/src/libassuan.m4
 -      else
 -        tmp=`$LIBASSUAN_CONFIG --variable=api_version 2>/dev/null || echo 0`
 -      fi
-+      tmp=`$PKG_CONFIG --variable=api_version libassuan`
++        tmp=`$PKG_CONFIG --variable=api_version libassuan`
        if test "$tmp" -gt 0 ; then
          AC_MSG_CHECKING([LIBASSUAN API version])
          if test "$req_libassuan_api" -eq "$tmp" ; then
-@@ -114,9 +46,7 @@ AC_DEFUN([_AM_PATH_LIBASSUAN_COMMON],
+@@ -115,9 +46,7 @@ AC_DEFUN([_AM_PATH_LIBASSUAN_COMMON],
    if test $ok = yes; then
      if test x"$host" != x ; then
        if test -z "$use_gpgrt_config"; then
 -        libassuan_config_host=`$LIBASSUAN_CONFIG --host 2>/dev/null || echo none`
 -      else
 -        libassuan_config_host=`$LIBASSUAN_CONFIG --variable=host 2>/dev/null || echo none`
-+        libassuan_config_host=`$PKG_CONFIG --variable=host libassuan`
++	libassuan_config_host=`$PKG_CONFIG --variable=host libassuan`
        fi
        if test x"$libassuan_config_host" != xnone ; then
          if test x"$libassuan_config_host" != x"$host" ; then
-@@ -158,12 +88,8 @@ dnl
- AC_DEFUN([AM_PATH_LIBASSUAN],
- [ _AM_PATH_LIBASSUAN_COMMON($1)
-   if test $ok = yes; then
--    LIBASSUAN_CFLAGS=`$LIBASSUAN_CONFIG --cflags`
--    LIBASSUAN_LIBS=`$LIBASSUAN_CONFIG --libs`
-     ifelse([$2], , :, [$2])
-   else
--    LIBASSUAN_CFLAGS=""
--    LIBASSUAN_LIBS=""
-     ifelse([$3], , :, [$3])
-   fi
-   AC_SUBST(LIBASSUAN_CFLAGS)
+-- 
+2.25.1
+
diff --git a/meta/recipes-support/libassuan/libassuan_2.5.4.bb b/meta/recipes-support/libassuan/libassuan_2.5.5.bb
similarity index 93%
rename from meta/recipes-support/libassuan/libassuan_2.5.4.bb
rename to meta/recipes-support/libassuan/libassuan_2.5.5.bb
index d44b95aa0f..3d12ea09e8 100644
--- a/meta/recipes-support/libassuan/libassuan_2.5.4.bb
+++ b/meta/recipes-support/libassuan/libassuan_2.5.5.bb
@@ -20,7 +20,7 @@ SRC_URI = "${GNUPG_MIRROR}/libassuan/libassuan-${PV}.tar.bz2 \
            file://libassuan-add-pkgconfig-support.patch \
           "
 
-SRC_URI[sha256sum] = "c080ee96b3bd519edd696cfcebdecf19a3952189178db9887be713ccbcb5fbf0"
+SRC_URI[sha256sum] = "8e8c2fcc982f9ca67dcbb1d95e2dc746b1739a4668bc20b3a3c5be632edb34e4"
 
 BINCONFIG = "${bindir}/libassuan-config"
 
-- 
2.25.1

[OE-core] [PATCH] vte: upgrade 0.62.2 -> 0.62.3

[wangmy]

From: Wang Mingyu <wangmy@cn.fujitsu.com>

Signed-off-by: Wang Mingyu <wangmy@cn.fujitsu.com>
---
 meta/recipes-support/vte/{vte_0.62.2.bb => vte_0.62.3.bb} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta/recipes-support/vte/{vte_0.62.2.bb => vte_0.62.3.bb} (95%)

diff --git a/meta/recipes-support/vte/vte_0.62.2.bb b/meta/recipes-support/vte/vte_0.62.3.bb
similarity index 95%
rename from meta/recipes-support/vte/vte_0.62.2.bb
rename to meta/recipes-support/vte/vte_0.62.3.bb
index a2164f43d3..8d2470cad8 100644
--- a/meta/recipes-support/vte/vte_0.62.2.bb
+++ b/meta/recipes-support/vte/vte_0.62.3.bb
@@ -20,7 +20,7 @@ inherit gnomebase gtk-doc features_check upstream-version-is-even gobject-intros
 
 # vapigen.m4 is required when vala is not present (but the one from vala should be used normally)
 SRC_URI += "file://0001-Add-W_EXITCODE-macro-for-non-glibc-systems.patch"
-SRC_URI[archive.sha256sum] = "b0300bbcf0c02df5812a10a3cb8e4fff723bab92c08c97a0a90c167cf543aff0"
+SRC_URI[archive.sha256sum] = "f5770285a52cc23a3c0428a43d492b7c0ba458ce7b8a73768a7d4f1e8a7db3b4"
 
 ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}"
 
-- 
2.25.1

Re: [OE-core] [PATCH] libassuan: upgrade 2.5.4 -> 2.5.5

[Alexander Kanavin]

[-- Attachment #1: Type: text/plain, Size: 690 bytes --]

On Thu, 25 Mar 2021 at 00:47, wangmy <wangmy@fujitsu.com> wrote:

> -@@ -158,12 +88,8 @@ dnl
> - AC_DEFUN([AM_PATH_LIBASSUAN],
> - [ _AM_PATH_LIBASSUAN_COMMON($1)
> -   if test $ok = yes; then
> --    LIBASSUAN_CFLAGS=`$LIBASSUAN_CONFIG --cflags`
> --    LIBASSUAN_LIBS=`$LIBASSUAN_CONFIG --libs`
> -     ifelse([$2], , :, [$2])
> -   else
> --    LIBASSUAN_CFLAGS=""
> --    LIBASSUAN_LIBS=""
> -     ifelse([$3], , :, [$3])
> -   fi
> -   AC_SUBST(LIBASSUAN_CFLAGS)
>
>
How was the patch refreshed? This chunk should not have been removed,
unless upstream has fixed the code, and even then needs to be separately
explained.

Please do use 'devtool upgrade'.

Alex

[-- Attachment #2: Type: text/html, Size: 1091 bytes --]