build, qt: Fix regression in rendering on macOS Big Sur #23556

pull hebasto wants to merge 13 commits into bitcoin:master from hebasto:211119-macstyle changing 27 files +387 −414
  1. hebasto commented at 7:15 pm on November 19, 2021: member

    This PR is a follow up of #23489.

    The initial support of macOS Big Sur by Qt was pretty broken. Fixup commits were submitted into the dev branch, and backported to 5.12 and 5.15 branches.

    Those fixups were released with the Qt 5.12.11, but, unfortunately, will be never (?) released as Qt 5.15.3 (for license issues, I guess).

    Therefore, bumping Qt version from 5.12.11 to 5.15.2 brings a regression into rendering of some widgets in macOS BigSur.

    This PR fixes this regression.

    See:

  2. build: xproto 7.0.31 a90a787393
  3. build: libXau 1.0.9 49593be7d7
  4. build: xcb_proto 1.14.1 22ac2b6a92
  5. build: expat 2.4.1 245b96eaa0
  6. build: freetype 2.11.0
    Co-authored-by: mammix2 <mammix2@hotmail.com>
    001df786c0
  7. build: libxcb 1.14
    Minimum required libxcb to build qt 5.15.x is 1.11.
    
    https://codereview.qt.nokia.com/c/qt/qtbase/+/253905
    
    Some plugins have been re-enabled as they are required by Qt.
    14f7ad05bc
  8. build: add libxcb_util 0.4.0 0787f67774
  9. build: add libxcb_util_render 0.3.9 41bdfbfeaa
  10. build: add libxcb_util_keysyms 0.4.0 5d2dc09519
  11. build: add libxcb_util_image 0.4.0 7d921576cb
  12. build: add libxcb_util_wm 0.4.1
    Required for xcb_icccm.
    bef3113474
  13. build: qt 5.15.2 299b352ae6
  14. build, qt: Fix regression in rendering on macOS Big Sur 53d432b108
  15. hebasto added the label macOS on Nov 19, 2021
  16. hebasto added the label Build system on Nov 19, 2021
  17. DrahtBot commented at 8:36 pm on November 19, 2021: member

    The following sections might be updated with supplementary metadata relevant to reviewers and maintainers.

    Conflicts

    Reviewers, this pull request conflicts with the following ones:

    • #23495 (build: Bump Fontconfig version up to 2.12.6 by hebasto)
    • #22708 (build, qt: Add Wayland support for Linux builds with depends by hebasto)
    • #22555 (build: Fix make apk for Android w/ non-default SOURCES_PATH in depends by hebasto)
    • #22552 (build: Improve depends build system robustness by hebasto)
    • #22487 (build, qt: Fix cross-compiling detection on M1-based macOS (aarch64) by hebasto)

    If you consider this pull request important, please also help to review the conflicting pull requests. Ideally, start with the one that should be merged first.

  18. jarolrod commented at 8:36 pm on November 20, 2021: member

    Concept ACK, This does in fact fix the regression. It should be documented what the regression is:

    Master Depends Build (Qt 5.12)

    PR23489 Depends Build (Qt 5.15)

    This PR Depends Build (Qt 5.15)

  19. fanquake commented at 5:20 am on November 21, 2021: member
    Cherry-picked into #23489.
  20. fanquake closed this on Nov 21, 2021

  21. hebasto deleted the branch on Nov 21, 2021
  22. DrahtBot locked this on Nov 21, 2022

github-metadata-mirror

This is a metadata mirror of the GitHub repository bitcoin/bitcoin. This site is not affiliated with GitHub. Content is generated from a GitHub metadata backup.
generated: 2024-09-29 01:12 UTC

This site is hosted by @0xB10C
More mirrored repositories can be found on mirror.b10c.me