search

Freescale / meta-freescale

Layer containing NXP hardware support metadata
Other
166 stars 254 forks source link

qtbase: update patches #187

Closed cpboyd closed 4 years ago

cpboyd commented 4 years ago

Originally filed as #42, which was closed without comment.

0016-Configure-eglfs-with-egl-pkg-config.patch hasn't been needed since Qt v5.9: https://github.com/qt/qtbase/commit/e9a7739e77f79baeb5452189b6d17e63de5b341d

In Yocto Warrior and Zeus, this causes a fuzz warning:

WARNING: qtbase-5.13.0+gitAUTOINC+fc9ae22c88-r0 do_patch: Fuzz detected:

Applying patch 0016-Configure-eglfs-with-egl-pkg-config.patch
patching file src/plugins/platforms/eglfs/eglfs-plugin.pro
Hunk #1 succeeded at 7 with fuzz 2 (offset 5 lines).

The context lines in the patches can be updated with devtool:

    devtool modify qtbase
    devtool finish --force-patch-refresh qtbase <layer_path>

Don't forget to review changes done by devtool!

WARNING: qtbase-5.13.0+gitAUTOINC+fc9ae22c88-r0 do_patch: QA Issue: Patch log indicates that patches do not apply cleanly. [patch-fuzz]
otavio commented 4 years ago

Mind to prepare a PR fixing this?

cpboyd commented 4 years ago

@otavio Sure. Do I need to submit two separate ones for master and warrior branches?

otavio commented 4 years ago

@otavio Sure. Do I need to submit two separate ones for master and warrior branches?

Prepare for master; then we make a new one for warrior once it is merged.