[0.19] Backports #20150

pull fanquake wants to merge 8 commits into bitcoin:0.19 from fanquake:more_019_backports changing 10 files +26 −29
  1. fanquake commented at 1:22 am on October 15, 2020: member

    Backports the following to the 0.19 branch:

    • #19194 - util: Don’t reference errno when pthread fails. - not clean.
    • #19536 - qt, build: Fix QFileDialog for static builds
    • #19777 - docs: Correct description for getblockstats’s txs field
    • #19836 - rpc: Properly deserialize txs with witness before signing
    • #20095 - CI: Bump vcpkg commit ID to get new msys mirror list
    • #20141 - Avoid the use of abs64 in timedata
    • #20142 - [0.20] build: set minimum required Boost to 1.48.0
  2. qt: Fix QFileDialog for static builds
    This change partially reverts 248e22bbc0d7bc40ae3584d53a18507c46b0e553.
    
    Github-Pull: #19536
    Rebased-From: 6457361e90c0cf704d086c51d75f51dbdfd374d7
    a8411b3d9c
  3. docs: Correct description for getblockstats's txs field
    It does count the coinbase transaction.
    
    Refs #19766
    
    Github-Pull: #19777
    Rebased-From: 4148f55dd016f940df50a44cf03d117cdb1dd929
    8bd2ab1f35
  4. DrahtBot added the label Backport on Oct 15, 2020
  5. fanquake commented at 2:54 am on October 15, 2020: member
    Have just realised that 6148f52fd996d7b3fe603d0c806b905a463e2723 should probably be a backport of c83155b406b849a1589d22c34843cc883897431d (#20095) instead, as that is newer.
  6. laanwj added this to the milestone 0.19.2 on Oct 15, 2020
  7. util: Don't reference errno when pthread fails.
    Pthread library does not set errno.
    Pthread library's errno is returned by return value.
    
    Co-authored-by: Hennadii Stepanov <32963518+hebasto@users.noreply.github.com>
    
    Github-Pull: #19194
    Rebased-From: cb38b069b0f41b1a26264784b1c1303c8ac6ab08
    27bb2cc3b6
  8. build: set minimum required Boost to 1.48.0
    Due to the use of boost::filesystem::canonical(), the minimum required
    version of Boost is actually 1.48.0. Use of canonical was introduced
    in #14146.
    
    See also Boost filesystem 1.48.0 release notes:
    https://github.com/boostorg/filesystem/blob/6b5e38134a336b6ea777cd8a69b6ae929819db7e/doc/release_history.html#L508
    
    Github-Pull: #20142
    Rebased-From: 3562c15be3dbf725197d719d58c8d78e2f2c6779
    6957419a28
  9. Bump vcpkg commit ID to get new msys mirror list
    This fixes the appveyor CI job, see #20066.
    
    Currently the job fails because some of the vcpkg dependencies need to install msys2 and the hardcoded mirror in the vcpkg config is down.
    
    Vcpkg commit 76a7e9248fb3c57350b559966dcaa2d52a5e4458 adds new mirrors to the hardcoded list.
    
    Github-Pull: #20095
    Rebased-From: c83155b406b849a1589d22c34843cc883897431d
    5b2de04e7f
  10. Avoid the use of abs64 in timedata
    Github-Pull: #20141
    Rebased-From: d1292f25f272401da0c58580521c74b1fa03a9ad
    0b64310fb6
  11. fanquake force-pushed on Oct 16, 2020
  12. rpc: Properly deserialize txs with witness before signing
    Github-Pull: #19836
    Rebased-From: cccc7525697e7b8d99b545e34f0f504c78ffdb94
    a7bdf5c3ac
  13. rpc: Adjust witness-tx deserialize error message
    Github-Pull: #19836
    Rebased-From: 33330778230961cfbf2a24de36b5877e395cc596
    9c714993e9
  14. jnewbery commented at 9:38 am on October 29, 2020: member

    utACK 9c714993e9dba2f08c2c89cf06ad8fecd528ad1b

    Manually verified that the backport commits were the same as master.

  15. dergoegge commented at 7:15 am on December 2, 2020: member

    utACK 9c714993e9dba2f08c2c89cf06ad8fecd528ad1b

    a8411b3d9c37b4c6fcf0ab992d3f622f6bda879b - 9c714993e9dba2f08c2c89cf06ad8fecd528ad1b: apply the same changes as the commits on master. (9c714993e9dba2f08c2c89cf06ad8fecd528ad1b is missing the change from rpc/mining.cpp but thats ok because it is located in the generateblock RPC which will not be backported to 0.19)

  16. MarcoFalke commented at 8:29 am on December 2, 2020: member
    ACK 9c714993e9dba2f08c2c89cf06ad8fecd528ad1b
  17. MarcoFalke merged this on Dec 2, 2020
  18. MarcoFalke closed this on Dec 2, 2020

  19. DrahtBot locked this on Feb 15, 2022
  20. fanquake deleted the branch on Nov 9, 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-11-17 06:12 UTC

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