depends: Qt 5.12.10 by fanquake · Pull Request #21376 · bitcoin/bitcoin

fanquake · 2021-03-06T06:17:39Z

Switch to Qt 5.12.10 in depends. Based on #21363. This is a much smaller changeset, and should be easier to review than #19716. Also postpones needing to bring a bunch of new libs into depends.

Big thanks to Hebasto that has been helping with this.

DrahtBot · 2021-03-06T08:00:01Z

The following sections might be updated with supplementary metadata relevant to reviewers and maintainers.

Conflicts

Reviewers, this pull request conflicts with the following ones:

depends: Use Qt top-level build facilities #20641 (depends: Use Qt top-level build facilities 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.

contrib/gitian-descriptors/gitian-linux.yml

depends/packages/libxkbcommon.mk

hebasto · 2021-03-06T12:43:18Z

The build fail on CentOS

/tmp/cirrus-ci-build/depends/i686-pc-linux-gnu/lib/libQt5XcbQpa.a(qxcbbackingstore.o): In function `QXcbBackingStoreImage::createShmSegment(unsigned int)':
qxcbbackingstore.cpp:(.text._ZN21QXcbBackingStoreImage16createShmSegmentEj+0x4e): undefined reference to `xcb_shm_create_segment'
qxcbbackingstore.cpp:(.text._ZN21QXcbBackingStoreImage16createShmSegmentEj+0x60): undefined reference to `xcb_shm_create_segment_reply'
qxcbbackingstore.cpp:(.text._ZN21QXcbBackingStoreImage16createShmSegmentEj+0x7b): undefined reference to `xcb_shm_create_segment_reply_fds'
collect2: error: ld returned 1 exit status
make[2]: *** [Makefile:5668: qt/bitcoin-qt] Error 1

could be solved with the following patch:

--- a/build-aux/m4/bitcoin_qt.m4
+++ b/build-aux/m4/bitcoin_qt.m4
@@ -336,6 +336,7 @@ AC_DEFUN([_BITCOIN_QT_CHECK_STATIC_LIBS], [
   PKG_CHECK_MODULES([QTFB], [Qt5FbSupport${qt_lib_suffix}], [QT_LIBS="-lQt5FbSupport${qt_lib_suffix} $QT_LIBS"])
   if test "x$TARGET_OS" = xlinux; then
     PKG_CHECK_MODULES([QTXCBQPA], [Qt5XcbQpa], [QT_LIBS="$QTXCBQPA_LIBS $QT_LIBS"])
+    QT_LIBS="-lxcb-shm $QT_LIBS"
   elif test "x$TARGET_OS" = xdarwin; then
     PKG_CHECK_MODULES([QTCLIPBOARD], [Qt5ClipboardSupport${qt_lib_suffix}], [QT_LIBS="-lQt5ClipboardSupport${qt_lib_suffix} $QT_LIBS"])
     PKG_CHECK_MODULES([QTGRAPHICS], [Qt5GraphicsSupport${qt_lib_suffix}], [QT_LIBS="-lQt5GraphicsSupport${qt_lib_suffix} $QT_LIBS"])

--- a/depends/packages/libxcb.mk
+++ b/depends/packages/libxcb.mk
@@ -15,7 +15,7 @@ $(package)_config_opts += --disable-composite --disable-damage --disable-dpms
 $(package)_config_opts += --disable-dri2 --disable-dri3 --disable-glx
 $(package)_config_opts += --disable-present --disable-randr --disable-record
 $(package)_config_opts += --disable-render --disable-resource --disable-screensaver
-$(package)_config_opts += --disable-shape --disable-shm --disable-sync
+$(package)_config_opts += --disable-shape --disable-sync
 $(package)_config_opts += --disable-xevie --disable-xfixes --disable-xfree86-dri
 $(package)_config_opts += --disable-xinerama --disable-xinput
 $(package)_config_opts += --disable-xprint --disable-selinux --disable-xtest

See QTBUG-74874.

UPDATE: https://cirrus-ci.com/build/5056331922014208 is green now 🐅

contrib/devtools/symbol-check.py

DrahtBot · 2021-03-07T16:20:37Z

Guix builds

File	commit `48725e6` (master)	commit 3be11666df002c4a3c01f6506bcbf0bec00b1092 (master and this pull)
*-aarch64-linux-gnu-debug.tar.gz	`c0874d1b330fbefe...`
*-aarch64-linux-gnu.tar.gz	`aa5812a46cdb9b17...`
*-arm-linux-gnueabihf-debug.tar.gz	`829d64e019d44cdb...`
*-arm-linux-gnueabihf.tar.gz	`bfe6daf32d21c1ba...`
*-osx-unsigned.dmg	`994a38a15423c943...`
*-osx-unsigned.tar.gz	`b8ba9767e95854c3...`
*-osx64.tar.gz	`e40a6c3d367faac0...`
*-powerpc64-linux-gnu-debug.tar.gz	`e578666d86258fba...`
*-powerpc64-linux-gnu.tar.gz	`25cf822c602f666c...`
*-powerpc64le-linux-gnu-debug.tar.gz	`ecc42f86e8f789f1...`
*-powerpc64le-linux-gnu.tar.gz	`54550694128472dc...`
*-riscv64-linux-gnu-debug.tar.gz	`a47b303965bb52bf...`
*-riscv64-linux-gnu.tar.gz	`fa622fe7877da0bf...`
*-win-unsigned.tar.gz	`2c86f79a791858e3...`
*-win64-debug.zip	`49435c78f11fb3c8...`
*-win64-setup-unsigned.exe	`0e76b2d89273a43e...`
*-win64.zip	`d5c10f3570fa1003...`
*-x86_64-linux-gnu-debug.tar.gz	`fc1699b9ca5f0d2c...`
*-x86_64-linux-gnu.tar.gz	`92f5688dc334ea8e...`
*.tar.gz	`ff440483a5453fd3...`
guix_build.log	`2070abe8ac15129b...`	`c46a8ed521c7894b...`
guix_build.log.diff		`bc1aa3ff77a72217...`

maflcko · 2021-03-07T17:51:06Z

Copied excerpt from the guix build log:

touch /bitcoin/depends/work/build/x86_64-linux-gnu/libxkbcommon/0.8.4-b8529cd0f07/./.stamp_configured
echo Building libxkbcommon...
Building libxkbcommon...
mkdir -p /bitcoin/depends/work/build/x86_64-linux-gnu/libxkbcommon/0.8.4-b8529cd0f07/.
cd /bitcoin/depends/work/build/x86_64-linux-gnu/libxkbcommon/0.8.4-b8529cd0f07/.; PATH=/bitcoin/depends/x86_64-linux-gnu/native/bin:/gnu/store/pqnpqpvidr9sziccd7dp9fr7ckk1f998-profile/bin:/gnu/store/pqnpqpvidr9sziccd7dp9fr7ckk1f998-profile/sbin   make
make[1]: Entering directory '/bitcoin/depends/work/build/x86_64-linux-gnu/libxkbcommon/0.8.4-b8529cd0f07'
/bin/sh ./build-aux/ylwrap src/xkbcomp/parser.y y.tab.c src/xkbcomp/parser.c y.tab.h `echo src/xkbcomp/parser.c | sed -e s/cc$/hh/ -e s/cpp$/hpp/ -e s/cxx$/hxx/ -e s/c++$/h++/ -e s/c$/h/` y.output src/xkbcomp/parser.output -- yacc -d -p _xkbcommon_ 
./build-aux/ylwrap: line 176: yacc: command not found
make[1]: *** [Makefile:1705: src/xkbcomp/parser.c] Error 127
make[1]: Leaving directory '/bitcoin/depends/work/build/x86_64-linux-gnu/libxkbcommon/0.8.4-b8529cd0f07'
make: *** [funcs.mk:275: /bitcoin/depends/work/build/x86_64-linux-gnu/libxkbcommon/0.8.4-b8529cd0f07/./.stamp_built] Error 2
make: Leaving directory '/bitcoin/depends'

hebasto · 2021-03-07T17:59:17Z

touch /bitcoin/depends/work/build/x86_64-linux-gnu/libxkbcommon/0.8.4-b8529cd0f07/./.stamp_configured
echo Building libxkbcommon...
Building libxkbcommon...
mkdir -p /bitcoin/depends/work/build/x86_64-linux-gnu/libxkbcommon/0.8.4-b8529cd0f07/.
cd /bitcoin/depends/work/build/x86_64-linux-gnu/libxkbcommon/0.8.4-b8529cd0f07/.; PATH=/bitcoin/depends/x86_64-linux-gnu/native/bin:/gnu/store/pqnpqpvidr9sziccd7dp9fr7ckk1f998-profile/bin:/gnu/store/pqnpqpvidr9sziccd7dp9fr7ckk1f998-profile/sbin   make
make[1]: Entering directory '/bitcoin/depends/work/build/x86_64-linux-gnu/libxkbcommon/0.8.4-b8529cd0f07'
/bin/sh ./build-aux/ylwrap src/xkbcomp/parser.y y.tab.c src/xkbcomp/parser.c y.tab.h `echo src/xkbcomp/parser.c | sed -e s/cc$/hh/ -e s/cpp$/hpp/ -e s/cxx$/hxx/ -e s/c++$/h++/ -e s/c$/h/` y.output src/xkbcomp/parser.output -- yacc -d -p _xkbcommon_ 
./build-aux/ylwrap: line 176: yacc: command not found
make[1]: *** [Makefile:1705: src/xkbcomp/parser.c] Error 127
make[1]: Leaving directory '/bitcoin/depends/work/build/x86_64-linux-gnu/libxkbcommon/0.8.4-b8529cd0f07'
make: *** [funcs.mk:275: /bitcoin/depends/work/build/x86_64-linux-gnu/libxkbcommon/0.8.4-b8529cd0f07/./.stamp_built] Error 2
make: Leaving directory '/bitcoin/depends'

With installed bison package?

maflcko · 2021-03-07T18:00:59Z

(clarified that my comment is an excerpt from the guix build log, which will be deleted in 14 days by @DrahtBot )

hebasto · 2021-03-07T18:40:16Z

Copied excerpt from the guix build log:

touch /bitcoin/depends/work/build/x86_64-linux-gnu/libxkbcommon/0.8.4-b8529cd0f07/./.stamp_configured
echo Building libxkbcommon...
Building libxkbcommon...
mkdir -p /bitcoin/depends/work/build/x86_64-linux-gnu/libxkbcommon/0.8.4-b8529cd0f07/.
cd /bitcoin/depends/work/build/x86_64-linux-gnu/libxkbcommon/0.8.4-b8529cd0f07/.; PATH=/bitcoin/depends/x86_64-linux-gnu/native/bin:/gnu/store/pqnpqpvidr9sziccd7dp9fr7ckk1f998-profile/bin:/gnu/store/pqnpqpvidr9sziccd7dp9fr7ckk1f998-profile/sbin   make
make[1]: Entering directory '/bitcoin/depends/work/build/x86_64-linux-gnu/libxkbcommon/0.8.4-b8529cd0f07'
/bin/sh ./build-aux/ylwrap src/xkbcomp/parser.y y.tab.c src/xkbcomp/parser.c y.tab.h `echo src/xkbcomp/parser.c | sed -e s/cc$/hh/ -e s/cpp$/hpp/ -e s/cxx$/hxx/ -e s/c++$/h++/ -e s/c$/h/` y.output src/xkbcomp/parser.output -- yacc -d -p _xkbcommon_ 
./build-aux/ylwrap: line 176: yacc: command not found
make[1]: *** [Makefile:1705: src/xkbcomp/parser.c] Error 127
make[1]: Leaving directory '/bitcoin/depends/work/build/x86_64-linux-gnu/libxkbcommon/0.8.4-b8529cd0f07'
make: *** [funcs.mk:275: /bitcoin/depends/work/build/x86_64-linux-gnu/libxkbcommon/0.8.4-b8529cd0f07/./.stamp_built] Error 2
make: Leaving directory '/bitcoin/depends'

Adding bison package:

--- a/contrib/guix/manifest.scm
+++ b/contrib/guix/manifest.scm
@@ -3,6 +3,7 @@
              (gnu packages autotools)
              (gnu packages base)
              (gnu packages bash)
+             (gnu packages bison)
              (gnu packages cdrom)
              (gnu packages check)
              (gnu packages cmake)
@@ -214,6 +215,7 @@ chain for " target " development."))
         xz
         zlib
         ;; Build tools
+        bison
         gnu-make
         libtool
         autoconf

could help.

fanquake · 2021-03-07T23:28:27Z

Copied excerpt from the guix build log:
Adding bison package:

That isn't enough to fix the Guix failure. I said the package needed adding in the op, where I mentioned this failure still needed fixing

Linux Guix build needs bison and fixing up this failure:

hebasto · 2021-03-07T23:32:59Z

That isn't enough to fix the Guix failure. I said the package needed adding in the op, where I mentioned this failure still needed fixing

Why? Guix build works for me :)

hebasto · 2021-03-07T23:52:10Z

FWIW, I've got successful guix builds for a branch with applied suggestions:

$ find output -type f -name *$(git rev-parse --short HEAD)*.* -print0 | env LC_ALL=C sort -z | xargs -r0 sha256sum
be0a3034a4fb50875d8fd15b37f2bf60d862fd3dc5e90e3d1be09546718084ed  output/bitcoin-603dbff13496-aarch64-linux-gnu-debug.tar.gz
7f69079103b01809c7662a3bc489176aab7fb0859aa1119cb2c62083769ff637  output/bitcoin-603dbff13496-aarch64-linux-gnu.tar.gz
6668a96bb7e575723af6938206895c0da2d5fa3e9067c61552c35f7ff86add23  output/bitcoin-603dbff13496-arm-linux-gnueabihf-debug.tar.gz
50b17e55bf243da9d438579e32b8c9fe7091ffd624867f29a853ed2e9cc118b5  output/bitcoin-603dbff13496-arm-linux-gnueabihf.tar.gz
0afa08dc12e20ec11afbb8c74a49510f9eb691b48e1734f606f5cc0a0beb131f  output/bitcoin-603dbff13496-osx-unsigned.dmg
03294dc786a86a3850404b333cdc353fe806ca46ee80b933014a0510b264fe75  output/bitcoin-603dbff13496-osx-unsigned.tar.gz
38443badd4421f826001b1253c99c611863954ec60e39d6f74a08774e236ccfd  output/bitcoin-603dbff13496-osx64.tar.gz
9961a4c14699081c187d0a849a9624754451e7123271772f659f6689bfaaf375  output/bitcoin-603dbff13496-powerpc64-linux-gnu-debug.tar.gz
e6d672570321dfda1548b294b3f2a65c56622ad111a5ab20316229e5c3f47bd7  output/bitcoin-603dbff13496-powerpc64-linux-gnu.tar.gz
a9191c47ebe6a0c9760bc523886c11d583d6d97250e91207b0829aa408165bbe  output/bitcoin-603dbff13496-powerpc64le-linux-gnu-debug.tar.gz
aa8966386569e4f0d9f8f96f2acbd369def83c9219dfca56e0abab1049b0e507  output/bitcoin-603dbff13496-powerpc64le-linux-gnu.tar.gz
0920d67970657a0934ef8c358e55a8365bb1d59bbe7b1b454c4181fd041a7c02  output/bitcoin-603dbff13496-riscv64-linux-gnu-debug.tar.gz
1394b47a416eaa2c5c5afabc37ff967878f2ab8bcb276d7a04e41b07c255238f  output/bitcoin-603dbff13496-riscv64-linux-gnu.tar.gz
8094f77b1a310e37c5fbc231c832ba183de91ae36047bc4defe036417ce8e20f  output/bitcoin-603dbff13496-win-unsigned.tar.gz
f3ea2c7e6399b753fda806cd69001927fe88d7632d86325d3a169521cca51121  output/bitcoin-603dbff13496-win64-debug.zip
2d8f75e46090984e9155144ac1be7be3a075ce6b2a5a216b90b99c3c4f77961e  output/bitcoin-603dbff13496-win64-setup-unsigned.exe
600d1bd697ef5dfabe7013440018053c47cb047734e726feca42f92e751fb220  output/bitcoin-603dbff13496-win64.zip
a957606119fb89f5f088a5ae7264adea0b43a03e5607ac32cd6628a9518a080d  output/bitcoin-603dbff13496-x86_64-linux-gnu-debug.tar.gz
b0b21604aec17a96eca76fc9bffc50fcd56418d869780a18b67d18522c4fd189  output/bitcoin-603dbff13496-x86_64-linux-gnu.tar.gz
09dd2789871533ab1a90de3eafb38af877e7532a851053c879f3b2349feb9e2e  output/src/bitcoin-603dbff13496.tar.gz

fanquake · 2021-03-08T00:24:57Z

FWIW, I've got successful guix builds for a branch with applied suggestions:

I'm still seeing the same failure I was seeing before opening this PR, with the guix bison changes applied:

Building libxkbcommon...
make[1]: Entering directory '/bitcoin/depends/work/build/arm-linux-gnueabihf/libxkbcommon/0.8.4-47d086c3594'
  YACC     src/xkbcomp/parser.c
/bitcoin/depends/work/build/arm-linux-gnueabihf/libxkbcommon/0.8.4-47d086c3594/src/xkbcomp/parser.y:85.1-12: warning: POSIX Yacc does not support %pure-parser [-Wyacc]
   85 | %pure-parser
      | ^~~~~~~~~~~~
/bitcoin/depends/work/build/arm-linux-gnueabihf/libxkbcommon/0.8.4-47d086c3594/src/xkbcomp/parser.y:85.1-12: warning: deprecated directive: '%pure-parser', use '%define api.pure' [-Wdeprecated]
   85 | %pure-parser
      | ^~~~~~~~~~~~
      | %define api.pure
/bitcoin/depends/work/build/arm-linux-gnueabihf/libxkbcommon/0.8.4-47d086c3594/src/xkbcomp/parser.y:188.17-23: warning: POSIX yacc reserves %type to nonterminals [-Wyacc]
  188 | %type <num>     INTEGER FLOAT
      |                 ^~~~~~~
/bitcoin/depends/work/build/arm-linux-gnueabihf/libxkbcommon/0.8.4-47d086c3594/src/xkbcomp/parser.y:188.25-29: warning: POSIX yacc reserves %type to nonterminals [-Wyacc]
  188 | %type <num>     INTEGER FLOAT
      |                         ^~~~~
/bitcoin/depends/work/build/arm-linux-gnueabihf/libxkbcommon/0.8.4-47d086c3594/src/xkbcomp/parser.y:189.17-21: warning: POSIX yacc reserves %type to nonterminals [-Wyacc]
  189 | %type <str>     IDENT STRING
      |                 ^~~~~
/bitcoin/depends/work/build/arm-linux-gnueabihf/libxkbcommon/0.8.4-47d086c3594/src/xkbcomp/parser.y:189.23-28: warning: POSIX yacc reserves %type to nonterminals [-Wyacc]
  189 | %type <str>     IDENT STRING
      |                       ^~~~~~
/bitcoin/depends/work/build/arm-linux-gnueabihf/libxkbcommon/0.8.4-47d086c3594/src/xkbcomp/parser.y:190.17-23: warning: POSIX yacc reserves %type to nonterminals [-Wyacc]
  190 | %type <atom>    KEYNAME
      |                 ^~~~~~~
/bitcoin/depends/work/build/arm-linux-gnueabihf/libxkbcommon/0.8.4-47d086c3594/src/xkbcomp/parser.y:219.1-11: warning: POSIX Yacc does not support %destructor [-Wyacc]
  219 | %destructor { FreeStmt((ParseCommon *) $$); }
      | ^~~~~~~~~~~
/bitcoin/depends/work/build/arm-linux-gnueabihf/libxkbcommon/0.8.4-47d086c3594/src/xkbcomp/parser.y:224.1-11: warning: POSIX Yacc does not support %destructor [-Wyacc]
  224 | %destructor { if (!param->rtrn) FreeXkbFile($$); } <file>
      | ^~~~~~~~~~~
/bitcoin/depends/work/build/arm-linux-gnueabihf/libxkbcommon/0.8.4-47d086c3594/src/xkbcomp/parser.y:225.1-11: warning: POSIX Yacc does not support %destructor [-Wyacc]
  225 | %destructor { free($$); } <str>
      | ^~~~~~~~~~~
/bitcoin/depends/work/build/arm-linux-gnueabihf/libxkbcommon/0.8.4-47d086c3594/src/xkbcomp/parser.y: warning: fix-its can be applied.  Rerun with option '--update'. [-Wother]
updating src/xkbcomp/parser.h
make  all-am
make[2]: Entering directory '/bitcoin/depends/work/build/arm-linux-gnueabihf/libxkbcommon/0.8.4-47d086c3594'
/bin/sh: /gnu/store/axjyxggd6wnixpy6wjlcim8vggn6lapq-profile/bin/mkdir: No such file or directory
/bin/sh: /gnu/store/axjyxggd6wnixpy6wjlcim8vggn6lapq-profile/bin/mkdir: No such file or directory
/bin/sh: /gnu/store/axjyxggd6wnixpy6wjlcim8vggn6lapq-profile/bin/mkdir: No such file or directory
make[2]: *** [Makefile:1204: src/compose/.dirstamp] Error 127

hebasto · 2021-03-08T01:16:14Z

I'm still seeing the same failure I was seeing before opening this PR, with the guix bison changes applied:

Made guix build again (for the same branch):

Building libxkbcommon...
make[1]: Entering directory '/bitcoin/depends/work/build/arm-linux-gnueabihf/libxkbcommon/0.8.4-967647c9b27'
  YACC     src/xkbcomp/parser.c
/bitcoin/depends/work/build/arm-linux-gnueabihf/libxkbcommon/0.8.4-967647c9b27/src/xkbcomp/parser.y:85.1-12: warning: POSIX Yacc does not support %pure-parser [-Wyacc]
   85 | %pure-parser
      | ^~~~~~~~~~~~
/bitcoin/depends/work/build/arm-linux-gnueabihf/libxkbcommon/0.8.4-967647c9b27/src/xkbcomp/parser.y:85.1-12: warning: deprecated directive: '%pure-parser', use '%define api.pure' [-Wdeprecated]
   85 | %pure-parser
      | ^~~~~~~~~~~~
      | %define api.pure
/bitcoin/depends/work/build/arm-linux-gnueabihf/libxkbcommon/0.8.4-967647c9b27/src/xkbcomp/parser.y:188.17-23: warning: POSIX yacc reserves %type to nonterminals [-Wyacc]
  188 | %type <num>     INTEGER FLOAT
      |                 ^~~~~~~
/bitcoin/depends/work/build/arm-linux-gnueabihf/libxkbcommon/0.8.4-967647c9b27/src/xkbcomp/parser.y:188.25-29: warning: POSIX yacc reserves %type to nonterminals [-Wyacc]
  188 | %type <num>     INTEGER FLOAT
      |                         ^~~~~
/bitcoin/depends/work/build/arm-linux-gnueabihf/libxkbcommon/0.8.4-967647c9b27/src/xkbcomp/parser.y:189.17-21: warning: POSIX yacc reserves %type to nonterminals [-Wyacc]
  189 | %type <str>     IDENT STRING
      |                 ^~~~~
/bitcoin/depends/work/build/arm-linux-gnueabihf/libxkbcommon/0.8.4-967647c9b27/src/xkbcomp/parser.y:189.23-28: warning: POSIX yacc reserves %type to nonterminals [-Wyacc]
  189 | %type <str>     IDENT STRING
      |                       ^~~~~~
/bitcoin/depends/work/build/arm-linux-gnueabihf/libxkbcommon/0.8.4-967647c9b27/src/xkbcomp/parser.y:190.17-23: warning: POSIX yacc reserves %type to nonterminals [-Wyacc]
  190 | %type <atom>    KEYNAME
      |                 ^~~~~~~
/bitcoin/depends/work/build/arm-linux-gnueabihf/libxkbcommon/0.8.4-967647c9b27/src/xkbcomp/parser.y:219.1-11: warning: POSIX Yacc does not support %destructor [-Wyacc]
  219 | %destructor { FreeStmt((ParseCommon *) $$); }
      | ^~~~~~~~~~~
/bitcoin/depends/work/build/arm-linux-gnueabihf/libxkbcommon/0.8.4-967647c9b27/src/xkbcomp/parser.y:224.1-11: warning: POSIX Yacc does not support %destructor [-Wyacc]
  224 | %destructor { if (!param->rtrn) FreeXkbFile($$); } <file>
      | ^~~~~~~~~~~
/bitcoin/depends/work/build/arm-linux-gnueabihf/libxkbcommon/0.8.4-967647c9b27/src/xkbcomp/parser.y:225.1-11: warning: POSIX Yacc does not support %destructor [-Wyacc]
  225 | %destructor { free($$); } <str>
      | ^~~~~~~~~~~
/bitcoin/depends/work/build/arm-linux-gnueabihf/libxkbcommon/0.8.4-967647c9b27/src/xkbcomp/parser.y: warning: fix-its can be applied.  Rerun with option '--update'. [-Wother]
updating src/xkbcomp/parser.h
make  all-am
make[2]: Entering directory '/bitcoin/depends/work/build/arm-linux-gnueabihf/libxkbcommon/0.8.4-967647c9b27'
  CC       src/compose/paths.lo
  CC       src/compose/parser.lo
  CC       src/compose/state.lo
  CC       src/compose/table.lo
  CC       src/xkbcomp/action.lo
  CC       src/xkbcomp/ast-build.lo
  CC       src/xkbcomp/compat.lo
  CC       src/xkbcomp/expr.lo
  CC       src/xkbcomp/include.lo
  CC       src/xkbcomp/keycodes.lo
  CC       src/xkbcomp/keymap.lo
  CC       src/xkbcomp/keymap-dump.lo
  CC       src/xkbcomp/keywords.lo
  CC       src/xkbcomp/parser.lo
  CC       src/xkbcomp/rules.lo
  CC       src/xkbcomp/scanner.lo
  CC       src/xkbcomp/symbols.lo
  CC       src/xkbcomp/types.lo
  CC       src/xkbcomp/vmod.lo
  CC       src/xkbcomp/xkbcomp.lo
  CC       src/atom.lo
  CC       src/context.lo
  CC       src/context-priv.lo
  CC       src/keysym.lo
  CC       src/keysym-utf.lo
  CC       src/keymap.lo
  CC       src/keymap-priv.lo
  CC       src/state.lo
  CC       src/text.lo
  CC       src/utf8.lo
  CC       src/utils.lo
  CC       src/x11/libxkbcommon_x11_la-keymap.lo
  CC       src/x11/libxkbcommon_x11_la-state.lo
  CC       src/x11/libxkbcommon_x11_la-util.lo
  CC       src/libxkbcommon_x11_la-context-priv.lo
  CC       src/libxkbcommon_x11_la-keymap-priv.lo
  CC       src/libxkbcommon_x11_la-atom.lo
  CCLD     libxkbcommon.la
  CCLD     libxkbcommon-x11.la
make[2]: Leaving directory '/bitcoin/depends/work/build/arm-linux-gnueabihf/libxkbcommon/0.8.4-967647c9b27'
make[1]: Leaving directory '/bitcoin/depends/work/build/arm-linux-gnueabihf/libxkbcommon/0.8.4-967647c9b27'
Staging libxkbcommon...
make[1]: Entering directory '/bitcoin/depends/work/build/arm-linux-gnueabihf/libxkbcommon/0.8.4-967647c9b27'
make[1]: warning: jobserver unavailable: using -j1.  Add '+' to parent make rule.
make  install-am
make[2]: Entering directory '/bitcoin/depends/work/build/arm-linux-gnueabihf/libxkbcommon/0.8.4-967647c9b27'
make[3]: Entering directory '/bitcoin/depends/work/build/arm-linux-gnueabihf/libxkbcommon/0.8.4-967647c9b27'
 /gnu/store/12p53bj5lr2jhqsfj0b3vijx6yd5f43p-profile/bin/mkdir -p '/bitcoin/depends/work/staging/arm-linux-gnueabihf/libxkbcommon/0.8.4-967647c9b27/bitcoin/depends/arm-linux-gnueabihf/lib'
 /bin/sh ./libtool   --mode=install /gnu/store/12p53bj5lr2jhqsfj0b3vijx6yd5f43p-profile/bin/install -c   libxkbcommon.la libxkbcommon-x11.la '/bitcoin/depends/work/staging/arm-linux-gnueabihf/libxkbcommon/0.8.4-967647c9b27/bitcoin/depends/arm-linux-gnueabihf/lib'
libtool: install: /gnu/store/12p53bj5lr2jhqsfj0b3vijx6yd5f43p-profile/bin/install -c .libs/libxkbcommon.so.0.0.0 /bitcoin/depends/work/staging/arm-linux-gnueabihf/libxkbcommon/0.8.4-967647c9b27/bitcoin/depends/arm-linux-gnueabihf/lib/libxkbcommon.so.0.0.0
libtool: install: (cd /bitcoin/depends/work/staging/arm-linux-gnueabihf/libxkbcommon/0.8.4-967647c9b27/bitcoin/depends/arm-linux-gnueabihf/lib && { ln -s -f libxkbcommon.so.0.0.0 libxkbcommon.so.0 || { rm -f libxkbcommon.so.0 && ln -s libxkbcommon.so.0.0.0 libxkbcommon.so.0; }; })
libtool: install: (cd /bitcoin/depends/work/staging/arm-linux-gnueabihf/libxkbcommon/0.8.4-967647c9b27/bitcoin/depends/arm-linux-gnueabihf/lib && { ln -s -f libxkbcommon.so.0.0.0 libxkbcommon.so || { rm -f libxkbcommon.so && ln -s libxkbcommon.so.0.0.0 libxkbcommon.so; }; })
libtool: install: /gnu/store/12p53bj5lr2jhqsfj0b3vijx6yd5f43p-profile/bin/install -c .libs/libxkbcommon.lai /bitcoin/depends/work/staging/arm-linux-gnueabihf/libxkbcommon/0.8.4-967647c9b27/bitcoin/depends/arm-linux-gnueabihf/lib/libxkbcommon.la
libtool: warning: relinking 'libxkbcommon-x11.la'
libtool: install: (cd /bitcoin/depends/work/build/arm-linux-gnueabihf/libxkbcommon/0.8.4-967647c9b27; /bin/sh "/bitcoin/depends/work/build/arm-linux-gnueabihf/libxkbcommon/0.8.4-967647c9b27/libtool"  --silent --tag CC --mode=relink arm-linux-gnueabihf-gcc -Wall -Wpointer-arith -Wmissing-declarations -Wformat=2 -Wstrict-prototypes -Wmissing-prototypes -Wnested-externs -Wbad-function-cast -Wold-style-definition -Wdeclaration-after-statement -Wunused -Wuninitialized -Wshadow -Wmissing-noreturn -Wmissing-format-attribute -Wredundant-decls -Wlogical-op -Werror=implicit -Werror=nonnull -Werror=init-self -Werror=main -Werror=missing-braces -Werror=sequence-point -Werror=return-type -Werror=trigraphs -Werror=array-bounds -Werror=write-strings -Werror=address -Werror=int-to-pointer-cast -Werror=pointer-to-int-cast -fvisibility=hidden -fno-strict-aliasing -fsanitize-undefined-trap-on-error -Wextra -Wno-unused-parameter -Wno-missing-field-initializers -I/bitcoin/depends/arm-linux-gnueabihf/include -pipe -O2 -Wl,--version-script=./xkbcommon-x11.map -L/bitcoin/depends/arm-linux-gnueabihf/lib -o libxkbcommon-x11.la -rpath /bitcoin/depends/arm-linux-gnueabihf/lib src/x11/libxkbcommon_x11_la-keymap.lo src/x11/libxkbcommon_x11_la-state.lo src/x11/libxkbcommon_x11_la-util.lo src/libxkbcommon_x11_la-context-priv.lo src/libxkbcommon_x11_la-keymap-priv.lo src/libxkbcommon_x11_la-atom.lo libxkbcommon.la -L/bitcoin/depends/arm-linux-gnueabihf/lib -lxcb-xkb -lxcb -inst-prefix-dir /bitcoin/depends/work/staging/arm-linux-gnueabihf/libxkbcommon/0.8.4-967647c9b27)
libtool: install: /gnu/store/12p53bj5lr2jhqsfj0b3vijx6yd5f43p-profile/bin/install -c .libs/libxkbcommon-x11.so.0.0.0T /bitcoin/depends/work/staging/arm-linux-gnueabihf/libxkbcommon/0.8.4-967647c9b27/bitcoin/depends/arm-linux-gnueabihf/lib/libxkbcommon-x11.so.0.0.0
libtool: install: (cd /bitcoin/depends/work/staging/arm-linux-gnueabihf/libxkbcommon/0.8.4-967647c9b27/bitcoin/depends/arm-linux-gnueabihf/lib && { ln -s -f libxkbcommon-x11.so.0.0.0 libxkbcommon-x11.so.0 || { rm -f libxkbcommon-x11.so.0 && ln -s libxkbcommon-x11.so.0.0.0 libxkbcommon-x11.so.0; }; })
libtool: install: (cd /bitcoin/depends/work/staging/arm-linux-gnueabihf/libxkbcommon/0.8.4-967647c9b27/bitcoin/depends/arm-linux-gnueabihf/lib && { ln -s -f libxkbcommon-x11.so.0.0.0 libxkbcommon-x11.so || { rm -f libxkbcommon-x11.so && ln -s libxkbcommon-x11.so.0.0.0 libxkbcommon-x11.so; }; })
libtool: install: /gnu/store/12p53bj5lr2jhqsfj0b3vijx6yd5f43p-profile/bin/install -c .libs/libxkbcommon-x11.lai /bitcoin/depends/work/staging/arm-linux-gnueabihf/libxkbcommon/0.8.4-967647c9b27/bitcoin/depends/arm-linux-gnueabihf/lib/libxkbcommon-x11.la
libtool: warning: remember to run 'libtool --finish /bitcoin/depends/arm-linux-gnueabihf/lib'
 /gnu/store/12p53bj5lr2jhqsfj0b3vijx6yd5f43p-profile/bin/mkdir -p '/bitcoin/depends/work/staging/arm-linux-gnueabihf/libxkbcommon/0.8.4-967647c9b27/bitcoin/depends/arm-linux-gnueabihf/lib/pkgconfig'
 /gnu/store/12p53bj5lr2jhqsfj0b3vijx6yd5f43p-profile/bin/install -c -m 644 xkbcommon.pc xkbcommon-x11.pc '/bitcoin/depends/work/staging/arm-linux-gnueabihf/libxkbcommon/0.8.4-967647c9b27/bitcoin/depends/arm-linux-gnueabihf/lib/pkgconfig'
 /gnu/store/12p53bj5lr2jhqsfj0b3vijx6yd5f43p-profile/bin/mkdir -p '/bitcoin/depends/work/staging/arm-linux-gnueabihf/libxkbcommon/0.8.4-967647c9b27/bitcoin/depends/arm-linux-gnueabihf/include/xkbcommon'
 /gnu/store/12p53bj5lr2jhqsfj0b3vijx6yd5f43p-profile/bin/install -c -m 644 xkbcommon/xkbcommon-x11.h '/bitcoin/depends/work/staging/arm-linux-gnueabihf/libxkbcommon/0.8.4-967647c9b27/bitcoin/depends/arm-linux-gnueabihf/include/xkbcommon'
 /gnu/store/12p53bj5lr2jhqsfj0b3vijx6yd5f43p-profile/bin/mkdir -p '/bitcoin/depends/work/staging/arm-linux-gnueabihf/libxkbcommon/0.8.4-967647c9b27/bitcoin/depends/arm-linux-gnueabihf/include/xkbcommon'
 /gnu/store/12p53bj5lr2jhqsfj0b3vijx6yd5f43p-profile/bin/install -c -m 644 xkbcommon/xkbcommon.h xkbcommon/xkbcommon-compat.h xkbcommon/xkbcommon-compose.h xkbcommon/xkbcommon-keysyms.h xkbcommon/xkbcommon-names.h '/bitcoin/depends/work/staging/arm-linux-gnueabihf/libxkbcommon/0.8.4-967647c9b27/bitcoin/depends/arm-linux-gnueabihf/include/xkbcommon'
make[3]: Leaving directory '/bitcoin/depends/work/build/arm-linux-gnueabihf/libxkbcommon/0.8.4-967647c9b27'
make[2]: Leaving directory '/bitcoin/depends/work/build/arm-linux-gnueabihf/libxkbcommon/0.8.4-967647c9b27'
make[1]: Leaving directory '/bitcoin/depends/work/build/arm-linux-gnueabihf/libxkbcommon/0.8.4-967647c9b27'
Postprocessing libxkbcommon...
Caching libxkbcommon...

32b8dc6 build, refactor: Fix indentation (Hennadii Stepanov) 57b6522 build, qt: Make Qt static libs check regardless of plugindir (Hennadii Stepanov) 6203457 build, refactor: Rename internal _BITCOIN_QT_FIND_STATIC_PLUGINS macro (Hennadii Stepanov) bf24774 build, qt: Refactor internal _BITCOIN_QT_CHECK_STATIC_PLUGINS macro (Hennadii Stepanov) Pull request description: Qt version bump is around the corner (#21376). As a preparation, this PR makes Qt static plugins/libs check code more correct, and easier to reason about. `configure` script log (for `HOST=x86_64-pc-linux-gnu`): - master (b4d2265): ``` checking for static Qt plugins: -lqminimal... yes checking for static Qt plugins: -lqxcb -lxcb-static... yes ``` - this PR: ``` checking for QMinimalIntegrationPlugin (-lqminimal)... yes checking for QXcbIntegrationPlugin (-lqxcb -lxcb-static)... yes ``` ACKs for top commit: fanquake: ACK 32b8dc6 Tree-SHA512: a9ed8178cdbe3586898adc145b474355804ca00c5cee85dcdb8fb33a16575fc469298ef532c973d3aae53e1cb49569a9232595d609f232fae2bf05862fb34781

173ef89 build: Small libxcb.mk improvements (Hennadii Stepanov) 5129b36 build: Clean remnants of QTBUG-34748 fix (Hennadii Stepanov) Pull request description: Hope, this PR will make [transit](bitcoin/bitcoin#21376) to Qt 5.12.10 neater. A fix for [QTBUG-34748](https://bugreports.qt.io/browse/QTBUG-34748) was introduced in #5915 (v0.11.0, Qt 5.2.1). [QTBUG-34748](https://bugreports.qt.io/browse/QTBUG-34748) was [fixed](qt/qtbase@b19b080) in Qt 5.3.0. The separated [`fix-xcb-include-order.patch`](https://github.com/theuni/bitcoin/blob/bb44d9e7546e6118cd91db5bbe471a3ce2ee7fcd/depends/patches/qt/fix-xcb-include-order.patch), provided by #5915, was dropped in #12971 while bumping Qt to 5.9.4 (5.9.6). But `libxcb.mk` remained unchanged. This PR reverts #5915 for `libxcb.mk` as well. ACKs for top commit: practicalswift: cr ACK 173ef89: patch looks correct fanquake: ACK 173ef89 Tree-SHA512: 9815a7e532ff4aa08f9623ded8d5708eca1c9c73ac7a2684419a18c125da7627b44ac3191f2e7978946942c8d0580e73b1a93df624986fb2a13791a68ce1e025

depends/packages/qt.mk

build-aux/m4/bitcoin_qt.m4

hebasto · 2021-03-09T14:59:44Z

@fanquake
wrt #21376 (comment) (marked as resolved):

$ make -j 9 -C depends libxkbcommon_staged
$ cd $PATH_TO_STAGED_DIR
$ find .
.
./include
./include/xkbcommon
./include/xkbcommon/xkbcommon-compose.h
./include/xkbcommon/xkbcommon-compat.h
./include/xkbcommon/xkbcommon-keysyms.h
./include/xkbcommon/xkbcommon-names.h
./include/xkbcommon/xkbcommon-x11.h
./include/xkbcommon/xkbcommon.h
./lib
./lib/libxkbcommon.so.0.0.0
./lib/libxkbcommon-x11.so.0
./lib/libxkbcommon-x11.so.0.0.0
./lib/libxkbcommon.so
./lib/libxkbcommon.la
./lib/libxkbcommon-x11.so
./lib/libxkbcommon.so.0
./lib/libxkbcommon-x11.la
./lib/pkgconfig
./lib/pkgconfig/xkbcommon.pc
./lib/pkgconfig/xkbcommon-x11.pc

There are no share, share/man, share/doc directories at all. rm lib/*.la will work.

contrib/devtools/symbol-check.py

fecb372 build: additional PKG_CHECK_MODULES calls in bitcoin_qt.m4 (fanquake) a53eff3 build: misc doc changes in bitcoin_qt.m4 (fanquake) 340fa6c build: set QT_*_CFLAGS & QT_*_LIBS in PKG_CHECK_MODULES() calls (fanquake) 4b8ad97 build: use QT_*_LIBS rather than passing lib names (fanquake) 13313b2 scripted-diff: replace Qt5 with ${qt_lib_prefix} in _BITCOIN_QT_CHECK_STATIC_LIBS (fanquake) 477df36 build: reorder libs in _BITCOIN_QT_CHECK_STATIC_LIBS (move-only) (fanquake) Pull request description: These are some small changes to simplify this code before we may end up supporting Qt6. Replaces usages of `Qt5` with `qt_lib_prefix`, minor docs cleanups and takes care of [a suggestion](#21376 (comment)) left over from #21376. Guix builds: ```bash 8749dca4a86c39607ff86b0107b76daea60d415a15b5022824f4a4469c6edc37 output/bitcoin-fecb3723b63d-aarch64-linux-gnu-debug.tar.gz 7b162ad6d953ceed9402f5fef03a8199a76c6dd300a71b03c1814c33ce0126f6 output/bitcoin-fecb3723b63d-aarch64-linux-gnu.tar.gz 869c42616320fc5bb25e942d7e20c0a8a4b8510939f8f8f6021a784e4afda83e output/bitcoin-fecb3723b63d-arm-linux-gnueabihf-debug.tar.gz 278b1481045e93b3ac7c31ae14ea3b6a3030391c2abc90e04ab80072f4c33dd3 output/bitcoin-fecb3723b63d-arm-linux-gnueabihf.tar.gz e5501939838f930bf5d5a6da4f6d3665c008d736aa916ef0e7e0e06db91e1a36 output/bitcoin-fecb3723b63d-osx-unsigned.dmg 834a94ea3fbc5e090618842b339b301bebd622d1f392918f0f500ec6637733ac output/bitcoin-fecb3723b63d-osx-unsigned.tar.gz 6cf70af01a48bea9270e6883ed15ce458c46c6840f826414df7a244fffa3338d output/bitcoin-fecb3723b63d-osx64.tar.gz d80e9e2789fdee931f80c049c70912e9ff146d5fe2ae7bcd26244d7fe5dd4910 output/bitcoin-fecb3723b63d-powerpc64-linux-gnu-debug.tar.gz d924e161f1c32b3980c72b4949c99269e3d5fad8656749edae9fbbaafb1b7ff9 output/bitcoin-fecb3723b63d-powerpc64-linux-gnu.tar.gz d2f339fc78608ac6cdc505b21abc5f397e52283914113f45dc0adad0c023df54 output/bitcoin-fecb3723b63d-powerpc64le-linux-gnu-debug.tar.gz d537c014adbdd712b7b20f3171bc4342622ba56f4fa655bba85afbf35aee2840 output/bitcoin-fecb3723b63d-powerpc64le-linux-gnu.tar.gz 0f42646fa5be154e8717df0e39ba843a61928225b00e0d48b1b2179966fea315 output/bitcoin-fecb3723b63d-riscv64-linux-gnu-debug.tar.gz f7b9cc85f74c006ac484e20915c84a12069447102d685124c5246b6eff8545c8 output/bitcoin-fecb3723b63d-riscv64-linux-gnu.tar.gz b60b51544a26dfa2e6a05a6daa99c63aeb62d7a1893191824867e1da9bbb73c4 output/bitcoin-fecb3723b63d-win-unsigned.tar.gz abc4cdb44146edf16fc47aa11d72648fa53c00d8f70937cab74cdaaaa9947c58 output/bitcoin-fecb3723b63d-win64-debug.zip 3c6d437b09acc479060d922c64c1f6688df6385a6a3950d31c7a6e0977d757eb output/bitcoin-fecb3723b63d-win64-setup-unsigned.exe d4f015fcfca15f23a797786fe67ca12ac73d3f594dd9e1b885e33d765f21beff output/bitcoin-fecb3723b63d-win64.zip 5fcb478027cb790ab7a3480fab91f764b10da4fd25d82b08f5ecfe42b4b7d316 output/bitcoin-fecb3723b63d-x86_64-linux-gnu-debug.tar.gz eef74c6b301bd799c6522b60c26d700a496ecf2bd357f09c83cbd88132086783 output/bitcoin-fecb3723b63d-x86_64-linux-gnu.tar.gz af897573bd4f1e9acfef43af19a79e0e1c6a662cb3dc0bc8f5f6d2656c441953 output/src/bitcoin-fecb3723b63d.tar.gz ``` Gitian builds: ```bash # macOS: b3926b7956b31b87ec96885369401141cc5a3f37e91a0ad9a03c6f7c1bd2bee7 bitcoin-fecb3723b63d-osx-unsigned.dmg 61792260b3afd0b921d84ddb0bb3639c2b4e063c7b7fb715d515b3601c7ad38b bitcoin-fecb3723b63d-osx-unsigned.tar.gz 953081b66a1feababe041cae0b31664856260f7364f87c5c50f7f7c1fd6b710a bitcoin-fecb3723b63d-osx64.tar.gz af897573bd4f1e9acfef43af19a79e0e1c6a662cb3dc0bc8f5f6d2656c441953 src/bitcoin-fecb3723b63d.tar.gz aecaa381205e9ed6585cdffa22c7b46d3ece989c1774855d4a3b4cae5d75567a bitcoin-core-osx-22-res.yml # Windows: 21c23951c96bcbf79fa75a6b915c40c24445964cced6242f4e9181464f66ba40 bitcoin-fecb3723b63d-win-unsigned.tar.gz 327cc290f5f709892e54cdc7bbf1745892eed497cd636c8f80d2310419e585c2 bitcoin-fecb3723b63d-win64-debug.zip e86a36c26897be064339cda866cb9563d08c867eceae59a677329390d729cbfe bitcoin-fecb3723b63d-win64-setup-unsigned.exe 844754a178b3b7ba62fc39bcc3f5e76b3903c9cd86adc26ec224ecf84d697239 bitcoin-fecb3723b63d-win64.zip af897573bd4f1e9acfef43af19a79e0e1c6a662cb3dc0bc8f5f6d2656c441953 src/bitcoin-fecb3723b63d.tar.gz # Linux: b6224d86755e6c609fd1cfff79f6514bdd0cf1af8689eca692352c515e6cb7dd bitcoin-fecb3723b63d-aarch64-linux-gnu-debug.tar.gz 371a2533f3510c7a7e7bd2a9b504accffdcdd65bcc9d6c393570e0378f470f93 bitcoin-fecb3723b63d-aarch64-linux-gnu.tar.gz 6c171cf1168f7bc6a1f78d5662c6cd1de7dd6157559fe4f7f95d34df7e398354 bitcoin-fecb3723b63d-arm-linux-gnueabihf-debug.tar.gz ac455dcb33c92191eb0124c78fa356cea78c88e3976bfe8b4b9f9052458b7b24 bitcoin-fecb3723b63d-arm-linux-gnueabihf.tar.gz 166ec0874d09b1e3d1b682ed120873b2715dee5ed13dd721443ee29784074107 bitcoin-fecb3723b63d-powerpc64-linux-gnu-debug.tar.gz 2b32d1a761625c28ed59fdbe8463dcb89b4f583a3119c57fd6815c9882241c78 bitcoin-fecb3723b63d-powerpc64-linux-gnu.tar.gz b9b37f0097f39fb16c2612166ffe21a09b436feea42394935831e2cb102c532a bitcoin-fecb3723b63d-powerpc64le-linux-gnu-debug.tar.gz e98fb672a5205a8d18f6ca4a39dec0c26353031c455c4e1b3917b917ce687d8d bitcoin-fecb3723b63d-powerpc64le-linux-gnu.tar.gz f92b07bd155fc469a18aa34571534f2c0bf12706f381ca973bb7a51692e25754 bitcoin-fecb3723b63d-riscv64-linux-gnu-debug.tar.gz 94321b7db0446457c372bea24d71d84d0f0181f7607bf9f96a8b773e69ee1370 bitcoin-fecb3723b63d-riscv64-linux-gnu.tar.gz 350bc9be945e3410bf73d9631fe4bb750f9a2ee3d538d2ce3efd42b15eba926a bitcoin-fecb3723b63d-x86_64-linux-gnu-debug.tar.gz 74aa3745942a9d76d3db23fa0251a27bbe1ea95683a901df37333caf9c6d13ab bitcoin-fecb3723b63d-x86_64-linux-gnu.tar.gz af897573bd4f1e9acfef43af19a79e0e1c6a662cb3dc0bc8f5f6d2656c441953 src/bitcoin-fecb3723b63d.tar.gz 959c25666565646279659fccb93278875bb926b67faf685185f461bf55b4058e bitcoin-core-linux-22-res.yml ``` ACKs for top commit: hebasto: ACK fecb372 Tree-SHA512: 00edf084852bfab404fb32d0a726088a50283a58a240d4e03cbd746cbffbe085d309434b2c22a4ed18c28be4df6958eb51d92d4ccd7548dd0ee49f99d458ff03

hebasto · 2021-05-21T14:56:29Z

depends/packages/qt.mk

 $(package)_config_opts += -no-feature-printer
 $(package)_config_opts += -no-feature-printpreviewdialog
 $(package)_config_opts += -no-feature-printpreviewwidget
-$(package)_config_opts += -no-feature-regularexpression


@fanquake
Was it done intentionally? If so, what reasons for?

Asking in regards to https://github.com/bitcoin-core/gui/pull/337/files#r636353521.

From what I remember qt wouldn't compiler with this disabled.

Thanks. Can confirm it.

…n (regression) ab86ac7 build, qt: Make QWindowsVistaStylePlugin available again (regression) (Hennadii Stepanov) Pull request description: This PR is similar to 1be8e0f, and, actually, it is a #21376 follow up. Required as in Qt 5.12.x style plugins are separated. Fixes #22132. Fixes bitcoin-core/gui#303. **Note for reviewers**. Besides visual changes in the GUI, you could compare the first dozen of lines in the `debug.log` file. --- #### Guix build: ``` $ HOSTS=x86_64-w64-mingw32 contrib/guix/guix-build $ find guix-build-$(git rev-parse --short=12 HEAD)/output/ -type f -print0 | env LC_ALL=C sort -z | xargs -r0 sha256sum e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 guix-build-ab86ac7739b2/output/dist-archive/SKIPATTEST.TAG d3f05888c95d6cf6f4a0bac952d4c0bf1e271f49cb7ab92b08080b753957e5e5 guix-build-ab86ac7739b2/output/dist-archive/bitcoin-ab86ac7739b2.tar.gz 113bb86ffd2854e08d3c0c5cd3f9728f2e4fe6c7a1813bc1c4b73eb48ad6597f guix-build-ab86ac7739b2/output/x86_64-w64-mingw32/bitcoin-ab86ac7739b2-win-unsigned.tar.gz 3fdc99754d6f26d9655a308c8847076d8fd4db8d61f4f18d8ef545894a42c10d guix-build-ab86ac7739b2/output/x86_64-w64-mingw32/bitcoin-ab86ac7739b2-win64-debug.zip 932bb69e3eb1a617f9e337b83220c9d6a277bec421f4d78e32dffde5643eb00c guix-build-ab86ac7739b2/output/x86_64-w64-mingw32/bitcoin-ab86ac7739b2-win64-setup-unsigned.exe 852f4c03ad049fcd6bb2ce25b3bcf4e18b90d34f7232660024b341bd7c8dd710 guix-build-ab86ac7739b2/output/x86_64-w64-mingw32/bitcoin-ab86ac7739b2-win64.zip c6a33a193a6b128e665198dde94758acab3a5ab7fefe0c3c6617eb98ad01693d guix-build-ab86ac7739b2/output/x86_64-w64-mingw32/inputs.SHA256SUMS ``` ACKs for top commit: laanwj: Concept and code review ACK ab86ac7 fanquake: ACK ab86ac7 Tree-SHA512: 9f5498480379fad41de616da48331e123daf5b2294ca79c33ffea2b113b314634be9a2a70bf060cb5be1392a48e9d047891e1d22c129f408f1d76a0bc888441f

Required to self-compile Qt 5.12.10 as introduced in PR bitcoin#21376.

fecb372 build: additional PKG_CHECK_MODULES calls in bitcoin_qt.m4 (fanquake) a53eff3 build: misc doc changes in bitcoin_qt.m4 (fanquake) 340fa6c build: set QT_*_CFLAGS & QT_*_LIBS in PKG_CHECK_MODULES() calls (fanquake) 4b8ad97 build: use QT_*_LIBS rather than passing lib names (fanquake) 13313b2 scripted-diff: replace Qt5 with ${qt_lib_prefix} in _BITCOIN_QT_CHECK_STATIC_LIBS (fanquake) 477df36 build: reorder libs in _BITCOIN_QT_CHECK_STATIC_LIBS (move-only) (fanquake) Pull request description: These are some small changes to simplify this code before we may end up supporting Qt6. Replaces usages of `Qt5` with `qt_lib_prefix`, minor docs cleanups and takes care of [a suggestion](bitcoin#21376 (comment)) left over from bitcoin#21376. Guix builds: ```bash 8749dca4a86c39607ff86b0107b76daea60d415a15b5022824f4a4469c6edc37 output/bitcoin-fecb3723b63d-aarch64-linux-gnu-debug.tar.gz 7b162ad6d953ceed9402f5fef03a8199a76c6dd300a71b03c1814c33ce0126f6 output/bitcoin-fecb3723b63d-aarch64-linux-gnu.tar.gz 869c42616320fc5bb25e942d7e20c0a8a4b8510939f8f8f6021a784e4afda83e output/bitcoin-fecb3723b63d-arm-linux-gnueabihf-debug.tar.gz 278b1481045e93b3ac7c31ae14ea3b6a3030391c2abc90e04ab80072f4c33dd3 output/bitcoin-fecb3723b63d-arm-linux-gnueabihf.tar.gz e5501939838f930bf5d5a6da4f6d3665c008d736aa916ef0e7e0e06db91e1a36 output/bitcoin-fecb3723b63d-osx-unsigned.dmg 834a94ea3fbc5e090618842b339b301bebd622d1f392918f0f500ec6637733ac output/bitcoin-fecb3723b63d-osx-unsigned.tar.gz 6cf70af01a48bea9270e6883ed15ce458c46c6840f826414df7a244fffa3338d output/bitcoin-fecb3723b63d-osx64.tar.gz d80e9e2789fdee931f80c049c70912e9ff146d5fe2ae7bcd26244d7fe5dd4910 output/bitcoin-fecb3723b63d-powerpc64-linux-gnu-debug.tar.gz d924e161f1c32b3980c72b4949c99269e3d5fad8656749edae9fbbaafb1b7ff9 output/bitcoin-fecb3723b63d-powerpc64-linux-gnu.tar.gz d2f339fc78608ac6cdc505b21abc5f397e52283914113f45dc0adad0c023df54 output/bitcoin-fecb3723b63d-powerpc64le-linux-gnu-debug.tar.gz d537c014adbdd712b7b20f3171bc4342622ba56f4fa655bba85afbf35aee2840 output/bitcoin-fecb3723b63d-powerpc64le-linux-gnu.tar.gz 0f42646fa5be154e8717df0e39ba843a61928225b00e0d48b1b2179966fea315 output/bitcoin-fecb3723b63d-riscv64-linux-gnu-debug.tar.gz f7b9cc85f74c006ac484e20915c84a12069447102d685124c5246b6eff8545c8 output/bitcoin-fecb3723b63d-riscv64-linux-gnu.tar.gz b60b51544a26dfa2e6a05a6daa99c63aeb62d7a1893191824867e1da9bbb73c4 output/bitcoin-fecb3723b63d-win-unsigned.tar.gz abc4cdb44146edf16fc47aa11d72648fa53c00d8f70937cab74cdaaaa9947c58 output/bitcoin-fecb3723b63d-win64-debug.zip 3c6d437b09acc479060d922c64c1f6688df6385a6a3950d31c7a6e0977d757eb output/bitcoin-fecb3723b63d-win64-setup-unsigned.exe d4f015fcfca15f23a797786fe67ca12ac73d3f594dd9e1b885e33d765f21beff output/bitcoin-fecb3723b63d-win64.zip 5fcb478027cb790ab7a3480fab91f764b10da4fd25d82b08f5ecfe42b4b7d316 output/bitcoin-fecb3723b63d-x86_64-linux-gnu-debug.tar.gz eef74c6b301bd799c6522b60c26d700a496ecf2bd357f09c83cbd88132086783 output/bitcoin-fecb3723b63d-x86_64-linux-gnu.tar.gz af897573bd4f1e9acfef43af19a79e0e1c6a662cb3dc0bc8f5f6d2656c441953 output/src/bitcoin-fecb3723b63d.tar.gz ``` Gitian builds: ```bash # macOS: b3926b7956b31b87ec96885369401141cc5a3f37e91a0ad9a03c6f7c1bd2bee7 bitcoin-fecb3723b63d-osx-unsigned.dmg 61792260b3afd0b921d84ddb0bb3639c2b4e063c7b7fb715d515b3601c7ad38b bitcoin-fecb3723b63d-osx-unsigned.tar.gz 953081b66a1feababe041cae0b31664856260f7364f87c5c50f7f7c1fd6b710a bitcoin-fecb3723b63d-osx64.tar.gz af897573bd4f1e9acfef43af19a79e0e1c6a662cb3dc0bc8f5f6d2656c441953 src/bitcoin-fecb3723b63d.tar.gz aecaa381205e9ed6585cdffa22c7b46d3ece989c1774855d4a3b4cae5d75567a bitcoin-core-osx-22-res.yml # Windows: 21c23951c96bcbf79fa75a6b915c40c24445964cced6242f4e9181464f66ba40 bitcoin-fecb3723b63d-win-unsigned.tar.gz 327cc290f5f709892e54cdc7bbf1745892eed497cd636c8f80d2310419e585c2 bitcoin-fecb3723b63d-win64-debug.zip e86a36c26897be064339cda866cb9563d08c867eceae59a677329390d729cbfe bitcoin-fecb3723b63d-win64-setup-unsigned.exe 844754a178b3b7ba62fc39bcc3f5e76b3903c9cd86adc26ec224ecf84d697239 bitcoin-fecb3723b63d-win64.zip af897573bd4f1e9acfef43af19a79e0e1c6a662cb3dc0bc8f5f6d2656c441953 src/bitcoin-fecb3723b63d.tar.gz # Linux: b6224d86755e6c609fd1cfff79f6514bdd0cf1af8689eca692352c515e6cb7dd bitcoin-fecb3723b63d-aarch64-linux-gnu-debug.tar.gz 371a2533f3510c7a7e7bd2a9b504accffdcdd65bcc9d6c393570e0378f470f93 bitcoin-fecb3723b63d-aarch64-linux-gnu.tar.gz 6c171cf1168f7bc6a1f78d5662c6cd1de7dd6157559fe4f7f95d34df7e398354 bitcoin-fecb3723b63d-arm-linux-gnueabihf-debug.tar.gz ac455dcb33c92191eb0124c78fa356cea78c88e3976bfe8b4b9f9052458b7b24 bitcoin-fecb3723b63d-arm-linux-gnueabihf.tar.gz 166ec0874d09b1e3d1b682ed120873b2715dee5ed13dd721443ee29784074107 bitcoin-fecb3723b63d-powerpc64-linux-gnu-debug.tar.gz 2b32d1a761625c28ed59fdbe8463dcb89b4f583a3119c57fd6815c9882241c78 bitcoin-fecb3723b63d-powerpc64-linux-gnu.tar.gz b9b37f0097f39fb16c2612166ffe21a09b436feea42394935831e2cb102c532a bitcoin-fecb3723b63d-powerpc64le-linux-gnu-debug.tar.gz e98fb672a5205a8d18f6ca4a39dec0c26353031c455c4e1b3917b917ce687d8d bitcoin-fecb3723b63d-powerpc64le-linux-gnu.tar.gz f92b07bd155fc469a18aa34571534f2c0bf12706f381ca973bb7a51692e25754 bitcoin-fecb3723b63d-riscv64-linux-gnu-debug.tar.gz 94321b7db0446457c372bea24d71d84d0f0181f7607bf9f96a8b773e69ee1370 bitcoin-fecb3723b63d-riscv64-linux-gnu.tar.gz 350bc9be945e3410bf73d9631fe4bb750f9a2ee3d538d2ce3efd42b15eba926a bitcoin-fecb3723b63d-x86_64-linux-gnu-debug.tar.gz 74aa3745942a9d76d3db23fa0251a27bbe1ea95683a901df37333caf9c6d13ab bitcoin-fecb3723b63d-x86_64-linux-gnu.tar.gz af897573bd4f1e9acfef43af19a79e0e1c6a662cb3dc0bc8f5f6d2656c441953 src/bitcoin-fecb3723b63d.tar.gz 959c25666565646279659fccb93278875bb926b67faf685185f461bf55b4058e bitcoin-core-linux-22-res.yml ``` ACKs for top commit: hebasto: ACK fecb372 Tree-SHA512: 00edf084852bfab404fb32d0a726088a50283a58a240d4e03cbd746cbffbe085d309434b2c22a4ed18c28be4df6958eb51d92d4ccd7548dd0ee49f99d458ff03

fanquake added Build system Needs gitian build DrahtBot Guix build requested labels Mar 6, 2021

DrahtBot mentioned this pull request Mar 6, 2021

build, qt: Improve Qt static plugins/libs check code #21363

Merged

hebasto reviewed Mar 6, 2021

View reviewed changes

contrib/gitian-descriptors/gitian-linux.yml Outdated Show resolved Hide resolved

hebasto reviewed Mar 6, 2021

View reviewed changes

depends/packages/libxkbcommon.mk Outdated Show resolved Hide resolved

DrahtBot mentioned this pull request Mar 6, 2021

depends: Use Qt top-level build facilities #20641

Merged

hebasto reviewed Mar 6, 2021

View reviewed changes

contrib/devtools/symbol-check.py Outdated Show resolved Hide resolved

DrahtBot removed the DrahtBot Guix build requested label Mar 7, 2021

hebasto mentioned this pull request Mar 7, 2021

build: Clean remnants of QTBUG-34748 fix #21382

Merged

fanquake added the GUI label Mar 9, 2021

fanquake force-pushed the qt_5_12_10_enhanced branch from 6275f15 to 54f2312 Compare March 9, 2021 07:54

fanquake commented Mar 9, 2021

View reviewed changes

depends/packages/qt.mk Show resolved Hide resolved

hebasto reviewed Mar 9, 2021

View reviewed changes

build-aux/m4/bitcoin_qt.m4 Outdated Show resolved Hide resolved

hebasto reviewed Mar 9, 2021

View reviewed changes

contrib/devtools/symbol-check.py Show resolved Hide resolved

This was referenced Mar 22, 2021

macOS 11 (Big Sur) visual bugs bitcoin-core/gui#136

Closed

qt: Support macOS Dark mode bitcoin-core/gui#154

Merged

fanquake mentioned this pull request Mar 23, 2021

missing QT dependency #21511

Closed

This was referenced Mar 29, 2021

ci: Bump Qt version in msvc builds #21548

Closed

build: Weird fontconfig package issue #21381

Closed

fanquake mentioned this pull request Apr 1, 2021

build: make bitcoin_qt.m4 more generic #21565

Merged

hebasto mentioned this pull request Apr 3, 2021

build, qt: Native Qt builds in depends do not work #21588

Closed

This was referenced May 8, 2021

Remove indented/raised borders elements on Windows bitcoin-core/gui#303

Closed

[0.21] depends: update Qt 5.9 source url #21932

Merged

hebasto reviewed May 21, 2021

View reviewed changes

hebasto mentioned this pull request Jun 2, 2021

build, qt: Make QWindowsVistaStylePlugin available again (regression) #22133

Merged

blockstreamsatellite added a commit to Blockstream/bitcoinsatellite that referenced this pull request Oct 28, 2021

[0.22] Add bison on ARM and i686 builders

41d9ef8

Required to self-compile Qt 5.12.10 as introduced in PR bitcoin#21376.

blockstreamsatellite added a commit to Blockstream/bitcoinsatellite that referenced this pull request Nov 10, 2021

[0.22] Add bison on ARM and i686 builders

be17147

Required to self-compile Qt 5.12.10 as introduced in PR bitcoin#21376.

hebasto mentioned this pull request Jan 5, 2022

No GUI loading at all, completely blank but core running. bitcoin-core/gui#175

Closed

kwvg added a commit to kwvg/dash that referenced this pull request Apr 25, 2022

merge bitcoin#21376: Qt 5.12.10

1763f72

bitcoin locked as resolved and limited conversation to collaborators Aug 18, 2022

Conversation

fanquake commented Mar 6, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

DrahtBot commented Mar 6, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Conflicts

Uh oh!

Uh oh!

Uh oh!

hebasto commented Mar 6, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

DrahtBot commented Mar 7, 2021

Guix builds

Uh oh!

maflcko commented Mar 7, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

hebasto commented Mar 7, 2021

Uh oh!

maflcko commented Mar 7, 2021

Uh oh!

hebasto commented Mar 7, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

fanquake commented Mar 7, 2021

Uh oh!

hebasto commented Mar 7, 2021

Uh oh!

hebasto commented Mar 7, 2021

Uh oh!

fanquake commented Mar 8, 2021

Uh oh!

hebasto commented Mar 8, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

Uh oh!

hebasto commented Mar 9, 2021

Uh oh!

Uh oh!

hebasto May 21, 2021

Choose a reason for hiding this comment

Uh oh!

fanquake May 22, 2021

Choose a reason for hiding this comment

Uh oh!

hebasto May 22, 2021

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

fanquake commented Mar 6, 2021 •

edited

Loading

DrahtBot commented Mar 6, 2021 •

edited

Loading

hebasto commented Mar 6, 2021 •

edited

Loading

maflcko commented Mar 7, 2021 •

edited

Loading

hebasto commented Mar 7, 2021 •

edited

Loading

hebasto commented Mar 8, 2021 •

edited

Loading