Changeset 7979906


Ignore:
Timestamp:
05/22/2017 08:46:50 PM (6 years ago)
Author:
Bruce Dubbs <bdubbs@…>
Branches:
10.0, 10.1, 11.0, 11.1, 11.2, 11.3, 12.0, 8.1, 8.2, 8.3, 8.4, 9.0, 9.1, basic, bdubbs/svn, elogind, kea, ken/inkscape-core-mods, lazarus, lxqt, perl-modules, plabs/python-mods, qt5new, trunk, upgradedb, xry111/intltool, xry111/soup3, xry111/test-20220226, xry111/xf86-video-removal
Children:
4328f2f
Parents:
7ee0102
Message:

Update to pycairo-1.13.2. Combines
build for python2 and python3. Py2cairo archived.

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

Files:
7 edited
1 moved

Legend:

Unmodified
Added
Removed

  • general/prog/pycairo.xml

    r7ee0102 r7979906  
    55  %general-entities;
    66
    7   <!ENTITY pycairo-download-http
    8            "http://cairographics.org/releases/pycairo-&pycairo-version;.tar.bz2">
     7  <!ENTITY pycairo-download-http "https://github.com/pygobject/pycairo/releases/download/v&pycairo-version;/pycairo-&pycairo-version;.tar.gz">
    98  <!ENTITY pycairo-download-ftp  " ">
    10   <!ENTITY pycairo-md5sum        "e6fd3f2f1e6a72e0db0868c4985669c5">
    11   <!ENTITY pycairo-size          "244 KB">
    12   <!ENTITY pycairo-buildsize     "3.0 MB">
     9  <!ENTITY pycairo-md5sum        "e6e8407d3f51b0b89863872da0760616">
     10  <!ENTITY pycairo-size          "140 KB">
     11  <!ENTITY pycairo-buildsize     "3.2 MB">
    1312  <!ENTITY pycairo-time          "less than 0.1 SBU">
    1413]>
    … …  
    2726
    2827      <para>
    29         PyCairo provides <application>Python 3</application> bindings to
     28        PyCairo provides <application>Python</application> bindings to
    3029        <application>Cairo</application>.
    3130      </para>
    3231
    3332      &lfs80_checked;
     33      <!-- Does not use gcc -->
    3434
    3535      <bridgehead renderas="sect4">Package Information</bridgehead>
    … …  
    6767      </itemizedlist>
    6868
    69       <bridgehead renderas="sect4">Additional Downloads</bridgehead>
    70       <itemizedlist spacing="compact">
    71         <listitem>
    72           <para>
    73             Required patch:
    74             <ulink url="&patch-root;/pycairo-&pycairo-version;-waf_unpack-1.patch"/>
    75           </para>
    76         </listitem>
    77         <listitem>
    78           <para>
    79             Required patch:
    80             <ulink url="&patch-root;/pycairo-&pycairo-version;-waf_python_3_4-1.patch"/>
    81           </para>
    82         </listitem>
    83       </itemizedlist>
    84 
    8569      <bridgehead renderas="sect4">PyCairo Dependencies</bridgehead>
    8670
    8771      <bridgehead renderas="sect5">Required</bridgehead>
    8872      <para role="required">
    89         <xref linkend="cairo"/> and
     73        <xref linkend="cairo"/>,
     74        <xref linkend="python"/>, and/or
    9075        <xref linkend="python3"/>
    9176      </para>
    … …  
    10085
    10186      <para>
    102         Install <application>PyCairo</application> by running the following
    103         commands:
     87        Install <application>PyCairo</application> for Python2 by running
     88        the following commands:
    10489      </para>
    10590
    106 <screen><userinput>patch -Np1 -i ../pycairo-&pycairo-version;-waf_unpack-1.patch     &amp;&amp;
    107 wafdir=$(./waf unpack) &amp;&amp;
    108 pushd $wafdir          &amp;&amp;
    109 patch -Np1 -i ../../pycairo-&pycairo-version;-waf_python_3_4-1.patch &amp;&amp;
    110 popd                   &amp;&amp;
    111 unset wafdir           &amp;&amp;
    112 PYTHON=/usr/bin/python3 ./waf configure --prefix=/usr  &amp;&amp;
    113 ./waf build</userinput></screen>
     91<screen><userinput>python2 setup.py build</userinput></screen>
    11492
    11593      <para>
    … …  
    12199      </para>
    122100
    123 <screen role="root"><userinput>./waf install</userinput></screen>
     101<screen role="root"><userinput>python2 setup.py install --optimize=1</userinput></screen>
     102
     103      <para>
     104        Install <application>PyCairo</application> for Python3 by running
     105        the following commands:
     106      </para>
     107
     108<screen><userinput>python3 setup.py build</userinput></screen>
     109
     110      <para>
     111        This package does not come with a test suite.
     112      </para>
     113
     114      <para>
     115        Now, as the <systemitem class="username">root</systemitem> user:
     116      </para>
     117
     118<screen role="root"><userinput>python3 setup.py install --optimize=1</userinput></screen>
    124119
    125120    </sect3>
    … …  
    130125      <segmentedlist>
    131126        <segtitle>Installed Programs</segtitle>
    132         <segtitle>Installed Library</segtitle>
    133         <segtitle>Installed Directory</segtitle>
     127        <segtitle>Installed Libraries</segtitle>
     128        <segtitle>Installed Directories</segtitle>
    134129
    135130        <seglistitem>
    … …  
    138133          </seg>
    139134          <seg>
    140             None
     135            _cairo.so (python2) and
     136            _cairo.cpython-36m-x86_64-linux-gnu.so (python3)
    141137          </seg>
    142138          <seg>
    143             /usr/include/pycairo and
     139            /usr/lib/python&python2-majorver;/site-packages/cairo and
    144140            /usr/lib/python&python3-majorver;/site-packages/cairo
    145141          </seg>

  • general/prog/pygobject2.xml

    r7ee0102 r7979906  
    8484      <para role="required">
    8585        <xref linkend="glib2"/> and
    86         <xref linkend="py2cairo"/>
     86        <xref linkend="pycairo"/> (Python 2)
    8787      </para>
    8888

  • general/prog/pygobject3.xml

    r7ee0102 r7979906  
    7474      <para role="required">
    7575        <xref linkend="gobject-introspection"/> and
    76         <xref linkend="py2cairo"/>
    77         (for <application>Python 2</application> bindings) and/or
    7876        <xref linkend="pycairo"/>
    79         (for <application>Python 3</application> bindings)
     77          (for <application>Python 2</application> and/or
     78          <application>Python 3</application> bindings)
    8079      </para>
    8180

  • general/prog/pygtk.xml

    r7ee0102 r7979906  
    8787      <bridgehead renderas="sect5">Required (pangocairo module)</bridgehead>
    8888      <para role="required">
    89         <xref linkend="py2cairo"/> and
     89        <xref linkend="pycairo"/> (Python 2) and
    9090        <xref linkend="pango"/>
    9191      </para>
    … …  
    9393      <bridgehead renderas="sect5">Required (gtk and gtk.unixprint modules)</bridgehead>
    9494      <para role="required">
    95         <xref linkend="py2cairo"/> and
     95        <xref linkend="pycairo"/> (Python 2) and
    9696        <xref linkend="gtk2"/>.
    9797      </para>
    … …  
    9999      <bridgehead renderas="sect5">Required (gtk.glade module)</bridgehead>
    100100      <para role="required">
    101         <xref linkend="py2cairo"/> and
     101        <xref linkend="pycairo"/> (Python 2) and
    102102        <xref linkend="libglade"/>.
    103103      </para>

  • general/prog/python-modules.xml

    r7ee0102 r7979906  
    4242        </para>
    4343      </listitem>
     44<!--     
    4445      <listitem>
    4546        <para>
    4647          <xref linkend="py2cairo"/>
    47         </para>
     48        </para> 
    4849      </listitem>
     50-->
    4951      <listitem>
    5052        <para>
    … …  
    127129  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    128130    href="pyatspi2.xml"/>
    129 
     131<!--
    130132  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    131133    href="py2cairo.xml"/>
    132 
     134-->
    133135  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    134136    href="pycairo.xml"/>

  • introduction/welcome/changelog.xml

    r7ee0102 r7979906  
    4646      <itemizedlist>
    4747        <listitem>
     48          <para>[bdubbs] - Update to pycairo-1.13.2. Combines
     49          build for python2 and python3. Py2cairo archived.
     50          Fixes
     51          <ulink url="&blfs-ticket-root;9267">#9267</ulink>.</para>
     52        </listitem>
     53        <listitem>
    4854          <para>[bdubbs] - Update to gucharmap-9.0.4. Fixes
    4955          <ulink url="&blfs-ticket-root;9226">#9226</ulink>.</para>

  • packages.ent

    r7ee0102 r7979906  
    390390<!ENTITY MarkupSafe-version           "1.0">
    391391<!ENTITY pyatspi2-version             "2.24.0">
    392 <!ENTITY py2cairo-version             "1.10.0">
     392<!--<!ENTITY py2cairo-version             "1.10.0"> -->
    393393<!ENTITY pycairo-version              "1.10.0">
    394394<!ENTITY pycrypto-version             "2.6.1">
Note: See TracChangeset for help on using the changeset viewer.