Changeset 0c2e5325

Timestamp:

02/13/2020 11:23:59 PM (4 years ago)

Author:

Ken Moffat <ken@…>

Branches:

10.0, 10.1, 11.0, 11.1, 11.2, 11.3, 12.0, 9.1, kea, ken/inkscape-core-mods, ken/tuningfonts, lazarus, lxqt, plabs/python-mods, qt5new, renodr/vulkan-addition, trunk, upgradedb, xry111/intltool, xry111/soup3, xry111/test-20220226, xry111/xf86-video-removal

Children:

2f2d73a

Parents:

6b21bfd0

Message:

Split old python2 pycairo into pycairo2.xml

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

Files:

• general/prog/pycairo.xml (modified) (2 diffs)
• general/prog/pycairo2.xml (added)
• general/prog/pygobject2.xml (modified) (1 diff)
• general/prog/pygtk.xml (modified) (3 diffs)
• general/prog/python-modules.xml (modified) (2 diffs)
• introduction/welcome/changelog.xml (modified) (1 diff)
• packages.ent (modified) (1 diff)

general/prog/pycairo.xml

@@ -76 +76 @@
       <bridgehead renderas="sect5">Optional</bridgehead>
       <para role="optional">
-        <xref linkend="python2"/> (<xref role="nodep" linkend="pygtk"/>
-          can only use <application>Python 2</application>)
         <ulink url="https://hypothesis.readthedocs.io">Hypothesis</ulink> 
           (for tests)
@@ -93 +91 @@
         <para>
            The current version of pycairo no longer builds the Python2 module.
-           If you need this module for packages sych as <xref linkend="gimp"/>, use the 
-           <ulink url="https://github.com/pygobject/pycairo/releases/download/v1.18.2/pycairo-1.18.2.tar.gz">pycairo-1.18.2</ulink>
-           version and use the same commands as below substituting python for 
-           python3.
+           If you need that module for packages sych as <xref linkend="gimp"/>, use
+           <xref linkend="pycairo2"/>
         </para>
       </note>
 
       <para>
-        Install <application>PyCairo</application> for <!--Python2--> and Python3 by
+        Install <application>PyCairo</application> for Python3 by
         running the following commands:
       </para>

general/prog/pygobject2.xml

@@ -84 +84 @@
       <para role="required">
         <xref linkend="glib2"/>,
-        <xref linkend="pycairo"/> (Python 2), and
+        <xref linkend="pycairo2"/> and
         <xref linkend="python2"/>
       </para>

general/prog/pygtk.xml

@@ -88 +88 @@
       <bridgehead renderas="sect5">Required (pangocairo module)</bridgehead>
       <para role="required">
-        <xref linkend="pycairo"/> (Python 2) and
+        <xref linkend="pycairo2"/> and
         <xref linkend="pango"/>
       </para>
@@ -94 +94 @@
       <bridgehead renderas="sect5">Required (gtk and gtk.unixprint modules)</bridgehead>
       <para role="required">
-        <xref linkend="pycairo"/> (Python 2) and
+        <xref linkend="pycairo2"/> and
         <xref linkend="gtk2"/>.
       </para>
@@ -100 +100 @@
       <bridgehead renderas="sect5">Required (gtk.glade module)</bridgehead>
       <para role="required">
-        <xref linkend="pycairo"/> (Python 2) and
+        <xref linkend="pycairo2"/> and
         <xref linkend="libglade"/>.
       </para>

general/prog/python-modules.xml

@@ -57 +57 @@
       <listitem>
         <para>
+          <xref linkend="pycairo2"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
           <xref linkend="pycryptodome"/>
         </para>
@@ -167 +172 @@
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="pycairo2.xml"/>
+
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="pycryptodome.xml"/>
 

introduction/welcome/changelog.xml

@@ -45 +45 @@
       <para>February 13th, 2020</para>
       <itemizedlist>
+        <listitem>
+          <para>[ken] - Reinstate pycairo-1.18.2 for python2 as 'pycairo',
+          needed for the deps of pygtk. Addresses
+          <ulink url="&blfs-ticket-root;13128">#13128</ulink>.</para>
+        </listitem>
         <listitem>
           <para>[timtas] - Update to dovecot-2.3.9.3. Fixes

packages.ent

@@ -535 +535 @@
 <!ENTITY pyatspi2-version             "2.34.0">
 <!--<!ENTITY py2cairo-version             "1.10.0"> -->
+<!ENTITY pycairo2-version             "1.18.2">
 <!ENTITY pycairo-version              "1.19.0">
 <!--<!ENTITY pycrypto-version             "2.6.1"> Replaced by pycryptodome -->