[blfs-book] r10269 - in trunk/BOOK: general/genutils introduction/welcome kde4/core multimedia/libdriv networking/netlibs networking/netutils x/lib

ken at linuxfromscratch.org ken at linuxfromscratch.org
Tue Jun 5 13:51:51 PDT 2012


Author: ken
Date: 2012-06-05 14:51:46 -0600 (Tue, 05 Jun 2012)
New Revision: 10269

Modified:
   trunk/BOOK/general/genutils/gtk-doc.xml
   trunk/BOOK/introduction/welcome/changelog.xml
   trunk/BOOK/kde4/core/phonon.xml
   trunk/BOOK/kde4/core/polkit-qt.xml
   trunk/BOOK/multimedia/libdriv/gstreamer.xml
   trunk/BOOK/networking/netlibs/libnice.xml
   trunk/BOOK/networking/netutils/avahi.xml
   trunk/BOOK/x/lib/qt4.xml
Log:
Start on replacing pkgconfig by glib2 in deps.  This commit effectively reverts what is left of r9689 and r9661.

Modified: trunk/BOOK/general/genutils/gtk-doc.xml
===================================================================
--- trunk/BOOK/general/genutils/gtk-doc.xml	2012-06-05 19:36:06 UTC (rev 10268)
+++ trunk/BOOK/general/genutils/gtk-doc.xml	2012-06-05 20:51:46 UTC (rev 10269)
@@ -77,6 +77,7 @@
     <para role="optional">
     <ulink url="http://sourceforge.net/projects/dblatex/">dblatex</ulink> or
     <xref linkend="fop"/> (XML PDF support),
+    <xref linkend="glib2"/> (for the test suite),
     <xref linkend="gnome-doc-utils"/> and
     <xref linkend="which"/> (required for the test suite and gtk-doc documentation),
     <xref linkend="openjade"/> with

Modified: trunk/BOOK/introduction/welcome/changelog.xml
===================================================================
--- trunk/BOOK/introduction/welcome/changelog.xml	2012-06-05 19:36:06 UTC (rev 10268)
+++ trunk/BOOK/introduction/welcome/changelog.xml	2012-06-05 20:51:46 UTC (rev 10269)
@@ -50,6 +50,8 @@
         <listitem>
           <para>[ken] - Removed "special measures" from glib2 so that it again
           depends on pkg-config.</para>
+          <para>[ken] - start to change dependencies on pkg-config back to glib2.
+          </para>
         </listitem>
       </itemizedlist>
     </listitem>

Modified: trunk/BOOK/kde4/core/phonon.xml
===================================================================
--- trunk/BOOK/kde4/core/phonon.xml	2012-06-05 19:36:06 UTC (rev 10268)
+++ trunk/BOOK/kde4/core/phonon.xml	2012-06-05 20:51:46 UTC (rev 10269)
@@ -72,7 +72,7 @@
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
     <xref linkend="automoc4"/>,
-    <xref linkend="pkgconfig"/>
+    <xref linkend="glib2"/>
     </para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>

Modified: trunk/BOOK/kde4/core/polkit-qt.xml
===================================================================
--- trunk/BOOK/kde4/core/polkit-qt.xml	2012-06-05 19:36:06 UTC (rev 10268)
+++ trunk/BOOK/kde4/core/polkit-qt.xml	2012-06-05 20:51:46 UTC (rev 10269)
@@ -70,8 +70,8 @@
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
     <xref linkend="qt4"/>, 
-    <xref linkend="polkit"/> and 
-    <xref linkend="pkgconfig"/>
+    <xref linkend="polkit"/> and
+    <xref linkend="glib2"/>
     </para>
 
     <para condition="html" role="usernotes">User Notes:

Modified: trunk/BOOK/multimedia/libdriv/gstreamer.xml
===================================================================
--- trunk/BOOK/multimedia/libdriv/gstreamer.xml	2012-06-05 19:36:06 UTC (rev 10268)
+++ trunk/BOOK/multimedia/libdriv/gstreamer.xml	2012-06-05 20:51:46 UTC (rev 10269)
@@ -68,8 +68,8 @@
 
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
-      <xref linkend="libxml2"/> and
-      <xref linkend="pkgconfig"/>
+      <xref linkend="glib2"/> and
+      <xref linkend="libxml2"/>
     </para>
 
     <bridgehead renderas="sect4">Optional (Required if building GNOME)</bridgehead>

Modified: trunk/BOOK/networking/netlibs/libnice.xml
===================================================================
--- trunk/BOOK/networking/netlibs/libnice.xml	2012-06-05 19:36:06 UTC (rev 10268)
+++ trunk/BOOK/networking/netlibs/libnice.xml	2012-06-05 20:51:46 UTC (rev 10269)
@@ -78,7 +78,7 @@
 
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
-      <xref linkend="pkgconfig"/>
+      <xref linkend="glib2"/>
     </para>
 
     <bridgehead renderas="sect4">Recommended</bridgehead>

Modified: trunk/BOOK/networking/netutils/avahi.xml
===================================================================
--- trunk/BOOK/networking/netutils/avahi.xml	2012-06-05 19:36:06 UTC (rev 10268)
+++ trunk/BOOK/networking/netutils/avahi.xml	2012-06-05 20:51:46 UTC (rev 10269)
@@ -74,8 +74,8 @@
 
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
-      <xref linkend="intltool"/> and
-      <xref linkend="pkgconfig"/>
+      <xref linkend="glib2"/> and
+      <xref linkend="intltool"/>
     </para>
 
     <bridgehead renderas="sect4">Recommended</bridgehead>

Modified: trunk/BOOK/x/lib/qt4.xml
===================================================================
--- trunk/BOOK/x/lib/qt4.xml	2012-06-05 19:36:06 UTC (rev 10268)
+++ trunk/BOOK/x/lib/qt4.xml	2012-06-05 20:51:46 UTC (rev 10269)
@@ -96,6 +96,7 @@
       <!--<xref linkend="nas"/>,-->
       <xref linkend="gst-plugins-base"/>,
       <xref linkend='pulseaudio'/>,
+      <xref linkend='glib2'/>,
       <xref linkend="gtk2"/>,
       <xref linkend="openssl"/>,
       <xref linkend="cups"/>,




More information about the blfs-book mailing list