Changeset 13e0a61 for general/prog

Timestamp:

06/01/2013 08:03:58 AM (11 years ago)

Author:

Krejzi <krejzi@…>

Branches:

systemd-11177

Children:

af73a280

Parents:

dcdde93

Message:

Merge trunk and systemd branch

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/branches/systemd@11231 af4574ff-66df-0310-9fd7-8a98e5e911e0

File:

• general/prog/python-modules.xml (modified) (5 diffs)

general/prog/python-modules.xml

@@ -436 +436 @@
       <listitem>
         <para>
-          Required patch (if you have installed
-          <xref linkend="gobject-introspection"/>):
+          Optional patch:
           <ulink url="&patch-root;/pygobject-&pygobject2-version;-introspection-1.patch"/>
         </para>
@@ -453 +452 @@
       <bridgehead renderas="sect5">Optional</bridgehead>
       <para role="optional">
+        <xref linkend="gobject-introspection"/> and
         <xref linkend="libxslt"/> (to Build Documentation)
       </para>
@@ -465 +465 @@
 
       <para>
+        If you have installed <xref linkend="gobject-introspection"/>, apply the
+        required patch by running the following commands:
+      </para>
+
+<screen><userinput>patch -p1 &lt; ../pygobject-&pygobject2-version;-introspection-1.patch</userinput></screen>
+
+      <para>
         Install <application>PyGObject</application> by running the following
         commands:
       </para>
 
-<screen><userinput>patch -p1 &lt; ../pygobject-&pygobject2-version;-introspection-1.patch &amp;&amp;
-./configure --prefix=/usr &amp;&amp;
+<screen><userinput>./configure --prefix=/usr --disable-introspection &amp;&amp;
 make</userinput></screen>
 
@@ -486 +492 @@
     <sect3 role="commands">
       <title>Command Explanations</title>
+
+      <para>
+        <option>--disable-introspection</option>: Omit this switch if you have
+        installed <xref linkend="gobject-introspection"/>. Note that it
+        conflicts with <xref linkend="pygobject3"/>.
+      </para>
 
       <para>
@@ -738 +750 @@
       </para>
 
-      <bridgehead renderas="sect5">Required (gtk.libglade module)</bridgehead>
+      <bridgehead renderas="sect5">Required (gtk.glade module)</bridgehead>
       <para role="required">
         <xref linkend="py2cairo"/> and