Author: pierre Date: Tue Oct 18 01:59:33 2016 New Revision: 17895 Log: Revert 17894, because some files are missing
Modified: trunk/BOOK/introduction/welcome/changelog.xml trunk/BOOK/lxqt/desktop/desktop.xml trunk/BOOK/lxqt/desktop/liblxqt.xml trunk/BOOK/lxqt/desktop/libqtxdg.xml trunk/BOOK/lxqt/desktop/libsysstat.xml trunk/BOOK/lxqt/desktop/lxqt-about.xml trunk/BOOK/lxqt/desktop/lxqt-common.xml trunk/BOOK/lxqt/desktop/lxqt-config.xml trunk/BOOK/lxqt/desktop/lxqt-globalkeys.xml trunk/BOOK/lxqt/desktop/lxqt-notificationd.xml trunk/BOOK/lxqt/desktop/lxqt-panel.xml trunk/BOOK/lxqt/desktop/lxqt-policykit.xml trunk/BOOK/lxqt/desktop/lxqt-powermanagement.xml trunk/BOOK/lxqt/desktop/lxqt-qtplugin.xml trunk/BOOK/lxqt/desktop/lxqt-runner.xml trunk/BOOK/lxqt/desktop/lxqt-session.xml trunk/BOOK/lxqt/desktop/lxqt-solid.xml trunk/BOOK/lxqt/desktop/pcmanfm-qt.xml trunk/BOOK/lxqt/desktop/post-install.xml trunk/BOOK/lxqt/desktop/pre-install.xml trunk/BOOK/packages.ent Modified: trunk/BOOK/introduction/welcome/changelog.xml ============================================================================== --- trunk/BOOK/introduction/welcome/changelog.xml Mon Oct 17 23:58:48 2016 (r17894) +++ trunk/BOOK/introduction/welcome/changelog.xml Tue Oct 18 01:59:33 2016 (r17895) @@ -41,34 +41,12 @@ </listitem> </itemizedlist> </listitem> ---> +--> <listitem> <para>October 17th, 2016</para> <itemizedlist> <listitem> - <para>[pierre] - Add libfm-qt-0.11.1, lxqt-admin-0.11.0, - lxqt-kidletime-5.25.0, and lxqt-l10n-0.11.0, as part of - <ulink url="&blfs-ticket-root;8349">#8349</ulink>.</para> - </listitem> - <listitem> - <para>[pierre] - Update to liblxqt-0.11.0, lxqt-about-0.11.0, - lxqt-common-0.11.0, lxqt-config-0.11.0, lxqt-globalkeys-0.11.0, - lxqt-notificationd-0.11.0, lxqt-panel-0.11.0, lxqt-policykit-0.11.0, - lxqt-powermanagement-0.11.0, lxqt-qtplugin-0.11.0, - lxqt-runner-0.11.0, lxqt-session-0.11.0, and - pcmanfm-qt-0.11.1. Partially fixes - <ulink url="&blfs-ticket-root;8349">#8349</ulink>.</para> - </listitem> - <listitem> - <para>[pierre] - Update to libqtxdg-2.0.0. Fixes - <ulink url="&blfs-ticket-root;8310">#8310</ulink>.</para> - </listitem> - <listitem> - <para>[pierre] - Update to libsysstat-0.3.2. Fixes - <ulink url="&blfs-ticket-root;8309">#8309</ulink>.</para> - </listitem> - <listitem> <para>[bdubbs] - Update to fontforge-dist-20161004. Fixes <ulink url="&blfs-ticket-root;8410">#8410</ulink>.</para> </listitem> Modified: trunk/BOOK/lxqt/desktop/desktop.xml ============================================================================== --- trunk/BOOK/lxqt/desktop/desktop.xml Mon Oct 17 23:58:48 2016 (r17894) +++ trunk/BOOK/lxqt/desktop/desktop.xml Tue Oct 18 01:59:33 2016 (r17895) @@ -20,14 +20,16 @@ </para> <para> - <application>LXQt</application> is a <application>Qt</application> based - Desktop Environment. It comes with a beautiful interface, - multi-language support, standard keyboard shortcuts and additional - features like tabbed file browsing. <application>LXQt</application> uses - less CPU and less RAM than most other environments. It is especially - useful for cloud computers with low hardware specifications, such as - netbooks, mobile devices (e.g. MIDs) or older computers, but can be used - with modern hardware. + <application>LXQt</application> is a <application>Qt</application> based + Desktop Environment. Here, we choose to build with + <application>Qt5</application>, although some parts could use + <application>Qt4</application>. It comes with a beautiful interface, + multi-language support, standard keyboard shortcuts and additional + features like tabbed file browsing. <application>LXQt</application> uses + less CPU and less RAM than most other environments. It is especially + useful for cloud computers with low hardware specifications, such as + netbooks, mobile devices (e.g. MIDs) or older computers, but can be used + with modern hardware. </para> <para> @@ -40,26 +42,22 @@ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libqtxdg.xml"/> <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="lxqt-kwindowsystem.xml"/> <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="liblxqt.xml"/> - <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libfm-qt.xml"/> - <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="lxqt-about.xml"/> - <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="lxqt-admin.xml"/> - <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="lxqt-common.xml"/> + <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="lxqt-globalkeys.xml"/> + <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="lxqt-kguiaddons.xml"/> + <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="lxqt-solid.xml"/> + <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="lxqt-panel.xml"/> + <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="pcmanfm-qt.xml"/> + <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="lxqt-qtplugin.xml"/> + <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="lxqt-policykit.xml"/> + <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="lxqt-powermanagement.xml"/> <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="lxqt-kwayland.xml"/> <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="lxqt-libkscreen.xml"/> <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="lxqt-config.xml"/> - <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="lxqt-globalkeys.xml"/> + <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="lxqt-about.xml"/> + <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="lxqt-common.xml"/> <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="lxqt-notificationd.xml"/> - <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="lxqt-policykit.xml"/> - <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="lxqt-kidletime.xml"/> - <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="lxqt-solid.xml"/> - <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="lxqt-powermanagement.xml"/> - <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="lxqt-qtplugin.xml"/> - <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="lxqt-session.xml"/> - <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="lxqt-l10n.xml"/> - <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="lxqt-kguiaddons.xml"/> - <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="lxqt-panel.xml"/> <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="lxqt-runner.xml"/> - <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="pcmanfm-qt.xml"/> + <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="lxqt-session.xml"/> <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="post-install.xml"/> </chapter> Modified: trunk/BOOK/lxqt/desktop/liblxqt.xml ============================================================================== --- trunk/BOOK/lxqt/desktop/liblxqt.xml Mon Oct 17 23:58:48 2016 (r17894) +++ trunk/BOOK/lxqt/desktop/liblxqt.xml Tue Oct 18 01:59:33 2016 (r17895) @@ -6,10 +6,10 @@ <!ENTITY liblxqt-download-http "&lxqt-http-repo;/&lxqt-version;/liblxqt-&liblxqt-version;.tar.xz"> <!ENTITY liblxqt-download-ftp " "> - <!ENTITY liblxqt-md5sum "69112c9f058493f56fe9a96f6e61ce71"> - <!ENTITY liblxqt-size "56 KB"> - <!ENTITY liblxqt-buildsize "3.4 MB"> - <!ENTITY liblxqt-time "0.2 SBU"> + <!ENTITY liblxqt-md5sum "3856e2e690612c5564dc52f5b570a438"> + <!ENTITY liblxqt-size "76 KB"> + <!ENTITY liblxqt-buildsize "4.3 MB"> + <!ENTITY liblxqt-time "0.3 SBU"> ]> <sect1 id="liblxqt" xreflabel="liblxqt-&liblxqt-version;"> @@ -70,6 +70,17 @@ </listitem> </itemizedlist> + <bridgehead renderas="sect3" revision="sysv">Additional Downloads</bridgehead> + <itemizedlist spacing="compact" revision="sysv"> + <listitem> + <para> + Optional patch, which adds <quote>Hibernate</quote> and + <quote>Suspend</quote> capabilities through ConsoleKit2 API: + <ulink url="&patch-root;/liblxqt-&liblxqt-version;-hibernate_consolekit-1.patch"/> + </para> + </listitem> + </itemizedlist> + <bridgehead renderas="sect3">liblxqt Dependencies</bridgehead> <bridgehead renderas="sect4">Required</bridgehead> @@ -79,12 +90,6 @@ <xref linkend="kf5-frameworks"/>) </para> - <bridgehead renderas="sect4">Optional</bridgehead> - <para role="optional"> - <xref linkend="git"/> (to download translation files) or - <xref linkend="lxqt-l10n"/> (to add localization files) - </para> - <para condition="html" role="usernotes"> User Notes: <ulink url="&blfs-wiki;/liblxqt"/> </para> @@ -93,6 +98,13 @@ <sect2 role="installation"> <title>Installation of liblxqt</title> + <para revision="sysv"> + Optionally apply the following patch to be able to put your system + into <quote>Suspend</quote> or <quote>Hibernate</quote> state. + </para> + +<screen revision="sysv"><userinput>patch -p1 -i ../liblxqt-&liblxqt-version;-hibernate_consolekit-1.patch</userinput></screen> + <para> Install <application>liblxqt</application> by running the following commands: @@ -103,7 +115,6 @@ cmake -DCMAKE_INSTALL_PREFIX=$LXQT_PREFIX \ -DCMAKE_BUILD_TYPE=Release \ - -DPULL_TRANSLATIONS=no \ -DCMAKE_INSTALL_LIBDIR=lib \ .. && make</userinput></screen> @@ -119,17 +130,15 @@ <screen role="root"><userinput>make install</userinput></screen> </sect2> - +<!-- <sect2 role="commands"> <title>Command Explanations</title> <para> - <parameter>-DPULL_TRANSLATIONS=no</parameter>: Removes the need for - <xref linkend="git"/>, which would otherwise be requested to download - the translation files. + <command>sed -e ...</command>: Fixes the headers for Qt5-5.5. </para> - </sect2> + </sect2>--> <sect2 role="content"> <title>Contents</title> @@ -147,7 +156,7 @@ liblxqt.so </seg> <seg> - $LXQT_PREFIX/{include,share/cmake}/lxqt + $LXQT_PREFIX/{include,share{,/cmake}}/lxqt </seg> </seglistitem> </segmentedlist> Modified: trunk/BOOK/lxqt/desktop/libqtxdg.xml ============================================================================== --- trunk/BOOK/lxqt/desktop/libqtxdg.xml Mon Oct 17 23:58:48 2016 (r17894) +++ trunk/BOOK/lxqt/desktop/libqtxdg.xml Tue Oct 18 01:59:33 2016 (r17895) @@ -6,9 +6,9 @@ <!ENTITY libqtxdg-download-http "http://downloads.lxqt.org/libqtxdg/&libqtxdg-version;/libqtxdg-&libqtxdg-version;.tar.xz"> <!ENTITY libqtxdg-download-ftp " "> - <!ENTITY libqtxdg-md5sum "a5683d77db13c6e86b6b578050c6f435"> - <!ENTITY libqtxdg-size "61 KB"> - <!ENTITY libqtxdg-buildsize "3.2 MB"> + <!ENTITY libqtxdg-md5sum "47b311531c1864dd1296515b9658b87a"> + <!ENTITY libqtxdg-size "52 KB"> + <!ENTITY libqtxdg-buildsize "2.9 MB"> <!ENTITY libqtxdg-time "0.2 SBU"> ]> @@ -78,11 +78,6 @@ <xref linkend="qt5"/> </para> - <bridgehead renderas="sect4">Optional (runtime)</bridgehead> - <para role="optional"> - <xref linkend="gtk2"/> (for <command>gtk-update-icon-cache</command>) - </para> - <para condition="html" role="usernotes"> User Notes: <ulink url="&blfs-wiki;/libqtxdg"/> </para> @@ -118,20 +113,6 @@ </sect2> - <sect2 role="commands"> - <title>Command Explanations</title> - - <para> - <option>-DBUILD_TESTS=ON</option>: Builds tests. - </para> - - <para> - <option>-DBUILD_DEV_UTILS=ON</option>: Builds and installs development - utilities. - </para> - - </sect2> - <sect2 role="content"> <title>Contents</title> @@ -145,11 +126,10 @@ None </seg> <seg> - libQt5Xdg.so and libQt5XdgIconLoader.so + libQt5Xdg.so </seg> <seg> - $LXQT_PREFIX/include/{qt5xdg,qt5xdgiconloader} and - $LXQT_PREFIX/share/cmake/{qt5xdg,qt5xdgiconloader} + $LXQT_PREFIX/{include,share}/qt5xdg </seg> </seglistitem> </segmentedlist> @@ -170,18 +150,6 @@ </indexterm> </listitem> </varlistentry> - - <varlistentry id="libQt5XdgIconLoader-lib"> - <term><filename class="libraryfile">libQt5XdgIconLoader.so</filename></term> - <listitem> - <para> - contains the <application>libQt5XdgIconLoader</application> API functions. - </para> - <indexterm zone="libqtxdg libQt5XdgIconLoader-lib"> - <primary sortas="c-libQt5XdgIconLoader">libQt5XdgIconLoader.so</primary> - </indexterm> - </listitem> - </varlistentry> </variablelist> Modified: trunk/BOOK/lxqt/desktop/libsysstat.xml ============================================================================== --- trunk/BOOK/lxqt/desktop/libsysstat.xml Mon Oct 17 23:58:48 2016 (r17894) +++ trunk/BOOK/lxqt/desktop/libsysstat.xml Tue Oct 18 01:59:33 2016 (r17895) @@ -6,7 +6,7 @@ <!ENTITY libsysstat-download-http "http://downloads.lxqt.org/libsysstat/&libsysstat-version;/libsysstat-&libsysstat-version;.tar.xz"> <!ENTITY libsysstat-download-ftp " "> - <!ENTITY libsysstat-md5sum "692042112d63d18b2f38f2f939061a6c"> + <!ENTITY libsysstat-md5sum "484c8d6bcec256724aa3109521fef36e"> <!ENTITY libsysstat-size "20 KB"> <!ENTITY libsysstat-buildsize "1.2 MB"> <!ENTITY libsysstat-time "less than 0.1 SBU"> Modified: trunk/BOOK/lxqt/desktop/lxqt-about.xml ============================================================================== --- trunk/BOOK/lxqt/desktop/lxqt-about.xml Mon Oct 17 23:58:48 2016 (r17894) +++ trunk/BOOK/lxqt/desktop/lxqt-about.xml Tue Oct 18 01:59:33 2016 (r17895) @@ -6,10 +6,10 @@ <!ENTITY lxqt-about-download-http "&lxqt-http-repo;/&lxqt-version;/lxqt-about-&lxqt-about-version;.tar.xz"> <!ENTITY lxqt-about-download-ftp " "> - <!ENTITY lxqt-about-md5sum "fc03056a2226f78da99acaeb5ce78e80"> - <!ENTITY lxqt-about-size "21 KB"> - <!ENTITY lxqt-about-buildsize "1.4 MB"> - <!ENTITY lxqt-about-time "less than 0.1 SBU"> + <!ENTITY lxqt-about-md5sum "6de6c3f0ab13bb65fb94abe508a90f3a"> + <!ENTITY lxqt-about-size "32 KB"> + <!ENTITY lxqt-about-buildsize "2 MB"> + <!ENTITY lxqt-about-time "0.1 SBU"> ]> <sect1 id="lxqt-about" xreflabel="lxqt-about-&lxqt-about-version;"> @@ -77,12 +77,6 @@ <xref linkend="liblxqt"/> </para> - <bridgehead renderas="sect4">Optional</bridgehead> - <para role="optional"> - <xref linkend="git"/> (to download translation files) or - <xref linkend="lxqt-l10n"/> (to add localization files) - </para> - <para condition="html" role="usernotes"> User Notes: <ulink url="&blfs-wiki;/lxqt-about"/> </para> @@ -101,7 +95,6 @@ cmake -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=$LXQT_PREFIX \ - -DPULL_TRANSLATIONS=no \ .. && make</userinput></screen> @@ -118,17 +111,6 @@ </sect2> - <sect2 role="commands"> - <title>Command Explanations</title> - - <para> - <parameter>-DPULL_TRANSLATIONS=no</parameter>: Removes the need for - <xref linkend="git"/>, which would otherwise be requested to download - the translation files. - </para> - - </sect2> - <sect2 role="content"> <title>Contents</title> @@ -145,7 +127,7 @@ None </seg> <seg> - None + $LXQT_PREFIX/share/lxqt/translations/lxqt-about </seg> </seglistitem> </segmentedlist> Modified: trunk/BOOK/lxqt/desktop/lxqt-common.xml ============================================================================== --- trunk/BOOK/lxqt/desktop/lxqt-common.xml Mon Oct 17 23:58:48 2016 (r17894) +++ trunk/BOOK/lxqt/desktop/lxqt-common.xml Tue Oct 18 01:59:33 2016 (r17895) @@ -6,10 +6,10 @@ <!ENTITY lxqt-common-download-http "&lxqt-http-repo;/&lxqt-version;/lxqt-common-&lxqt-common-version;.tar.xz"> <!ENTITY lxqt-common-download-ftp " "> - <!ENTITY lxqt-common-md5sum "cd3beb74d1634922f720581a39a3ae84"> - <!ENTITY lxqt-common-size "3.1 MB"> - <!ENTITY lxqt-common-buildsize "10 MB"> - <!ENTITY lxqt-common-time "less than 0.1 SBU"> + <!ENTITY lxqt-common-md5sum "6bf2c06e0de15da33a054bb02b681b02"> + <!ENTITY lxqt-common-size "3.9 MB"> + <!ENTITY lxqt-common-buildsize "12 MB"> + <!ENTITY lxqt-common-time "less than 0.1 SBU (desktop, mime and hicolor databases and cache updates take over 0.1 SBU)"> ]> <sect1 id="lxqt-common" xreflabel="lxqt-common-&lxqt-common-version;"> @@ -30,8 +30,7 @@ <title>Introduction to lxqt-common</title> <para> - The <application>lxqt-common</application> package provides common files - for various <application>LXQt</application> components. + The <application>lxqt-common</application> package provides common files for <application>LXQt</application>. </para> &lfs7a_checked; @@ -75,8 +74,26 @@ <bridgehead renderas="sect4">Required</bridgehead> <para role="required"> <xref linkend="liblxqt"/>, - <xref linkend="hicolor-icon-theme"/>, and at runtime - <xref linkend="xorg7-app"/> (for <command>xmessage</command>) + <xref linkend="openbox"/> (runtime - may be replaced by another WM, e.g. + <xref linkend="xfwm4"/>), + <xref linkend="xdg-utils"/> + </para> + + <bridgehead renderas="sect4">Recommended</bridgehead> + <para role="recommended"> + <phrase revision="sysv"><xref linkend="consolekit"/> alone or with</phrase> + <xref linkend="lxdm"/><phrase revision='sysv'> or another Display Manager, e.g. + <xref linkend="sddm"/> (this has been + reported as the <quote>recommended <application>LXQt</application> + display manager</quote>)</phrase>, + <xref linkend="desktop-file-utils"/>, + <xref linkend="hicolor-icon-theme"/>, and + <xref linkend="shared-mime-info"/> + </para> + + <bridgehead renderas="sect4">Optional</bridgehead> + <para role="optional"> + <xref linkend="xscreensaver"/> </para> <para condition="html" role="usernotes"> @@ -92,10 +109,7 @@ commands: </para> -<screen><userinput>sed -e '/TryExec/s@=@='$LXQT_PREFIX'/bin/@' \ - -i xsession/lxqt.desktop.in && - -mkdir -v build && +<screen><userinput>mkdir -v build && cd build && cmake -DCMAKE_BUILD_TYPE=Release \ @@ -113,18 +127,15 @@ <screen role="root"><userinput>make install</userinput></screen> - </sect2> - - <sect2 role="commands"> - <title>Command Explanations</title> - <para> - <command>sed -e '/TryExec/s@=@='$LXQT_PREFIX'/bin/@' -i xsessions/lxqt.desktop.in</command>: - If using a display manager, the full path of the <quote>TryExec</quote> - directive has to be given so that the <application>LXQt</application> - desktop appear in the sessions list. + If you have installed recommended dependencies, run the following + commands as <systemitem class="username">root</systemitem> user: </para> +<screen role="root"><userinput>update-mime-database /usr/share/mime && +xdg-icon-resource forceupdate --theme hicolor && +update-desktop-database -q</userinput></screen> + </sect2> <sect2 role="content"> @@ -143,7 +154,7 @@ None </seg> <seg> - /etc/xdg/{pcmanfm-qt,lxqt} and + /etc/xdg/pcmanfm-qt/lxqt and $LXQT_PREFIX/share/{desktop-directories,lxqt/{graphics,openbox,themes}} </seg> </seglistitem> Modified: trunk/BOOK/lxqt/desktop/lxqt-config.xml ============================================================================== --- trunk/BOOK/lxqt/desktop/lxqt-config.xml Mon Oct 17 23:58:48 2016 (r17894) +++ trunk/BOOK/lxqt/desktop/lxqt-config.xml Tue Oct 18 01:59:33 2016 (r17895) @@ -6,10 +6,10 @@ <!ENTITY lxqt-config-download-http "&lxqt-http-repo;/&lxqt-version;/lxqt-config-&lxqt-config-version;.tar.xz"> <!ENTITY lxqt-config-download-ftp " "> - <!ENTITY lxqt-config-md5sum "e50bf87b509ec57281cda154b272392c"> - <!ENTITY lxqt-config-size "192 KB"> - <!ENTITY lxqt-config-buildsize "10 MB"> - <!ENTITY lxqt-config-time "0.7 SBU"> + <!ENTITY lxqt-config-md5sum "b7a338a1348abe27911893ba6f69cbc2"> + <!ENTITY lxqt-config-size "152 KB"> + <!ENTITY lxqt-config-buildsize "12 MB"> + <!ENTITY lxqt-config-time "0.8 SBU"> ]> <sect1 id="lxqt-config" xreflabel="lxqt-config-&lxqt-config-version;"> @@ -79,12 +79,6 @@ <xref linkend="plasma5-build"/>) </para> - <bridgehead renderas="sect4">Optional</bridgehead> - <para role="optional"> - <xref linkend="git"/> (to download translation files) or - <xref linkend="lxqt-l10n"/> (to add localization files) - </para> - <para condition="html" role="usernotes"> User Notes: <ulink url="&blfs-wiki;/lxqt-config"/> </para> @@ -103,8 +97,6 @@ cmake -DCMAKE_INSTALL_PREFIX=$LXQT_PREFIX \ -DCMAKE_BUILD_TYPE=Release \ - -DPULL_TRANSLATIONS=no \ - -DCMAKE_INSTALL_LIBDIR=lib \ .. && make</userinput></screen> @@ -120,17 +112,15 @@ <screen role="root"><userinput>make install</userinput></screen> </sect2> - +<!-- <sect2 role="commands"> <title>Command Explanations</title> <para> - <parameter>-DPULL_TRANSLATIONS=no</parameter>: Removes the need for - <xref linkend="git"/>, which would otherwise be requested to download - the translation files. + <command>sed -e ...</command>: Fixes the headers for Qt-5.5. </para> - </sect2> + </sect2>--> <sect2 role="content"> <title>Contents</title> @@ -142,15 +132,14 @@ <seglistitem> <seg> - lxqt-config, lxqt-config-appearance, lxqt-config-brightness, - lxqt-config-file-associations, lxqt-config-input, lxqt-config-locale, - and lxqt-config-monitor + lxqt-config, lxqt-config-file-associations, lxqt-config-monitor, + lxqt-config-appearance, and lxqt-config-input </seg> <seg> liblxqt-config-cursor.so </seg> <seg> - $LXQT_PREFIX/lib/lxqt-config + $LXQT_PREFIX/share/lxqt/translations/lxqt-config{,-appearance,-cursor,-file-associations,-input,-monitor} </seg> </seglistitem> </segmentedlist> @@ -185,18 +174,6 @@ </listitem> </varlistentry> - <varlistentry id="lxqt-config-brightness"> - <term><command>lxqt-config-brightness</command></term> - <listitem> - <para> - configures brightness settings of ouput devices. - </para> - <indexterm zone="lxqt-config lxqt-config-brightness"> - <primary sortas="b-lxqt-config-brightness">lxqt-config-brightness</primary> - </indexterm> - </listitem> - </varlistentry> - <varlistentry id="lxqt-config-file-associations"> <term><command>lxqt-config-file-associations</command></term> <listitem> @@ -223,19 +200,6 @@ </indexterm> </listitem> </varlistentry> - - <varlistentry id="lxqt-config-locale"> - <term><command>lxqt-config-locale</command></term> - <listitem> - <para> - configures the locale used in <application>LXQt</application> - sessions. - </para> - <indexterm zone="lxqt-config lxqt-config-locale"> - <primary sortas="b-lxqt-config-locale">lxqt-config-locale</primary> - </indexterm> - </listitem> - </varlistentry> <varlistentry id="lxqt-config-monitor"> <term><command>lxqt-config-monitor</command></term> Modified: trunk/BOOK/lxqt/desktop/lxqt-globalkeys.xml ============================================================================== --- trunk/BOOK/lxqt/desktop/lxqt-globalkeys.xml Mon Oct 17 23:58:48 2016 (r17894) +++ trunk/BOOK/lxqt/desktop/lxqt-globalkeys.xml Tue Oct 18 01:59:33 2016 (r17895) @@ -6,10 +6,10 @@ <!ENTITY lxqt-globalkeys-download-http "&lxqt-http-repo;/&lxqt-version;/lxqt-globalkeys-&lxqt-globalkeys-version;.tar.xz"> <!ENTITY lxqt-globalkeys-download-ftp " "> - <!ENTITY lxqt-globalkeys-md5sum "827836c3d33195efd7ddb580887c0769"> - <!ENTITY lxqt-globalkeys-size "49 KB"> - <!ENTITY lxqt-globalkeys-buildsize "6.2 MB"> - <!ENTITY lxqt-globalkeys-time "0.4 SBU"> + <!ENTITY lxqt-globalkeys-md5sum "7657a595119fea4d4d08253b0816b792"> + <!ENTITY lxqt-globalkeys-size "52 KB"> + <!ENTITY lxqt-globalkeys-buildsize "6.6 MB"> + <!ENTITY lxqt-globalkeys-time "0.5 SBU"> ]> <sect1 id="lxqt-globalkeys" xreflabel="lxqt-globalkeys-&lxqt-globalkeys-version;"> @@ -77,12 +77,6 @@ <xref linkend="liblxqt"/> </para> - <bridgehead renderas="sect4">Optional</bridgehead> - <para role="optional"> - <xref linkend="git"/> (to download translation files) or - <xref linkend="lxqt-l10n"/> (to add localization files) - </para> - <para condition="html" role="usernotes"> User Notes: <ulink url="&blfs-wiki;/lxqt-globalkeys"/> </para> @@ -101,7 +95,6 @@ cmake -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=$LXQT_PREFIX \ - -DPULL_TRANSLATIONS=no \ -DCMAKE_INSTALL_LIBDIR=lib \ .. && @@ -119,17 +112,6 @@ </sect2> - <sect2 role="commands"> - <title>Command Explanations</title> - - <para> - <parameter>-DPULL_TRANSLATIONS=no</parameter>: Removes the need for - <xref linkend="git"/>, which would otherwise be requested to download - the translation files. - </para> - - </sect2> - <sect2 role="content"> <title>Contents</title> @@ -146,8 +128,9 @@ liblxqt-globalkeys.so and liblxqt-globalkeys-ui.so </seg> <seg> - $LXQT_PREFIX/include/lxqt-globalkeys{,-ui} - and $LXQT_PREFIX/share/cmake/lxqt-globalkeys{,-ui} + $LXQT_PREFIX/include/lxqt-globalkeys, + $LXQT_PREFIX/share/lxqt/translations/lxqt-config-globalkeyshortcuts and + $LXQT_PREFIX/lib/cmake/lxqt-globalkeys{,-ui} </seg> </seglistitem> </segmentedlist> Modified: trunk/BOOK/lxqt/desktop/lxqt-notificationd.xml ============================================================================== --- trunk/BOOK/lxqt/desktop/lxqt-notificationd.xml Mon Oct 17 23:58:48 2016 (r17894) +++ trunk/BOOK/lxqt/desktop/lxqt-notificationd.xml Tue Oct 18 01:59:33 2016 (r17895) @@ -6,10 +6,10 @@ <!ENTITY lxqt-notificationd-download-http "&lxqt-http-repo;/&lxqt-version;/lxqt-notificationd-&lxqt-notificationd-version;.tar.xz"> <!ENTITY lxqt-notificationd-download-ftp " "> - <!ENTITY lxqt-notificationd-md5sum "19f4f8a46174f349a3956f0024c5744a"> - <!ENTITY lxqt-notificationd-size "30 KB"> - <!ENTITY lxqt-notificationd-buildsize "2.3 MB"> - <!ENTITY lxqt-notificationd-time "0.15 SBU"> + <!ENTITY lxqt-notificationd-md5sum "6fc72335b4cb0ae1db3cbbcc2f6e38ca"> + <!ENTITY lxqt-notificationd-size "32 KB"> + <!ENTITY lxqt-notificationd-buildsize "2.5 MB"> + <!ENTITY lxqt-notificationd-time "0.2 SBU"> ]> <sect1 id="lxqt-notificationd" xreflabel="lxqt-notificationd-&lxqt-notificationd-version;"> @@ -78,12 +78,6 @@ <xref linkend="lxqt-common"/> </para> - <bridgehead renderas="sect4">Optional</bridgehead> - <para role="optional"> - <xref linkend="git"/> (to download translation files) or - <xref linkend="lxqt-l10n"/> (to add localization files) - </para> - <para condition="html" role="usernotes"> User Notes: <ulink url="&blfs-wiki;/lxqt-notificationd"/> </para> @@ -102,7 +96,6 @@ cmake -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=$LXQT_PREFIX \ - -DPULL_TRANSLATIONS=no \ .. && make</userinput></screen> @@ -118,17 +111,20 @@ <screen role="root"><userinput>make install</userinput></screen> </sect2> - +<!-- <sect2 role="commands"> <title>Command Explanations</title> <para> - <parameter>-DPULL_TRANSLATIONS=no</parameter>: Removes the need for - <xref linkend="git"/>, which would otherwise be requested to download - the translation files. + <command>sed -e ... src/notification.cpp</command>: Fixes the headers for KF5. </para> - </sect2> + <para> + <command>sed -e ... config/basicsettings.cpp</command>: Fixes the headers for + Qt5-5.5. + </para> + + </sect2>--> <sect2 role="content"> <title>Contents</title> @@ -146,7 +142,7 @@ None </seg> <seg> - None + $LXQT_PREFIX/share/lxqt/translations/lxqt-{config-,}notificationd </seg> </seglistitem> </segmentedlist> Modified: trunk/BOOK/lxqt/desktop/lxqt-panel.xml ============================================================================== --- trunk/BOOK/lxqt/desktop/lxqt-panel.xml Mon Oct 17 23:58:48 2016 (r17894) +++ trunk/BOOK/lxqt/desktop/lxqt-panel.xml Tue Oct 18 01:59:33 2016 (r17895) @@ -6,10 +6,10 @@ <!ENTITY lxqt-panel-download-http "&lxqt-http-repo;/&lxqt-version;/lxqt-panel-&lxqt-panel-version;.tar.xz"> <!ENTITY lxqt-panel-download-ftp " "> - <!ENTITY lxqt-panel-md5sum "6548d7dcb8bf55eef75ba1c601eb4992"> - <!ENTITY lxqt-panel-size "257 KB"> - <!ENTITY lxqt-panel-buildsize "23 MB"> - <!ENTITY lxqt-panel-time "1.3 SBU"> + <!ENTITY lxqt-panel-md5sum "4a884aa9a59b2f554204ab3491663edc"> + <!ENTITY lxqt-panel-size "324 KB"> + <!ENTITY lxqt-panel-buildsize "31 MB"> + <!ENTITY lxqt-panel-time "1.8 SBU"> ]> <sect1 id="lxqt-panel" xreflabel="lxqt-panel-&lxqt-panel-version;"> @@ -78,8 +78,9 @@ (<xref linkend="lxqt-kguiaddons"/> and <xref linkend="lxqt-solid"/>) (keyboard indicator plugin), <xref linkend="lxqt-globalkeys"/>, - <xref linkend="libdbusmenu-qt"/>, + <xref linkend="libdbusmenu-qt"/> (built against Qt5), <xref linkend="liblxqt"/>, + <xref linkend="libxkbcommon"/>, <xref linkend="lxmenu-data"/>, and <xref linkend="menu-cache"/> </para> @@ -88,18 +89,11 @@ <para role="recommended"> <xref linkend="alsa-lib"/> or <xref linkend="pulseaudio"/> (volume plugin), - <xref linkend="libstatgrab"/> (network monitor and CPU load plugins), - <xref linkend="libsysstat"/> (CPU and network monitor plugins), - <xref linkend="libxkbcommon"/> (keyboard indicator plugin), and + <xref linkend="libstatgrab"/> (system statistics plugin), + <xref linkend="libsysstat"/> (CPU and network monitor plugins), and <xref linkend="lm_sensors"/> (sensors plugin) </para> - <bridgehead renderas="sect4">Optional</bridgehead> - <para role="optional"> - <xref linkend="git"/> (to download translation files) or - <xref linkend="lxqt-l10n"/> (to add localization files) - </para> - <para condition="html" role="usernotes"> User Notes: <ulink url="&blfs-wiki;/lxqt-panel"/> </para> @@ -113,12 +107,14 @@ commands: </para> -<screen><userinput>mkdir -v build && +<screen><userinput>sed -e 's:<KF5/KWindowSystem/:<:' \ + -i plugin-taskbar/lxqttaskgroup.{h,cpp} && + +mkdir -v build && cd build && cmake -DCMAKE_INSTALL_PREFIX=$LXQT_PREFIX \ -DCMAKE_BUILD_TYPE=Release \ - -DPULL_TRANSLATIONS=no \ -DCMAKE_INSTALL_LIBDIR=lib \ .. && make</userinput></screen> @@ -139,22 +135,7 @@ <title>Command Explanations</title> <para> - <parameter>-DPULL_TRANSLATIONS=no</parameter>: Removes the need for - <xref linkend="git"/>, which would otherwise be requested to download - the translation files. - </para> - - <para> - <option>-D<plugin>_PLUGIN=no</option>: Disable $lt;plugin>, - where <plugin> may be CLOCK, COLORPICKER, CPULOAD, DIRECTORYMENU, - DESKTOPSWITCH, KBINDICATOR, MAINMENU, MOUNT, QUICKLAUNCH, SENSORS, - SHOWDESKTOP, NETWORKMONITOR, SYSSTAT, TASKBAR, STATUSNOTIFIER, TRAY, - VOLUME, WORLDCLOCK, or SPACER, - </para> - - <para> - <option>-DVOLUME_USE_<backend>=no</option>: Disable support - for <backend> in volume plugin, where backend is ALSA or PULSEAUDIO. + <command>sed ...</command>: Fixes the headers for KF5. </para> </sect2> @@ -176,7 +157,7 @@ </seg> <seg> /etc/xdg/lxqt, - $LXQT_PREFIX/share/lxqt/lxqt-panel and + $LXQT_PREFIX/share/lxqt/{,translations/}lxqt-panel and $LXQT_PREFIX/lib/lxqt-panel </seg> </seglistitem> Modified: trunk/BOOK/lxqt/desktop/lxqt-policykit.xml ============================================================================== --- trunk/BOOK/lxqt/desktop/lxqt-policykit.xml Mon Oct 17 23:58:48 2016 (r17894) +++ trunk/BOOK/lxqt/desktop/lxqt-policykit.xml Tue Oct 18 01:59:33 2016 (r17895) @@ -6,9 +6,9 @@ <!ENTITY lxqt-policykit-download-http "&lxqt-http-repo;/&lxqt-version;/lxqt-policykit-&lxqt-policykit-version;.tar.xz"> <!ENTITY lxqt-policykit-download-ftp " "> - <!ENTITY lxqt-policykit-md5sum "53b05581fae0b69d0979ae487048021d"> - <!ENTITY lxqt-policykit-size "31 KB"> - <!ENTITY lxqt-policykit-buildsize "936 KB"> + <!ENTITY lxqt-policykit-md5sum "1a740ac879b6363e5a0c043ed6f7602a"> + <!ENTITY lxqt-policykit-size "16 KB"> + <!ENTITY lxqt-policykit-buildsize "996 KB"> <!ENTITY lxqt-policykit-time "less than 0.1 SBU"> ]> @@ -75,13 +75,9 @@ <bridgehead renderas="sect4">Required</bridgehead> <para role="required"> <xref linkend="liblxqt"/>, - <xref linkend="polkit-qt"/> - </para> - - <bridgehead renderas="sect4">Optional</bridgehead> - <para role="optional"> - <xref linkend="git"/> (to download translation files) or - <xref linkend="lxqt-l10n"/> (to add localization files) + <xref linkend="polkit-qt"/> (Qt5), and + (<xref linkend="lxqt-kwindowsystem"/> or + <xref linkend="kf5-frameworks"/>) </para> <para condition="html" role="usernotes"> @@ -102,7 +98,6 @@ cmake -DCMAKE_INSTALL_PREFIX=$LXQT_PREFIX \ -DCMAKE_BUILD_TYPE=Release \ - -DPULL_TRANSLATIONS=no \ .. && make</userinput></screen> @@ -119,17 +114,6 @@ </sect2> - <sect2 role="commands"> - <title>Command Explanations</title> - - <para> - <parameter>-DPULL_TRANSLATIONS=no</parameter>: Removes the need for - <xref linkend="git"/>, which would otherwise be requested to download - the translation files. - </para> - - </sect2> - <sect2 role="content"> <title>Contents</title> @@ -146,7 +130,7 @@ None </seg> <seg> - None + $LXQT_PREFIX/share/lxqt/translations/lxqt-policykit-agent </seg> </seglistitem> </segmentedlist> Modified: trunk/BOOK/lxqt/desktop/lxqt-powermanagement.xml ============================================================================== --- trunk/BOOK/lxqt/desktop/lxqt-powermanagement.xml Mon Oct 17 23:58:48 2016 (r17894) +++ trunk/BOOK/lxqt/desktop/lxqt-powermanagement.xml Tue Oct 18 01:59:33 2016 (r17895) @@ -6,10 +6,10 @@ <!ENTITY lxqt-powermanagement-download-http "&lxqt-http-repo;/&lxqt-version;/lxqt-powermanagement-&lxqt-powermanagement-version;.tar.xz"> <!ENTITY lxqt-powermanagement-download-ftp " "> - <!ENTITY lxqt-powermanagement-md5sum "cde27ffc5e8000e9ba927321e5f0ba20"> - <!ENTITY lxqt-powermanagement-size "29 KB"> - <!ENTITY lxqt-powermanagement-buildsize "3.1 MB"> - <!ENTITY lxqt-powermanagement-time "0.2 SBU"> + <!ENTITY lxqt-powermanagement-md5sum "e17763f5e7c2a9f8595a58209d51cb86"> + <!ENTITY lxqt-powermanagement-size "40 KB"> + <!ENTITY lxqt-powermanagement-buildsize "3.6 MB"> + <!ENTITY lxqt-powermanagement-time "0.3 SBU"> ]> <sect1 id="lxqt-powermanagement" xreflabel="lxqt-powermanagement-&lxqt-powermanagement-version;"> @@ -74,17 +74,10 @@ <bridgehead renderas="sect4">Required</bridgehead> <para role="required"> + <xref linkend="hicolor-icon-theme"/>, <xref linkend="liblxqt"/>, - (<xref linkend="lxqt-kidletime"/> and - <xref linkend="lxqt-solid"/>) or - <xref linkend="kf5-frameworks"/>, and - <xref linkend="upower"/> - </para> - - <bridgehead renderas="sect4">Optional</bridgehead> - <para role="optional"> - <xref linkend="git"/> (to download translation files) or - <xref linkend="lxqt-l10n"/> (to add localization files) + <xref linkend="upower"/>, and + <xref linkend="xdg-utils"/> </para> <para condition="html" role="usernotes"> @@ -96,8 +89,8 @@ <title>Installation of lxqt-powermanagement</title> <para> - Install <application>lxqt-powermanagement</application> by running the - following commands: + Install <application>lxqt-powermanagement</application> by running the following + commands: </para> <screen><userinput>mkdir -v build && @@ -105,7 +98,6 @@ cmake -DCMAKE_INSTALL_PREFIX=$LXQT_PREFIX \ -DCMAKE_BUILD_TYPE=Release \ - -DPULL_TRANSLATIONS=no \ .. && make</userinput></screen> @@ -122,17 +114,6 @@ </sect2> - <sect2 role="commands"> - <title>Command Explanations</title> - - <para> - <parameter>-DPULL_TRANSLATIONS=no</parameter>: Remove the need for - <xref linkend="git"/>, which would otherwise be requested to download - the translation files. - </para> - - </sect2> - <sect2 role="content"> <title>Contents</title> @@ -149,7 +130,7 @@ None </seg> <seg> - None + $LXQT_PREFIX/share/lxqt/translations/lxqt-{config-,}powermanagement </seg> </seglistitem> </segmentedlist> Modified: trunk/BOOK/lxqt/desktop/lxqt-qtplugin.xml ============================================================================== --- trunk/BOOK/lxqt/desktop/lxqt-qtplugin.xml Mon Oct 17 23:58:48 2016 (r17894) +++ trunk/BOOK/lxqt/desktop/lxqt-qtplugin.xml Tue Oct 18 01:59:33 2016 (r17895) @@ -6,8 +6,8 @@ <!ENTITY lxqt-qtplugin-download-http "&lxqt-http-repo;/&lxqt-version;/lxqt-qtplugin-&lxqt-qtplugin-version;.tar.xz"> <!ENTITY lxqt-qtplugin-download-ftp " "> - <!ENTITY lxqt-qtplugin-md5sum "d75b3566581dccea9d55de731c49d844"> - <!ENTITY lxqt-qtplugin-size "20 KB"> + <!ENTITY lxqt-qtplugin-md5sum "f16426b72cbb78211714a5e08dd15665"> + <!ENTITY lxqt-qtplugin-size "24 KB"> <!ENTITY lxqt-qtplugin-buildsize "1.4 MB"> <!ENTITY lxqt-qtplugin-time "0.1 SBU"> ]> @@ -75,8 +75,7 @@ <bridgehead renderas="sect4">Required</bridgehead> <para role="required"> - <xref linkend="liblxqt"/> and - <xref linkend="libdbusmenu-qt"/> + <xref linkend="liblxqt"/> </para> <para condition="html" role="usernotes"> @@ -113,30 +112,6 @@ </sect2> - <sect2 role="configuration"> - <title>Configuring lxqt-qtplugin</title> - - <sect3><title>Configuration Information</title> - - <para> - To use the plugin in Qt 5, the environment variable - <envar>QT_QPA_PLATFORMTHEME</envar> must be set to <quote>lxqt</quote>. - One way to do that is to issue as the <systemitem - class="username">root</systemitem> user: - </para> - -<screen role="root"><userinput>cat >> /etc/profile.d/lxqt.sh << "EOF" -<literal># Begin lxqt-qtplugin configuration - -export QT_QPA_PLATFORMTHEME=lxqt - -# End lxqt-qtplugin configuration</literal> -EOF</userinput></screen> - - </sect3> - - </sect2> - <sect2 role="content"> <title>Contents</title> @@ -153,7 +128,7 @@ libqtlxqt.so </seg> <seg> - $QT5DIR/plugins/platformthemes + /opt/qt5/plugins/platformthemes </seg> </seglistitem> </segmentedlist> @@ -168,7 +143,7 @@ <term><filename class="libraryfile">libqtlxqt.so</filename></term> <listitem> <para> - contains the LXQt QT plugin. + contains the <application>libqtlxqt</application> API functions. </para> <indexterm zone="lxqt-qtplugin libqtlxqt-lib"> <primary sortas="c-libqtlxqt">libqtlxqt.so</primary> Modified: trunk/BOOK/lxqt/desktop/lxqt-runner.xml ============================================================================== --- trunk/BOOK/lxqt/desktop/lxqt-runner.xml Mon Oct 17 23:58:48 2016 (r17894) +++ trunk/BOOK/lxqt/desktop/lxqt-runner.xml Tue Oct 18 01:59:33 2016 (r17895) @@ -6,10 +6,10 @@ <!ENTITY lxqt-runner-download-http "&lxqt-http-repo;/&lxqt-version;/lxqt-runner-&lxqt-runner-version;.tar.xz"> <!ENTITY lxqt-runner-download-ftp " "> - <!ENTITY lxqt-runner-md5sum "1775481281003297bf290471a583f22a"> - <!ENTITY lxqt-runner-size "204 KB"> - <!ENTITY lxqt-runner-buildsize "2.1 MB"> - <!ENTITY lxqt-runner-time "0.2 SBU"> + <!ENTITY lxqt-runner-md5sum "eab734eed0a904672f9367732bd5b511"> + <!ENTITY lxqt-runner-size "192 KB"> + <!ENTITY lxqt-runner-buildsize "2.6 MB"> + <!ENTITY lxqt-runner-time "0.1 SBU"> ]> <sect1 id="lxqt-runner" xreflabel="lxqt-runner-&lxqt-runner-version;"> @@ -70,29 +70,15 @@ </listitem> </itemizedlist> - <bridgehead renderas="sect3">Additional Downloads</bridgehead> - <itemizedlist spacing="compact"> - <listitem> - <para> - Required patch to fix a misplaced <quote>#endif</quote>: - <ulink url="&patch-root;/lxqt-runner-&lxqt-runner-version;-fix_endif-1.patch"/> - </para> - </listitem> - </itemizedlist> - <bridgehead renderas="sect3">lxqt-runner Dependencies</bridgehead> <bridgehead renderas="sect4">Required</bridgehead> <para role="required"> - <xref linkend="lxqt-globalkeys"/> and - <xref linkend="menu-cache"/> - </para> - - <bridgehead renderas="sect4">Optional</bridgehead> - <para role="optional"> - <xref linkend="git"/> (to download translation files) or - <xref linkend="lxqt-l10n"/> (to add localization files), and - <ulink url="http://muparser.beltoforion.de">muparser</ulink> + <xref linkend="lxqt-common"/>, + <xref linkend="lxqt-globalkeys"/>, + <xref linkend="menu-cache"/>, and + (<xref linkend="lxqt-kwindowsystem"/> or + <xref linkend="kf5-frameworks"/>) </para> <para condition="html" role="usernotes"> @@ -108,15 +94,11 @@ commands: </para> -<screen><userinput>patch -p1 -i ../lxqt-runner-&lxqt-runner-version;-fix_endif-1.patch && - -mkdir -v build && +<screen><userinput>mkdir -v build && cd build && cmake -DCMAKE_BUILD_TYPE=Release \ - -DRUNNER_MATH=OFF \ -DCMAKE_INSTALL_PREFIX=$LXQT_PREFIX \ - -DPULL_TRANSLATIONS=no \ .. && make</userinput></screen> @@ -132,24 +114,15 @@ <screen role="root"><userinput>make install</userinput></screen> </sect2> - +<!-- <sect2 role="commands"> <title>Command Explanations</title> <para> - <parameter>-DRUNNER_MATH=OFF</parameter>: Removes the dependency on - <application>muparser</application>. If you want Math expression support, - in <application>lxqt-runner</application>, install - <application>muparser</application> and remove this switch. - </para> - - <para> - <parameter>-DPULL_TRANSLATIONS=no</parameter>: Removes the need for - <xref linkend="git"/>, which would otherwise be requested to download - the translation files. + <command>sed ...</command>: Fixes the headers for KF5. </para> - </sect2> + </sect2>--> <sect2 role="use"> <title>Using lxqt-runner</title> @@ -179,7 +152,7 @@ None </seg> <seg> - None + $LXQT_PREFIX/share/lxqt/translations/lxqt-runner </seg> </seglistitem> </segmentedlist> Modified: trunk/BOOK/lxqt/desktop/lxqt-session.xml ============================================================================== --- trunk/BOOK/lxqt/desktop/lxqt-session.xml Mon Oct 17 23:58:48 2016 (r17894) +++ trunk/BOOK/lxqt/desktop/lxqt-session.xml Tue Oct 18 01:59:33 2016 (r17895) @@ -6,10 +6,10 @@ <!ENTITY lxqt-session-download-http "&lxqt-http-repo;/&lxqt-version;/lxqt-session-&lxqt-session-version;.tar.xz"> <!ENTITY lxqt-session-download-ftp " "> - <!ENTITY lxqt-session-md5sum "bfc0553d4afbaddf55fa10b674991202"> - <!ENTITY lxqt-session-size "118 KB"> - <!ENTITY lxqt-session-buildsize "4.7 MB"> - <!ENTITY lxqt-session-time "0.3 SBU"> + <!ENTITY lxqt-session-md5sum "c50065bf9fba51a5299fab45af4c8ffc"> + <!ENTITY lxqt-session-size "64 KB"> + <!ENTITY lxqt-session-buildsize "5.4 MB"> + <!ENTITY lxqt-session-time "0.4 SBU"> ]> <sect1 id="lxqt-session" xreflabel="lxqt-session-&lxqt-session-version;"> @@ -75,14 +75,7 @@ <bridgehead renderas="sect4">Required</bridgehead> <para role="required"> <xref linkend="liblxqt"/> and - (<xref linkend="lxqt-kwindowsystem"/> or - <xref linkend="kf5-frameworks"/>) - </para> - - <bridgehead renderas="sect4">Optional</bridgehead> - <para role="optional"> - <xref linkend="git"/> (to download translation files) or - <xref linkend="lxqt-l10n"/> (to add localization files) + <xref linkend="lxqt-common"/> </para> <para condition="html" role="usernotes"> @@ -98,12 +91,13 @@ commands: </para> -<screen><userinput>mkdir -v build && +<screen><userinput>sed -i s/minimumSize/size/ lxqt-leave/main.cpp && + +mkdir -v build && cd build && cmake -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=$LXQT_PREFIX \ - -DPULL_TRANSLATIONS=no \ .. && make</userinput></screen> @@ -124,9 +118,8 @@ <title>Command Explanations</title> <para> - <parameter>-DPULL_TRANSLATIONS=no</parameter>: Removes the need for - <xref linkend="git"/>, which would otherwise be requested to download - the translation files. + <command>sed ...</command>: Works around a bug preventing the + <quote>leave</quote> dialog window to show up. </para> </sect2> @@ -178,7 +171,7 @@ None </seg> <seg> - None + $LXQT_PREFIX/share/lxqt/translations/lxqt-{config-session,leave,session} </seg> </seglistitem> </segmentedlist> Modified: trunk/BOOK/lxqt/desktop/lxqt-solid.xml ============================================================================== --- trunk/BOOK/lxqt/desktop/lxqt-solid.xml Mon Oct 17 23:58:48 2016 (r17894) +++ trunk/BOOK/lxqt/desktop/lxqt-solid.xml Tue Oct 18 01:59:33 2016 (r17895) @@ -85,8 +85,6 @@ <bridgehead renderas="sect4">Optional (runtime)</bridgehead> <para role="optional"> - <xref linkend="udisks2"/>, - <xref linkend="upower"/>, and <ulink url="http://www.freedesktop.org/wiki/Software/media-player-info"> media-player-info</ulink> </para> Modified: trunk/BOOK/lxqt/desktop/pcmanfm-qt.xml ============================================================================== --- trunk/BOOK/lxqt/desktop/pcmanfm-qt.xml Mon Oct 17 23:58:48 2016 (r17894) +++ trunk/BOOK/lxqt/desktop/pcmanfm-qt.xml Tue Oct 18 01:59:33 2016 (r17895) @@ -4,12 +4,12 @@ <!ENTITY % general-entities SYSTEM "../../general.ent"> %general-entities; - <!ENTITY pcmanfm-qt-download-http "http://downloads.lxqt.org/pcmanfm-qt/&pcmanfm-qt-version;/pcmanfm-qt-&pcmanfm-qt-version;.tar.xz"> + <!ENTITY pcmanfm-qt-download-http "&lxqt-http-repo;/&lxqt-version;/pcmanfm-qt-&pcmanfm-qt-version;.tar.xz"> <!ENTITY pcmanfm-qt-download-ftp " "> - <!ENTITY pcmanfm-qt-md5sum "6e506e5755f9f5276dd69dbb15467303"> - <!ENTITY pcmanfm-qt-size "91 KB"> - <!ENTITY pcmanfm-qt-buildsize "4.6 MB"> - <!ENTITY pcmanfm-qt-time "0.25 SBU"> + <!ENTITY pcmanfm-qt-md5sum "9a69dcb7940123e2b17523855ccda6ae"> + <!ENTITY pcmanfm-qt-size "224 KB"> + <!ENTITY pcmanfm-qt-buildsize "13 MB"> + <!ENTITY pcmanfm-qt-time "0.5 SBU"> ]> <sect1 id="pcmanfm-qt" xreflabel="pcmanfm-qt-&pcmanfm-qt-version;"> @@ -76,7 +76,7 @@ <bridgehead renderas="sect4">Required</bridgehead> <para role="required"> <xref linkend="liblxqt"/>, - <xref linkend="libfm-qt"/>, and + <xref linkend="libfm"/>, and <xref linkend="lxmenu-data"/> </para> @@ -86,12 +86,6 @@ choice, some icons will be missing in several places) </para> - <bridgehead renderas="sect4">Optional</bridgehead> - <para role="optional"> - <xref linkend="git"/> (to download translation files) or - <xref linkend="lxqt-l10n"/> (to add localization files) - </para> - <para condition="html" role="usernotes"> User Notes: <ulink url="&blfs-wiki;/pcmanfm-qt"/> </para> @@ -110,7 +104,6 @@ cmake -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=$LXQT_PREFIX \ - -DPULL_TRANSLATIONS=no \ -DCMAKE_INSTALL_LIBDIR=lib \ .. && @@ -128,17 +121,6 @@ </sect2> - <sect2 role="commands"> - <title>Command Explanations</title> - - <para> - <parameter>-DPULL_TRANSLATIONS=no</parameter>: Removes the need for - <xref linkend="git"/>, which would otherwise be requested to download - the translation files. - </para> - - </sect2> - <sect2 role="content"> <title>Contents</title> @@ -152,10 +134,10 @@ pcmanfm-qt </seg> <seg> - None + libfm-qt5.so </seg> <seg> - None + $LXQT_PREFIX/include/libfm-qt and $LXQT_PREFIX/lxqt/share/{libfm-qt,pcmanfm-qt} </seg> </seglistitem> </segmentedlist> @@ -176,6 +158,18 @@ </indexterm> </listitem> </varlistentry> + + <varlistentry id="libfm-qt5"> + <term><filename class="libraryfile">libfm-qt5.so</filename></term> + <listitem> + <para> + contains the <application>libfm-qt5</application> API functions. + </para> + <indexterm zone="pcmanfm-qt libfm-qt5"> + <primary sortas="c-libfm-qt5">libfm-qt5.so</primary> + </indexterm> + </listitem> + </varlistentry> </variablelist> Modified: trunk/BOOK/lxqt/desktop/post-install.xml ============================================================================== --- trunk/BOOK/lxqt/desktop/post-install.xml Mon Oct 17 23:58:48 2016 (r17894) +++ trunk/BOOK/lxqt/desktop/post-install.xml Tue Oct 18 01:59:33 2016 (r17895) @@ -30,24 +30,21 @@ <bridgehead renderas="sect4">Required</bridgehead> <para role="required"> - <xref linkend="openbox"/>, or another window manager, such as - <xref linkend="xfwm4"/>, or kwin from <xref linkend="plasma5-build"/>. - Note that <xref linkend="icewm"/> is not suitable for LXQt + <xref linkend="openbox"/> (runtime) - this may be replaced by + another WM, see the Configuring instructions in <xref + linkend="lxqt-session"/>. </para> <bridgehead renderas="sect4">Recommended</bridgehead> <para role="recommended"> <phrase revision="sysv"> - <xref linkend="consolekit"/> with - <xref linkend="pm-utils"/>, + <xref linkend="consolekit"/> alone or with + <xref linkend="sddm"/> (this has been + reported as the <quote>recommended <application>LXQt</application> + display manager</quote>) or another Display Manager, e.g. </phrase> - <xref linkend="sddm"/> (recommended by <application>LXQt</application> - developpers) or another Display Manager, e.g. - <xref linkend="lxdm"/>, - <xref linkend="desktop-file-utils"/>, - <xref linkend="shared-mime-info"/>, - <xref linkend="xdg-utils"/>, and - <xref linkend="xscreensaver"/> + <xref linkend="lxdm"/>, and + <xref linkend="dbus"/> </para> <para condition="html" role="usernotes"> @@ -56,25 +53,19 @@ </sect2> - <sect2 role="configuration"> - <title>Final Configuration</title> + <sect2 role="final-config"> + <title>Final configuration</title> <para> - If <application>LXQt</application> is installed in <filename - class="directory">/usr</filename>, jump directly to <xref - linkend="lxqt-final-updates"/>, otherwise run the commands in the - next section. + If installed in /usr, you do not need final configuration. Jump to + <quote>Starting LXQt</quote>, below. </para> - <sect3> - <title>Configuration needed only if installing into /opt</title> - <para> - If <application>LXQt</application> is installed into <filename - class="directory">/opt</filename>, some files have to be copied to - <filename class="directory">/usr/share</filename>, so that the system - can find them. Run the following commands, as the <systemitem - class="username">root</systemitem> user: - </para> + <para> + If installed in /opt, in order for the system to find some files, run the + following commands, as the <systemitem class="username">root</systemitem> + user: + </para> <screen role="root"><userinput>ln -svfn $LXQT_PREFIX/share/lxqt /usr/share/lxqt && @@ -94,23 +85,6 @@ ldconfig</userinput></screen> - </sect3> - - <sect3 id="lxqt-final-updates" xreflabel="LXQt Final Updates"> - <title>LXQt Final Updates</title> - - <para> - The desktop databases have to be created or updated at this point. - Run the following commands as the <systemitem - class="username">root</systemitem> user: - </para> - -<screen role="root"><userinput>update-mime-database /usr/share/mime && -xdg-icon-resource forceupdate --theme hicolor && -update-desktop-database -q</userinput></screen> - - </sect3> - </sect2> <sect2 role="starting"> @@ -119,15 +93,22 @@ <para revision="sysv"> You can start <application>LXQt</application> from runlevel 3, using <xref linkend="xinit"/>, or from runlevel 5, using a Display Manager, - such as <xref linkend="sddm"/>. + such as <xref linkend="sddm"/>. The <filename>lxqt.desktop</filename> + file needs to be fixed, or will not be listed in <xref linkend="sddm"/> + and <xref linkend="lxdm"/>: </para> <para revision="systemd"> You can start <application>LXQt</application> from a TTY, using - <xref linkend="xinit"/>, or by using a graphical display manager such - as <xref linkend="sddm"/>. + <xref linkend="xinit"/><!--, or by using a graphical display manager such + as <xref linkend="sddm"/>. The <filename>lxqt.desktop</filename> + file needs to be fixed, or it will not be listed in <xref linkend="sddm"/> + and <xref linkend="lxdm"/>-->. </para> +<screen role="root"><userinput>sed -e '/TryExec/d' \ + -i /usr/share/xsessions/lxqt.desktop</userinput></screen> + <para> To start <application>LXQt</application> using <xref linkend="xinit"/>, run the following commands: Modified: trunk/BOOK/lxqt/desktop/pre-install.xml ============================================================================== --- trunk/BOOK/lxqt/desktop/pre-install.xml Mon Oct 17 23:58:48 2016 (r17894) +++ trunk/BOOK/lxqt/desktop/pre-install.xml Tue Oct 18 01:59:33 2016 (r17895) @@ -22,8 +22,8 @@ <caution> <para> Due to recent changes in <command>grep</command> it is essential that - the installing system be set to an UTF-8 locale. An example - is <command>export LANG=en_US.UTF-8</command>, but any UTF-8 locale is + the installing system be set to a UTF-8 locale. An example + is <command>export LANG=en_US.utf8</command>, but any UTF-8 locale is sufficient. Failure to do this will result in a faulty installation. </para> </caution> @@ -125,20 +125,27 @@ <para> Some packages from the KDE Frameworks 5 bundle install files into D-Bus directories. In order to have D-Bus find those files, the easiest - way is to create a symlink. Some packages may also install icons from - the <quote>hicolor</quote> icon set. Since that icon set is used by many - packages, it is a good idea to create a symlink to the one in <filename + way is to create the following symlink (as the <systemitem + class="username">root</systemitem> user): + </para> + +<screen role="root"><userinput>ln -sfv /usr/share/dbus-1 $LXQT_PREFIX/share</userinput></screen> + + <para> + Some packages may also install icons from the <quote>hicolor</quote> + icon set. Since that icon set is used by many packages, it is a good + idea to create a symlink to the one in <filename class="directory">/usr/share</filename> to avoid having multiple - installations of <xref linkend="hicolor-icon-theme"/>. Run the + installations of <xref linkend="hicolor-icon-theme"/>. Run the following commands as the <systemitem class="username">root</systemitem> user: </para> <screen role="root"><userinput>source /etc/profile && -ln -sfv /usr/share/dbus-1 $LXQT_PREFIX/share && install -v -dm755 $LXQT_PREFIX/share/icons && ln -sfv /usr/share/icons/hicolor $LXQT_PREFIX/share/icons</userinput></screen> + <tip> <para> Sometimes, the installation paths are hardcoded into installed files. @@ -164,105 +171,4 @@ </sect2> - <sect2> - <title>Notes about building LXQt dependencies</title> - - <para> - <application>LXQt</application> obviously needs <xref linkend="qt5"/>, - but not all Qt5 modules and dependencies are necessary. Since the aim - of <application>LXQt</application> is to be light weight, it may be - interesting to cut down the Qt5 overhead, and to build only parts of it. - To build Qt and LXQT dependencies, the proposed order is the following: - </para> - - <procedure> - <step> - <para> - Build <xref linkend="linux-pam"/>, <xref linkend="shadow"/>, - and <xref linkend="sudo"/>, with their dependencies - </para> - </step> - - <step> - <para> - Build the whole <xref linkend="x-window-system"/> chapter, with - Wayland support, and replacing twm vith <xref linkend="openbox"/> - (and its required dependencies). Some Xorg applications and fonts - may be omitted, but with a negligible impact on build time and size - </para> - </step> - - <step> - <para> - Build <xref linkend="gtk2"/> and its required and recommended - dependencies. GTK+2 is needed for <xref linkend="libfm"/>, and - brings the <command>gtk-update-icon-cache</command> executable, - which is needed by libqtxdg - </para> - </step> - - <step> - <para> - Build required Qt dependencies, and some of the recommended or - optional dependencies, namely: - <xref linkend="dbus"/>, - <xref linkend="alsa-lib"/>, - <xref linkend="pulseaudio"/>, and - <xref linkend="libxkbcommon"/> - </para> - </step> - - <step> - <para> - Build the required parts of <xref linkend="qt5"/>. To skip all - modules but the four needed for LXQt, do: - </para> -<screen role="nodump"><userinput>ls -Fd qt* | grep / | sed 's/^/-skip /;s/qt//;s@/@@' > tempconf -sed -i '/base/d;/tools/d;/x11extras/d;/svg/d' tempconf -# if you plan to build SDDM, add: -sed -i '/declarative/d' -./configure <book flags> $(cat tempconf)</userinput></screen> - <para> - The time needed to complete the Qt installation is thus reduced to - around 6 SBU - </para> - </step> - - <step> - <para> - Build miscelaneous dependencies (with their required ones): - <xref linkend="libstatgrab"/>, - <xref linkend="polkit"/>, - <phrase revision="sysv"> - <xref linkend="consolekit"/>, - <xref linkend="pm-utils"/>, - </phrase> - <xref linkend="lm_sensors"/>, - <xref linkend="upower"/>, and - <xref linkend="libfm"/>. If <xref linkend="cmake"/> has not been - built during the preceding steps, build it now - </para> - </step> - - <step> - <para> - Build KDE frameworks dependencies: - <xref linkend="extra-cmake-modules"/>, - <xref linkend="libdbusmenu-qt"/>, and - <xref linkend="polkit-qt"/> - </para> - </step> - - <step> - <para> - Finally, build some desktop utilities: - <xref linkend="xdg-utils"/> (needs only xmlto), - <xref linkend="xdg-user-dirs"/>, - <xref linkend="oxygen-icons5"/> or other sets of icons - </para> - </step> - </procedure> - - </sect2> - </sect1> Modified: trunk/BOOK/packages.ent ============================================================================== --- trunk/BOOK/packages.ent Mon Oct 17 23:58:48 2016 (r17894) +++ trunk/BOOK/packages.ent Tue Oct 18 01:59:33 2016 (r17895) @@ -642,16 +642,13 @@ <!ENTITY lxterminal-version "0.2.0"> <!-- Chapter 40 --> -<!ENTITY lxqt-version "0.11.0"> -<!ENTITY libsysstat-version "0.3.2"> -<!ENTITY libqtxdg-version "2.0.0"> -<!ENTITY libfm-qt-version "0.11.1"> +<!ENTITY lxqt-version "0.10.0"> +<!ENTITY libsysstat-version "0.3.1"> +<!ENTITY libqtxdg-version "1.3.0"> <!ENTITY liblxqt-version "&lxqt-version;"> -<!ENTITY lxqt-admin-version "&lxqt-version;"> -<!ENTITY lxqt-l10n-version "&lxqt-version;"> <!ENTITY lxqt-globalkeys-version "&lxqt-version;"> <!ENTITY lxqt-panel-version "&lxqt-version;"> -<!ENTITY pcmanfm-qt-version "&libfm-qt-version;"> +<!ENTITY pcmanfm-qt-version "&lxqt-version;"> <!ENTITY lxqt-qtplugin-version "&lxqt-version;"> <!ENTITY lxqt-policykit-version "&lxqt-version;"> <!ENTITY lxqt-powermanagement-version "&lxqt-version;"> -- http://lists.linuxfromscratch.org/listinfo/blfs-book FAQ: http://www.linuxfromscratch.org/blfs/faq.html Unsubscribe: See the above information page