Changeset 31b1acd

Timestamp:

04/02/2012 09:12:27 PM (12 years ago)

Author:

Andrew Benton <andy@…>

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:

e85edcc

Parents:

1e62b33

Message:

commented out pycairo as it seems it's not needed

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

Files:

• general.ent (modified) (1 diff)
• general/prog/python-modules.xml (modified) (13 diffs)
• gnome/add/orca.xml (modified) (1 diff)
• gnome/core/pre-install-config.xml (modified) (2 diffs)

general.ent

@@ -451 +451 @@
 <!-- Python module versions used in the Python Modules instructions -->
 <!ENTITY pyxml-version                "0.8.4">
-<!ENTITY pycairo-version              "1.8.8">
+<!-- <!ENTITY pycairo-version              "1.10.0"> -->
 <!ENTITY py2cairo-version             "1.10.0">
 <!ENTITY pygobject2-version           "2.28.6">

general/prog/python-modules.xml

@@ -13 +13 @@
   <!ENTITY pyxml-time          "less than 0.1 SBU">
 
+  <!--
   <!ENTITY pycairo-download-http
   "http://cairographics.org/releases/pycairo-&pycairo-version;.tar.gz">
@@ -20 +21 @@
   <!ENTITY pycairo-buildsize     "3 MB">
   <!ENTITY pycairo-time          "0.1 SBU">
+  -->
 
   <!ENTITY py2cairo-download-http
@@ -127 +129 @@
         </para>
       </listitem>
-      <listitem>
+      <!-- <listitem>
         <para>
           <xref linkend="pycairo"/>
         </para>
-      </listitem>
+      </listitem> -->
       <listitem>
         <para>
@@ -402 +404 @@
 
       <para condition="html" role="usernotes">
-        User Notes: <ulink url="&blfs-wiki;/pycairo"/>
+        User Notes: <ulink url="&blfs-wiki;/py2cairo"/>
       </para>
     </sect3>
@@ -458 +460 @@
     </sect3>
   </sect2>
-
   <!-- End Py2cairo -->
-  <!-- Begin Pycairo -->
+
+  <!-- Begin Pycairo
   <sect2 id="pycairo" xreflabel="Pycairo-&pycairo-version;">
 
@@ -515 +517 @@
       <bridgehead renderas="sect5">Required</bridgehead>
       <para role="required">
-        <xref linkend="python2"/> and
+        <xref linkend="python3"/> and
         <xref linkend="cairo"/>
       </para>
@@ -532 +534 @@
       </para>
 
-<screen><userinput>./configure --prefix=/usr &amp;&amp;
+<screen><userinput>./configure -&45;prefix=/usr &amp;&amp;
 make</userinput></screen>
 
@@ -557 +559 @@
           <seg>
             /usr/include/pycairo and
-            /usr/lib/python&python2-majorver;/site-packages/cairo
+            /usr/lib/python&python3-majorver;/site-packages/cairo
           </seg>
         </seglistitem>
@@ -563 +565 @@
     </sect3>
   </sect2>
-  <!-- End Pycairo -->
+  End Pycairo -->
 
   <!-- Begin PyGObject2 -->
@@ -634 +636 @@
       <bridgehead renderas="sect5">Required</bridgehead>
       <para role="required">
-        <xref linkend="pycairo"/> and
+        <xref linkend="py2cairo"/> and
         <xref linkend="pkgconfig"/>.
       </para>
@@ -922 +924 @@
       <bridgehead renderas="sect5">Required (pangocairo module)</bridgehead>
       <para role="required">
-        <xref linkend="pycairo"/> and
+        <xref linkend="py2cairo"/> and
         <xref linkend="pango"/>
       </para>
@@ -928 +930 @@
       <bridgehead renderas="sect5">Required (gtk and gtk.unixprint modules)</bridgehead>
       <para role="required">
-        <xref linkend="pycairo"/> and
+        <xref linkend="py2cairo"/> and
         <xref linkend="gtk2"/>.
       </para>
@@ -934 +936 @@
       <bridgehead renderas="sect5">Required (gtk.libglade module)</bridgehead>
       <para role="required">
-        <xref linkend="pycairo"/> and
+        <xref linkend="py2cairo"/> and
         <xref linkend="libglade"/>.
       </para>

gnome/add/orca.xml

@@ -68 +68 @@
     <xref linkend="dbus-python"/>,
     <xref linkend="gtk3"/>,
-    <xref linkend="pycairo"/>.
+    <!-- <xref linkend="py2cairo"/>, -->
     <xref linkend="pygobject3"/>,
     <xref linkend="pyxdg"/></para>

gnome/core/pre-install-config.xml

@@ -23 +23 @@
 <literal>export GNOME_PREFIX=/usr
 export GNOME_SYSCONFDIR=&gnome-etc-dir;
-export XDG_CONFIG_DIRS=$GNOME_SYSCONFDIR/xdg
+export XDG_CONFIG_DIRS=${GNOME_SYSCONFDIR}/xdg
 export XDG_DATA_DIRS=/usr/share:/usr/local/share</literal>
 EOF
@@ -57 +57 @@
   <para>Add to your system or personal profile:</para>
 
-<screen><literal>export PATH=$PATH:/opt/gnome-&gnome-version;&gnome-minor-version;/bin
-export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:/opt/gnome-&gnome-version;&gnome-minor-version;/lib/pkgconfig
-export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:/opt/gnome-&gnome-version;&gnome-minor-version;/share/pkgconfig
+<screen><literal>export PATH=${PATH}:/opt/gnome-&gnome-version;&gnome-minor-version;/bin
+export PKG_CONFIG_PATH=${PKG_CONFIG_PATH}:/opt/gnome-&gnome-version;&gnome-minor-version;/lib/pkgconfig
+export PKG_CONFIG_PATH=${PKG_CONFIG_PATH}:/opt/gnome-&gnome-version;&gnome-minor-version;/share/pkgconfig
 export GNOME_LIBCONFIG_PATH=/usr/lib:/opt/gnome-&gnome-version;&gnome-minor-version;/lib
-export PYTHONPATH=$PYTHONPATH:/opt/gnome-&gnome-version;&gnome-minor-version;/lib/python&python2-majorver;/site-packages</literal></screen>
+export PYTHONPATH=${PYTHONPATH}:/usr/lib/python&python2-majorver;/site-packages:/opt/gnome-&gnome-version;/lib/python&python2-majorver;/site-packages"</literal></screen>
 
   <para>Add to your <filename>/etc/ld.so.conf</filename>:</para>