Changeset 1de357f4


Ignore:
Timestamp:
03/31/2015 05:58:49 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:
de4ed8e
Parents:
6621c93
Message:

Remove one extra line from WebKitGTK+-2.4.8.
Remove a left over dependency from NetworkManager-1.0.0.
Fix setq4 and setq5, in case one of them is installed with respective Qt but the other version of Qt is not installed.

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

Files:
3 edited

Legend:

Unmodified
Added
Removed
  • networking/netutils/networkmanager.xml

    r6621c93 r1de357f4  
    8383      <xref linkend="libndp"/>,
    8484      <xref linkend="libnl"/>,
    85       <xref linkend="nss"/>,
    86       (or <xref linkend="gnutls"/>), and
     85      <xref linkend="nss"/>, and
    8786      <xref linkend="udev-extras"/> (for GUdev)
    8887    </para>
  • x/lib/webkitgtk2.xml

    r6621c93 r1de357f4  
    218218
    219219<screen><userinput>cd build-1 &amp;&amp;
    220 
    221220
    222221../configure --prefix=/usr --with-gtk=2.0 --disable-webkit2 &amp;&amp;
  • xincludes/setqt.xml

    r6621c93 r1de357f4  
    1818
    1919<screen role="root"><userinput>cat &gt; /usr/bin/setqt4 &lt;&lt; 'EOF'
    20 <literal>if [ "x$QT5DIR" != "x/usr" ]; then pathremove  $QT5DIR/bin; fi
     20<literal>if [ "x$QT5DIR" != "x/usr" ] &amp;&amp; [ "x$QT5DIR" != "x" ]; then pathremove  $QT5DIR/bin; fi
    2121if [ "x$QT4DIR" != "x/usr" ]; then pathprepend $QT4DIR/bin; fi
    2222echo $PATH</literal>
     
    2424
    2525<screen role="root"><userinput>cat &gt; /usr/bin/setqt5 &lt;&lt; 'EOF'
    26 <literal>if [ "x$QT4DIR" != "x/usr" ]; then pathremove  $QT4DIR/bin; fi
     26<literal>if [ "x$QT4DIR" != "x/usr" ] &amp;&amp; [ "x$QT4DIR" != "x" ]; then pathremove  $QT4DIR/bin; fi
    2727if [ "x$QT5DIR" != "x/usr" ]; then pathprepend $QT5DIR/bin; fi
    2828echo $PATH</literal>
Note: See TracChangeset for help on using the changeset viewer.