Changeset 49d3336


Ignore:
Timestamp:
03/04/2014 01:30:09 PM (9 years ago)
Author:
Fernando de Oliveira <fernando@…>
Branches:
10.0, 10.1, 11.0, 11.1, 11.2, 11.3, 7.10, 7.5, 7.6, 7.6-blfs, 7.6-systemd, 7.7, 7.8, 7.9, 8.0, 8.1, 8.2, 8.3, 8.4, 9.0, 9.1, basic, bdubbs/svn, elogind, gnome, kde5-13430, kde5-14269, kde5-14686, ken/inkscape-core-mods, krejzi/svn, lazarus, nosym, perl-modules, plabs/python-mods, qt5new, systemd-11177, systemd-13485, trunk, upgradedb, xry111/intltool, xry111/soup3, xry111/test-20220226
Children:
4f161b1
Parents:
7300611
Message:

Tweaks, reformats and fixes: setqt, Qt-5.2.1, Qt-4.8.5, LibreOffice-4.2.0, WebKitGTK+-1.10.2 and WebKitGTK+-2.2.4.

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

Files:
8 edited

Legend:

Unmodified
Added
Removed

  • general.ent

    r7300611 r49d3336  
    11<!-- $LastChangedBy$ $Date$ -->
    22
    3 <!ENTITY day          "03">                   <!-- Always 2 digits -->
     3<!ENTITY day          "04">                   <!-- Always 2 digits -->
    44<!ENTITY month        "03">                   <!-- Always 2 digits -->
    55<!ENTITY year         "2014">
    … …  
    77<!ENTITY copyholder   "The BLFS Development Team">
    88<!ENTITY version      "&year;-&month;-&day;">
    9 <!ENTITY releasedate  "March 3rd, &year;">
     9<!ENTITY releasedate  "March 4th, &year;">
    1010<!ENTITY pubdate      "&year;-&month;-&day;"> <!-- metadata req. by TLDP -->
    1111<!ENTITY blfs-version "svn">                  <!-- svn|[release #] -->

  • introduction/welcome/changelog.xml

    r7300611 r49d3336  
    4646
    4747    <listitem>
     48      <para>March 4th, 2014</para>
     49      <itemizedlist>
     50        <listitem>
     51          <para>[fernando] - Tweaks, reformats and fixes: setqt, Qt-5.2.1,
     52          Qt-4.8.5, LibreOffice-4.2.0, WebKitGTK+-1.10.2 and
     53          WebKitGTK+-2.2.4.</para>
     54        </listitem>
     55      </itemizedlist>
     56    </listitem>
     57
     58    <listitem>
    4859      <para>March 3rd, 2014</para>
    4960      <itemizedlist>

  • x/lib/qt4.xml

    r7300611 r49d3336  
    156156    </para>
    157157
    158 <screen><userinput>export QTLINK=/usr
     158<screen><userinput>export QT4LINK=/usr
    159159
    160160sed -i -e "/#if/d" -e "/#error/d" -e "/#endif/d" \
    … …  
    232232    </para>
    233233
    234 <screen><userinput>export QTDIR=/opt/qt-&qt4-version; &amp;&amp;
    235 export QTLINK=/opt/qt4 &amp;&amp;
     234<screen><userinput>export QT4DIR=/opt/qt-&qt4-version; &amp;&amp;
     235export QT4LINK=/opt/qt4 &amp;&amp;
    236236
    237237sed -i -e "/#if/d" -e "/#error/d" -e "/#endif/d" \
    … …  
    241241     src/3rdparty/webkit/Source/WebKit2/DerivedSources.pro &amp;&amp;
    242242
    243 ./configure -prefix $QTDIR       \
     243./configure -prefix     $QT4DIR  \
    244244            -sysconfdir /etc/xdg \
    245245            -confirm-license     \
    … …  
    265265
    266266<screen role="root"><userinput>make install
    267 ln -svfn $QTDIR /opt/qt4</userinput></screen>
     267ln -svfn $QT4DIR /opt/qt4</userinput></screen>
    268268
    269269    <para>
    … …  
    273273    </para>
    274274
    275 <screen role="root"><userinput>for file in `basename -a -s .prl $QTDIR/lib/lib*.prl`; do
     275<screen role="root"><userinput>for file in `basename -a -s .prl $QT4DIR/lib/lib*.prl`; do
    276276       sed -r -e '/^QMAKE_PRL_BUILD_DIR/d'    \
    277277              -e 's/(QMAKE_PRL_LIBS =).*/\1/' \
    278               -i $QTDIR/lib/${file}.prl
    279 
    280    perl -pi -e "s, -L$PWD/?\S+,,g" $QTDIR/lib/pkgconfig/${file##lib}.pc
     278              -i $QT4DIR/lib/${file}.prl
     279
     280   perl -pi -e "s, -L$PWD/?\S+,,g" $QT4DIR/lib/pkgconfig/${file##lib}.pc
    281281done
    282282
    … …  
    288288      <para>
    289289        For all methods, install images and create the menu entries
    290         for installed applications.  Be sure that the <envar>QTLINK</envar>
     290        for installed applications.  Be sure that the <envar>QT4LINK</envar>
    291291        variable is defined in root's environment and
    292292        as the <systemitem class="username">root</systemitem> user:
    … …  
    314314Name=Qt4 Assistant
    315315Comment=Shows Qt4 documentation and examples
    316 Exec=$QTLINK/bin/assistant
     316Exec=$QT4LINK/bin/assistant
    317317Icon=assistant-qt4.png
    318318Terminal=false
    … …  
    326326Name=Qt4 Designer
    327327Comment=Design GUIs for Qt4 applications
    328 Exec=$QTLINK/bin/designer
     328Exec=$QT4LINK/bin/designer
    329329Icon=designer-qt4.png
    330330MimeType=application/x-designer;
    … …  
    339339Name=Qt4 Linguist
    340340Comment=Add translations to Qt4 applications
    341 Exec=$QTLINK/bin/linguist
     341Exec=$QT4LINK/bin/linguist
    342342Icon=linguist-qt4.png
    343343MimeType=text/vnd.trolltech.linguist;application/x-linguist;
    … …  
    353353GenericName=D-Bus Debugger
    354354Comment=Debug D-Bus applications
    355 Exec=$QTLINK/bin/qdbusviewer
     355Exec=$QT4LINK/bin/qdbusviewer
    356356Icon=qdbusviewer-qt4.png
    357357Terminal=false
    … …  
    365365Name=Qt4 Config
    366366Comment=Configure Qt4 behavior, styles, fonts
    367 Exec=$QTLINK/bin/qtconfig
     367Exec=$QT4LINK/bin/qtconfig
    368368Icon=qt4logo.png
    369369Terminal=false
    … …  
    465465<literal># Begin /etc/profile.d/qt4.sh
    466466
    467 QTDIR=/usr
    468 export QTDIR
     467QT4DIR=/usr
     468export QT4DIR
    469469
    470470# End /etc/profile.d/qt4.sh</literal>
    … …  
    504504<literal># Begin /etc/profile.d/qt4.sh
    505505   
    506 QTDIR=/opt/qt4
     506QT4DIR=/opt/qt4
    507507   
    508508pathappend /opt/qt4/bin           PATH
    509509pathappend /opt/qt4/lib/pkgconfig PKG_CONFIG_PATH
    510510   
    511 export QTDIR
     511export QT4DIR
    512512   
    513513# End /etc/profile.d/qt4.sh</literal>

  • x/lib/qt5.xml

    r7300611 r49d3336  
    454454<literal># Begin /etc/profile.d/qt5.sh
    455455
    456 QTDIR=/usr
     456QT5DIR=/usr
    457457export QT5DIR
    458458

  • x/lib/webkitgtk.xml

    r7300611 r49d3336  
    149149    </para>
    150150
    151 <screen role="root"><userinput>make install</userinput></screen>
     151<screen role="root"><userinput>make install                                    &amp;&amp;
     152rm -rf /usr/share/gtk-doc/html/webkitgtk-1.0    &amp;&amp;
     153mv -vi /usr/share/gtk-doc/html/webkitgtk{,-1.0}</userinput></screen>
    152154  </sect2>
    153155
    154156  <sect2 role="commands">
    155157    <title>Command Explanations</title>
     158
     159    <para>
     160      <command>mv -vi /usr/share/gtk-doc/html/webkitgtk{,-1.0}</command>:
     161      There is a conflict with the directory installed with same name by
     162      <xref linkend="webkitgtk2"/>.
     163    </para>
    156164
    157165    <para>
    … …  
    192200        </seg>
    193201        <seg>
    194           libjavascriptcoregtk-1.0.so and libwebkit-1.0.so
     202          libjavascriptcoregtk-1.0.so and libwebkitgtk-1.0.so
    195203        </seg>
    196204        <seg>
    197           /usr/include/webkit-1.0 and
     205          /usr/include/webkit-1.0,
     206          /usr/share/gtk-doc/html/webkitgtk-1.0 and
    198207          /usr/share/webkit-1.0
    199208        </seg>

  • x/lib/webkitgtk2.xml

    r7300611 r49d3336  
    159159    </para>
    160160
    161 <screen role="root"><userinput>make install</userinput></screen>
     161<screen role="root"><userinput>make install                                    &amp;&amp;
     162rm -rf /usr/share/gtk-doc/html/webkitgtk-2.0    &amp;&amp;
     163mv -vi /usr/share/gtk-doc/html/webkitgtk{,-2.0}</userinput></screen>
    162164  </sect2>
    163165
    164166  <sect2 role="commands">
    165167    <title>Command Explanations</title>
     168
     169    <para>
     170      <command>mv -vi /usr/share/gtk-doc/html/webkitgtk{,-2.0}</command>:
     171      There is a conflict with the directory installed with same name by
     172      <xref linkend="webkitgtk"/>.
     173    </para>
    166174
    167175    <para>
    … …  
    210218        <seg>
    211219          /usr/include/webkitgtk-3.0,
    212           /usr/lib/webkitgtk3,
    213           /usr/share/gtk-doc/html/webkitgtk,
     220          /usr/share/gtk-doc/html/webkitgtk-2.0,
    214221          /usr/share/gtk-doc/html/webkit2gtk and
    215222          /usr/share/webkitgtk-3.0

  • xincludes/setqt.xml

    r7300611 r49d3336  
    1919<screen role="root"><userinput>cat &gt; /usr/bin/setqt4 &lt;&lt; 'EOF'
    2020<literal>if [ "x$QT5DIR" != "x/usr" ]; then pathremove  $QT5DIR/bin; fi
    21 if [ "x$QTDIR"  != "x/usr" ]; then pathprepend $QTDIR/bin; fi
     21if [ "x$QT4DIR" != "x/usr" ]; then pathprepend $QT4DIR/bin; fi
    2222echo $PATH</literal>
    2323EOF</userinput></screen>
    2424
    2525<screen role="root"><userinput>cat &gt; /usr/bin/setqt5 &lt;&lt; 'EOF'
    26 <literal>if [ "x$QTDIR"  != "x/usr" ]; then pathremove  $QTDIR/bin; fi
     26<literal>if [ "x$QT4DIR" != "x/usr" ]; then pathremove  $QT4DIR/bin; fi
    2727if [ "x$QT5DIR" != "x/usr" ]; then pathprepend $QT5DIR/bin; fi
    2828echo $PATH</literal>

  • xsoft/office/libreoffice.xml

    r7300611 r49d3336  
    377377    </para>
    378378
    379 <screen role="root"><userinput>make distro-pack-install                                  &amp;&amp;
     379<screen role="root"><userinput>make distro-pack-install                                    &amp;&amp;
    380380install -v -m755 -d $LO_PREFIX/share/appdata                &amp;&amp;
    381381install -v -m644    sysui/desktop/appstream-appdata/*.xml \
    … …  
    387387    </para>
    388388
    389 <screen role="root"><userinput>chown -cR 0:0 dictionaries/                                                      &amp;&amp;
     389<screen role="root"><userinput>chown -cR 0:0 dictionaries/                                                        &amp;&amp;
    390390mkdir -pv $LO_PREFIX/lib/libreoffice/share/extensions/dict-en                      &amp;&amp;
    391391cp -vR dictionaries/en/*    $LO_PREFIX/lib/libreoffice/share/extensions/dict-en    &amp;&amp;
Note: See TracChangeset for help on using the changeset viewer.