Changeset 1de357f4

Timestamp:

03/31/2015 05:58:49 PM (9 years ago)

Author:

Fernando de Oliveira <fernando@…>

Branches:

10.0, 10.1, 11.0, 11.1, 11.2, 11.3, 12.0, 12.1, 7.10, 7.8, 7.9, 8.0, 8.1, 8.2, 8.3, 8.4, 9.0, 9.1, basic, bdubbs/svn, elogind, kea, ken/TL2024, ken/inkscape-core-mods, ken/tuningfonts, lazarus, lxqt, nosym, perl-modules, plabs/newcss, plabs/python-mods, python3.11, qt5new, rahul/power-profiles-daemon, renodr/vulkan-addition, trunk, upgradedb, xry111/intltool, xry111/llvm18, xry111/soup3, xry111/test-20220226, xry111/xf86-video-removal

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:

• networking/netutils/networkmanager.xml (modified) (1 diff)
• x/lib/webkitgtk2.xml (modified) (1 diff)
• xincludes/setqt.xml (modified) (2 diffs)

networking/netutils/networkmanager.xml

@@ -83 +83 @@
       <xref linkend="libndp"/>,
       <xref linkend="libnl"/>,
-      <xref linkend="nss"/>,
-      (or <xref linkend="gnutls"/>), and
+      <xref linkend="nss"/>, and
       <xref linkend="udev-extras"/> (for GUdev)
     </para>

x/lib/webkitgtk2.xml

@@ -218 +218 @@
 
 <screen><userinput>cd build-1 &amp;&amp;
-
 
 ../configure --prefix=/usr --with-gtk=2.0 --disable-webkit2 &amp;&amp;

xincludes/setqt.xml

@@ -18 +18 @@
 
 <screen role="root"><userinput>cat &gt; /usr/bin/setqt4 &lt;&lt; 'EOF'
-<literal>if [ "x$QT5DIR" != "x/usr" ]; then pathremove  $QT5DIR/bin; fi
+<literal>if [ "x$QT5DIR" != "x/usr" ] &amp;&amp; [ "x$QT5DIR" != "x" ]; then pathremove  $QT5DIR/bin; fi
 if [ "x$QT4DIR" != "x/usr" ]; then pathprepend $QT4DIR/bin; fi
 echo $PATH</literal>
@@ -24 +24 @@
 
 <screen role="root"><userinput>cat &gt; /usr/bin/setqt5 &lt;&lt; 'EOF'
-<literal>if [ "x$QT4DIR" != "x/usr" ]; then pathremove  $QT4DIR/bin; fi
+<literal>if [ "x$QT4DIR" != "x/usr" ] &amp;&amp; [ "x$QT4DIR" != "x" ]; then pathremove  $QT4DIR/bin; fi
 if [ "x$QT5DIR" != "x/usr" ]; then pathprepend $QT5DIR/bin; fi
 echo $PATH</literal>