Re: [PATCH] python3-pycairo: upgrade 1.18.2 -> 1.19.0

Re: [PATCH] python3-pycairo: upgrade 1.18.2 -> 1.19.0

[Alexander Kanavin]

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

Thanks Wang, the recipe upgrade work is very appreciated, particularly
because it doesn't fit very well into commercial product development and
its typical incentives.

Do you want to be the official maintainer for any of the oe-core recipes?
In the sense that you would be listed for them in
meta/conf/distro/include/maintainers.inc

The benefits are - you can place the 'official' bit into your CV; you will
also get monthly upgrade patches by email from AUH, so you don't have to
create them yourself.

Alex


On Fri, 14 Feb 2020 at 17:12, Wang Mingyu <wangmy@cn.fujitsu.com> wrote:

> -License-Update: "PDX-License-Identifier: LGPL-2.1-only OR MPL-1.1"
> is added
>
> Signed-off-by: Wang Mingyu <wangmy@cn.fujitsu.com>
> ---
>  ...{python3-pycairo_1.18.2.bb => python3-pycairo_1.19.0.bb} | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
>  rename meta/recipes-devtools/python/{python3-pycairo_1.18.2.bb =>
> python3-pycairo_1.19.0.bb} (77%)
>
> diff --git a/meta/recipes-devtools/python/python3-pycairo_1.18.2.bb
> b/meta/recipes-devtools/python/python3-pycairo_1.19.0.bb
> similarity index 77%
> rename from meta/recipes-devtools/python/python3-pycairo_1.18.2.bb
> rename to meta/recipes-devtools/python/python3-pycairo_1.19.0.bb
> index 3aedf3d142..8f60834c17 100644
> --- a/meta/recipes-devtools/python/python3-pycairo_1.18.2.bb
> +++ b/meta/recipes-devtools/python/python3-pycairo_1.19.0.bb
> @@ -3,7 +3,7 @@ HOMEPAGE = "http://cairographics.org/pycairo"
>  BUGTRACKER = "http://bugs.freedesktop.org"
>  SECTION = "python-devel"
>  LICENSE = "LGPLv2.1 & MPLv1.1"
> -LIC_FILES_CHKSUM = "file://COPYING;md5=f2e071ab72978431b294a0d696327421 \
> +LIC_FILES_CHKSUM = "file://COPYING;md5=f3713ca2c28d9312ad718520b6dc3eee \
>
>  file://COPYING-LGPL-2.1;md5=fad9b3332be894bab9bc501572864b29 \
>
>  file://COPYING-MPL-1.1;md5=bfe1f75d606912a4111c90743d6c7325"
>
> @@ -13,8 +13,8 @@ DEPENDS = "cairo python3"
>  SRC_URI = "
> https://github.com/pygobject/pycairo/releases/download/v${PV}/pycairo-${PV}.tar.gz
> "
>  UPSTREAM_CHECK_URI = "https://github.com/pygobject/pycairo/releases/"
>
> -SRC_URI[md5sum] = "be2ba51f234270dec340f28f1695a95e"
> -SRC_URI[sha256sum] =
> "dcb853fd020729516e8828ad364084e752327d4cff8505d20b13504b32b16531"
> +SRC_URI[md5sum] = "38b84416021640b01250c8f8ec4c52d4"
> +SRC_URI[sha256sum] =
> "4f5ba9374a46c98729dd3727d993f5e17ed0286fd6738ed464fe4efa0612d19c"
>
>  S = "${WORKDIR}/pycairo-${PV}"
>
> --
> 2.17.1
>
>
>
> --
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core
>

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

[PATCH] ell: upgrade 0.27 -> 0.28

[Wang Mingyu]

Signed-off-by: Wang Mingyu <wangmy@cn.fujitsu.com>
---
 meta/recipes-core/ell/{ell_0.27.bb => ell_0.28.bb} | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-core/ell/{ell_0.27.bb => ell_0.28.bb} (83%)

diff --git a/meta/recipes-core/ell/ell_0.27.bb b/meta/recipes-core/ell/ell_0.28.bb
similarity index 83%
rename from meta/recipes-core/ell/ell_0.27.bb
rename to meta/recipes-core/ell/ell_0.28.bb
index 503f1e22a3..464bf631e3 100644
--- a/meta/recipes-core/ell/ell_0.27.bb
+++ b/meta/recipes-core/ell/ell_0.28.bb
@@ -14,8 +14,8 @@ DEPENDS = "dbus"
 inherit autotools pkgconfig
 
 SRC_URI = "https://mirrors.edge.kernel.org/pub/linux/libs/${BPN}/${BPN}-${PV}.tar.xz"
-SRC_URI[md5sum] = "e090d6a910a43c2a32114ba1cdc9f1f2"
-SRC_URI[sha256sum] = "afc5441d6f6ece512a188b1e6aeabd7153de4f38989c897a2197ae50fc46da96"
+SRC_URI[md5sum] = "e38089e54d4b41e508bbb7f37a4a59d9"
+SRC_URI[sha256sum] = "6254fcb98d681cb2c3078dde462ba20bf90e6c10919204c6878a4381adcdb74b"
 
 do_configure_prepend () {
     mkdir -p ${S}/build-aux
-- 
2.17.1

[PATCH] icu: upgrade 64.2 -> 65.1

[Wang Mingyu]

Signed-off-by: Wang Mingyu <wangmy@cn.fujitsu.com>
---
 meta/recipes-support/icu/{icu_64.2.bb => icu_65.1.bb} | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-support/icu/{icu_64.2.bb => icu_65.1.bb} (88%)

diff --git a/meta/recipes-support/icu/icu_64.2.bb b/meta/recipes-support/icu/icu_65.1.bb
similarity index 88%
rename from meta/recipes-support/icu/icu_64.2.bb
rename to meta/recipes-support/icu/icu_65.1.bb
index 44caa43..bd932d7 100644
--- a/meta/recipes-support/icu/icu_64.2.bb
+++ b/meta/recipes-support/icu/icu_65.1.bb
@@ -28,8 +28,8 @@ SRC_URI = "${BASE_SRC_URI} \
 SRC_URI_append_class-target = "\
            file://0001-Disable-LDFLAGSICUDT-for-Linux.patch \
           "
-SRC_URI[md5sum] = "a3d18213beec454e3cdec9a3116d6b05"
-SRC_URI[sha256sum] = "627d5d8478e6d96fc8c90fed4851239079a561a6a8b9e48b0892f24e82d31d6c"
+SRC_URI[md5sum] = "d1ff436e26cabcb28e6cb383d32d1339"
+SRC_URI[sha256sum] = "53e37466b3d6d6d01ead029e3567d873a43a5d1c668ed2278e253b683136d948"
 
 UPSTREAM_CHECK_REGEX = "icu4c-(?P<pver>\d+(_\d+)+)-src"
 UPSTREAM_CHECK_URI = "https://github.com/unicode-org/icu/releases"
-- 
2.7.4

[PATCH] libgpg-error: upgrade 1.36 -> 1.37

[Wang Mingyu]

libgpg-error-1.36-gawk5-support.patch
Removed since it is included in 1.37.

Signed-off-by: Wang Mingyu <wangmy@cn.fujitsu.com>
---
 .../libgpg-error-1.36-gawk5-support.patch          | 144 ---------------------
 .../{libgpg-error_1.36.bb => libgpg-error_1.37.bb} |   5 +-
 2 files changed, 2 insertions(+), 147 deletions(-)
 delete mode 100644 meta/recipes-support/libgpg-error/libgpg-error/libgpg-error-1.36-gawk5-support.patch
 rename meta/recipes-support/libgpg-error/{libgpg-error_1.36.bb => libgpg-error_1.37.bb} (92%)

diff --git a/meta/recipes-support/libgpg-error/libgpg-error/libgpg-error-1.36-gawk5-support.patch b/meta/recipes-support/libgpg-error/libgpg-error/libgpg-error-1.36-gawk5-support.patch
deleted file mode 100644
index b936d11..0000000
--- a/meta/recipes-support/libgpg-error/libgpg-error/libgpg-error-1.36-gawk5-support.patch
+++ /dev/null
@@ -1,144 +0,0 @@
-Upstream-Status: Backport [https://dev.gnupg.org/T4459]
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
-
-From 7865041c77f4f7005282f10f9b6666b19072fbdf Mon Sep 17 00:00:00 2001
-From: NIIBE Yutaka <gniibe@fsij.org>
-Date: Mon, 15 Apr 2019 15:10:44 +0900
-Subject: [PATCH] awk: Prepare for Gawk 5.0.
-
-* src/Makefile.am: Use pkg_namespace (instead of namespace).
-* src/mkerrnos.awk: Likewise.
-* lang/cl/mkerrcodes.awk: Don't escape # in regexp.
-* src/mkerrcodes.awk, src/mkerrcodes1.awk, src/mkerrcodes2.awk: Ditto.
-
---
-
-In Gawk 5.0, regexp routines are replaced by Gnulib implementation,
-which only allows escaping specific characters.
-
-GnuPG-bug-id: 4459
-Reported-by: Marius Schamschula
-Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
----
- lang/cl/mkerrcodes.awk |  2 +-
- src/Makefile.am        |  2 +-
- src/mkerrcodes.awk     |  2 +-
- src/mkerrcodes1.awk    |  2 +-
- src/mkerrcodes2.awk    |  2 +-
- src/mkerrnos.awk       |  2 +-
- src/mkstrtable.awk     | 10 +++++-----
- 7 files changed, 11 insertions(+), 11 deletions(-)
-
---- a/lang/cl/mkerrcodes.awk
-+++ b/lang/cl/mkerrcodes.awk
-@@ -122,7 +122,7 @@ header {
- }
- 
- !header {
--  sub (/\#.+/, "");
-+  sub (/#.+/, "");
-   sub (/[ 	]+$/, ""); # Strip trailing space and tab characters.
- 
-   if (/^$/)
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -293,7 +293,7 @@ code-from-errno.h: mkerrcodes$(EXEEXT_FO
- 
- errnos-sym.h: Makefile mkstrtable.awk errnos.in
- 	$(AWK) -f $(srcdir)/mkstrtable.awk -v textidx=2 -v nogettext=1 \
--		-v prefix=GPG_ERR_ -v namespace=errnos_ \
-+		-v prefix=GPG_ERR_ -v pkg_namespace=errnos_ \
- 		$(srcdir)/errnos.in >$@
- 
- 
---- a/src/mkerrcodes.awk
-+++ b/src/mkerrcodes.awk
-@@ -85,7 +85,7 @@ header {
- }
- 
- !header {
--  sub (/\#.+/, "");
-+  sub (/#.+/, "");
-   sub (/[ 	]+$/, ""); # Strip trailing space and tab characters.
- 
-   if (/^$/)
---- a/src/mkerrcodes1.awk
-+++ b/src/mkerrcodes1.awk
-@@ -81,7 +81,7 @@ header {
- }
- 
- !header {
--  sub (/\#.+/, "");
-+  sub (/#.+/, "");
-   sub (/[ 	]+$/, ""); # Strip trailing space and tab characters.
- 
-   if (/^$/)
---- a/src/mkerrcodes2.awk
-+++ b/src/mkerrcodes2.awk
-@@ -91,7 +91,7 @@ header {
- }
- 
- !header {
--  sub (/\#.+/, "");
-+  sub (/#.+/, "");
-   sub (/[ 	]+$/, ""); # Strip trailing space and tab characters.
- 
-   if (/^$/)
---- a/src/mkerrnos.awk
-+++ b/src/mkerrnos.awk
-@@ -83,7 +83,7 @@ header {
- }
- 
- !header {
--  sub (/\#.+/, "");
-+  sub (/#.+/, "");
-   sub (/[ 	]+$/, ""); # Strip trailing space and tab characters.
- 
-   if (/^$/)
---- a/src/mkstrtable.awk
-+++ b/src/mkstrtable.awk
-@@ -77,7 +77,7 @@
- #
- # The variable prefix can be used to prepend a string to each message.
- #
--# The variable namespace can be used to prepend a string to each
-+# The variable pkg_namespace can be used to prepend a string to each
- # variable and macro name.
- 
- BEGIN {
-@@ -102,7 +102,7 @@ header {
-       print "/* The purpose of this complex string table is to produce";
-       print "   optimal code with a minimum of relocations.  */";
-       print "";
--      print "static const char " namespace "msgstr[] = ";
-+      print "static const char " pkg_namespace "msgstr[] = ";
-       header = 0;
-     }
-   else
-@@ -110,7 +110,7 @@ header {
- }
- 
- !header {
--  sub (/\#.+/, "");
-+  sub (/#.+/, "");
-   sub (/[ 	]+$/, ""); # Strip trailing space and tab characters.
- 
-   if (/^$/)
-@@ -150,7 +150,7 @@ END {
-   else
-     print "  gettext_noop (\"" last_msgstr "\");";
-   print "";
--  print "static const int " namespace "msgidx[] =";
-+  print "static const int " pkg_namespace "msgidx[] =";
-   print "  {";
-   for (i = 0; i < coded_msgs; i++)
-     print "    " pos[i] ",";
-@@ -158,7 +158,7 @@ END {
-   print "  };";
-   print "";
-   print "static GPG_ERR_INLINE int";
--  print namespace "msgidxof (int code)";
-+  print pkg_namespace "msgidxof (int code)";
-   print "{";
-   print "  return (0 ? 0";
- 
diff --git a/meta/recipes-support/libgpg-error/libgpg-error_1.36.bb b/meta/recipes-support/libgpg-error/libgpg-error_1.37.bb
similarity index 92%
rename from meta/recipes-support/libgpg-error/libgpg-error_1.36.bb
rename to meta/recipes-support/libgpg-error/libgpg-error_1.37.bb
index b11ab05..bf1da84 100644
--- a/meta/recipes-support/libgpg-error/libgpg-error_1.36.bb
+++ b/meta/recipes-support/libgpg-error/libgpg-error_1.37.bb
@@ -14,11 +14,10 @@ SECTION = "libs"
 UPSTREAM_CHECK_URI = "https://gnupg.org/download/index.html"
 SRC_URI = "${GNUPG_MIRROR}/libgpg-error/libgpg-error-${PV}.tar.bz2 \
            file://pkgconfig.patch \
-           file://libgpg-error-1.36-gawk5-support.patch \
 	  "
 
-SRC_URI[md5sum] = "eff437f397e858a9127b76c0d87fa5ed"
-SRC_URI[sha256sum] = "babd98437208c163175c29453f8681094bcaf92968a15cafb1a276076b33c97c"
+SRC_URI[md5sum] = "729f22d917494fdc4b54fce5aa6547c7"
+SRC_URI[sha256sum] = "b32d6ff72a73cf79797f7f2d039e95e9c6f92f0c1450215410840ab62aea9763"
 
 BINCONFIG = "${bindir}/gpg-error-config"
 
-- 
2.7.4

[PATCH] python3-pycairo: upgrade 1.18.2 -> 1.19.0

[Wang Mingyu]

-License-Update: "PDX-License-Identifier: LGPL-2.1-only OR MPL-1.1"
is added

Signed-off-by: Wang Mingyu <wangmy@cn.fujitsu.com>
---
 ...{python3-pycairo_1.18.2.bb => python3-pycairo_1.19.0.bb} | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
 rename meta/recipes-devtools/python/{python3-pycairo_1.18.2.bb => python3-pycairo_1.19.0.bb} (77%)

diff --git a/meta/recipes-devtools/python/python3-pycairo_1.18.2.bb b/meta/recipes-devtools/python/python3-pycairo_1.19.0.bb
similarity index 77%
rename from meta/recipes-devtools/python/python3-pycairo_1.18.2.bb
rename to meta/recipes-devtools/python/python3-pycairo_1.19.0.bb
index 3aedf3d142..8f60834c17 100644
--- a/meta/recipes-devtools/python/python3-pycairo_1.18.2.bb
+++ b/meta/recipes-devtools/python/python3-pycairo_1.19.0.bb
@@ -3,7 +3,7 @@ HOMEPAGE = "http://cairographics.org/pycairo"
 BUGTRACKER = "http://bugs.freedesktop.org"
 SECTION = "python-devel"
 LICENSE = "LGPLv2.1 & MPLv1.1"
-LIC_FILES_CHKSUM = "file://COPYING;md5=f2e071ab72978431b294a0d696327421 \
+LIC_FILES_CHKSUM = "file://COPYING;md5=f3713ca2c28d9312ad718520b6dc3eee \
                     file://COPYING-LGPL-2.1;md5=fad9b3332be894bab9bc501572864b29 \
                     file://COPYING-MPL-1.1;md5=bfe1f75d606912a4111c90743d6c7325"
 
@@ -13,8 +13,8 @@ DEPENDS = "cairo python3"
 SRC_URI = "https://github.com/pygobject/pycairo/releases/download/v${PV}/pycairo-${PV}.tar.gz"
 UPSTREAM_CHECK_URI = "https://github.com/pygobject/pycairo/releases/"
 
-SRC_URI[md5sum] = "be2ba51f234270dec340f28f1695a95e"
-SRC_URI[sha256sum] = "dcb853fd020729516e8828ad364084e752327d4cff8505d20b13504b32b16531"
+SRC_URI[md5sum] = "38b84416021640b01250c8f8ec4c52d4"
+SRC_URI[sha256sum] = "4f5ba9374a46c98729dd3727d993f5e17ed0286fd6738ed464fe4efa0612d19c"
 
 S = "${WORKDIR}/pycairo-${PV}"
 
-- 
2.17.1

Re: [PATCH] libgpg-error: upgrade 1.36 -> 1.37

[Richard Purdie]

On Fri, 2020-02-14 at 15:44 -0800, Wang Mingyu wrote:
> libgpg-error-1.36-gawk5-support.patch
> Removed since it is included in 1.37.
> 
> Signed-off-by: Wang Mingyu <wangmy@cn.fujitsu.com>

Fails on x32:

https://autobuilder.yoctoproject.org/typhoon/#/builders/57/builds/1547

Cheers,

Richard

Re: [PATCH] icu: upgrade 64.2 -> 65.1

[Richard Purdie]

On Fri, 2020-02-14 at 15:44 -0800, Wang Mingyu wrote:
> Signed-off-by: Wang Mingyu <wangmy@cn.fujitsu.com>
> ---
>  meta/recipes-support/icu/{icu_64.2.bb => icu_65.1.bb} | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
>  rename meta/recipes-support/icu/{icu_64.2.bb => icu_65.1.bb} (88%)
> 
> diff --git a/meta/recipes-support/icu/icu_64.2.bb b/meta/recipes-support/icu/icu_65.1.bb
> similarity index 88%
> rename from meta/recipes-support/icu/icu_64.2.bb
> rename to meta/recipes-support/icu/icu_65.1.bb
> index 44caa43..bd932d7 100644
> --- a/meta/recipes-support/icu/icu_64.2.bb
> +++ b/meta/recipes-support/icu/icu_65.1.bb
> @@ -28,8 +28,8 @@ SRC_URI = "${BASE_SRC_URI} \
>  SRC_URI_append_class-target = "\
>             file://0001-Disable-LDFLAGSICUDT-for-Linux.patch \
>            "
> -SRC_URI[md5sum] = "a3d18213beec454e3cdec9a3116d6b05"
> -SRC_URI[sha256sum] = "627d5d8478e6d96fc8c90fed4851239079a561a6a8b9e48b0892f24e82d31d6c"
> +SRC_URI[md5sum] = "d1ff436e26cabcb28e6cb383d32d1339"
> +SRC_URI[sha256sum] = "53e37466b3d6d6d01ead029e3567d873a43a5d1c668ed2278e253b683136d948"
>  
>  UPSTREAM_CHECK_REGEX = "icu4c-(?P<pver>\d+(_\d+)+)-src"
>  UPSTREAM_CHECK_URI = "https://github.com/unicode-org/icu/releases"

This breaks webkitgtk:

https://autobuilder.yoctoproject.org/typhoon/#/builders/52/builds/1548
https://autobuilder.yoctoproject.org/typhoon/#/builders/108/builds/272

https://autobuilder.yoctoproject.org/typhoon/#/builders/64/builds/1563
https://autobuilder.yoctoproject.org/typhoon/#/builders/45/builds/1567

Cheers,

Richard

Re: [PATCH] icu: upgrade 64.2 -> 65.1

[Alexander Kanavin]

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

On Sat, 15 Feb 2020 at 11:19, Richard Purdie <
richard.purdie@linuxfoundation.org> wrote:

>
> This breaks webkitgtk:
>
> https://autobuilder.yoctoproject.org/typhoon/#/builders/52/builds/1548
> https://autobuilder.yoctoproject.org/typhoon/#/builders/108/builds/272
>
> https://autobuilder.yoctoproject.org/typhoon/#/builders/64/builds/1563
> https://autobuilder.yoctoproject.org/typhoon/#/builders/45/builds/1567
>

This should be addressed by the webkit update Khem just posted.

Alex

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

Re: [PATCH] python3-pycairo: upgrade 1.18.2 -> 1.19.0

[Peter Kjellerstedt]

> -----Original Message-----
> From: openembedded-core-bounces@lists.openembedded.org <openembedded-core-
> bounces@lists.openembedded.org> On Behalf Of Wang Mingyu
> Sent: den 15 februari 2020 00:44
> To: openembedded-core@lists.openembedded.org
> Subject: [OE-core] [PATCH] python3-pycairo: upgrade 1.18.2 -> 1.19.0
> 
> -License-Update: "PDX-License-Identifier: LGPL-2.1-only OR MPL-1.1"
> is added

If the SPDX-License-Identifier is "LGPL-2.1-only OR MPL-1.1", why is 
the LICENSE set to "LGPLv2.1 & MPLv1.1"? Shouldn't it be "LGPLv2.1 | MPLv1.1"?

//Peter

> Signed-off-by: Wang Mingyu <wangmy@cn.fujitsu.com>
> ---
>  ...{python3-pycairo_1.18.2.bb => python3-pycairo_1.19.0.bb} | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
>  rename meta/recipes-devtools/python/{python3-pycairo_1.18.2.bb => python3-pycairo_1.19.0.bb} (77%)
> 
> diff --git a/meta/recipes-devtools/python/python3-pycairo_1.18.2.bb b/meta/recipes-devtools/python/python3-pycairo_1.19.0.bb
> similarity index 77%
> rename from meta/recipes-devtools/python/python3-pycairo_1.18.2.bb
> rename to meta/recipes-devtools/python/python3-pycairo_1.19.0.bb
> index 3aedf3d142..8f60834c17 100644
> --- a/meta/recipes-devtools/python/python3-pycairo_1.18.2.bb
> +++ b/meta/recipes-devtools/python/python3-pycairo_1.19.0.bb
> @@ -3,7 +3,7 @@ HOMEPAGE = "http://cairographics.org/pycairo"
>  BUGTRACKER = "http://bugs.freedesktop.org"
>  SECTION = "python-devel"
>  LICENSE = "LGPLv2.1 & MPLv1.1"
> -LIC_FILES_CHKSUM = "file://COPYING;md5=f2e071ab72978431b294a0d696327421 \
> +LIC_FILES_CHKSUM = "file://COPYING;md5=f3713ca2c28d9312ad718520b6dc3eee \
>                      file://COPYING-LGPL-2.1;md5=fad9b3332be894bab9bc501572864b29 \
>                      file://COPYING-MPL-1.1;md5=bfe1f75d606912a4111c90743d6c7325"
> 
> @@ -13,8 +13,8 @@ DEPENDS = "cairo python3"
>  SRC_URI = "https://github.com/pygobject/pycairo/releases/download/v${PV}/pycairo-${PV}.tar.gz"
>  UPSTREAM_CHECK_URI = "https://github.com/pygobject/pycairo/releases/"
> 
> -SRC_URI[md5sum] = "be2ba51f234270dec340f28f1695a95e"
> -SRC_URI[sha256sum] = "dcb853fd020729516e8828ad364084e752327d4cff8505d20b13504b32b16531"
> +SRC_URI[md5sum] = "38b84416021640b01250c8f8ec4c52d4"
> +SRC_URI[sha256sum] = "4f5ba9374a46c98729dd3727d993f5e17ed0286fd6738ed464fe4efa0612d19c"
> 
>  S = "${WORKDIR}/pycairo-${PV}"
> 
> --
> 2.17.1

Re: [PATCH] libgpg-error: upgrade 1.36 -> 1.37

[Alexander Kanavin]

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

Patch sent. :)

Alex

On Fri, 28 Feb 2020 at 00:42, Trevor Gamblin <trevor.gamblin@windriver.com>
wrote:

>
> On 2/27/20 6:14 PM, Richard Purdie wrote:
> > On Thu, 2020-02-27 at 11:24 -0500, Trevor Gamblin wrote:
> >> Looks like I got beat by a day!
> > Does your version work on x32 though? :)
> >
> > We need one that does...
>
> They look the same, unfortunately.
>
> Will take a look in between some other tasks, unless Alex gets to it
> first (he usually does, that guy's a machine).
>
> >
> > Cheers,
> >
> > Richard
> >
>

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

[PATCH] libgpg-error: upgrade 1.36 -> 1.37

[Alexander Kanavin]

Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
 ...not-fail-when-testing-config-scripts.patch |  27 ++++
 .../libgpg-error-1.36-gawk5-support.patch     | 144 ------------------
 ...gpg-error_1.36.bb => libgpg-error_1.37.bb} |   8 +-
 3 files changed, 31 insertions(+), 148 deletions(-)
 create mode 100644 meta/recipes-support/libgpg-error/libgpg-error/0001-Do-not-fail-when-testing-config-scripts.patch
 delete mode 100644 meta/recipes-support/libgpg-error/libgpg-error/libgpg-error-1.36-gawk5-support.patch
 rename meta/recipes-support/libgpg-error/{libgpg-error_1.36.bb => libgpg-error_1.37.bb} (91%)

diff --git a/meta/recipes-support/libgpg-error/libgpg-error/0001-Do-not-fail-when-testing-config-scripts.patch b/meta/recipes-support/libgpg-error/libgpg-error/0001-Do-not-fail-when-testing-config-scripts.patch
new file mode 100644
index 0000000000..a0ab4f23ff
--- /dev/null
+++ b/meta/recipes-support/libgpg-error/libgpg-error/0001-Do-not-fail-when-testing-config-scripts.patch
@@ -0,0 +1,27 @@
+From 137805890951b6b585c1d23097e0a51e8c7a8a50 Mon Sep 17 00:00:00 2001
+From: Alexander Kanavin <alex.kanavin@gmail.com>
+Date: Fri, 28 Feb 2020 09:19:56 +0000
+Subject: [PATCH] Do not fail when testing config scripts
+
+In previous versions this was not a hard a failure, and so went
+unnoticed. The test is unsuitable for building with sysroots anyway as the
+failure is due to that.
+
+Upstream-Status: Inappropriate [oe-core specific]
+Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
+---
+ src/Makefile.am | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 9303954..7630540 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -344,7 +344,6 @@ gpg-error-config: gpgrt-config gpg-error-config-old
+ 	else                                                   \
+ 	  echo "no";                                           \
+ 	  echo "***  Please report to <https://bugs.gnupg.org> with gpg-error-config-test.log"; \
+-	  exit 1; \
+ 	fi
+ 	cp gpg-error-config-old $@
+ 
diff --git a/meta/recipes-support/libgpg-error/libgpg-error/libgpg-error-1.36-gawk5-support.patch b/meta/recipes-support/libgpg-error/libgpg-error/libgpg-error-1.36-gawk5-support.patch
deleted file mode 100644
index b936d1143b..0000000000
--- a/meta/recipes-support/libgpg-error/libgpg-error/libgpg-error-1.36-gawk5-support.patch
+++ /dev/null
@@ -1,144 +0,0 @@
-Upstream-Status: Backport [https://dev.gnupg.org/T4459]
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
-
-From 7865041c77f4f7005282f10f9b6666b19072fbdf Mon Sep 17 00:00:00 2001
-From: NIIBE Yutaka <gniibe@fsij.org>
-Date: Mon, 15 Apr 2019 15:10:44 +0900
-Subject: [PATCH] awk: Prepare for Gawk 5.0.
-
-* src/Makefile.am: Use pkg_namespace (instead of namespace).
-* src/mkerrnos.awk: Likewise.
-* lang/cl/mkerrcodes.awk: Don't escape # in regexp.
-* src/mkerrcodes.awk, src/mkerrcodes1.awk, src/mkerrcodes2.awk: Ditto.
-
---
-
-In Gawk 5.0, regexp routines are replaced by Gnulib implementation,
-which only allows escaping specific characters.
-
-GnuPG-bug-id: 4459
-Reported-by: Marius Schamschula
-Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
----
- lang/cl/mkerrcodes.awk |  2 +-
- src/Makefile.am        |  2 +-
- src/mkerrcodes.awk     |  2 +-
- src/mkerrcodes1.awk    |  2 +-
- src/mkerrcodes2.awk    |  2 +-
- src/mkerrnos.awk       |  2 +-
- src/mkstrtable.awk     | 10 +++++-----
- 7 files changed, 11 insertions(+), 11 deletions(-)
-
---- a/lang/cl/mkerrcodes.awk
-+++ b/lang/cl/mkerrcodes.awk
-@@ -122,7 +122,7 @@ header {
- }
- 
- !header {
--  sub (/\#.+/, "");
-+  sub (/#.+/, "");
-   sub (/[ 	]+$/, ""); # Strip trailing space and tab characters.
- 
-   if (/^$/)
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -293,7 +293,7 @@ code-from-errno.h: mkerrcodes$(EXEEXT_FO
- 
- errnos-sym.h: Makefile mkstrtable.awk errnos.in
- 	$(AWK) -f $(srcdir)/mkstrtable.awk -v textidx=2 -v nogettext=1 \
--		-v prefix=GPG_ERR_ -v namespace=errnos_ \
-+		-v prefix=GPG_ERR_ -v pkg_namespace=errnos_ \
- 		$(srcdir)/errnos.in >$@
- 
- 
---- a/src/mkerrcodes.awk
-+++ b/src/mkerrcodes.awk
-@@ -85,7 +85,7 @@ header {
- }
- 
- !header {
--  sub (/\#.+/, "");
-+  sub (/#.+/, "");
-   sub (/[ 	]+$/, ""); # Strip trailing space and tab characters.
- 
-   if (/^$/)
---- a/src/mkerrcodes1.awk
-+++ b/src/mkerrcodes1.awk
-@@ -81,7 +81,7 @@ header {
- }
- 
- !header {
--  sub (/\#.+/, "");
-+  sub (/#.+/, "");
-   sub (/[ 	]+$/, ""); # Strip trailing space and tab characters.
- 
-   if (/^$/)
---- a/src/mkerrcodes2.awk
-+++ b/src/mkerrcodes2.awk
-@@ -91,7 +91,7 @@ header {
- }
- 
- !header {
--  sub (/\#.+/, "");
-+  sub (/#.+/, "");
-   sub (/[ 	]+$/, ""); # Strip trailing space and tab characters.
- 
-   if (/^$/)
---- a/src/mkerrnos.awk
-+++ b/src/mkerrnos.awk
-@@ -83,7 +83,7 @@ header {
- }
- 
- !header {
--  sub (/\#.+/, "");
-+  sub (/#.+/, "");
-   sub (/[ 	]+$/, ""); # Strip trailing space and tab characters.
- 
-   if (/^$/)
---- a/src/mkstrtable.awk
-+++ b/src/mkstrtable.awk
-@@ -77,7 +77,7 @@
- #
- # The variable prefix can be used to prepend a string to each message.
- #
--# The variable namespace can be used to prepend a string to each
-+# The variable pkg_namespace can be used to prepend a string to each
- # variable and macro name.
- 
- BEGIN {
-@@ -102,7 +102,7 @@ header {
-       print "/* The purpose of this complex string table is to produce";
-       print "   optimal code with a minimum of relocations.  */";
-       print "";
--      print "static const char " namespace "msgstr[] = ";
-+      print "static const char " pkg_namespace "msgstr[] = ";
-       header = 0;
-     }
-   else
-@@ -110,7 +110,7 @@ header {
- }
- 
- !header {
--  sub (/\#.+/, "");
-+  sub (/#.+/, "");
-   sub (/[ 	]+$/, ""); # Strip trailing space and tab characters.
- 
-   if (/^$/)
-@@ -150,7 +150,7 @@ END {
-   else
-     print "  gettext_noop (\"" last_msgstr "\");";
-   print "";
--  print "static const int " namespace "msgidx[] =";
-+  print "static const int " pkg_namespace "msgidx[] =";
-   print "  {";
-   for (i = 0; i < coded_msgs; i++)
-     print "    " pos[i] ",";
-@@ -158,7 +158,7 @@ END {
-   print "  };";
-   print "";
-   print "static GPG_ERR_INLINE int";
--  print namespace "msgidxof (int code)";
-+  print pkg_namespace "msgidxof (int code)";
-   print "{";
-   print "  return (0 ? 0";
- 
diff --git a/meta/recipes-support/libgpg-error/libgpg-error_1.36.bb b/meta/recipes-support/libgpg-error/libgpg-error_1.37.bb
similarity index 91%
rename from meta/recipes-support/libgpg-error/libgpg-error_1.36.bb
rename to meta/recipes-support/libgpg-error/libgpg-error_1.37.bb
index b11ab0548d..b9a2b01c20 100644
--- a/meta/recipes-support/libgpg-error/libgpg-error_1.36.bb
+++ b/meta/recipes-support/libgpg-error/libgpg-error_1.37.bb
@@ -14,11 +14,11 @@ SECTION = "libs"
 UPSTREAM_CHECK_URI = "https://gnupg.org/download/index.html"
 SRC_URI = "${GNUPG_MIRROR}/libgpg-error/libgpg-error-${PV}.tar.bz2 \
            file://pkgconfig.patch \
-           file://libgpg-error-1.36-gawk5-support.patch \
-	  "
+           file://0001-Do-not-fail-when-testing-config-scripts.patch \
+           "
 
-SRC_URI[md5sum] = "eff437f397e858a9127b76c0d87fa5ed"
-SRC_URI[sha256sum] = "babd98437208c163175c29453f8681094bcaf92968a15cafb1a276076b33c97c"
+SRC_URI[md5sum] = "729f22d917494fdc4b54fce5aa6547c7"
+SRC_URI[sha256sum] = "b32d6ff72a73cf79797f7f2d039e95e9c6f92f0c1450215410840ab62aea9763"
 
 BINCONFIG = "${bindir}/gpg-error-config"
 
-- 
2.25.1

Re: [PATCH] libgpg-error: upgrade 1.36 -> 1.37

[Trevor Gamblin]

On 2/27/20 6:14 PM, Richard Purdie wrote:
> On Thu, 2020-02-27 at 11:24 -0500, Trevor Gamblin wrote:
>> Looks like I got beat by a day!
> Does your version work on x32 though? :)
>
> We need one that does...

They look the same, unfortunately.

Will take a look in between some other tasks, unless Alex gets to it 
first (he usually does, that guy's a machine).

>
> Cheers,
>
> Richard
>

Re: [PATCH] libgpg-error: upgrade 1.36 -> 1.37

[Richard Purdie]

On Thu, 2020-02-27 at 11:24 -0500, Trevor Gamblin wrote:
> Looks like I got beat by a day!

Does your version work on x32 though? :)

We need one that does...

Cheers,

Richard

Re: [PATCH] libgpg-error: upgrade 1.36 -> 1.37

[Trevor Gamblin]

Looks like I got beat by a day!

On 2/26/20 1:39 PM, Trevor Gamblin wrote:
> https://dev.gnupg.org/T4459 was fixed in 1.37, so the backported
> patch is removed.
>
> Signed-off-by: Trevor Gamblin <trevor.gamblin@windriver.com>
> ---
>   .../libgpg-error-1.36-gawk5-support.patch     | 144 ------------------
>   ...gpg-error_1.36.bb => libgpg-error_1.37.bb} |   5 +-
>   2 files changed, 2 insertions(+), 147 deletions(-)
>   delete mode 100644 meta/recipes-support/libgpg-error/libgpg-error/libgpg-error-1.36-gawk5-support.patch
>   rename meta/recipes-support/libgpg-error/{libgpg-error_1.36.bb => libgpg-error_1.37.bb} (92%)
>
> diff --git a/meta/recipes-support/libgpg-error/libgpg-error/libgpg-error-1.36-gawk5-support.patch b/meta/recipes-support/libgpg-error/libgpg-error/libgpg-error-1.36-gawk5-support.patch
> deleted file mode 100644
> index b936d1143b..0000000000
> --- a/meta/recipes-support/libgpg-error/libgpg-error/libgpg-error-1.36-gawk5-support.patch
> +++ /dev/null
> @@ -1,144 +0,0 @@
> -Upstream-Status: Backport [https://dev.gnupg.org/T4459]
> -Signed-off-by: Khem Raj <raj.khem@gmail.com>
> -
> -From 7865041c77f4f7005282f10f9b6666b19072fbdf Mon Sep 17 00:00:00 2001
> -From: NIIBE Yutaka <gniibe@fsij.org>
> -Date: Mon, 15 Apr 2019 15:10:44 +0900
> -Subject: [PATCH] awk: Prepare for Gawk 5.0.
> -
> -* src/Makefile.am: Use pkg_namespace (instead of namespace).
> -* src/mkerrnos.awk: Likewise.
> -* lang/cl/mkerrcodes.awk: Don't escape # in regexp.
> -* src/mkerrcodes.awk, src/mkerrcodes1.awk, src/mkerrcodes2.awk: Ditto.
> -
> ---
> -
> -In Gawk 5.0, regexp routines are replaced by Gnulib implementation,
> -which only allows escaping specific characters.
> -
> -GnuPG-bug-id: 4459
> -Reported-by: Marius Schamschula
> -Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
> ----
> - lang/cl/mkerrcodes.awk |  2 +-
> - src/Makefile.am        |  2 +-
> - src/mkerrcodes.awk     |  2 +-
> - src/mkerrcodes1.awk    |  2 +-
> - src/mkerrcodes2.awk    |  2 +-
> - src/mkerrnos.awk       |  2 +-
> - src/mkstrtable.awk     | 10 +++++-----
> - 7 files changed, 11 insertions(+), 11 deletions(-)
> -
> ---- a/lang/cl/mkerrcodes.awk
> -+++ b/lang/cl/mkerrcodes.awk
> -@@ -122,7 +122,7 @@ header {
> - }
> -
> - !header {
> --  sub (/\#.+/, "");
> -+  sub (/#.+/, "");
> -   sub (/[ 	]+$/, ""); # Strip trailing space and tab characters.
> -
> -   if (/^$/)
> ---- a/src/Makefile.am
> -+++ b/src/Makefile.am
> -@@ -293,7 +293,7 @@ code-from-errno.h: mkerrcodes$(EXEEXT_FO
> -
> - errnos-sym.h: Makefile mkstrtable.awk errnos.in
> - 	$(AWK) -f $(srcdir)/mkstrtable.awk -v textidx=2 -v nogettext=1 \
> --		-v prefix=GPG_ERR_ -v namespace=errnos_ \
> -+		-v prefix=GPG_ERR_ -v pkg_namespace=errnos_ \
> - 		$(srcdir)/errnos.in >$@
> -
> -
> ---- a/src/mkerrcodes.awk
> -+++ b/src/mkerrcodes.awk
> -@@ -85,7 +85,7 @@ header {
> - }
> -
> - !header {
> --  sub (/\#.+/, "");
> -+  sub (/#.+/, "");
> -   sub (/[ 	]+$/, ""); # Strip trailing space and tab characters.
> -
> -   if (/^$/)
> ---- a/src/mkerrcodes1.awk
> -+++ b/src/mkerrcodes1.awk
> -@@ -81,7 +81,7 @@ header {
> - }
> -
> - !header {
> --  sub (/\#.+/, "");
> -+  sub (/#.+/, "");
> -   sub (/[ 	]+$/, ""); # Strip trailing space and tab characters.
> -
> -   if (/^$/)
> ---- a/src/mkerrcodes2.awk
> -+++ b/src/mkerrcodes2.awk
> -@@ -91,7 +91,7 @@ header {
> - }
> -
> - !header {
> --  sub (/\#.+/, "");
> -+  sub (/#.+/, "");
> -   sub (/[ 	]+$/, ""); # Strip trailing space and tab characters.
> -
> -   if (/^$/)
> ---- a/src/mkerrnos.awk
> -+++ b/src/mkerrnos.awk
> -@@ -83,7 +83,7 @@ header {
> - }
> -
> - !header {
> --  sub (/\#.+/, "");
> -+  sub (/#.+/, "");
> -   sub (/[ 	]+$/, ""); # Strip trailing space and tab characters.
> -
> -   if (/^$/)
> ---- a/src/mkstrtable.awk
> -+++ b/src/mkstrtable.awk
> -@@ -77,7 +77,7 @@
> - #
> - # The variable prefix can be used to prepend a string to each message.
> - #
> --# The variable namespace can be used to prepend a string to each
> -+# The variable pkg_namespace can be used to prepend a string to each
> - # variable and macro name.
> -
> - BEGIN {
> -@@ -102,7 +102,7 @@ header {
> -       print "/* The purpose of this complex string table is to produce";
> -       print "   optimal code with a minimum of relocations.  */";
> -       print "";
> --      print "static const char " namespace "msgstr[] = ";
> -+      print "static const char " pkg_namespace "msgstr[] = ";
> -       header = 0;
> -     }
> -   else
> -@@ -110,7 +110,7 @@ header {
> - }
> -
> - !header {
> --  sub (/\#.+/, "");
> -+  sub (/#.+/, "");
> -   sub (/[ 	]+$/, ""); # Strip trailing space and tab characters.
> -
> -   if (/^$/)
> -@@ -150,7 +150,7 @@ END {
> -   else
> -     print "  gettext_noop (\"" last_msgstr "\");";
> -   print "";
> --  print "static const int " namespace "msgidx[] =";
> -+  print "static const int " pkg_namespace "msgidx[] =";
> -   print "  {";
> -   for (i = 0; i < coded_msgs; i++)
> -     print "    " pos[i] ",";
> -@@ -158,7 +158,7 @@ END {
> -   print "  };";
> -   print "";
> -   print "static GPG_ERR_INLINE int";
> --  print namespace "msgidxof (int code)";
> -+  print pkg_namespace "msgidxof (int code)";
> -   print "{";
> -   print "  return (0 ? 0";
> -
> diff --git a/meta/recipes-support/libgpg-error/libgpg-error_1.36.bb b/meta/recipes-support/libgpg-error/libgpg-error_1.37.bb
> similarity index 92%
> rename from meta/recipes-support/libgpg-error/libgpg-error_1.36.bb
> rename to meta/recipes-support/libgpg-error/libgpg-error_1.37.bb
> index b11ab0548d..bf1da84eb9 100644
> --- a/meta/recipes-support/libgpg-error/libgpg-error_1.36.bb
> +++ b/meta/recipes-support/libgpg-error/libgpg-error_1.37.bb
> @@ -14,11 +14,10 @@ SECTION = "libs"
>   UPSTREAM_CHECK_URI = "https://gnupg.org/download/index.html"
>   SRC_URI = "${GNUPG_MIRROR}/libgpg-error/libgpg-error-${PV}.tar.bz2 \
>              file://pkgconfig.patch \
> -           file://libgpg-error-1.36-gawk5-support.patch \
>   	  "
>   
> -SRC_URI[md5sum] = "eff437f397e858a9127b76c0d87fa5ed"
> -SRC_URI[sha256sum] = "babd98437208c163175c29453f8681094bcaf92968a15cafb1a276076b33c97c"
> +SRC_URI[md5sum] = "729f22d917494fdc4b54fce5aa6547c7"
> +SRC_URI[sha256sum] = "b32d6ff72a73cf79797f7f2d039e95e9c6f92f0c1450215410840ab62aea9763"
>   
>   BINCONFIG = "${bindir}/gpg-error-config"
>   

[PATCH] libgpg-error: upgrade 1.36 -> 1.37

[Trevor Gamblin]

https://dev.gnupg.org/T4459 was fixed in 1.37, so the backported
patch is removed.

Signed-off-by: Trevor Gamblin <trevor.gamblin@windriver.com>
---
 .../libgpg-error-1.36-gawk5-support.patch     | 144 ------------------
 ...gpg-error_1.36.bb => libgpg-error_1.37.bb} |   5 +-
 2 files changed, 2 insertions(+), 147 deletions(-)
 delete mode 100644 meta/recipes-support/libgpg-error/libgpg-error/libgpg-error-1.36-gawk5-support.patch
 rename meta/recipes-support/libgpg-error/{libgpg-error_1.36.bb => libgpg-error_1.37.bb} (92%)

diff --git a/meta/recipes-support/libgpg-error/libgpg-error/libgpg-error-1.36-gawk5-support.patch b/meta/recipes-support/libgpg-error/libgpg-error/libgpg-error-1.36-gawk5-support.patch
deleted file mode 100644
index b936d1143b..0000000000
--- a/meta/recipes-support/libgpg-error/libgpg-error/libgpg-error-1.36-gawk5-support.patch
+++ /dev/null
@@ -1,144 +0,0 @@
-Upstream-Status: Backport [https://dev.gnupg.org/T4459]
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
-
-From 7865041c77f4f7005282f10f9b6666b19072fbdf Mon Sep 17 00:00:00 2001
-From: NIIBE Yutaka <gniibe@fsij.org>
-Date: Mon, 15 Apr 2019 15:10:44 +0900
-Subject: [PATCH] awk: Prepare for Gawk 5.0.
-
-* src/Makefile.am: Use pkg_namespace (instead of namespace).
-* src/mkerrnos.awk: Likewise.
-* lang/cl/mkerrcodes.awk: Don't escape # in regexp.
-* src/mkerrcodes.awk, src/mkerrcodes1.awk, src/mkerrcodes2.awk: Ditto.
-
---
-
-In Gawk 5.0, regexp routines are replaced by Gnulib implementation,
-which only allows escaping specific characters.
-
-GnuPG-bug-id: 4459
-Reported-by: Marius Schamschula
-Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
----
- lang/cl/mkerrcodes.awk |  2 +-
- src/Makefile.am        |  2 +-
- src/mkerrcodes.awk     |  2 +-
- src/mkerrcodes1.awk    |  2 +-
- src/mkerrcodes2.awk    |  2 +-
- src/mkerrnos.awk       |  2 +-
- src/mkstrtable.awk     | 10 +++++-----
- 7 files changed, 11 insertions(+), 11 deletions(-)
-
---- a/lang/cl/mkerrcodes.awk
-+++ b/lang/cl/mkerrcodes.awk
-@@ -122,7 +122,7 @@ header {
- }
- 
- !header {
--  sub (/\#.+/, "");
-+  sub (/#.+/, "");
-   sub (/[ 	]+$/, ""); # Strip trailing space and tab characters.
- 
-   if (/^$/)
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -293,7 +293,7 @@ code-from-errno.h: mkerrcodes$(EXEEXT_FO
- 
- errnos-sym.h: Makefile mkstrtable.awk errnos.in
- 	$(AWK) -f $(srcdir)/mkstrtable.awk -v textidx=2 -v nogettext=1 \
--		-v prefix=GPG_ERR_ -v namespace=errnos_ \
-+		-v prefix=GPG_ERR_ -v pkg_namespace=errnos_ \
- 		$(srcdir)/errnos.in >$@
- 
- 
---- a/src/mkerrcodes.awk
-+++ b/src/mkerrcodes.awk
-@@ -85,7 +85,7 @@ header {
- }
- 
- !header {
--  sub (/\#.+/, "");
-+  sub (/#.+/, "");
-   sub (/[ 	]+$/, ""); # Strip trailing space and tab characters.
- 
-   if (/^$/)
---- a/src/mkerrcodes1.awk
-+++ b/src/mkerrcodes1.awk
-@@ -81,7 +81,7 @@ header {
- }
- 
- !header {
--  sub (/\#.+/, "");
-+  sub (/#.+/, "");
-   sub (/[ 	]+$/, ""); # Strip trailing space and tab characters.
- 
-   if (/^$/)
---- a/src/mkerrcodes2.awk
-+++ b/src/mkerrcodes2.awk
-@@ -91,7 +91,7 @@ header {
- }
- 
- !header {
--  sub (/\#.+/, "");
-+  sub (/#.+/, "");
-   sub (/[ 	]+$/, ""); # Strip trailing space and tab characters.
- 
-   if (/^$/)
---- a/src/mkerrnos.awk
-+++ b/src/mkerrnos.awk
-@@ -83,7 +83,7 @@ header {
- }
- 
- !header {
--  sub (/\#.+/, "");
-+  sub (/#.+/, "");
-   sub (/[ 	]+$/, ""); # Strip trailing space and tab characters.
- 
-   if (/^$/)
---- a/src/mkstrtable.awk
-+++ b/src/mkstrtable.awk
-@@ -77,7 +77,7 @@
- #
- # The variable prefix can be used to prepend a string to each message.
- #
--# The variable namespace can be used to prepend a string to each
-+# The variable pkg_namespace can be used to prepend a string to each
- # variable and macro name.
- 
- BEGIN {
-@@ -102,7 +102,7 @@ header {
-       print "/* The purpose of this complex string table is to produce";
-       print "   optimal code with a minimum of relocations.  */";
-       print "";
--      print "static const char " namespace "msgstr[] = ";
-+      print "static const char " pkg_namespace "msgstr[] = ";
-       header = 0;
-     }
-   else
-@@ -110,7 +110,7 @@ header {
- }
- 
- !header {
--  sub (/\#.+/, "");
-+  sub (/#.+/, "");
-   sub (/[ 	]+$/, ""); # Strip trailing space and tab characters.
- 
-   if (/^$/)
-@@ -150,7 +150,7 @@ END {
-   else
-     print "  gettext_noop (\"" last_msgstr "\");";
-   print "";
--  print "static const int " namespace "msgidx[] =";
-+  print "static const int " pkg_namespace "msgidx[] =";
-   print "  {";
-   for (i = 0; i < coded_msgs; i++)
-     print "    " pos[i] ",";
-@@ -158,7 +158,7 @@ END {
-   print "  };";
-   print "";
-   print "static GPG_ERR_INLINE int";
--  print namespace "msgidxof (int code)";
-+  print pkg_namespace "msgidxof (int code)";
-   print "{";
-   print "  return (0 ? 0";
- 
diff --git a/meta/recipes-support/libgpg-error/libgpg-error_1.36.bb b/meta/recipes-support/libgpg-error/libgpg-error_1.37.bb
similarity index 92%
rename from meta/recipes-support/libgpg-error/libgpg-error_1.36.bb
rename to meta/recipes-support/libgpg-error/libgpg-error_1.37.bb
index b11ab0548d..bf1da84eb9 100644
--- a/meta/recipes-support/libgpg-error/libgpg-error_1.36.bb
+++ b/meta/recipes-support/libgpg-error/libgpg-error_1.37.bb
@@ -14,11 +14,10 @@ SECTION = "libs"
 UPSTREAM_CHECK_URI = "https://gnupg.org/download/index.html"
 SRC_URI = "${GNUPG_MIRROR}/libgpg-error/libgpg-error-${PV}.tar.bz2 \
            file://pkgconfig.patch \
-           file://libgpg-error-1.36-gawk5-support.patch \
 	  "
 
-SRC_URI[md5sum] = "eff437f397e858a9127b76c0d87fa5ed"
-SRC_URI[sha256sum] = "babd98437208c163175c29453f8681094bcaf92968a15cafb1a276076b33c97c"
+SRC_URI[md5sum] = "729f22d917494fdc4b54fce5aa6547c7"
+SRC_URI[sha256sum] = "b32d6ff72a73cf79797f7f2d039e95e9c6f92f0c1450215410840ab62aea9763"
 
 BINCONFIG = "${bindir}/gpg-error-config"
 
-- 
2.24.1