Changeset e40b79b6

Timestamp:

04/15/2012 10:33:50 AM (12 years ago)

Author:

Ragnar Thomsen <rthomsen@…>

Branches:

10.0, 10.1, 11.0, 11.1, 11.2, 11.3, 12.0, 12.1, 7.10, 7.4, 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, kea, ken/TL2024, ken/inkscape-core-mods, ken/tuningfonts, krejzi/svn, lazarus, lxqt, nosym, perl-modules, plabs/newcss, plabs/python-mods, python3.11, qt5new, rahul/power-profiles-daemon, renodr/vulkan-addition, systemd-11177, systemd-13485, trunk, upgradedb, xry111/intltool, xry111/llvm18, xry111/soup3, xry111/test-20220226, xry111/xf86-video-removal

Children:

c4fbedc

Parents:

b314b388

Message:

Fix dep. for VLC, Qt and Qca. Typos and root-role.

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

Files:

• general.ent (modified) (2 diffs)
• general/genlib/boost.xml (modified) (1 diff)
• general/genlib/qca.xml (modified) (1 diff)
• general/sysutils/strigi.xml (modified) (1 diff)
• introduction/welcome/changelog.xml (modified) (1 diff)
• multimedia/videoutils/vlc.xml (modified) (2 diffs)
• postlfs/security/consolekit.xml (modified) (1 diff)
• x/lib/qt4.xml (modified) (2 diffs)

general.ent

@@ -4 +4 @@
 -->
 
-<!ENTITY day          "14">                   <!-- Always 2 digits -->
+<!ENTITY day          "15">                   <!-- Always 2 digits -->
 <!ENTITY month        "04">                   <!-- Always 2 digits -->
 <!ENTITY year         "2012">
@@ -10 +10 @@
 <!ENTITY copyholder   "The BLFS Development Team">
 <!ENTITY version      "&year;-&month;-&day;">
-<!ENTITY releasedate  "April 14th, &year;">
+<!ENTITY releasedate  "April 15th, &year;">
 <!-- <!ENTITY releasedate  "November &day;st, &year;"> -->
 <!ENTITY pubdate      "&year;-&month;-&day;"> <!-- metadata req. by TLDP -->

general/genlib/boost.xml

@@ -84 +84 @@
     commands as the <systemitem class="username">root</systemitem> user:</para>
 
-<screen><userinput>./bootstrap.sh --prefix=/usr &amp;&amp;
+<screen role="root"><userinput>./bootstrap.sh --prefix=/usr &amp;&amp;
 ./b2 install link=shared</userinput></screen>
 

general/genlib/qca.xml

@@ -72 +72 @@
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
-    <xref linkend="qt4"/>
+    <xref linkend="qt4"/> and
+    <xref linkend="which"/>
     </para>
 

general/sysutils/strigi.xml

@@ -112 +112 @@
     <title>Command Explanations</title>
 
-  <para><option>patch -Np0 -i ../strigi-&strigi-version;-ffmpeg.patch</option>: This
+  <para><option>patch -Np1 -i ../strigi-&strigi-version;-ffmpeg.patch</option>: This
     patch fixes compiling with <application>ffmpeg</application>. It is safe to omit 
     if you don't have <application>ffmpeg</application>.</para>

introduction/welcome/changelog.xml

@@ -43 +43 @@
 -->
     <listitem>
+      <para>April 15th, 2012</para>
+      <itemizedlist>
+        <listitem>
+          <para>[rthomsen] - Fixed dependencies for VLC, Qt and Qca. Thanks 
+          to Pierre Labastie for the report.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>April 14th, 2012</para>
       <itemizedlist>

multimedia/videoutils/vlc.xml

@@ -67 +67 @@
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
-    <xref linkend="dbus"/>
+    <xref linkend="dbus"/>,
+    <xref linkend="ffmpeg"/>,
+    <xref linkend="libmad"/> and
+    <xref linkend="liba52"/>
     </para>
 
     <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended"><xref linkend="qt4"/>.
-    <application>Qt4</application> is used to make the graphical user interface.
-    Without Qt4 you will only be able to use the command line or
-    <application>ncurses</application> interface.</para>
+    <para role="recommended"><xref linkend="qt4"/> (<application>Qt</application>
+    is required for the graphical user interface. Without Qt you will only be able 
+    to use the command line or <application>ncurses</application> interface)</para>
 
     <bridgehead renderas="sect4">Optional input drivers and
@@ -107 +109 @@
     <ulink url="http://sourceforge.net/projects/libshine-fxp/">Shine</ulink>,
     <ulink url="http://www.khronos.org/openmax/">OpenMAX</ulink>,
-    <xref linkend="libmad"/>,
-    <xref linkend="ffmpeg"/>,
     <ulink url="http://www.splitted-desktop.com/static/libva/">libva</ulink>,
     <xref linkend="faad2"/>,
     <ulink url="http://www.twolame.org/">Twolame</ulink>,
-    <xref linkend="liba52"/>,
     <ulink url="http://www.videolan.org/developers/libdca.html">libdca</ulink>,
     <xref linkend="flac"/>,

postlfs/security/consolekit.xml

@@ -138 +138 @@
       <systemitem class="username">root</systemitem> user:</para>
    
-<screen><userinput>cat &gt;&gt; /etc/pam.d/system-session &lt;&lt; "EOF"
+<screen role="root"><userinput>cat &gt;&gt; /etc/pam.d/system-session &lt;&lt; "EOF"
 # Begin ConsoleKit addition
 

x/lib/qt4.xml

@@ -83 +83 @@
 
     <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended"><xref linkend="libjpeg"/>,
+    <para role="recommended">
+      <xref linkend="dbus"/>,
+      <xref linkend="libjpeg"/>,
       <xref linkend="libmng"/>,
       <xref linkend="libtiff"/>,
-      <xref linkend="libpng"/>, and
-      <xref linkend="pkgconfig"/> (needed to use D-BUS, GLib, GTK and PulseAudio)
+      <xref linkend="libpng"/> and
+      <xref linkend="pkgconfig"/> (needed to use D-Bus, GLib, GTK and PulseAudio)
     </para>
 
@@ -93 +95 @@
     <para role="optional">
       <!--<xref linkend="nas"/>,-->
-      <xref linkend="dbus"/>,
       <xref linkend="gst-plugins-base"/>,
       <xref linkend='pulseaudio'/>,