build, qt: No longer need to patch translation.pro #21420

hebasto commented at 1:49 AM on March 12, 2021: member

This is an alternative to #20642.

hebasto added the label Build system on Mar 12, 2021

DrahtBot commented at 3:28 AM on March 12, 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:

#22186 (build, qt: Fix compiling qt package in depends with GCC 11 by hebasto)
#22142 ([WIP] build: split depends Qt into native and target builds by fanquake)
#21591 (build, qt: Fix wrong cross-compiling detection on macOS by hebasto)
#21589 (build, qt: Do not require xml module for native builds in depends 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.

hebasto commented at 12:44 PM on March 12, 2021: member

Gitian builds:

Generating report
d3026344ac80465c0b5c5b8312c31926247b1a4c8235049a3ee92f4d808e7f0a  bitcoin-27ea907bc1cd-aarch64-linux-gnu-debug.tar.gz
75b74a9db827ab6c7d130b338ea3a3cc896ba1c538353f7acd154f43c1483e9b  bitcoin-27ea907bc1cd-aarch64-linux-gnu.tar.gz
79e6d90b604507423d5970d22e1b0ad84efc264b258e010d02c031aaff19c1d7  bitcoin-27ea907bc1cd-arm-linux-gnueabihf-debug.tar.gz
e60545eee0f2fb8df1e0ed3ef5cc6284578916392e140f8118269dd7a1ead4ec  bitcoin-27ea907bc1cd-arm-linux-gnueabihf.tar.gz
f0c47e2eb142cd23c1b5f98575a9f1b9adca981b2f7133bdb19dae69fe361a1c  bitcoin-27ea907bc1cd-powerpc64-linux-gnu-debug.tar.gz
3efcd39ec019d8abfb8db62c4425ac9bc8f42af0aacd35108801b1bf0565cfb6  bitcoin-27ea907bc1cd-powerpc64-linux-gnu.tar.gz
69fb57c969b18857f26ca5ba13a4908663de91517912e5b202acc07a9385ad3b  bitcoin-27ea907bc1cd-powerpc64le-linux-gnu-debug.tar.gz
9bf4c1c6bb145f8a185d46071be84ff926f9673acd2dea2b113e6bf6cd998f54  bitcoin-27ea907bc1cd-powerpc64le-linux-gnu.tar.gz
b4d3ec813f19f7194db51a8f17b0b58b290b6d0ece7ac7f099ea81e9012c15b6  bitcoin-27ea907bc1cd-riscv64-linux-gnu-debug.tar.gz
746ec1ae48458ec8ebbce44c03749d81f0bae5197c037295565f2729f28bd1cc  bitcoin-27ea907bc1cd-riscv64-linux-gnu.tar.gz
e6af2e50d08f55ffef7754e58a9b75af914933abb42504b3a4eb360a6102c914  bitcoin-27ea907bc1cd-x86_64-linux-gnu-debug.tar.gz
dce219045b7049ec974a0daf339c3cf61d9ccc59e3298c43d50a8a0b51898755  bitcoin-27ea907bc1cd-x86_64-linux-gnu.tar.gz
774ebde8cbe5b8c12b43ede2b9c161cff91957c953fb0edbbf3f8e0ac18766c4  src/bitcoin-27ea907bc1cd.tar.gz
ba09bad0e0e809027076996f4cff37edcccfaf0fd4376a321888fcb399dbeca3  bitcoin-core-linux-22-res.yml
Done.

Generating report
969d90b7b7aedcfd860c5b56848b5ad86ab58be4f2c59d5fc2fa2b27d4fb893b  bitcoin-27ea907bc1cd-win-unsigned.tar.gz
2cc3fd650c791c5d145af6d471bdf4c15b8f98e123c6c6bddde36e6aaebc3121  bitcoin-27ea907bc1cd-win64-debug.zip
cb97ebf87640200d6915f1585efa95dd845c4dbd8515e8631e20ac37bb6646d0  bitcoin-27ea907bc1cd-win64-setup-unsigned.exe
b7a4c3cf870e7e06a042800ca109c309b0285e497876c145b9d7d98357043a5b  bitcoin-27ea907bc1cd-win64.zip
774ebde8cbe5b8c12b43ede2b9c161cff91957c953fb0edbbf3f8e0ac18766c4  src/bitcoin-27ea907bc1cd.tar.gz
5ffb2b22f62e0ed7d32cfdac0575e60ed62f07c30607bff20f6abead0c65ee34  bitcoin-core-win-22-res.yml
Done.

Generating report
8387bb6dd904975919395d6f3a690394c85ec39ff57b1b926627c8bab454277d  bitcoin-27ea907bc1cd-osx-unsigned.dmg
3b73f86f8667ca35bf2c2e311cb11f1289db746c6a62fce01bbc2487e9d8562f  bitcoin-27ea907bc1cd-osx-unsigned.tar.gz
70b5a3812bd7c45fb8fbe1c70d371e3c692a24aeb8d208e3fde1cf468786e7bf  bitcoin-27ea907bc1cd-osx64.tar.gz
774ebde8cbe5b8c12b43ede2b9c161cff91957c953fb0edbbf3f8e0ac18766c4  src/bitcoin-27ea907bc1cd.tar.gz
c6205103ab90b3c6bcd5483a566ea945b10c4792f78fd416d6fc47ed6bae519f  bitcoin-core-osx-22-res.yml
Done.

Guix builds:

$ find output -type f -name *$(git rev-parse --short HEAD)*.* -print0 | env LC_ALL=C sort -z | xargs -r0 sha256sum
c5d80419a6cbc5536afc1a185352d3f00dfc29784f580b8ee87d0fb07ccf3631  output/bitcoin-27ea907bc1cd-aarch64-linux-gnu-debug.tar.gz
0f3ac79ca3ad9844d37b08a0b3204d84599c1ddaf81a271ccc6208c2c0187395  output/bitcoin-27ea907bc1cd-aarch64-linux-gnu.tar.gz
e394727ac3b27bc3c1ff22634c6065f63b2382a13bc85a4709ff2bc2bad11aec  output/bitcoin-27ea907bc1cd-arm-linux-gnueabihf-debug.tar.gz
0d5cec8323819ae25393f5d4e79fe166ccfb2aa14963f0c72c693531d800aaab  output/bitcoin-27ea907bc1cd-arm-linux-gnueabihf.tar.gz
d1cb906fc719e7054c61880658f07aee619cdd413a15412d2d10af26e7e9bb80  output/bitcoin-27ea907bc1cd-osx-unsigned.dmg
d3654fef76c42ec3fe42eaf96fe2528b1d6b16d57fcbeadd2e9ee649cc0082bf  output/bitcoin-27ea907bc1cd-osx-unsigned.tar.gz
9e520d3a558b1d3bcfd419f7c0b9b88bab8a20e49e0cf877c14ff16011a1b8eb  output/bitcoin-27ea907bc1cd-osx64.tar.gz
6f00540d23b01e4faf28d69f84115ebb2f7b6ca657837223ba69a8cf535a0c2c  output/bitcoin-27ea907bc1cd-powerpc64-linux-gnu-debug.tar.gz
7877e2165ee6c707a7fa948b772f0e85d780e7248501c3db4c758b7f7daa930b  output/bitcoin-27ea907bc1cd-powerpc64-linux-gnu.tar.gz
bc2874cae827549c6a9be31812875a688497328cb08cadd53d578ecc903fedf1  output/bitcoin-27ea907bc1cd-powerpc64le-linux-gnu-debug.tar.gz
0c48616c5a0a2859e8a22ea410f781e2604430e1aff1085ecd9cb627df393f40  output/bitcoin-27ea907bc1cd-powerpc64le-linux-gnu.tar.gz
c422ee50116bda336aaf4989bae566f09c18f88f86864985bb9ecd257a489e1b  output/bitcoin-27ea907bc1cd-riscv64-linux-gnu-debug.tar.gz
bae3a5ebe1c4a07ad178cf12bcccb04d601a868ed004bdd5c1855e8ccb894363  output/bitcoin-27ea907bc1cd-riscv64-linux-gnu.tar.gz
b155090578d578ec45fcb1d0680bbea2c6c36b9f58f1159da8907bc7ba9186ad  output/bitcoin-27ea907bc1cd-win-unsigned.tar.gz
2966e8841752bd5c38c94c34d1df4cea436ca2ee21d612290dd3ac465734a525  output/bitcoin-27ea907bc1cd-win64-debug.zip
ee2ba72492ad0f6235df7700ae1aa8e0ffa2643a8f86af14ec55f22f86f7e3f0  output/bitcoin-27ea907bc1cd-win64-setup-unsigned.exe
296465ea256e5fe4c0d7f3efd8dcd9e79b0a0bbc7879585b384d3769694b5c7d  output/bitcoin-27ea907bc1cd-win64.zip
267fd0c3aa9cd430b7a74eb9d96e00726c880f15619cc131c2d44040792632ee  output/bitcoin-27ea907bc1cd-x86_64-linux-gnu-debug.tar.gz
ec59e4fa0e7b12822264d9e63a869efa13838040dacad9198dbb88fb0bc795ea  output/bitcoin-27ea907bc1cd-x86_64-linux-gnu.tar.gz
774ebde8cbe5b8c12b43ede2b9c161cff91957c953fb0edbbf3f8e0ac18766c4  output/src/bitcoin-27ea907bc1cd.tar.gz

MarcoFalke added the label Needs gitian build on Mar 12, 2021

MarcoFalke added the label Needs Guix build on Mar 12, 2021

DrahtBot commented at 10:02 PM on March 16, 2021: member

Guix builds

File	commit e0bc27a14ceb18bfe3dd9ebdae6bef447c4ec922<br>(master)	commit db7ffef7e4d50e307e08b5c453e50c3f033a3dc1<br>(master and this pull)
*-aarch64-linux-gnu-debug.tar.gz	`3b30f4198b68fadf...`	`249202b91db23781...`
*-aarch64-linux-gnu.tar.gz	`176d561bd8a2aa0d...`	`3cac4d3cae4dbe60...`
*-arm-linux-gnueabihf-debug.tar.gz	`ea017c7dff2b99be...`	`fd849e32a07360b0...`
*-arm-linux-gnueabihf.tar.gz	`3ce0b418bce0f580...`	`661c68b8dca615bd...`
*-osx-unsigned.dmg	`772d2aa9989e8d40...`	`65274c23d7402952...`
*-osx-unsigned.tar.gz	`0d8003ee2c879e13...`	`d46958a62e123ba4...`
*-osx64.tar.gz	`135d20c9d45b8193...`	`551026660515c6e9...`
*-powerpc64-linux-gnu-debug.tar.gz	`0f86fbb3da88d75b...`	`c090ab43b5f33338...`
*-powerpc64-linux-gnu.tar.gz	`8fffb547da793622...`	`65a8fe3358584dc6...`
*-powerpc64le-linux-gnu-debug.tar.gz	`25bc9f40d7593a0e...`	`4ddfb6e5c8186077...`
*-powerpc64le-linux-gnu.tar.gz	`00ffc2de444f9f45...`	`07281f9cfe7bbdac...`
*-riscv64-linux-gnu-debug.tar.gz	`13259ba2232c7908...`	`09793b17934f9eca...`
*-riscv64-linux-gnu.tar.gz	`277fa4286cd1acc3...`	`1a008885efdf5bb8...`
*-win-unsigned.tar.gz	`586f395e11db7d10...`	`3c70772fe192f8e0...`
*-win64-debug.zip	`a47083334cbdcfa3...`	`f320309853dc516a...`
*-win64-setup-unsigned.exe	`926f391d3ea1f345...`	`4d0e634f2ac6f417...`
*-win64.zip	`cbfc8629325db892...`	`3625336fdd2b0840...`
*-x86_64-linux-gnu-debug.tar.gz	`ed183a137ae13cd4...`	`75d5d4b4fb2e050b...`
*-x86_64-linux-gnu.tar.gz	`f24558a571c69c68...`	`d5597ce79f47a20e...`
*.tar.gz	`86c28332470cb476...`	`24e1db4e503c7718...`
guix_build.log	`456643eedd9954da...`	`5fefacb35218ee90...`
guix_build.log.diff		`3aaa80b664807085...`

DrahtBot removed the label Needs Guix build on Mar 16, 2021

hebasto marked this as ready for review on Mar 16, 2021

hebasto commented at 11:39 PM on March 16, 2021: member

#20642 (comment):

Lets do #21420 instead of this.

Converted from "Draft" into "Ready for review".

in depends/packages/qt.mk:267 in 27ea907bc1 outdated

 260 | -  $(MAKE) -C qttranslations
 261 | +  $(MAKE) -C qttools/src/linguist/lupdate
 262 |  endef
 263 |  
 264 | +# Qt translations module depends on lrelease binary being installed,
 265 | +# therefore all translations processing is put here.

fanquake commented at 2:01 AM on March 17, 2021:

I think this comment needs to either be more explanatory, or just removed.

hebasto commented at 11:13 PM on March 17, 2021:

I mean that.

Remove it?

in depends/packages/qt.mk:273 in 27ea907bc1 outdated

 265 | +# therefore all translations processing is put here.
 266 |  define $(package)_stage_cmds
 267 |    $(MAKE) -C qtbase/src INSTALL_ROOT=$($(package)_staging_dir) $(addsuffix -install_subtargets,$(addprefix sub-,$($(package)_qt_libs))) && \
 268 |    $(MAKE) -C qttools/src/linguist/lrelease INSTALL_ROOT=$($(package)_staging_dir) install_target && \
 269 |    $(MAKE) -C qttools/src/linguist/lupdate INSTALL_ROOT=$($(package)_staging_dir) install_target && \
 270 | +  $(MAKE) -C qttools/src/linguist/lrelease INSTALL_ROOT=/ install_target && \

fanquake commented at 2:03 AM on March 17, 2021:

Why is lrelease being installed twice? Can this be re-ordered so it's clearer what's going on, and/or why ordering isn't important. Or the comment be updated to actually explain it.

hebasto commented at 11:12 PM on March 17, 2021:

The second time lrelease is installed into the prefix directory where the Qt expects it to find to process translations.

fanquake commented at 2:14 AM on March 17, 2021: member

Concept ACK on dropping patches & sed commands, however I don't like that you've moved a bunch of preprocessing & build commands into staging (which seems to be reverting to the behaviour that was being patched around, for the sake of dropping the patch). Can this re re-ordered/done in a different way?

hebasto commented at 11:18 PM on March 17, 2021: member

Can this re re-ordered/done in a different way?

Besides closed #20642, we could separate Qt tools.mk that builds qmake, lrelease and lupdate.

The most drawback is necessity to provide configure options in tools.mk. (that is why I threw away this variant)

DrahtBot removed the label Needs gitian build on Mar 23, 2021

MarcoFalke added the label Needs gitian build on Mar 23, 2021

DrahtBot added the label Needs rebase on Mar 24, 2021

hebasto force-pushed on Mar 25, 2021

hebasto commented at 1:08 AM on March 25, 2021: member

Rebased 27ea907bc1cdb316be514722ce9990eaefdc6c33 -> 52634e5741b017dca9b9b6bf54d85b8f052a55a8 (pr21420.01 -> pr21420.02) due to the conflict with #17227.

DrahtBot removed the label Needs rebase on Mar 25, 2021

DrahtBot added the label Needs rebase on Mar 25, 2021

hebasto force-pushed on Mar 25, 2021

hebasto commented at 4:39 AM on March 25, 2021: member

Rebased 52634e5741b017dca9b9b6bf54d85b8f052a55a8 -> a36c0f74ca18c55a03b961456910b5bec88a0189 (pr21420.02 -> pr21420.03) due to the conflict with #21495.

DrahtBot removed the label Needs rebase on Mar 25, 2021

hebasto commented at 1:00 PM on March 25, 2021: member

Gitian builds:

Generating report
6233c52e2b7446b39ca43eae741ddce4855f097b25abf2f4ae0b511d895c734f  bitcoin-a36c0f74ca18-aarch64-linux-gnu-debug.tar.gz
64e6a8974a00690862e6557d93f0c56d26447111e9be9bc30a96a3c1a38a90bc  bitcoin-a36c0f74ca18-aarch64-linux-gnu.tar.gz
c8e23c199ce3d41b8ac577c7a6c714d3ce8492d5e9015ab54a831bd2852ed54b  bitcoin-a36c0f74ca18-arm-linux-gnueabihf-debug.tar.gz
3ac615ceecdf87593a9f1431a12daf43d2390ac6ec5e0dc637135026eb31eb7e  bitcoin-a36c0f74ca18-arm-linux-gnueabihf.tar.gz
63a476d98a0fc944288b785d3511f910853688d34b44d0dbdabd8c5d3db15deb  bitcoin-a36c0f74ca18-powerpc64-linux-gnu-debug.tar.gz
d13409561376a199b60d1f5b6c332d133bd2ae80f27eb3ae178e00dde499fb69  bitcoin-a36c0f74ca18-powerpc64-linux-gnu.tar.gz
1bd968de9ad26ebc0334c7bf98fc4ce340969bc35950bbc0ba18f168de0fabda  bitcoin-a36c0f74ca18-powerpc64le-linux-gnu-debug.tar.gz
483f7dfa81cc06b4cd6bc8d1f7ee6a745c2eeecb5f4fa4ad8aa548342ffa7fed  bitcoin-a36c0f74ca18-powerpc64le-linux-gnu.tar.gz
7fd6d24e32ca660ff9b7a275e4dc6994227ccc1a5f3c2c2dcf2af2d68d8c9215  bitcoin-a36c0f74ca18-riscv64-linux-gnu-debug.tar.gz
7ff1a237063fa52e8ecf48b8e859e1690e9c80000897b0e7b9307ccf5c5d06f0  bitcoin-a36c0f74ca18-riscv64-linux-gnu.tar.gz
7d0b4182d368074f5aa575f7205a68f580d4221ee8536df8080d5187c752300b  bitcoin-a36c0f74ca18-x86_64-linux-gnu-debug.tar.gz
52cb78742fea4dc603803b6b3d8b9a9c2f278250e826aea36cc507a1636ce013  bitcoin-a36c0f74ca18-x86_64-linux-gnu.tar.gz
d71d2d725ff555e52031071fe614253fb6c2a31ee7770b13741699c920713427  src/bitcoin-a36c0f74ca18.tar.gz
f871bd1633c3ab4bbd4106ff701aa5cda947ce3b248b2265f90be23311d3ea31  bitcoin-core-linux-22-res.yml
Done.

Generating report
a05fca0fcf8cd65a6110a04bd5a28e809f53cf72a2dcec3ec368f3b53a3ee7d7  bitcoin-a36c0f74ca18-win-unsigned.tar.gz
00aab163478469805cd96bf031e0784156f06fca515ad8dedc0d2bb564afacaa  bitcoin-a36c0f74ca18-win64-debug.zip
3ce037a71e3204b5321406cac3a3b2fe20e41e7ed488aa4c8821d305f0b8f7ef  bitcoin-a36c0f74ca18-win64-setup-unsigned.exe
92f2add67a68026a816a2174d896c64cb6954628920d10d0a6adb23c18750e1e  bitcoin-a36c0f74ca18-win64.zip
d71d2d725ff555e52031071fe614253fb6c2a31ee7770b13741699c920713427  src/bitcoin-a36c0f74ca18.tar.gz
c62961c85fdbb065df7b7f5c78185ea042c4bf1526dea0ea6df509e8144f161e  bitcoin-core-win-22-res.yml
Done.

Generating report
87f746ef595e0a3e85eb657fa303045c048a8d262b85328e7103d59a1f475134  bitcoin-a36c0f74ca18-osx-unsigned.dmg
1771d11ebc0e34c558ead11418b31bc269baa903aa604bebe60e38b537700081  bitcoin-a36c0f74ca18-osx-unsigned.tar.gz
8d959041d02ad348814160661b76b7ec854556ed7ebb26cd09b3997b545b29ce  bitcoin-a36c0f74ca18-osx64.tar.gz
d71d2d725ff555e52031071fe614253fb6c2a31ee7770b13741699c920713427  src/bitcoin-a36c0f74ca18.tar.gz
424cdd2843891ae2b2c30816f65ffda3a36d0a0a5f30201f9cb873736dc6aed1  bitcoin-core-osx-22-res.yml
Done.

Guix builds:

$ find output -type f -name *$(git rev-parse --short HEAD)*.* -print0 | env LC_ALL=C sort -z | xargs -r0 sha256sum
9cde4200e6f1de14b39e38cce3a0e79d1070f80f9df40086a1fc2eb2e27cf633  output/bitcoin-a36c0f74ca18-aarch64-linux-gnu-debug.tar.gz
1399f2d65996bde011349ad845006aa2d22dec433adcc0c353f99fd27c9cf34c  output/bitcoin-a36c0f74ca18-aarch64-linux-gnu.tar.gz
0bc0147e7506a677c4b50b642fd76ab6d84d4debd02bd60526098c36d8608add  output/bitcoin-a36c0f74ca18-arm-linux-gnueabihf-debug.tar.gz
8213da13c9f0a1e83fc62455bed934d3143a5e0fb0eb7abebe264b0a06aa6905  output/bitcoin-a36c0f74ca18-arm-linux-gnueabihf.tar.gz
8545f22fad6b129eb1741e7df6173d9bbade642333ef560ead15608de1e6b7da  output/bitcoin-a36c0f74ca18-osx-unsigned.dmg
c38481fb06dae20ee98b6079e52057998e538f2c39a91a0257f48f09eefe6ff5  output/bitcoin-a36c0f74ca18-osx-unsigned.tar.gz
ed09d076f60f399094642bba703c293b38b52d0de2c5357e3a91867427010ce1  output/bitcoin-a36c0f74ca18-osx64.tar.gz
efcf58942c3a5033d3d7adef9db226909bf98b6b9cdb16e1275decd3170d0859  output/bitcoin-a36c0f74ca18-powerpc64-linux-gnu-debug.tar.gz
77b1fb00daf9cde82de9b59fdd222394a72e0c9e03c123f6147d311265013ec2  output/bitcoin-a36c0f74ca18-powerpc64-linux-gnu.tar.gz
8bfc6b9f3e36090f330ccaa39a820e3708325efa9dd309d60e088cd404ad7b4d  output/bitcoin-a36c0f74ca18-powerpc64le-linux-gnu-debug.tar.gz
a7bab55e9b9b2efbb9a1ce7218ac6da13eb898c3664dfc89e96917cfd8829513  output/bitcoin-a36c0f74ca18-powerpc64le-linux-gnu.tar.gz
9de013c166d77a6cd3a2ef9e9298240f4c0b72459f84c15df2ed7a16099bc554  output/bitcoin-a36c0f74ca18-riscv64-linux-gnu-debug.tar.gz
536befc56cbe913c290d65c9eba2b8c11f0088e06bdf702a53d9f6e4e602f200  output/bitcoin-a36c0f74ca18-riscv64-linux-gnu.tar.gz
522fd8cd58798877f26edc4181e380b2ee6817189806ded5a6da876b954f6a0c  output/bitcoin-a36c0f74ca18-win-unsigned.tar.gz
48e360148f053b0210f53cd2bd041f1980f312b930479306f5cc0b54537452d3  output/bitcoin-a36c0f74ca18-win64-debug.zip
4be14a48b6446502e1e6003b42579f233f98c9fd37e68e97e7e6a2c658e97310  output/bitcoin-a36c0f74ca18-win64-setup-unsigned.exe
fb904d19eb249b08126c5af21ce616388c6f2bd97226591b037f85423eadc46c  output/bitcoin-a36c0f74ca18-win64.zip
1336aaa4c3ab9b98bb02e7be38b605e5c7599a839bb0be6c34b61fd05c13c99e  output/bitcoin-a36c0f74ca18-x86_64-linux-gnu-debug.tar.gz
f5db95af1757e026f8631ed3ec643463751bb4a6a9d888e1fa67678d9f7eb3c2  output/bitcoin-a36c0f74ca18-x86_64-linux-gnu.tar.gz
d71d2d725ff555e52031071fe614253fb6c2a31ee7770b13741699c920713427  output/src/bitcoin-a36c0f74ca18.tar.gz

DrahtBot commented at 12:28 AM on March 27, 2021: member

Gitian builds

File	commit 9217f9fe7351d9c36803456f88ae561e23f17ac9<br>(master)	commit fd6d357c42871193293bca88aafe0238889ace70<br>(master and this pull)
*-aarch64-linux-gnu-debug.tar.gz	`a42090638c179880...`	`7dcb05b936efd03e...`
*-aarch64-linux-gnu.tar.gz	`df43fae4e56591ee...`	`d3e39468093085f2...`
*-arm-linux-gnueabihf-debug.tar.gz	`04cca3ba64742deb...`	`a25796b313a21239...`
*-arm-linux-gnueabihf.tar.gz	`eaa3969d992c2487...`	`9e43c14b7ca4be7b...`
*-osx-unsigned.dmg	`3b66d4fb3a6898ea...`	`c45e8b9586c23e35...`
*-osx64.tar.gz	`1f15accd0d1ba1be...`	`39689978cf1c9ede...`
*-powerpc64-linux-gnu-debug.tar.gz	`b4eb4f9abcfef607...`	`c5104edeeba76296...`
*-powerpc64-linux-gnu.tar.gz	`c6095400c6638eb2...`	`79aece883c008c21...`
*-powerpc64le-linux-gnu-debug.tar.gz	`276a1dfc8966a82c...`	`0429dc31cddcafcb...`
*-powerpc64le-linux-gnu.tar.gz	`6daccce71b265bed...`	`b83aa4d29fa8de02...`
*-riscv64-linux-gnu-debug.tar.gz	`33b8de5eef6fa76a...`	`ae5e92c4def15bc0...`
*-riscv64-linux-gnu.tar.gz	`3bbf0014ca5cd2f7...`	`da6f89d39eb4f07e...`
*-win64-debug.zip	`978fc25f9ee1007e...`	`8d462cbcab2a381d...`
*-win64-setup-unsigned.exe	`8ae20d7957cc6c93...`	`65c14d8500879459...`
*-win64.zip	`458636c892d4cd29...`	`fefbf57138268eca...`
*-x86_64-linux-gnu-debug.tar.gz	`6832136998fc2b8e...`	`205501ed23f538a2...`
*-x86_64-linux-gnu.tar.gz	`c3ab5503b2a4c964...`	`407c800a8499b444...`
*.tar.gz	`5a64644ff42a3eac...`	`9a16210e9d22a2e0...`
bitcoin-core-linux-22-res.yml	`208456b73bed8532...`	`c21b8dd41a1aad8f...`
bitcoin-core-osx-22-res.yml	`3f8475102c634710...`	`79acbdd1471384db...`
bitcoin-core-win-22-res.yml	`1c52aa8620dde699...`	`5d3c36b975c096c0...`
linux-build.log	`e84adf39bdc5ec75...`	`fad2ac0b815b21e2...`
osx-build.log	`7c60fbdb0677588d...`	`e7c967521c24a283...`
win-build.log	`2a3d04a98479e626...`	`93842383d708c502...`
bitcoin-core-linux-22-res.yml.diff		`d29db9b94c0eabaf...`
bitcoin-core-osx-22-res.yml.diff		`773ac1f57e981404...`
bitcoin-core-win-22-res.yml.diff		`2fe3ecc2b027bec9...`
linux-build.log.diff		`098bed34fea92794...`
osx-build.log.diff		`2e46e82938bec946...`
win-build.log.diff		`b8daf0da425fd796...`

DrahtBot removed the label Needs gitian build on Mar 27, 2021

MarcoFalke deleted a comment on Mar 27, 2021

DrahtBot added the label Needs rebase on Apr 5, 2021

hebasto force-pushed on Apr 5, 2021

hebasto commented at 11:55 PM on April 5, 2021: member

Rebased a36c0f74ca18c55a03b961456910b5bec88a0189 -> cd01109478901e53e3a4f85cedd1cc3b4c04446b (pr21420.03 -> pr21420.04) due to the conflict with #21375.

DrahtBot removed the label Needs rebase on Apr 6, 2021

hebasto force-pushed on Apr 12, 2021

hebasto commented at 12:59 PM on April 12, 2021: member

Rebased cd01109478901e53e3a4f85cedd1cc3b4c04446b -> 3192baf120dab1d72bc59bb1e8ea19ff1fb0dd27 (pr21420.04 -> pr21420.05) on top of the recent changes in CI.

hebasto commented at 4:07 PM on April 12, 2021: member

Gitian builds:

Linux

Generating report
4d8a4a36c5d9ada02d99cc788601812d1767071af8b8e180023eb350ed0a04ac  bitcoin-3192baf120da-aarch64-linux-gnu-debug.tar.gz
23f30ee07f7aaddeef3337f719de50577602ccf4d6395c10aaafdda8a2ff7697  bitcoin-3192baf120da-aarch64-linux-gnu.tar.gz
8b42057f0ab779972193961d89623ac68bfb67215cf477bc0d27c9757f09484e  bitcoin-3192baf120da-arm-linux-gnueabihf-debug.tar.gz
fd6495fdbcbf186abdd7b85acc8416b9eeb99bfc32f1f18492ef83342f124f05  bitcoin-3192baf120da-arm-linux-gnueabihf.tar.gz
cd4c926d7989af740d90ac85d2f1b9a26f64a7d0931bfe09b435260b7951726b  bitcoin-3192baf120da-powerpc64-linux-gnu-debug.tar.gz
fbc5b1dffaefae1abe35fc83251487ac47c2227bde17a62b279565688122a3e4  bitcoin-3192baf120da-powerpc64-linux-gnu.tar.gz
35bd60002bbe1482618a102530a90500cbc6af5d8ef32d20b53afb841734f265  bitcoin-3192baf120da-powerpc64le-linux-gnu-debug.tar.gz
914172cf6ef361e69d7baaa3d0075dcc3ff6c4f9d8e0a83bc13398c73c14523f  bitcoin-3192baf120da-powerpc64le-linux-gnu.tar.gz
b8fbdcfc13e884cc409c78e59a49c84499cea7c1898b39524f3c2793f54aad4e  bitcoin-3192baf120da-riscv64-linux-gnu-debug.tar.gz
2c398bc7cbac7bc86388af36a1dc8466550d529341a60bcab3b81c5ad12acdac  bitcoin-3192baf120da-riscv64-linux-gnu.tar.gz
e1cac9657593663e5ce2c7dc1c6f60d3c9ab2e674d17cc448fe3faccdc977887  bitcoin-3192baf120da-x86_64-linux-gnu-debug.tar.gz
b57d651ccf86bce52a00c48603fbb885c507bbae99f3ccf592756c60ac07e0ea  bitcoin-3192baf120da-x86_64-linux-gnu.tar.gz
9780519d726d7b4aae46ec466737309e03493f31ae659799260013a84fef7225  src/bitcoin-3192baf120da.tar.gz
5a5282b1f837ade9631d0c391df23fa03baf22d80a150ccc9185e0d367e211bd  bitcoin-core-linux-22-res.yml
Done.

Windows

Generating report
0e0540cd28418856bfecca2ad4b439f24a9ad3be9fb4c47994941cb4a2e11c07  bitcoin-3192baf120da-win-unsigned.tar.gz
d829fe3f60a95a230fc8cf346be82e928741d44a98b9e9a74989201913f2030c  bitcoin-3192baf120da-win64-debug.zip
2555b1e662572f5d2de50a698a57e94533d6622067113ace05e0cc052e48d4cd  bitcoin-3192baf120da-win64-setup-unsigned.exe
344f1d87828354027d9e05fe2a3a821880813fe82cfa45e64bccc960eca35076  bitcoin-3192baf120da-win64.zip
9780519d726d7b4aae46ec466737309e03493f31ae659799260013a84fef7225  src/bitcoin-3192baf120da.tar.gz
76ea0fdb09358e5e1cf220f04b92626d99a4553a66a10d62bd0171e6e56c803e  bitcoin-core-win-22-res.yml
Done.

macOS

Generating report
1246a9b273445bc1eb00564cc1b7050b1a34b41c241abb771e26ac5d9d07ebb7  bitcoin-3192baf120da-osx-unsigned.dmg
2398e62e820e9490f9fab43680c9e1063db3be6dff4c5751ebc211df17e4618b  bitcoin-3192baf120da-osx-unsigned.tar.gz
b8e9d44c076c2e526f6689a0b71bd5f5554b8bc4dbf1deba9062d28692f9b3dd  bitcoin-3192baf120da-osx64.tar.gz
9780519d726d7b4aae46ec466737309e03493f31ae659799260013a84fef7225  src/bitcoin-3192baf120da.tar.gz
77a82e7c8f4f67f14c563024e6530943243fd0985d6d89f8d547e32c31aedc9b  bitcoin-core-osx-22-res.yml
Done.

hebasto commented at 4:36 PM on April 12, 2021: member

Guix builds:

$ find guix-build-$(git rev-parse --short=12 HEAD)/output/ -type f -print0 | env LC_ALL=C sort -z | xargs -r0 sha256sum
b44151eee53fe582ea537a849008146a4d3c2708ece616e7ecee0e9b53f0a8c9  guix-build-3192baf120da/output/aarch64-linux-gnu/bitcoin-3192baf120da-aarch64-linux-gnu-debug.tar.gz
b6c196a57f201f38822f338e089462b5fb829502dadf5e4d2f2c49a0241ebd4d  guix-build-3192baf120da/output/aarch64-linux-gnu/bitcoin-3192baf120da-aarch64-linux-gnu.tar.gz
3afb5740dba104211f9e87453d752c37f2145244b7fd93414aa0097f1a08448b  guix-build-3192baf120da/output/arm-linux-gnueabihf/bitcoin-3192baf120da-arm-linux-gnueabihf-debug.tar.gz
abbe180ac93f9495adbac8b6f36f3839043b8fafaf73d150841858aa7289bfb4  guix-build-3192baf120da/output/arm-linux-gnueabihf/bitcoin-3192baf120da-arm-linux-gnueabihf.tar.gz
9780519d726d7b4aae46ec466737309e03493f31ae659799260013a84fef7225  guix-build-3192baf120da/output/dist-archive/bitcoin-3192baf120da.tar.gz
5c6388d1379c775ae64bb1375b2382c6ed3d00bb52b3552589525e037cf587f8  guix-build-3192baf120da/output/powerpc64-linux-gnu/bitcoin-3192baf120da-powerpc64-linux-gnu-debug.tar.gz
4b93f744915639d8689cc25f96ed1b108cb59ab8075c91f4ce1820adebed7b1f  guix-build-3192baf120da/output/powerpc64-linux-gnu/bitcoin-3192baf120da-powerpc64-linux-gnu.tar.gz
81c5f2fbb2fa7616633cd26e3d3c4dde823d60b8c1c9813e8a1701d4cef65359  guix-build-3192baf120da/output/powerpc64le-linux-gnu/bitcoin-3192baf120da-powerpc64le-linux-gnu-debug.tar.gz
73b92645eee09c7713535b7f2d1c572e608841dc28d081a952246c9b18b032a0  guix-build-3192baf120da/output/powerpc64le-linux-gnu/bitcoin-3192baf120da-powerpc64le-linux-gnu.tar.gz
7db1d48468b41808ffd60f4d2eca60deda1a7f161893e119947e83ade1a46d6d  guix-build-3192baf120da/output/riscv64-linux-gnu/bitcoin-3192baf120da-riscv64-linux-gnu-debug.tar.gz
9e467882705bb54fef6694facde2b1f5ff9e01eaddb0f3cf7fc95acd0e43b464  guix-build-3192baf120da/output/riscv64-linux-gnu/bitcoin-3192baf120da-riscv64-linux-gnu.tar.gz
0128fad3ab6644e47be0da171cd9c122224bd0b7e0a539d8a15b88b50b24e348  guix-build-3192baf120da/output/x86_64-apple-darwin18/bitcoin-3192baf120da-osx-unsigned.dmg
f87061a23e3886bf464c3b3c6bcf522178ef2cd9767a4c161984caa9d3ecdbdc  guix-build-3192baf120da/output/x86_64-apple-darwin18/bitcoin-3192baf120da-osx-unsigned.tar.gz
c043c40968cf2a66a2daccd2241fa2c22f7981181ff23aeb48696328da462ad0  guix-build-3192baf120da/output/x86_64-apple-darwin18/bitcoin-3192baf120da-osx64.tar.gz
e11805a8ba9850a8b363dfc3106fa31707386f5415c93bfbcb214a4dba95fc35  guix-build-3192baf120da/output/x86_64-linux-gnu/bitcoin-3192baf120da-x86_64-linux-gnu-debug.tar.gz
99d79bb89c47ade52abc1f36ea74da243d5abe4684740dd101b2c8b6aa067558  guix-build-3192baf120da/output/x86_64-linux-gnu/bitcoin-3192baf120da-x86_64-linux-gnu.tar.gz
12347bc684d39f7335ff320694f6d978a685d11559b98a18030224a7c2494c05  guix-build-3192baf120da/output/x86_64-w64-mingw32/bitcoin-3192baf120da-win-unsigned.tar.gz
56fd78bcd69d312eef7a0d7ddad444b580485549eb4155cc7f8a581f9dbdb781  guix-build-3192baf120da/output/x86_64-w64-mingw32/bitcoin-3192baf120da-win64-debug.zip
404c4feeaf2768aad29ae7a694e9f71582632a0aa00e69ad74cb8a4d6b42b5e1  guix-build-3192baf120da/output/x86_64-w64-mingw32/bitcoin-3192baf120da-win64-setup-unsigned.exe
5aa493d0e0a5ef3d37371ffaf4c7768a70ef80e4daf9ff88dcd7a148f76fa48d  guix-build-3192baf120da/output/x86_64-w64-mingw32/bitcoin-3192baf120da-win64.zip

jarolrod commented at 4:56 AM on April 13, 2021: member

contributing GUIX hashes for 3192baf120dab1d72bc59bb1e8ea19ff1fb0dd27, mine match hebasto's:

find guix-build-$(git rev-parse --short=12 HEAD)/output/ -type f -print0 | env LC_ALL=C sort -z | xargs -r0 sha256sum

b44151eee53fe582ea537a849008146a4d3c2708ece616e7ecee0e9b53f0a8c9  guix-build-3192baf120da/output/aarch64-linux-gnu/bitcoin-3192baf120da-aarch64-linux-gnu-debug.tar.gz
b6c196a57f201f38822f338e089462b5fb829502dadf5e4d2f2c49a0241ebd4d  guix-build-3192baf120da/output/aarch64-linux-gnu/bitcoin-3192baf120da-aarch64-linux-gnu.tar.gz
3afb5740dba104211f9e87453d752c37f2145244b7fd93414aa0097f1a08448b  guix-build-3192baf120da/output/arm-linux-gnueabihf/bitcoin-3192baf120da-arm-linux-gnueabihf-debug.tar.gz
abbe180ac93f9495adbac8b6f36f3839043b8fafaf73d150841858aa7289bfb4  guix-build-3192baf120da/output/arm-linux-gnueabihf/bitcoin-3192baf120da-arm-linux-gnueabihf.tar.gz
9780519d726d7b4aae46ec466737309e03493f31ae659799260013a84fef7225  guix-build-3192baf120da/output/dist-archive/bitcoin-3192baf120da.tar.gz
5c6388d1379c775ae64bb1375b2382c6ed3d00bb52b3552589525e037cf587f8  guix-build-3192baf120da/output/powerpc64-linux-gnu/bitcoin-3192baf120da-powerpc64-linux-gnu-debug.tar.gz
4b93f744915639d8689cc25f96ed1b108cb59ab8075c91f4ce1820adebed7b1f  guix-build-3192baf120da/output/powerpc64-linux-gnu/bitcoin-3192baf120da-powerpc64-linux-gnu.tar.gz
81c5f2fbb2fa7616633cd26e3d3c4dde823d60b8c1c9813e8a1701d4cef65359  guix-build-3192baf120da/output/powerpc64le-linux-gnu/bitcoin-3192baf120da-powerpc64le-linux-gnu-debug.tar.gz
73b92645eee09c7713535b7f2d1c572e608841dc28d081a952246c9b18b032a0  guix-build-3192baf120da/output/powerpc64le-linux-gnu/bitcoin-3192baf120da-powerpc64le-linux-gnu.tar.gz
7db1d48468b41808ffd60f4d2eca60deda1a7f161893e119947e83ade1a46d6d  guix-build-3192baf120da/output/riscv64-linux-gnu/bitcoin-3192baf120da-riscv64-linux-gnu-debug.tar.gz
9e467882705bb54fef6694facde2b1f5ff9e01eaddb0f3cf7fc95acd0e43b464  guix-build-3192baf120da/output/riscv64-linux-gnu/bitcoin-3192baf120da-riscv64-linux-gnu.tar.gz
0128fad3ab6644e47be0da171cd9c122224bd0b7e0a539d8a15b88b50b24e348  guix-build-3192baf120da/output/x86_64-apple-darwin18/bitcoin-3192baf120da-osx-unsigned.dmg
f87061a23e3886bf464c3b3c6bcf522178ef2cd9767a4c161984caa9d3ecdbdc  guix-build-3192baf120da/output/x86_64-apple-darwin18/bitcoin-3192baf120da-osx-unsigned.tar.gz
c043c40968cf2a66a2daccd2241fa2c22f7981181ff23aeb48696328da462ad0  guix-build-3192baf120da/output/x86_64-apple-darwin18/bitcoin-3192baf120da-osx64.tar.gz
e11805a8ba9850a8b363dfc3106fa31707386f5415c93bfbcb214a4dba95fc35  guix-build-3192baf120da/output/x86_64-linux-gnu/bitcoin-3192baf120da-x86_64-linux-gnu-debug.tar.gz
99d79bb89c47ade52abc1f36ea74da243d5abe4684740dd101b2c8b6aa067558  guix-build-3192baf120da/output/x86_64-linux-gnu/bitcoin-3192baf120da-x86_64-linux-gnu.tar.gz
12347bc684d39f7335ff320694f6d978a685d11559b98a18030224a7c2494c05  guix-build-3192baf120da/output/x86_64-w64-mingw32/bitcoin-3192baf120da-win-unsigned.tar.gz
56fd78bcd69d312eef7a0d7ddad444b580485549eb4155cc7f8a581f9dbdb781  guix-build-3192baf120da/output/x86_64-w64-mingw32/bitcoin-3192baf120da-win64-debug.zip
404c4feeaf2768aad29ae7a694e9f71582632a0aa00e69ad74cb8a4d6b42b5e1  guix-build-3192baf120da/output/x86_64-w64-mingw32/bitcoin-3192baf120da-win64-setup-unsigned.exe
5aa493d0e0a5ef3d37371ffaf4c7768a70ef80e4daf9ff88dcd7a148f76fa48d  guix-build-3192baf120da/output/x86_64-w64-mingw32/bitcoin-3192baf120da-win64.zip

DrahtBot added the label Needs rebase on Apr 20, 2021

hebasto force-pushed on Apr 20, 2021

hebasto commented at 3:13 PM on April 20, 2021: member

Rebased 3192baf120dab1d72bc59bb1e8ea19ff1fb0dd27 -> 44e9d737979d49088ce8e322c96bb9e5bab31943 (pr21420.05 -> pr21420.06) due to the conflict with #21694.

DrahtBot removed the label Needs rebase on Apr 20, 2021

DrahtBot added the label Needs rebase on May 3, 2021

build, qt: Move translations processing to the stage commands

This change allows to drop Qt code patches.

9a7c9632ff

build, qt: Drop sed translations.pro

It is no longer needed.

288a8dc85c

build, qt: Drop drop_lrelease_dependency.patch

It is no longer needed.

10adafc808

hebasto force-pushed on May 3, 2021

hebasto commented at 8:05 AM on May 3, 2021: member

Rebased 44e9d737979d49088ce8e322c96bb9e5bab31943 -> 10adafc80878ffb62be7be011ac9808111316eb3 (pr21420.06 -> pr21420.07) due to the conflict with #19817.

DrahtBot removed the label Needs rebase on May 3, 2021

fanquake commented at 8:51 AM on June 9, 2021: member

For now, I'm going to close this in favour of #22142. If, for some reason, we can't get that change done fairly shortly, I'll reopen this PR.

fanquake closed this on Jun 9, 2021

fanquake referenced this in commit 4315dc02a1 on Jul 18, 2021

sidhujag referenced this in commit 4a59fda74b on Jul 23, 2021

DrahtBot locked this on Aug 18, 2022