On Sun, 2020-08-30 at 22:20 -0700, Khem Raj wrote: > Now that we have updated to 3.24.22, the needed fix [1] is in and this > change is no longer needed > > This reverts commit c2e0b0785b8098dbe562e88f54b679ca87626937. > > [1] https://gitlab.gnome.org/GNOME/gtk/-/merge_requests/2183 > > Signed-off-by: Khem Raj <raj.k...@gmail.com> > Cc: Ross Burton <ross.bur...@arm.com> > --- > meta/recipes-gnome/gtk+/gtk+3.inc | 8 -------- > 1 file changed, 8 deletions(-) > > diff --git a/meta/recipes-gnome/gtk+/gtk+3.inc > b/meta/recipes-gnome/gtk+/gtk+3.inc > index 8d5edb7ee8..e1ecf504a0 100644 > --- a/meta/recipes-gnome/gtk+/gtk+3.inc > +++ b/meta/recipes-gnome/gtk+/gtk+3.inc > @@ -1,4 +1,3 @@ > - > SUMMARY = "Multi-platform toolkit for creating GUIs" > DESCRIPTION = "GTK+ is a multi-platform toolkit for creating graphical user > interfaces. Offering a complete \ > set of widgets, GTK+ is suitable for projects ranging from small one-off > projects to complete application suites." > @@ -32,13 +31,6 @@ do_configure_prepend() { > ln -s ${TARGET_PREFIX}libtool libtool > #delete a file that will get confused with generated one in ${B} > rm -f ${S}/gtk/gtktypefuncs.c > - > - # These files are generated by wayland-scanner but will race over > modification > - # time between the copies in the sysroot from wayland-protocols and the > copy > - # in the source tree. Solve the race by deleting so they need to be > regenerated. > - # 3.24.22 will not be shipping these files so this can be deleted then: > - # https://gitlab.gnome.org/GNOME/gtk/-/merge_requests/2183 > - rm -f ${S}/modules/input/text-input-unstable-v3*.[ch] > } >
I did try this, we see: https://autobuilder.yoctoproject.org/typhoon/#/builders/79/builds/1315/steps/8/logs/step2d so it seems there is more to this. Sadly, this means I'll now have to rerun yet another set of testing as this aborts the current build's validity :(. Cheers, Richard
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#142112): https://lists.openembedded.org/g/openembedded-core/message/142112 Mute This Topic: https://lists.openembedded.org/mt/76528747/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
