Changeset 8d427b0a


Ignore:
Timestamp:
08/01/2015 01:20:39 PM (6 years ago)
Author:
Fernando de Oliveira <fernando@…>
Branches:
10.0, 10.1, 11.0, 7.10, 7.8, 7.9, 8.0, 8.1, 8.2, 8.3, 8.4, 9.0, 9.1, basic, bdubbs/svn, elogind, lazarus, nosym, perl-modules, qt5new, trunk, xry111/git-date, xry111/git-date-for-trunk, xry111/git-date-test
Children:
9fa25aa
Parents:
02a729a
Message:
  • Qt-4.8.7, juffed-0.10.r71.gc3c1a3f, liblxqt-0.9.0 and pcmanfm-qt-0.9.0: minor fixes and reformatting.
  • 40. LXQt Applications: reorder.

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@16310 af4574ff-66df-0310-9fd7-8a98e5e911e0

Files:
6 edited

Legend:

Unmodified
Added
Removed
  • general.ent

    r02a729a r8d427b0a  
    11<!-- $LastChangedBy$ $Date$ -->
    22
    3 <!ENTITY day          "31">                   <!-- Always 2 digits -->
    4 <!ENTITY month        "07">                   <!-- Always 2 digits -->
     3<!ENTITY day          "01">                   <!-- Always 2 digits -->
     4<!ENTITY month        "08">                   <!-- Always 2 digits -->
    55<!ENTITY year         "2015">
    66<!ENTITY copyrightdate "2001-&year;">
    77<!ENTITY copyholder   "The BLFS Development Team">
    88<!ENTITY version      "&year;-&month;-&day;">
    9 <!ENTITY releasedate  "July 31th &year;">
     9<!ENTITY releasedate  "August 1st &year;">
    1010<!ENTITY pubdate      "&year;-&month;-&day;"> <!-- metadata req. by TLDP -->
    1111<!ENTITY blfs-version "svn">                  <!-- svn|[release #] -->
  • lxqt/apps/apps.xml

    r02a729a r8d427b0a  
    2323  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="lximage-qt.xml"/>
    2424  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="obconf-qt.xml"/>
     25  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="qtermwidget.xml"/>
     26  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="qterminal.xml"/>
    2527  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="qscintilla.xml"/>
    26   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="qtermwidget.xml"/>
    2728  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="juffed.xml"/>
    28   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="qterminal.xml"/>
    2929  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="qupzilla.xml"/>
    3030<!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="lxdm.xml"/>-->
  • lxqt/apps/juffed.xml

    r02a729a r8d427b0a  
    9090    <bridgehead renderas="sect4">Required</bridgehead>
    9191    <para role="required">
    92       <xref linkend="qscintilla"/>
     92      <xref linkend="qscintilla"/> and
    9393      <xref linkend="qtermwidget"/>
    9494    </para>
  • lxqt/desktop/liblxqt.xml

    r02a729a r8d427b0a  
    3131
    3232    <para>
    33       The <application>liblxqt</application> contains the core utility library
    34       for all <application>LXQt</application> components.
     33      The <application>liblxqt</application> is the core utility library for all
     34      <application>LXQt</application> components.
    3535    </para>
    3636
  • lxqt/desktop/pcmanfm-qt.xml

    r02a729a r8d427b0a  
    8383    <bridgehead renderas="sect4">Recommended</bridgehead>
    8484    <para role="recommended">
    85       <xref linkend="oxygen-icons"/> or another icon theme
     85      <xref linkend="oxygen-icons"/> or another icon theme (depending on your
     86      choice, you some icons will be missing in several places)
    8687    </para>
    8788
  • x/lib/qt4.xml

    r02a729a r8d427b0a  
    104104      <listitem>
    105105        <para>
    106           Recommended patch: <ulink url="&patch-root;/qtwebkit-&wk-version;-gcc5-1.patch"/>
     106          Recommended patch:
     107          <ulink url="&patch-root;/qtwebkit-&wk-version;-gcc5-1.patch"/>
    107108        </para>
    108109      </listitem>
     
    149150  </sect2>
    150151
    151   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" 
     152  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    152153              href="../../xincludes/qt-alternatives.xml"/>
    153154
     
    171172        This is the reason why <filename class="directory">/opt/qt4</filename>
    172173        is used as installation prefix instead of <filename
    173         class="directory">/opt/qt-&qt4-version;</filename>. To create a 
    174         versioned  <application>Qt4</application> directory, you may rename 
     174        class="directory">/opt/qt-&qt4-version;</filename>. To create a
     175        versioned  <application>Qt4</application> directory, you may rename
    175176        the directory and create a symlink:
    176177      </para>
     
    227228        components and to update to a new version.  If you do want to install
    228229        <application>Qt4</application> in /usr, the directories need to
    229         be specified explicitly.  In this case, set QT4PREFIX=/usr and add 
     230        be specified explicitly.  In this case, set QT4PREFIX=/usr and add
    230231        the following to the configure arguments below:</para>
    231232
     
    297298    <para>
    298299      The bundled version of qtwebkit in the main package requires an
    299       obsolete version of the <application>gstreamer</application> package. 
    300       To overcome this, we use a more recent version available separately.     
     300      obsolete version of the <application>gstreamer</application> package.
     301      To overcome this, we use a more recent version available separately.
    301302    </para>
    302303
     
    358359cat &gt; /usr/share/applications/assistant-qt4.desktop &lt;&lt; EOF
    359360<literal>[Desktop Entry]
    360 Name=Qt4 Assistant 
     361Name=Qt4 Assistant
    361362Comment=Shows Qt4 documentation and examples
    362363Exec=$QT4BINDIR/assistant
     
    383384cat &gt; /usr/share/applications/linguist-qt4.desktop &lt;&lt; EOF
    384385<literal>[Desktop Entry]
    385 Name=Qt4 Linguist 
     386Name=Qt4 Linguist
    386387Comment=Add translations to Qt4 applications
    387388Exec=$QT4BINDIR/linguist
     
    396397cat &gt; /usr/share/applications/qdbusviewer-qt4.desktop &lt;&lt; EOF
    397398<literal>[Desktop Entry]
    398 Name=Qt4 QDbusViewer 
     399Name=Qt4 QDbusViewer
    399400GenericName=D-Bus Debugger
    400401Comment=Debug D-Bus applications
     
    409410cat &gt; /usr/share/applications/qtconfig-qt4.desktop &lt;&lt; EOF
    410411<literal>[Desktop Entry]
    411 Name=Qt4 Config 
     412Name=Qt4 Config
    412413Comment=Configure Qt4 behavior, styles, fonts
    413414Exec=$QT4BINDIR/qtconfig
     
    525526      that <application>Qt</application> is correctly found by other packages
    526527      and system processes.</para>
    527    
     528
    528529      <para>As the <systemitem class="username">root</systemitem> user, update
    529530      the <filename>/etc/ld.so.conf</filename> file and the dynamic linker's
    530531      run-time cache file:
    531532   </para>
    532    
     533
    533534<screen role="root"><userinput>cat &gt;&gt; /etc/ld.so.conf &lt;&lt; EOF
    534535<literal># Begin Qt addition
    535    
     536
    536537/opt/qt4/lib
    537    
     538
    538539# End Qt addition</literal>
    539540EOF
    540541
    541542ldconfig</userinput></screen>
    542    
     543
    543544   <indexterm zone="qt4 qt4-config">
    544545      <primary sortas="e-etc-ld.so.conf">/etc/ld.so.conf</primary>
    545546   </indexterm>
    546    
     547
    547548   <para>
    548549      As the <systemitem class="username">root</systemitem> user, create
    549550      the <filename>/etc/profile.d/qt4.sh</filename> file:
    550551   </para>
    551    
     552
    552553<screen role="root"><userinput>cat &gt; /etc/profile.d/qt4.sh &lt;&lt; EOF
    553554<literal># Begin /etc/profile.d/qt4.sh
    554    
     555
    555556QT4DIR=/opt/qt4
    556557QTDIR=$QT4DIR
    557    
     558
    558559pathappend $QT4DIR/bin           PATH
    559560pathappend $QT4DIR/lib/pkgconfig PKG_CONFIG_PATH
    560    
     561
    561562export QT4DIR QTDIR
    562    
     563
    563564# End /etc/profile.d/qt4.sh</literal>
    564565EOF</userinput></screen>
     
    566567
    567568    </sect3>
    568    
    569     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" 
     569
     570    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    570571                href="../../xincludes/setqt.xml"/>
    571572  </sect2>
     
    602603          /usr/lib/qt4,
    603604          /usr/share/doc/qt4, and
    604           /usr/share/qt4 
    605           OR 
    606           /opt/qt4 and 
     605          /usr/share/qt4
     606          OR
     607          /opt/qt4 and
    607608          /opt/qt-&qt4-version;
    608609        </seg>
Note: See TracChangeset for help on using the changeset viewer.