libxkbcommon-1.6.0 removes some definitions that are unused.
These definitions are referenced in qtbase so we remove them
with a sed for both the full qt5 package and gt5-alternate.
It looks like we've forgotten some dependencies for Qt5 all the time.
And many dependencies of Qt5 are also needed by the alternative. I
gathered them via
readelf -d $(find -name \*.so) | grep NEEDED | grep -o '\[.*\]' |
sort | uniq | grep -v Qt 2>/dev/null
in the Qt5 alternative build directory.
The patch for qt-5.15.8 creates a header file, which needs to be
known by the build machinery. In a git repository, this is done
automatically, but in a build tree coming from a tarball, the header
file is ignored.
So we add a .git directory into qtbase, which fakes a git repository,
and allows the header file to be used and installed by the build system
(it may be needed when compiling programs using Qt thread mutexes).
I have only used the patches for modules used by packages in BLFS
or required by the extra KDE packages mentioned in BLFS. For the
full details of what has been applied (or omitted) see
https://www.linuxfromscratch.org/~ken/qt5/
I have also revised the SBU - the extra patches make a minimal
difference on my -j4 builds, but I need to use -j8 to get to 22
SBU. That figure seems to have been carried over from when we were
using gcc-10.2.
In the optional dependencies, pciutils was shown as optional but
required for qtwebengine: show it as optional, other parts of qt
can use it, and add it to qtwebengine as required. Remove python2
from the qt5 optional dependencies, only qtwebengine needs it and
it is already shown as required there.
It made sense as a dep of Qt5 when we were building webengine as
part of Qt5, but (at least for separate WebEngine, I've
deliberately forgotten the details of building it in Qt5) it
requires a switch to enable it.
Document that switch as an optional command.
I know it is somewhat useless, but I don't like them for
two reasons: first they cannot be seen, and I do not like things I
cannot see. Second, git highlights them, and this is disturbing...
In the process, some attributes in single quotes have been changed to double
quotes, and a few attribute lists have been written on one line instead of
several lines.
git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@24236 af4574ff-66df-0310-9fd7-8a98e5e911e0