backport: #11995 Fix Qt build with Xcode 9 #12636

pull fanquake wants to merge 2 commits into bitcoin:0.16 from fanquake:qt-fix-backport changing 3 files +73 −2
  1. fanquake commented at 4:30 pm on March 7, 2018: member
    GitHub-Pull: #11995 Rebased-From: 2b1f794
  2. fanquake added the label Build system on Mar 7, 2018
  3. fanquake added this to the milestone 0.16.1 on Mar 7, 2018
  4. fanquake requested review from theuni on Mar 7, 2018
  5. fanquake added the label Backport on Mar 7, 2018
  6. jonasschnelli commented at 6:36 am on March 9, 2018: contributor

    utACK b7d95037f42adb393881cea182814f9a8fc14879. Looks good, haven’t tested though (currently no access to 10.13).

    There is some whitespace issue: https://travis-ci.org/bitcoin/bitcoin/jobs/350402801

  7. [Depends] Fix Qt build with Xcode 9.2
    GitHub-Pull: #11995
    Rebased-From: 2b1f794
    686cb86002
  8. fanquake force-pushed on Mar 11, 2018
  9. fanquake commented at 11:00 pm on March 11, 2018: member
    Whitespace issue should be resolved.
  10. laanwj commented at 1:35 pm on March 14, 2018: member

    Gah, still seems there’s a whitespace issue.

    0diff --git a/depends/patches/qt/fix-cocoahelpers-macos.patch b/depends/patches/qt/fix-cocoahelpers-macos.patch
    1@@ -0,0 +1,70 @@
    2+
    3+
    4+
    5+
    6+
    7^---- failure generated from contrib/devtools/lint-whitespace.sh
    

    I think we should exclude .patch files from the whitespace checks?

  11. devtools: Exclude patches from lint-whitespace
    GitHub-Pull: #12442
    Rebased-From: fafbf7f
    f3b8d85b4b
  12. fanquake commented at 1:50 pm on March 14, 2018: member
    Added a backport of #12442 so that Travis stops harassing us about patch whitespace on the 0.16 branch.
  13. laanwj merged this on Mar 14, 2018
  14. laanwj closed this on Mar 14, 2018

  15. laanwj referenced this in commit 845838c445 on Mar 14, 2018
  16. fanquake deleted the branch on Apr 12, 2018
  17. MarcoFalke locked this on Sep 8, 2021


fanquake jonasschnelli laanwj


theuni

Labels
Build system Backport

Milestone
0.16.1


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-11-17 18:12 UTC

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