Author: pierre
Date: Tue Dec 15 08:57:45 2020
New Revision: 23982
Log:
First round of changes, do not use yet
Added:
branches/qt5new/x/lib/qtbase.xml
- copied, changed from r23981, branches/qt5new/x/lib/qtwebengine.xml
Deleted:
branches/qt5new/x/lib/qtwebengine.xml
Modified:
branches/qt5new/packages.ent
branches/qt5new/x/lib/lib.xml
branches/qt5new/x/lib/qt5.xml
branches/qt5new/xsoft/graphweb/falkon.xml
Modified: branches/qt5new/packages.ent
==============================================================================
--- branches/qt5new/packages.ent Tue Dec 15 08:00:10 2020 (r23981)
+++ branches/qt5new/packages.ent Tue Dec 15 08:57:45 2020 (r23982)
@@ -751,8 +751,10 @@
<!ENTITY libxklavier-version "5.4">
<!ENTITY pango-version "1.48.0">
<!ENTITY pangomm-version "2.42.1">
-<!ENTITY qt5-version "5.15.2">
-<!ENTITY qtwebengine-version "5.15.2">
+<!ENTITY qt5-major "5.15">
+<!ENTITY qt5-version "&qt5-major;.2">
+<!ENTITY qt5-url
"https://download.qt.io/archive/qt/&qt5-major;/&qt5-version;/submodules";>
+<!ENTITY qtwebengine-version "&qt5-major;.2">
<!ENTITY qtwebkit-version "5.9.0">
<!ENTITY qscintilla-version "2.10.4">
<!ENTITY shared-mime-info-version "2.0">
Modified: branches/qt5new/x/lib/lib.xml
==============================================================================
--- branches/qt5new/x/lib/lib.xml Tue Dec 15 08:00:10 2020 (r23981)
+++ branches/qt5new/x/lib/lib.xml Tue Dec 15 08:57:45 2020 (r23982)
@@ -70,8 +70,8 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="pango.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="pangomm.xml"/>
<!-- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude";
href="qscintilla.xml"/> -->
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="qtbase.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="qt5.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude";
href="qtwebengine.xml"/>
<!--
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude";
href="qtwebkit5.xml"/> -->
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude";
href="startup-notification.xml"/>
Modified: branches/qt5new/x/lib/qt5.xml
==============================================================================
--- branches/qt5new/x/lib/qt5.xml Tue Dec 15 08:00:10 2020 (r23981)
+++ branches/qt5new/x/lib/qt5.xml Tue Dec 15 08:57:45 2020 (r23982)
@@ -4,13 +4,11 @@
<!ENTITY % general-entities SYSTEM "../../general.ent">
%general-entities;
- <!ENTITY qt5-major "5.15">
- <!ENTITY qt5-url
"https://download.qt.io/archive/qt/&qt5-major;/&qt5-version;/single";>
- <!ENTITY qt5-download-http
"&qt5-url;/qt-everywhere-src-&qt5-version;.tar.xz">
+ <!ENTITY qt5-download-http "&qt5-url;/">
<!ENTITY qt5-download-ftp " ">
- <!ENTITY qt5-md5sum "e1447db4f06c841d8947f0a6ce83a7b5">
- <!ENTITY qt5-size "560 MB">
+ <!ENTITY qt5-md5sum "See below">
+ <!ENTITY qt5-size "59 MB">
<!ENTITY qt5-buildsize "14 GB (255 MB installed)">
<!ENTITY qt5-time "22 SBU (using parallelism=4)">
]>
@@ -429,8 +427,8 @@
<para>
<parameter>-skip qtwebengine</parameter>: This switch disables building
- the QtWebEngine. The BLFS editors have chosen to build <xref
- linkend="qtwebengine"/> separately.
+ the QtWebEngine. <!--The BLFS editors have chosen to build <xref
+ linkend="qtwebengine"/> separately.-->
</para>
<para>
Copied and modified: branches/qt5new/x/lib/qtbase.xml (from r23981,
branches/qt5new/x/lib/qtwebengine.xml)
==============================================================================
--- branches/qt5new/x/lib/qtwebengine.xml Tue Dec 15 08:00:10 2020
(r23981, copy source)
+++ branches/qt5new/x/lib/qtbase.xml Tue Dec 15 08:57:45 2020 (r23982)
@@ -4,217 +4,242 @@
<!ENTITY % general-entities SYSTEM "../../general.ent">
%general-entities;
- <!ENTITY qtwebengine-major "5.15">
- <!ENTITY qtwebengine-download-http
"https://download.qt.io/archive/qt/&qtwebengine-major;/&qtwebengine-version;/submodules/qtwebengine-everywhere-src-&qtwebengine-version;.tar.xz";>
- <!ENTITY qtwebengine-download-ftp " ">
- <!ENTITY qtwebengine-md5sum "c88cbe3158feb20c4feb3d54262feb23">
- <!ENTITY qtwebengine-size "267 MB">
- <!ENTITY qtwebengine-buildsize "4.4 GB (145 MB installed)">
- <!ENTITY qtwebengine-time "64 SBU (Using parallelism=4)">
+ <!ENTITY qtbase-download-http
"&qt5-url;/qtbase-everywhere-src-&qt5-version;.tar.xz">
+ <!ENTITY qtbase-download-ftp " ">
+ <!ENTITY qtbase-md5sum "0eb522ff6c2194f9690cbdcd5b33e803">
+ <!ENTITY qtbase-size "48 MB">
+ <!ENTITY qtbase-buildsize "4.4 GB (145 MB installed)">
+ <!ENTITY qtbase-time "64 SBU (Using parallelism=4)">
]>
-<sect1 id="qtwebengine" xreflabel="qtwebengine-&qtwebengine-version;">
- <?dbhtml filename="qtwebengine.html"?>
+<sect1 id="qtbase" xreflabel="qtbase-&qt5-version;">
+ <?dbhtml filename="qtbase.html"?>
<sect1info>
<othername>$LastChangedBy$</othername>
<date>$Date$</date>
</sect1info>
- <title>QtWebEngine-&qtwebengine-version;</title>
+ <title>Qt-&qt5-version; Base</title>
- <indexterm zone="qtwebengine">
- <primary sortas="a-qtwebengine">qtwebengine</primary>
+ <indexterm zone="qtbase">
+ <primary sortas="a-qtbase">qtbase</primary>
</indexterm>
<sect2 role="package">
- <title>Introduction to QtWebEngine</title>
+ <title>Introduction to Qt Library</title>
<para>
- <application>QtWebEngine</application> integrates
- <application>chromium</application>'s web capabilities into Qt. It
- ships with its own copy of ninja which it uses for the build if it cannot
- find a system copy, and various copies of libraries from ffmpeg, icu,
- libvpx, and zlib (including libminizip) which have been forked by the
- <application>chromium</application> developers.
+ <application>Qt5</application> is a cross-platform application framework
+ that is widely used for developing application software with a graphical
+ user interface (GUI) (in which cases <application>Qt5</application> is
+ classified as a widget toolkit), and also used for developing non-GUI
+ programs such as command-line tools and consoles for servers. One of the
+ major users of <application>Qt</application> is <application>KDE
+ Frameworks 5 (KF5)</application>.
</para>
- &lfs10_checked;
-
- <note>
- <para>
- By default, ninja will use all online CPUs +2 (if at least 4 exist),
- even if they are not available to the current task because the build
- terminal has been restricted with 'taskset'. To work around this, see
- the Command Explanations below.
- </para>
+ <para>
+ <application>Qt5</application> is made of several modules, which are not
+ all necessary for a given application. It has its own building tool
+ (<command>qmake</command>), and provides a complete development
+ environment. The instructions on this page allow to set up that
+ environment and to build basic modules.
+ </para>
- <para>
- Unusually, the shipped GN build system (used to create the Ninja files)
- requires a static <filename class="libraryfile">libstdc++.a</filename>
- although the installed libraries correctly use the shared version. If
- that static library is not present, the build will fail quite quickly.
- Please note that if you try to build webengine as part of
- <application>Qt</application> and the static library is not available,
- that build will either complete without installing webengine, or else
- fail during the install (both variants have been observed in 5.12.0).
- </para>
- </note>
+ &lfs10_checked;
<bridgehead renderas="sect3">Package Information</bridgehead>
<itemizedlist spacing="compact">
<listitem>
<para>
- Download (HTTP): <ulink url="&qtwebengine-download-http;"/>
- </para>
- </listitem>
- <listitem>
- <para>
- Download (FTP): <ulink url="&qtwebengine-download-ftp;"/>
+ Download (HTTP): <ulink url="&qtbase-download-http;"/>
</para>
</listitem>
<listitem>
<para>
- Download MD5 sum: &qtwebengine-md5sum;
+ Download (FTP): <ulink url="&qtbase-download-ftp;"/>
</para>
</listitem>
<listitem>
<para>
- Download size: &qtwebengine-size;
+ Download MD5 sum: &qtbase-md5sum;
</para>
</listitem>
<listitem>
<para>
- Estimated disk space required: &qtwebengine-buildsize;
+ Download size: &qtbase-size;
</para>
</listitem>
<listitem>
<para>
- Estimated build time: &qtwebengine-time;
+ Estimated disk space required: &qtbase-buildsize;
</para>
</listitem>
- </itemizedlist>
-
- <bridgehead renderas="sect3">Additional Downloads</bridgehead>
- <itemizedlist spacing="compact">
<listitem>
<para>
- Required patch:
- <ulink
url="&patch-root;/qtwebengine-everywhere-src-&qtwebengine-version;-ICU68-2.patch"/>
+ Estimated build time: &qtbase-time;
</para>
</listitem>
</itemizedlist>
- <bridgehead renderas="sect3">qtwebengine Dependencies</bridgehead>
+ <bridgehead renderas="sect3">Qt5 Dependencies</bridgehead>
<bridgehead renderas="sect4">Required</bridgehead>
- <!-- the qmake output tends to be misleading. 'khr' is from Mesa -->
<para role="required">
- <xref linkend="nss"/>,
- <xref linkend="python2"/>, and
- <xref linkend='qt5'/>
+ <xref linkend='xorg7-lib'/>
</para>
<bridgehead renderas="sect4">Recommended</bridgehead>
- <note>
- <para>
- If these packages are not installed, the build process will compile and
- install its own (perhaps older) version, with the side effect of
- increasing build and installed disk space and build time.
- </para>
- </note>
<para role="recommended">
- either <xref linkend="alsa-lib"/> or
- <xref linkend="pulseaudio"/> (or both),
- <xref linkend="ffmpeg"/>,
+ <xref linkend="cups"/>,
+ <xref linkend="glib2"/>,
+ <xref linkend="harfbuzz"/>,
<xref linkend="icu"/>,
- <xref linkend="libwebp"/>,
- <xref linkend="libxslt"/>, and
- <xref linkend="opus"/>
+<!-- not sure <xref linkend="jasper"/>, -->
+ <xref linkend="libjpeg"/>,
+<!-- not sure <xref linkend="libmng"/>, -->
+ <xref linkend="libpng"/>,
+<!-- not sure <xref linkend="libtiff"/>, -->
+<!-- seems not tested here <xref linkend="libwebp"/>, -->
+ <xref linkend="libxkbcommon"/>,
+ <xref linkend="mesa"/>,
+ <xref linkend="mitkrb"/>,
+ <xref linkend="mtdev"/>,
+ <xref linkend="pcre2"/>,
+ <xref linkend="sqlite"/>,
+<!-- not sure <xref linkend="wayland"/> (<application>Mesa</application>
+ must be built with <application>Wayland</application> EGL
+ backend), -->
+<!-- not sure <xref linkend="xcb-util-image"/>,
+ <xref linkend="xcb-util-keysyms"/>,
+ <xref linkend="xcb-util-renderutil"/>, --> and
+ <xref linkend="xcb-util-wm"/>
</para>
<bridgehead renderas="sect4">Optional</bridgehead>
<para role="optional">
- <xref linkend="libevent"/>,
- <xref linkend="poppler"/>,
- <ulink
url="https://github.com/open-source-parsers/jsoncpp/releases";>jsoncpp</ulink>,
- <ulink url="https://github.com/cisco/libsrtp/releases";>libsrtp</ulink>,
- <ulink url="http://google.github.io/snappy/";>snappy</ulink>
+ <xref linkend="db"/>,
+ <xref linkend="gtk3"/>,
+ <xref linkend="ibus"/>,
+ <xref linkend="libinput"/>,
+ <xref linkend="mariadb"/>
+ or <ulink url="http://www.mysql.com/";>MySQL</ulink>,
+ <xref linkend="postgresql"/>,
+ <xref linkend="unixodbc"/>,
+ <ulink url="http://www.firebirdsql.org/";>Firebird</ulink>,
+ <ulink url="http://www.freetds.org/";>FreeTDS</ulink>,
+ <ulink url="https://github.com/mity/md4c/";>libmd4c</ulink>,
+ <ulink url="https://openal.org/";>OpenAL</ulink>,
+ <ulink url="https://www.khronos.org/openvg/";>openvg</ulink>,
+ <ulink url="http:///www.tslib.org/";>tslib</ulink>, and
+ <ulink url="https://vulkan.lunarg.com/sdk/home/";>Vulkan</ulink>
</para>
<para condition="html" role="usernotes">
- User Notes: <ulink url="&blfs-wiki;/qtwebengine"/>
+ User Notes: <ulink url="&blfs-wiki;/qtbase"/>
</para>
</sect2>
- <sect2 role="installation">
- <title>Installation of qtwebengine</title>
+ <sect2 role="qt5-prefix">
+ <title>Setting the installation prefix</title>
+
+ <bridgehead renderas="sect3">Installing in /opt/qt5</bridgehead>
<para>
- First, ensure that the local headers are available when not building as
- part of the complete <xref linkend="qt5"/>:
+ The BLFS editors recommend installing <application>Qt5</application> in a
+ directory other than <filename class="directory">/usr</filename>, ie
+ <filename class="directory">/opt/qt5</filename>. To do this, set the
+ following environment variable:
</para>
-<screen><userinput>find -type f -name "*.pr[io]" |
- xargs sed -i -e 's|INCLUDEPATH += |&$$QTWEBENGINE_ROOT/include
|'</userinput></screen>
+<screen><userinput>export QT5PREFIX=/opt/qt5</userinput></screen>
- <para>
- Next, apply a patch that fixes the build with system ICU version 68.1.
- </para>
+ <tip>
+ <para>
+ Sometimes, the installation paths are hardcoded into installed files.
+ This is the reason why <filename class="directory">/opt/qt5</filename>
+ is used as installation prefix instead of <filename
+ class="directory">/opt/qt-&qt5-version;</filename>. To create a
+ versioned <application>Qt5</application> directory after the
+ installation is complete, you may rename the directory and create a
+ symlink:
+ </para>
-<screen><userinput remap="pre">patch -Np1 -i
../qtwebengine-everywhere-src-&qtwebengine-version;-ICU68-2.patch</userinput></screen>
+<screen role="root"><userinput>mkdir /opt/qt-&qt5-version;
+ln -sfnv qt-&qt5-version; /opt/qt5</userinput></screen>
- <para>
- Next, allow the pulseaudio library to be linked at build time, instead
- of run time. This also prevents an issue with newer pulseaudio:
- </para>
+ <para>
+ Later on, you may want to install other versions of
+ <application>Qt5</application>. To do that, just remove the symlink
+ and use <filename class="directory">/opt/qt5</filename> as the
+ prefix again. Which version of <application>Qt5</application> you
+ use depends only on where the symlink points.
+ </para>
+ </tip>
-<screen><userinput>sed -e '/link_pulseaudio/s/false/true/' \
- -i src/3rdparty/chromium/media/media_options.gni</userinput></screen>
+ </sect2>
- <para>
- Finally, fix a change in the build system which allows its developers to
- pass e.g. -j20 to make (for quick tests of some areas) but breaks the
- build with LFS's use of the NINJAJOBS environment variable:
- </para>
+ <sect2 role="installation">
+ <title>Installation of qtbase</title>
-<!-- editors: See thread at
-http://lists.linuxfromscratch.org/pipermail/blfs-dev/2019-December/036996.html
-et.seq, particularly 037002.html which shows the commit near the end. -->
+ <warning>
+ <para>
+ If <application>Qt5</application> is being reinstalled into the
+ same directory as an existing instance, run the commands done by
+ <systemitem class="username">root</systemitem>, such as
+ <command>make install</command>, from a console or non-Qt5 based
+ window manager. It overwrites <application>Qt5</application>
+ libraries that should not be in use during the install process.
+ </para>
+ </warning>
-<screen><userinput>sed -i 's/NINJAJOBS/NINJA_JOBS/'
src/core/gn_run.pro</userinput></screen>
+ <caution>
+ <para>
+ If you did not install some of the recommended dependencies, examine
+ <command>./configure --help</command> output to check how to disable
+ them or use internal versions bundled in the source tarball.
+ </para>
+ </caution>
- <para>
- If an older version of the package's main library has been installed,
- when the package is built separately it will link to that in preference
- to its own not-yet-installed version, and fail because of missing
symbols.
- Prevent that by, as the <systemitem class="username">root</systemitem>
- user, moving the symlink out of the way:
- </para>
+ <note>
+ <para>
+ The BLFS editors do not recommend installing
<application>Qt5</application>
+ into the /usr hierarchy because it becomes difficult to find
+ components and to update to a new version. If you do want to install
+ <application>Qt5</application> in /usr, the directories need to
+ be specified explicitly. In this case, set QT5PREFIX=/usr and add
+ the following to the configure arguments below:
+ </para>
-<screen role="root"><userinput>if [ -e ${QT5DIR}/lib/libQt5WebEngineCore.so ];
then
- mv -v ${QT5DIR}/lib/libQt5WebEngineCore.so{,.old}
-fi</userinput></screen>
+<screen role="nodump"><userinput> -archdatadir /usr/lib/qt5
\
+ -bindir /usr/bin \
+ -plugindir /usr/lib/qt5/plugins \
+ -importdir /usr/lib/qt5/imports \
+ -headerdir /usr/include/qt5 \
+ -datadir /usr/share/qt5 \
+ -docdir /usr/share/doc/qt5 \
+ -translationdir /usr/share/qt5/translations \
+ -examplesdir /usr/share/doc/qt5/examples</userinput></screen>
+ </note>
<para>
- Install <application>qtwebengine</application> by running the following
+ Install <application>qtbase</application> by running the following
commands:
</para>
-<screen><userinput>mkdir build &&
-cd build &&
-
-qmake .. -- -system-ffmpeg -webengine-icu &&
+<screen><userinput>./configure -prefix $QT5PREFIX \
+ -sysconfdir /etc/xdg \
+ -confirm-license \
+ -opensource \
+ -dbus-linked \
+ -openssl-linked \
+ -system-sqlite \
+ -nomake examples \
+ -no-rpath &&
make</userinput></screen>
-<!--
- <para>
- if you wish to build the HTML documentation, issue:
- </para>
-
-<screen><userinput>make docs</userinput></screen>
--->
<para>
This package does not come with a test suite.
</para>
@@ -226,13 +251,7 @@
<screen role="root"><userinput>make install</userinput></screen>
<!-- EDITORS NOTE: If you are updating this package, use INSTALL_ROOT=
instead of DESTDIR= -->
-<!--
- <para>
- If you built the HTML documentation, install it with:
- </para>
-<screen role="root"><userinput>make install_docs</userinput></screen>
--->
<para>
Remove references to the build directory from installed library
dependency (prl) files by running the following
@@ -247,80 +266,120 @@
<title>Command Explanations</title>
<para>
- <command>qmake</command>: This will build the included copy of
- <application>ninja</application> if it is not already installed
- and use it to configure the build.
+ <parameter>-confirm-license</parameter>: Accept license
+ without prompting user during configuration.
</para>
<para>
- <command>-- -system-ffmpeg -webengine-icu</command>: If any options are
- passed to qmake they must come after '--' which must follow '..' that
points
- to the main directory. The options here cause it to use system ffmpeg and
- system icu. If built as part of full Qt5, the system icu is
automatically
- used (only) by Qt5Core if it is available, but unless this option is used
- webengine will always use its shipped copy of icu, adding time and space
- to the build.
+ <parameter>-opensource</parameter>: Install the opensource
+ version of <application>Qt</application>.
</para>
- <!--
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude";
- href="../../xincludes/SIOCGSTAMP.xml"/>
- -->
+ <para>
+ <parameter>-nomake examples</parameter>: This switch
+ disables building of the example programs included
+ in the source tarball. Remove it if you want to build
+ them.
+ </para>
<para>
- <option>NINJAJOBS=4 make</option>: If you patched system ninja in LFS to
- recognize the NINJAJOBS environment variable, this command will run
system
- ninja with the specified number of jobs (i.e. 4).
- There are several reasons why you might want to do this:
- </para>
-
- <itemizedlist>
- <listitem>
- <para>
- Building on a subset of CPUs allows measuring the build time
- for that number of processors or to run other CPU-intensive tasks
on
- other cores.
- </para>
- </listitem>
- <listitem>
- <para>
- Improving the build speed on a less-well endowed 4-core machine.
- On a machine with a powerful CPU and plenty of RAM, running N+2
- jobs (the ninja default for 4+ cores) for the large working sets
- of the C++ compiles in this package is typically only marginally
- faster than running N jobs at a time. But for a machine with less
- memory it can be much slower.
- </para>
- </listitem>
- <listitem>
- <para>
- Reducing the number of cores being used on long running, CPU
- intensive packages may alleviate heat problems.
- </para>
- </listitem>
- </itemizedlist>
+ <parameter>-system-sqlite</parameter>: This switch enables use
+ of the system version of <application>SQLite</application>.
+ </para>
+
+ <para>
+ <parameter>-system-sqlite</parameter>: This switch enables use
+ of the system version of <application>SQLite</application>.
+ </para>
+
+ <para>
+ <parameter>-dbus-linked -openssl-linked</parameter>: These
+ switches enable explicit linking of the
+ <application>D-Bus</application> and
+ <application>OpenSSL</application> libraries into
+ <application>Qt5</application> libraries instead of
+ <command>dlopen()</command>-ing them.
+ </para>
</sect2>
<sect2 role="configuration">
- <title>Configuring QtWebEngine</title>
+ <title>Configuring qtbase</title>
- <sect3 id="qtwebengine-config">
+ <sect3 id="qtbase-config">
<title>Configuration Information</title>
<para>
- If you are upgrading from an older minor version of this
- application, for some webpages to load you may need to
- clear the <emphasis>browser</emphasis> caches, e.g. for
- <application>falkon</application> they will be found in
- <filename class="directory">~/.cache/falkon/</filename>.
- You will need to do this if the browser starts to render
- the page and then changes to a blank tab with a message
- that something went wrong, and a button to Retry. Even
- after removing the old caches, you may need to retry a
- few times for each affected tab.
+ If you installed <application>qtbase</application> in
+ <filename class="directory">/usr</filename>, create an
+ environment variable needed by certain packages.
+ As the <systemitem class="username">root</systemitem> user:
+ </para>
+
+<screen role="nodump"><userinput>cat > /etc/profile.d/qtbase.sh <<
"EOF"
+<literal># Begin /etc/profile.d/qtbase.sh
+
+QT5DIR=/usr
+export QT5DIR
+
+# End /etc/profile.d/qtbase.sh</literal>
+EOF</userinput></screen>
+
+ <para>
+ If <xref linkend="sudo"/> is installed, QT5DIR should be available to
+ the super user as well. Execute the following commands as the
+ <systemitem class="username">root</systemitem> user:
</para>
+<screen role="root"><userinput>cat > /etc/sudoers.d/qt << "EOF"
+<literal>Defaults env_keep += QT5DIR</literal>
+EOF</userinput></screen>
+
+ <para>
+ If you installed <application>qtbase</application> in a location other
+ than <filename class="directory">/usr</filename>, you need to update
the
+ following configuration files so that <application>qtbase</application>
+ is correctly found by other packages and system processes.
+ </para>
+
+ <para>
+ As the <systemitem class="username">root</systemitem> user, update
+ the <filename>/etc/ld.so.conf</filename> file and the dynamic linker's
+ run-time cache file:
+ </para>
+
+<screen role="root"><userinput>cat >> /etc/ld.so.conf << EOF
+<literal># Begin Qt addition
+
+/opt/qt5/lib
+
+# End Qt addition</literal>
+EOF
+
+ldconfig</userinput></screen>
+
+ <indexterm zone="qtbase qtbase-config">
+ <primary sortas="e-etc-ld.so.conf">/etc/ld.so.conf</primary>
+ </indexterm>
+
+ <para>
+ As the <systemitem class="username">root</systemitem> user, create
+ the <filename>/etc/profile.d/qtbase.sh</filename> file:
+ </para>
+
+<screen role="root"><userinput>cat > /etc/profile.d/qtbase.sh << "EOF"
+<literal># Begin /etc/profile.d/qtbase.sh
+
+QT5DIR=/opt/qt5
+
+pathappend $QT5DIR/bin PATH
+pathappend $QT5DIR/lib/pkgconfig PKG_CONFIG_PATH
+
+export QT5DIR
+
+# End /etc/profile.d/qtbase.sh</literal>
+EOF</userinput></screen>
+
</sect3>
</sect2>
@@ -358,75 +417,11 @@
</seglistitem>
</segmentedlist>
- <variablelist>
+<!-- <variablelist>
<bridgehead renderas="sect3">Short Descriptions</bridgehead>
<?dbfo list-presentation="list"?>
<?dbhtml list-presentation="table"?>
- <varlistentry id="qtwebengine_convert_dict">
- <term><command>qtwebengine_convert_dict</command></term>
- <listitem>
- <para>
- converts hunspell dictionaries (<literal>.dic</literal>) to
chromium
- format (<literal>.bdic</literal>)
- </para>
- <indexterm zone="qtwebengine qtwebengine_convert_dict">
- <primary
sortas="b-qtwebengine_convert_dict">qtwebengine_convert_dict</primary>
- </indexterm>
- </listitem>
- </varlistentry>
-
- <varlistentry id="QtWebEngineProcess">
- <term><command>QtWebEngineProcess</command></term>
- <listitem>
- <para>
- is a libexec program which runs a zygote process (one that listens
- for spawn requests from a master process and will fork itself in
- response).
- </para>
- <indexterm zone="qtwebengine QtWebEngineProcess">
- <primary sortas="b-QtWebEngineProcess">QtWebEngineProcess</primary>
- </indexterm>
- </listitem>
- </varlistentry>
-
- <varlistentry id="libQtWebEngine-lib">
- <term><filename class="libraryfile">libQtWebEngine.so</filename></term>
- <listitem>
- <para>
- provides QML types for rendering web content within a QML
application.
- </para>
- <indexterm zone="qtwebengine libQtWebEngine-lib">
- <primary sortas="c-libQtWebEngine">libQtWebEngine.so</primary>
- </indexterm>
- </listitem>
- </varlistentry>
-
- <varlistentry id="libQtWebEngineCore">
- <term><filename
class="libraryfile">libQtWebEngineCore.so</filename></term>
- <listitem>
- <para>
- provides public API shared by both QtWebEngine and
QtWebEngineWidgets.
- </para>
- <indexterm zone="qtwebengine libQtWebEngineCore">
- <primary
sortas="c-libQtWebEngineCore">libQtWebEngineCore.so</primary>
- </indexterm>
- </listitem>
- </varlistentry>
-
- <varlistentry id="libQtWebEngineWidgets">
- <term><filename
class="libraryfile">libQtWebEngineWidgets.so</filename></term>
- <listitem>
- <para>
- provides a web browser engine as well as C++ classes to render and
- interact with web content.
- </para>
- <indexterm zone="qtwebengine libQtWebEngineWidgets">
- <primary
sortas="c-libQtWebEngineWidgets">libQtWebEngineWidgets.so</primary>
- </indexterm>
- </listitem>
- </varlistentry>
-
- </variablelist>
+ </variablelist>-->
</sect2>
</sect1>
Modified: branches/qt5new/xsoft/graphweb/falkon.xml
==============================================================================
--- branches/qt5new/xsoft/graphweb/falkon.xml Tue Dec 15 08:00:10 2020
(r23981)
+++ branches/qt5new/xsoft/graphweb/falkon.xml Tue Dec 15 08:57:45 2020
(r23982)
@@ -81,8 +81,8 @@
<bridgehead renderas="sect4">Required</bridgehead>
<para role="required">
- <xref linkend="extra-cmake-modules"/> and
- <xref linkend="qtwebengine"/>
+ <xref linkend="extra-cmake-modules"/> <!-- and
+ <xref linkend="qtwebengine"/>-->
</para>
<bridgehead renderas="sect4">Optional</bridgehead>
--
http://lists.linuxfromscratch.org/listinfo/blfs-book
FAQ: http://www.linuxfromscratch.org/blfs/faq.html
Unsubscribe: See the above information page
