Page MenuHomePhabricator
Differential D13926

build, qt: bump Qt5 version to 5.15.5
ClosedPublic
Actions

Authored by PiRK on May 24 2023, 09:43.

Details

Reviewers
Fabien
Group Reviewers
Restricted Project
Commits
rABC6dd5e9f637a6: build, qt: bump Qt5 version to 5.15.5
Summary

This is a minor Qt bump to drop a few patches. It also has some style changes.

core#24668

Qt 5.15.3 release is a patch release made on the top of Qt 5.15.2. As a patch
release, Qt 5.15.3 does not add any new functionality but provides bug fixes
and other improvements.

https://code.qt.io/cgit/qt/qtreleasenotes.git/about/qt/5.15.3/release-note.md

  • dropped patches:
    • patches/qt/fix_bigsur_style.patch
  • adjusted patches:
    • patches/qt/fix_limits_header.patch

Co-authored-by: Hennadii Stepanov <32963518+hebasto@users.noreply.github.com>

build, qt: drop fix_no_printer.patch

The removed patch is not required since switching Qt version from
5.12.11 to 5.15.2.

build, qt: use one patch per line in depends/packages/qt.mk

core#25719

build: Bump Qt to 5.15.5 in depends

qt: use patch over sed for guix CROSS_LIBRARY_PATH change

This is a backport of core#24668 and core#25719

Depends on D13918

Test Plan

gitian builds, guix build

Diff Detail

Repository
rABC Bitcoin ABC
Lint
Lint Passed
Unit
No Test Coverage
Build Status
Buildable 23794
Build 47198: Build Diff
Build 47197: arc lint + arc unit

Event Timeline

PiRK created this revision.May 24 2023, 09:43
Herald added a reviewer: Restricted Project. · View Herald TranscriptMay 24 2023, 09:43
teamcity edited the summary of this revision. (Show Details)May 24 2023, 09:43
Harbormaster completed remote builds in B23778: Diff 40405.May 24 2023, 09:43
PiRK added a comment.May 24 2023, 09:44

@bot gitian-linux gitian-win gitian-osx

teamcity awarded a token.May 24 2023, 09:44
PiRK added a comment.May 24 2023, 11:49

@bot gitian-linux gitian-win gitian-osx

teamcity updated a token.May 24 2023, 11:49
PiRK published this revision for review.May 24 2023, 11:49
PiRK added a child revision: D13927: build, qt: backport patches.May 24 2023, 12:42
PiRK added a comment.May 24 2023, 13:12

@bot gitian-linux gitian-win gitian-osx

teamcity updated a token.May 24 2023, 13:12
PiRK added a comment.May 24 2023, 13:56

Not deterministic... lets see if D13927 helps

PiRK added a comment.May 24 2023, 14:57

It looks like the patches in D13927 fix the determinism

Fabien requested changes to this revision.May 25 2023, 12:42
Fabien added a subscriber: Fabien.

Clearing my queue, that will need to be rebased after the changes requested in D13918

This revision now requires changes to proceed.May 25 2023, 12:42
PiRK updated this revision to Diff 40430.May 25 2023, 14:16

rebase

Harbormaster completed remote builds in B23794: Diff 40430.May 25 2023, 14:16
PiRK added a comment.May 25 2023, 14:17

@bot gitian-osx gitian-linux gitian-win

teamcity updated a token.May 25 2023, 14:17
PiRK planned changes to this revision.May 25 2023, 14:18
PiRK updated this revision to Diff 40431.May 25 2023, 14:21

remove a deleted patch that was added back while rebasing

After the current gitian builds fail, I will rerun them. Rerunning immediately will make the log confusing.

Harbormaster completed remote builds in B23795: Diff 40431.May 25 2023, 14:22
teamcity added a comment.May 25 2023, 14:22
Build Bitcoin ABC Diffs / Diff Testing (gitian-win) failed.

Tail of the build log:

 * [new tag]             phabricator/diff/40247 -> phabricator/diff/40247
 * [new tag]             phabricator/diff/40249 -> phabricator/diff/40249
 * [new tag]             phabricator/diff/40254 -> phabricator/diff/40254
 * [new tag]             phabricator/diff/40255 -> phabricator/diff/40255
 * [new tag]             phabricator/diff/40275 -> phabricator/diff/40275
 * [new tag]             phabricator/diff/40276 -> phabricator/diff/40276
 * [new tag]             phabricator/diff/40277 -> phabricator/diff/40277
 * [new tag]             phabricator/diff/40278 -> phabricator/diff/40278
 * [new tag]             phabricator/diff/40279 -> phabricator/diff/40279
 * [new tag]             phabricator/diff/40281 -> phabricator/diff/40281
 * [new tag]             phabricator/diff/40285 -> phabricator/diff/40285
 * [new tag]             phabricator/diff/40310 -> phabricator/diff/40310
 * [new tag]             phabricator/diff/40326 -> phabricator/diff/40326
 * [new tag]             phabricator/diff/40334 -> phabricator/diff/40334
 * [new tag]             phabricator/diff/40335 -> phabricator/diff/40335
 * [new tag]             phabricator/diff/40340 -> phabricator/diff/40340
 * [new tag]             phabricator/diff/40341 -> phabricator/diff/40341
 * [new tag]             phabricator/diff/40365 -> phabricator/diff/40365
 * [new tag]             phabricator/diff/40366 -> phabricator/diff/40366
 * [new tag]             phabricator/diff/40367 -> phabricator/diff/40367
 * [new tag]             phabricator/diff/40368 -> phabricator/diff/40368
 * [new tag]             phabricator/diff/40377 -> phabricator/diff/40377
 * [new tag]             phabricator/diff/40379 -> phabricator/diff/40379
 * [new tag]             phabricator/diff/40380 -> phabricator/diff/40380
 * [new tag]             phabricator/diff/40382 -> phabricator/diff/40382
 * [new tag]             phabricator/diff/40384 -> phabricator/diff/40384
 * [new tag]             phabricator/diff/40400 -> phabricator/diff/40400
 * [new tag]             phabricator/diff/40401 -> phabricator/diff/40401
 * [new tag]             phabricator/diff/40402 -> phabricator/diff/40402
 * [new tag]             phabricator/diff/40404 -> phabricator/diff/40404
 * [new tag]             phabricator/diff/40405 -> phabricator/diff/40405
 * [new tag]             phabricator/diff/40408 -> phabricator/diff/40408
 * [new tag]             phabricator/diff/40409 -> phabricator/diff/40409
 * [new tag]             phabricator/diff/40429 -> phabricator/diff/40429
 * [new tag]             phabricator/diff/40430 -> phabricator/diff/40430
 * [new tag]             phabricator/diff/8992  -> phabricator/diff/8992
 * [new tag]             phabricator/diff/8993  -> phabricator/diff/8993
 * [new branch]          master                 -> master
--- Building for bullseye amd64 ---
Stopping target if it is up
Error response from daemon: No such container: gitian-target
Error: No such container: gitian-target
Making a new image copy
Starting target
Checking if target is up..
Preparing build environment
Updating apt-get repository (log in var/install.log)
Installing additional packages (log in var/install.log)
Upgrading system, may take a while (log in var/install.log)
Creating package manifest
Creating build script (var/build-script)
Running build script (log in var/build.log)
./bin/gbuild:23:in `system!': failed to run on-target setarch x86_64 bash -x < var/build-script > var/build.log 2>&1 (RuntimeError)
	from ./bin/gbuild:185:in `build_one_configuration'
	from ./bin/gbuild:339:in `block (2 levels) in <main>'
	from ./bin/gbuild:334:in `each'
	from ./bin/gbuild:334:in `block in <main>'
	from ./bin/gbuild:332:in `each'
	from ./bin/gbuild:332:in `<main>'
Build gitian-win failed with exit code 1
teamcity added a comment.May 25 2023, 14:25
Build Bitcoin ABC Diffs / Diff Testing (gitian-osx) failed.

Tail of the build log:

 * [new tag]             phabricator/diff/40233 -> phabricator/diff/40233
 * [new tag]             phabricator/diff/40234 -> phabricator/diff/40234
 * [new tag]             phabricator/diff/40244 -> phabricator/diff/40244
 * [new tag]             phabricator/diff/40245 -> phabricator/diff/40245
 * [new tag]             phabricator/diff/40246 -> phabricator/diff/40246
 * [new tag]             phabricator/diff/40247 -> phabricator/diff/40247
 * [new tag]             phabricator/diff/40249 -> phabricator/diff/40249
 * [new tag]             phabricator/diff/40254 -> phabricator/diff/40254
 * [new tag]             phabricator/diff/40255 -> phabricator/diff/40255
 * [new tag]             phabricator/diff/40274 -> phabricator/diff/40274
 * [new tag]             phabricator/diff/40276 -> phabricator/diff/40276
 * [new tag]             phabricator/diff/40278 -> phabricator/diff/40278
 * [new tag]             phabricator/diff/40279 -> phabricator/diff/40279
 * [new tag]             phabricator/diff/40285 -> phabricator/diff/40285
 * [new tag]             phabricator/diff/40286 -> phabricator/diff/40286
 * [new tag]             phabricator/diff/40310 -> phabricator/diff/40310
 * [new tag]             phabricator/diff/40335 -> phabricator/diff/40335
 * [new tag]             phabricator/diff/40339 -> phabricator/diff/40339
 * [new tag]             phabricator/diff/40365 -> phabricator/diff/40365
 * [new tag]             phabricator/diff/40366 -> phabricator/diff/40366
 * [new tag]             phabricator/diff/40367 -> phabricator/diff/40367
 * [new tag]             phabricator/diff/40368 -> phabricator/diff/40368
 * [new tag]             phabricator/diff/40373 -> phabricator/diff/40373
 * [new tag]             phabricator/diff/40379 -> phabricator/diff/40379
 * [new tag]             phabricator/diff/40380 -> phabricator/diff/40380
 * [new tag]             phabricator/diff/40381 -> phabricator/diff/40381
 * [new tag]             phabricator/diff/40400 -> phabricator/diff/40400
 * [new tag]             phabricator/diff/40401 -> phabricator/diff/40401
 * [new tag]             phabricator/diff/40402 -> phabricator/diff/40402
 * [new tag]             phabricator/diff/40404 -> phabricator/diff/40404
 * [new tag]             phabricator/diff/40406 -> phabricator/diff/40406
 * [new tag]             phabricator/diff/40409 -> phabricator/diff/40409
 * [new tag]             phabricator/diff/40428 -> phabricator/diff/40428
 * [new tag]             phabricator/diff/40429 -> phabricator/diff/40429
 * [new tag]             phabricator/diff/40430 -> phabricator/diff/40430
 * [new tag]             phabricator/diff/8992  -> phabricator/diff/8992
 * [new tag]             phabricator/diff/8993  -> phabricator/diff/8993
 * [new branch]          master                 -> master
--- Building for bullseye amd64 ---
Stopping target if it is up
Error response from daemon: No such container: gitian-target
Error: No such container: gitian-target
Making a new image copy
Starting target
Checking if target is up.
Preparing build environment
Updating apt-get repository (log in var/install.log)
Installing additional packages (log in var/install.log)
Upgrading system, may take a while (log in var/install.log)
Creating package manifest
Creating build script (var/build-script)
Running build script (log in var/build.log)
./bin/gbuild:23:in `system!': failed to run on-target setarch x86_64 bash -x < var/build-script > var/build.log 2>&1 (RuntimeError)
	from ./bin/gbuild:185:in `build_one_configuration'
	from ./bin/gbuild:339:in `block (2 levels) in <main>'
	from ./bin/gbuild:334:in `each'
	from ./bin/gbuild:334:in `block in <main>'
	from ./bin/gbuild:332:in `each'
	from ./bin/gbuild:332:in `<main>'
Build gitian-osx failed with exit code 1
teamcity added a comment.May 25 2023, 14:28
Build Bitcoin ABC Diffs / Diff Testing (gitian-linux) failed.

Tail of the build log:

 * [new tag]             phabricator/diff/40235 -> phabricator/diff/40235
 * [new tag]             phabricator/diff/40245 -> phabricator/diff/40245
 * [new tag]             phabricator/diff/40247 -> phabricator/diff/40247
 * [new tag]             phabricator/diff/40249 -> phabricator/diff/40249
 * [new tag]             phabricator/diff/40254 -> phabricator/diff/40254
 * [new tag]             phabricator/diff/40255 -> phabricator/diff/40255
 * [new tag]             phabricator/diff/40275 -> phabricator/diff/40275
 * [new tag]             phabricator/diff/40276 -> phabricator/diff/40276
 * [new tag]             phabricator/diff/40277 -> phabricator/diff/40277
 * [new tag]             phabricator/diff/40278 -> phabricator/diff/40278
 * [new tag]             phabricator/diff/40279 -> phabricator/diff/40279
 * [new tag]             phabricator/diff/40281 -> phabricator/diff/40281
 * [new tag]             phabricator/diff/40285 -> phabricator/diff/40285
 * [new tag]             phabricator/diff/40310 -> phabricator/diff/40310
 * [new tag]             phabricator/diff/40326 -> phabricator/diff/40326
 * [new tag]             phabricator/diff/40334 -> phabricator/diff/40334
 * [new tag]             phabricator/diff/40335 -> phabricator/diff/40335
 * [new tag]             phabricator/diff/40340 -> phabricator/diff/40340
 * [new tag]             phabricator/diff/40341 -> phabricator/diff/40341
 * [new tag]             phabricator/diff/40365 -> phabricator/diff/40365
 * [new tag]             phabricator/diff/40366 -> phabricator/diff/40366
 * [new tag]             phabricator/diff/40367 -> phabricator/diff/40367
 * [new tag]             phabricator/diff/40368 -> phabricator/diff/40368
 * [new tag]             phabricator/diff/40377 -> phabricator/diff/40377
 * [new tag]             phabricator/diff/40379 -> phabricator/diff/40379
 * [new tag]             phabricator/diff/40380 -> phabricator/diff/40380
 * [new tag]             phabricator/diff/40382 -> phabricator/diff/40382
 * [new tag]             phabricator/diff/40384 -> phabricator/diff/40384
 * [new tag]             phabricator/diff/40400 -> phabricator/diff/40400
 * [new tag]             phabricator/diff/40401 -> phabricator/diff/40401
 * [new tag]             phabricator/diff/40402 -> phabricator/diff/40402
 * [new tag]             phabricator/diff/40404 -> phabricator/diff/40404
 * [new tag]             phabricator/diff/40405 -> phabricator/diff/40405
 * [new tag]             phabricator/diff/40408 -> phabricator/diff/40408
 * [new tag]             phabricator/diff/40409 -> phabricator/diff/40409
 * [new tag]             phabricator/diff/40429 -> phabricator/diff/40429
 * [new tag]             phabricator/diff/40430 -> phabricator/diff/40430
 * [new tag]             phabricator/diff/8992  -> phabricator/diff/8992
 * [new tag]             phabricator/diff/8993  -> phabricator/diff/8993
 * [new branch]          master                 -> master
--- Building for bullseye amd64 ---
Stopping target if it is up
Making a new image copy
Starting target
Checking if target is up.
Preparing build environment
Updating apt-get repository (log in var/install.log)
Installing additional packages (log in var/install.log)
Upgrading system, may take a while (log in var/install.log)
Creating package manifest
Creating build script (var/build-script)
Running build script (log in var/build.log)
./bin/gbuild:23:in `system!': failed to run on-target setarch x86_64 bash -x < var/build-script > var/build.log 2>&1 (RuntimeError)
	from ./bin/gbuild:185:in `build_one_configuration'
	from ./bin/gbuild:339:in `block (2 levels) in <main>'
	from ./bin/gbuild:334:in `each'
	from ./bin/gbuild:334:in `block in <main>'
	from ./bin/gbuild:332:in `each'
	from ./bin/gbuild:332:in `<main>'
Build gitian-linux failed with exit code 1
PiRK added a comment.May 25 2023, 14:34

@bot gitian-osx gitian-win gitian-linux

teamcity updated a token.May 25 2023, 14:34
Fabien accepted this revision.May 25 2023, 20:06
This revision is now accepted and ready to land.May 25 2023, 20:06
Closed by commit rABC6dd5e9f637a6: build, qt: bump Qt5 version to 5.15.5 (authored by Pavol Rusnak <pavol@rusnak.io>, committed by PiRK). · Explain WhyMay 26 2023, 13:08
This revision was automatically updated to reflect the committed changes.
PiRK added a commit: rABC6dd5e9f637a6: build, qt: bump Qt5 version to 5.15.5.

Revision Contents
Changeset List

Diff 40430

View Options

depends/packages/qt.mk

Loading...
View Options

depends/patches/qt/fix_bigsur_style.patch

Loading...
View Options

depends/patches/qt/fix_limits_header.patch

Loading...
View Options

depends/patches/qt/fix_no_printer.patch

Loading...
View Options

depends/patches/qt/guix_cross_lib_path.patch

Loading...
View Options

doc/dependencies.md

Loading...