| Message ID | 1647945489-5242-2-git-send-email-wangmy@fujitsu.com |
|---|---|
| State | New |
| Headers | show |
| Series | libhandy: upgrade 1.5.0 -> 1.6.1 | expand |
Hello, This probably caused this error: https://autobuilder.yoctoproject.org/typhoon/#/builders/108/builds/2767/steps/11/logs/stdio On 22/03/2022 18:38:07+0800, wangmy wrote: > 0001-Add-private-headers.patch > removed since it's included in 1.6.1 > > Signed-off-by: Wang Mingyu <wangmy@fujitsu.com> > --- > .../libhandy/0001-Add-private-headers.patch | 37 ------------------- > .../{libhandy_1.5.0.bb => libhandy_1.6.1.bb} | 6 +-- > 2 files changed, 2 insertions(+), 41 deletions(-) > delete mode 100644 meta/recipes-gnome/libhandy/libhandy/0001-Add-private-headers.patch > rename meta/recipes-gnome/libhandy/{libhandy_1.5.0.bb => libhandy_1.6.1.bb} (89%) > > diff --git a/meta/recipes-gnome/libhandy/libhandy/0001-Add-private-headers.patch b/meta/recipes-gnome/libhandy/libhandy/0001-Add-private-headers.patch > deleted file mode 100644 > index 7b2a512738..0000000000 > --- a/meta/recipes-gnome/libhandy/libhandy/0001-Add-private-headers.patch > +++ /dev/null > @@ -1,37 +0,0 @@ > -From e7c3e8fa00f6a68b2e0629db5ee115e641ea710e Mon Sep 17 00:00:00 2001 > -From: Mingli Yu <mingli.yu@windriver.com> > -Date: Wed, 8 Dec 2021 07:35:52 +0000 > -Subject: [PATCH] Add private headers > - > -After the commit(8157ecc Separate public and private enums) introduced, > -there comes a race as below: > - | In file included from ../git/src/hdy-settings.c:11: > - | ../git/src/hdy-settings-private.h:16:10: fatal error: hdy-enums-private.h: No such file or directory > - | 16 | #include "hdy-enums-private.h" > - > -So also add private headers like private sources to libhandy_sources to > -fix the issue. > - > -Upstream-Status: Submitted [https://gitlab.gnome.org/GNOME/libhandy/-/merge_requests/796] > - > -Signed-off-by: Mingli Yu <mingli.yu@windriver.com> > ---- > - src/meson.build | 2 +- > - 1 file changed, 1 insertion(+), 1 deletion(-) > - > -diff --git a/src/meson.build b/src/meson.build > -index d087323..6f11f27 100644 > ---- a/src/meson.build > -+++ b/src/meson.build > -@@ -64,7 +64,7 @@ hdy_private_enums = gnome.mkenums('hdy-enums-private', > - ) > - > - libhandy_public_sources += [hdy_public_enums[0]] > --libhandy_private_sources += [hdy_private_enums[0]] > -+libhandy_private_sources += hdy_private_enums > - libhandy_generated_headers += [hdy_public_enums[1]] > - > - src_headers = [ > --- > -2.32.0 > - > diff --git a/meta/recipes-gnome/libhandy/libhandy_1.5.0.bb b/meta/recipes-gnome/libhandy/libhandy_1.6.1.bb > similarity index 89% > rename from meta/recipes-gnome/libhandy/libhandy_1.5.0.bb > rename to meta/recipes-gnome/libhandy/libhandy_1.6.1.bb > index 722593dfb1..06b2b467fe 100644 > --- a/meta/recipes-gnome/libhandy/libhandy_1.5.0.bb > +++ b/meta/recipes-gnome/libhandy/libhandy_1.6.1.bb > @@ -9,10 +9,8 @@ BUGTRACKER = "https://gitlab.gnome.org/GNOME/libhandy/-/issues" > LICENSE = "LGPL-2.1-only" > LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" > > -SRC_URI = "git://gitlab.gnome.org/GNOME/libhandy.git;protocol=https;branch=master \ > - file://0001-Add-private-headers.patch \ > -" > -SRCREV = "8fa8306a79215fc6ebf2483145da98bf9b2495ab" > +SRC_URI = "git://gitlab.gnome.org/GNOME/libhandy.git;protocol=https;branch=libhandy-1-6" > +SRCREV = "4186dae5570cf8e73cf8a145236240eec3a237b5" > S = "${WORKDIR}/git" > > UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+\.(\d*[02468])+(\.\d+))" > -- > 2.25.1 > > > -=-=-=-=-=-=-=-=-=-=-=- > Links: You receive all messages sent to this group. > View/Reply Online (#163540): https://lists.openembedded.org/g/openembedded-core/message/163540 > Mute This Topic: https://lists.openembedded.org/mt/89949055/3617179 > Group Owner: openembedded-core+owner@lists.openembedded.org > Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [alexandre.belloni@bootlin.com] > -=-=-=-=-=-=-=-=-=-=-=- >
diff --git a/meta/recipes-gnome/libhandy/libhandy/0001-Add-private-headers.patch b/meta/recipes-gnome/libhandy/libhandy/0001-Add-private-headers.patch deleted file mode 100644 index 7b2a512738..0000000000 --- a/meta/recipes-gnome/libhandy/libhandy/0001-Add-private-headers.patch +++ /dev/null @@ -1,37 +0,0 @@ -From e7c3e8fa00f6a68b2e0629db5ee115e641ea710e Mon Sep 17 00:00:00 2001 -From: Mingli Yu <mingli.yu@windriver.com> -Date: Wed, 8 Dec 2021 07:35:52 +0000 -Subject: [PATCH] Add private headers - -After the commit(8157ecc Separate public and private enums) introduced, -there comes a race as below: - | In file included from ../git/src/hdy-settings.c:11: - | ../git/src/hdy-settings-private.h:16:10: fatal error: hdy-enums-private.h: No such file or directory - | 16 | #include "hdy-enums-private.h" - -So also add private headers like private sources to libhandy_sources to -fix the issue. - -Upstream-Status: Submitted [https://gitlab.gnome.org/GNOME/libhandy/-/merge_requests/796] - -Signed-off-by: Mingli Yu <mingli.yu@windriver.com> ---- - src/meson.build | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/meson.build b/src/meson.build -index d087323..6f11f27 100644 ---- a/src/meson.build -+++ b/src/meson.build -@@ -64,7 +64,7 @@ hdy_private_enums = gnome.mkenums('hdy-enums-private', - ) - - libhandy_public_sources += [hdy_public_enums[0]] --libhandy_private_sources += [hdy_private_enums[0]] -+libhandy_private_sources += hdy_private_enums - libhandy_generated_headers += [hdy_public_enums[1]] - - src_headers = [ --- -2.32.0 - diff --git a/meta/recipes-gnome/libhandy/libhandy_1.5.0.bb b/meta/recipes-gnome/libhandy/libhandy_1.6.1.bb similarity index 89% rename from meta/recipes-gnome/libhandy/libhandy_1.5.0.bb rename to meta/recipes-gnome/libhandy/libhandy_1.6.1.bb index 722593dfb1..06b2b467fe 100644 --- a/meta/recipes-gnome/libhandy/libhandy_1.5.0.bb +++ b/meta/recipes-gnome/libhandy/libhandy_1.6.1.bb @@ -9,10 +9,8 @@ BUGTRACKER = "https://gitlab.gnome.org/GNOME/libhandy/-/issues" LICENSE = "LGPL-2.1-only" LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" -SRC_URI = "git://gitlab.gnome.org/GNOME/libhandy.git;protocol=https;branch=master \ - file://0001-Add-private-headers.patch \ -" -SRCREV = "8fa8306a79215fc6ebf2483145da98bf9b2495ab" +SRC_URI = "git://gitlab.gnome.org/GNOME/libhandy.git;protocol=https;branch=libhandy-1-6" +SRCREV = "4186dae5570cf8e73cf8a145236240eec3a237b5" S = "${WORKDIR}/git" UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+\.(\d*[02468])+(\.\d+))"
0001-Add-private-headers.patch removed since it's included in 1.6.1 Signed-off-by: Wang Mingyu <wangmy@fujitsu.com> --- .../libhandy/0001-Add-private-headers.patch | 37 ------------------- .../{libhandy_1.5.0.bb => libhandy_1.6.1.bb} | 6 +-- 2 files changed, 2 insertions(+), 41 deletions(-) delete mode 100644 meta/recipes-gnome/libhandy/libhandy/0001-Add-private-headers.patch rename meta/recipes-gnome/libhandy/{libhandy_1.5.0.bb => libhandy_1.6.1.bb} (89%)