Skip to content

[18.x] backport: backports for rc5 and bump#4856

Merged
UdjinM6 merged 7 commits into
dashpay:v18.xfrom
PastaPastaPasta:rc5-backports
May 30, 2022
Merged

[18.x] backport: backports for rc5 and bump#4856
UdjinM6 merged 7 commits into
dashpay:v18.xfrom
PastaPastaPasta:rc5-backports

Conversation

@PastaPastaPasta
Copy link
Copy Markdown
Member

No description provided.

@PastaPastaPasta PastaPastaPasta added this to the 18 milestone May 29, 2022
@PastaPastaPasta PastaPastaPasta requested a review from UdjinM6 May 29, 2022 20:45
@UdjinM6
Copy link
Copy Markdown

UdjinM6 commented May 29, 2022

Missing #4843, #4846 and #4854 (see https://github.com/dashpay/dash/pulls?q=is%3Apr+is%3Aclosed+label%3Abackport-candidate-18.x). Also, ideally, 3636ec0 should be done on develop first and then backported.

@PastaPastaPasta
Copy link
Copy Markdown
Member Author

PastaPastaPasta commented May 29, 2022

Cherry picked 4854, and dropped copyright, the other two have conflicting changes; maybe @knst can create a backport PR with his commits

@PastaPastaPasta PastaPastaPasta changed the title [18.x] backport: backports for rc5 and bumps [18.x] backport: backports for rc5 and bump May 29, 2022
@UdjinM6
Copy link
Copy Markdown

UdjinM6 commented May 30, 2022

1233977a0fb15fa69cf2bb87b88a8d91e0f23ac2 and db91e4f8e9e90472b9b8619c4f4fababb6950996 should do it I think

knst and others added 2 commits May 30, 2022 10:57
* Fix build of qtbase in contrib for Gcc 11.x

It adds a patch with missing include <limits> in qtbase/src/tools/moc/generator.cpp

* Merge bitcoin#23716: test: replace hashlib.ripemd160 with an own implementation

5b559dc Swap out hashlib.ripemd160 for own implementation (Pieter Wuille)
ad3e9e1 Add pure Python RIPEMD-160 (Pieter Wuille)

Pull request description:

  Closes bitcoin#23710.

ACKs for top commit:
  jamesob:
    ACK bitcoin@5b559dc, pending CI

Tree-SHA512: dcd4ea2027eac572f7ab0da434b081b9a5d6b78675e559258a446b4d254b29d93c4d2cc12da4a28303543d6d99f5f2246fde4052e84af81d18e04399b137b39e

* Updates doc for Unix build: added missing dependency bison

Co-authored-by: MarcoFalke <falke.marco@gmail.com>
* Qt: fix layout of components on "Wallet Repair" window

* Qt: refactor ui xml config

It orders components accordingly their positions on windows and fixes space indentation
@PastaPastaPasta
Copy link
Copy Markdown
Member Author

Okay @UdjinM6 please review

Copy link
Copy Markdown
Member

@QuantumExplorer QuantumExplorer left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Approved because these are just cherry picked commits.

Copy link
Copy Markdown

@UdjinM6 UdjinM6 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ACK

@UdjinM6 UdjinM6 merged commit 5d32741 into dashpay:v18.x May 30, 2022
@PastaPastaPasta PastaPastaPasta deleted the rc5-backports branch May 30, 2022 16:22
@knst
Copy link
Copy Markdown
Collaborator

knst commented May 30, 2022

Strange, seems as zlib 1.2.11 is not available by link anymore (404 error).

I applied this patch (1.2.12) to revision 07249a8 and it works fine on Kubuntu 22.04.

diff --git a/depends/packages/zlib.mk b/depends/packages/zlib.mk
index acb02020a8..66cb8aa7a0 100644
--- a/depends/packages/zlib.mk
+++ b/depends/packages/zlib.mk
@@ -1,8 +1,8 @@
 package=zlib
-$(package)_version=1.2.11
+$(package)_version=1.2.12
 $(package)_download_path=https://www.zlib.net
 $(package)_file_name=$(package)-$($(package)_version).tar.gz
-$(package)_sha256_hash=c3e5e9fdd5004dcb542feda5ee4f0ff0744628baf8ed2dd5d66f8ca1197cb1a1
+$(package)_sha256_hash=91844808532e5ce316b3c010929493c0244f3d37593afd6de04f71821d5136d9

@UdjinM6
Copy link
Copy Markdown

UdjinM6 commented May 30, 2022

@knst Hmm, right. So I guess it worked for me locally cause I have zlib downloaded already and it works for gitian cause it uses https://bitcoincore.org/depends-sources/ as a fallback for all dependencies (i.e. https://bitcoincore.org/depends-sources/zlib-1.2.11.tar.gz for zlib). Pls create a PR with your patch and v18.x as a base branch.

@knst
Copy link
Copy Markdown
Collaborator

knst commented May 30, 2022

#4858

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants