build, qt: No longer need to patch translation.pro #21420
Closed
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
The following sections might be updated with supplementary metadata relevant to reviewers and maintainers. ConflictsReviewers, this pull request conflicts with the following ones:
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. |
|
Gitian builds: Guix builds: |
Converted from "Draft" into "Ready for review". |
fanquake
reviewed
Mar 17, 2021
There was a problem hiding this comment.
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?
| endef | ||
|
|
||
| # Qt translations module depends on lrelease binary being installed, | ||
| # therefore all translations processing is put here. |
There was a problem hiding this comment.
I think this comment needs to either be more explanatory, or just removed.
| define $(package)_stage_cmds | ||
| $(MAKE) -C qtbase/src INSTALL_ROOT=$($(package)_staging_dir) $(addsuffix -install_subtargets,$(addprefix sub-,$($(package)_qt_libs))) && \ | ||
| $(MAKE) -C qttools/src/linguist/lrelease INSTALL_ROOT=$($(package)_staging_dir) install_target && \ | ||
| $(MAKE) -C qttools/src/linguist/lupdate INSTALL_ROOT=$($(package)_staging_dir) install_target && \ | ||
| $(MAKE) -C qttools/src/linguist/lrelease INSTALL_ROOT=/ install_target && \ |
There was a problem hiding this comment.
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.
There was a problem hiding this comment.
The second time lrelease is installed into the prefix directory where the Qt expects it to find to process translations.
This was referenced Mar 17, 2021
Besides closed #20642, we could separate Qt The most drawback is necessity to provide configure options in |
This was referenced Mar 18, 2021
|
Rebased 27ea907 -> 52634e5 (pr21420.01 -> pr21420.02) due to the conflict with #17227. |
|
Rebased 52634e5 -> a36c0f7 (pr21420.02 -> pr21420.03) due to the conflict with #21495. |
|
Rebased a36c0f7 -> cd01109 (pr21420.03 -> pr21420.04) due to the conflict with #21375. |
|
Rebased cd01109 -> 3192baf (pr21420.04 -> pr21420.05) on top of the recent changes in CI. |
Gitian builds:
|
Guix builds: |
jarolrod
reviewed
Apr 13, 2021
There was a problem hiding this comment.
contributing GUIX hashes for 3192baf, 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
|
Rebased 3192baf -> 44e9d73 (pr21420.05 -> pr21420.06) due to the conflict with #21694. |
This change allows to drop Qt code patches.
It is no longer needed.
It is no longer needed.
|
Rebased 44e9d73 -> 10adafc (pr21420.06 -> pr21420.07) due to the conflict with #19817. |
This was referenced Jun 4, 2021
|
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
added a commit
that referenced
this pull request
Jul 18, 2021
1155978 build, qt: Do not install *.prl files (Hennadii Stepanov) 763793b build, qt: Fix wrong cross-compiling detection on macOS (Hennadii Stepanov) 3098272 build, qt: Force bootstrap while building linguist tools (Hennadii Stepanov) 689320e build, qt: Drop translations.pro hack (Hennadii Stepanov) 6a1f98f build, qt: Drop lrelease dependency patch (Hennadii Stepanov) 39e561e build, qt: Add linguist_tools list (Hennadii Stepanov) 27d3def build: Use Qt top-level build facilities (Hennadii Stepanov) Pull request description: This PR: - uses Qt top-level build facilities without the need to download all-in-one archive - is based on **BlockMechanic**'s [idea](#20600), and is an alternative to #20600 - makes it easy to integrate [new modules](#16883) into static builds - has the minimal diff - makes the qt package build process streamlined by dropping some patches and hacks (an alternative to #21420 and #20642) Fixes #18536 (a non-intrusive alternative to #21589 and #19785). Fixes #14648. Fixes #21588 (a non-intrusive alternative to #21591). Required for adding [Wayland support](#19950) on Linux. --- **Note for reviewers**: With 9046de8 from #21995 it is easy to verify that there are no changes in the resulted `qt` package archive on the per commit basis. For example, for `HOST=i686-pc-linux-gnu` no commit in this PR introduces any changes. ACKs for top commit: fanquake: ACK 1155978 Tree-SHA512: 667b06b72cb7ff26d68b9b88e8dddb51084783ca9e3d80b3392710794c1dc7fd77bbcc3ccf4ccece9919d33b9bf8fce13c5059502bd228021dc7c93fdb87ca7a
sidhujag
pushed a commit
to syscoin/syscoin
that referenced
this pull request
Jul 23, 2021
1155978 build, qt: Do not install *.prl files (Hennadii Stepanov) 763793b build, qt: Fix wrong cross-compiling detection on macOS (Hennadii Stepanov) 3098272 build, qt: Force bootstrap while building linguist tools (Hennadii Stepanov) 689320e build, qt: Drop translations.pro hack (Hennadii Stepanov) 6a1f98f build, qt: Drop lrelease dependency patch (Hennadii Stepanov) 39e561e build, qt: Add linguist_tools list (Hennadii Stepanov) 27d3def build: Use Qt top-level build facilities (Hennadii Stepanov) Pull request description: This PR: - uses Qt top-level build facilities without the need to download all-in-one archive - is based on **BlockMechanic**'s [idea](bitcoin#20600), and is an alternative to bitcoin#20600 - makes it easy to integrate [new modules](bitcoin#16883) into static builds - has the minimal diff - makes the qt package build process streamlined by dropping some patches and hacks (an alternative to bitcoin#21420 and bitcoin#20642) Fixes bitcoin#18536 (a non-intrusive alternative to bitcoin#21589 and bitcoin#19785). Fixes bitcoin#14648. Fixes bitcoin#21588 (a non-intrusive alternative to bitcoin#21591). Required for adding [Wayland support](bitcoin#19950) on Linux. --- **Note for reviewers**: With 9046de8 from bitcoin#21995 it is easy to verify that there are no changes in the resulted `qt` package archive on the per commit basis. For example, for `HOST=i686-pc-linux-gnu` no commit in this PR introduces any changes. ACKs for top commit: fanquake: ACK 1155978 Tree-SHA512: 667b06b72cb7ff26d68b9b88e8dddb51084783ca9e3d80b3392710794c1dc7fd77bbcc3ccf4ccece9919d33b9bf8fce13c5059502bd228021dc7c93fdb87ca7a
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This is an alternative to #20642.