Author: bdubbs
Date: Mon May 22 13:46:50 2017
New Revision: 18756
Log:
Update to pycairo-1.13.2. Combines
build for python2 and python3. Py2cairo archived.
Added:
trunk/BOOK/archive/py2cairo.xml
- copied unchanged from r18755, trunk/BOOK/general/prog/py2cairo.xml
Deleted:
trunk/BOOK/general/prog/py2cairo.xml
Modified:
trunk/BOOK/general/prog/pycairo.xml
trunk/BOOK/general/prog/pygobject2.xml
trunk/BOOK/general/prog/pygobject3.xml
trunk/BOOK/general/prog/pygtk.xml
trunk/BOOK/general/prog/python-modules.xml
trunk/BOOK/introduction/welcome/changelog.xml
trunk/BOOK/packages.ent
Copied: trunk/BOOK/archive/py2cairo.xml (from r18755,
trunk/BOOK/general/prog/py2cairo.xml)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ trunk/BOOK/archive/py2cairo.xml Mon May 22 13:46:50 2017
(r18756, copy of r18755, trunk/BOOK/general/prog/py2cairo.xml)
@@ -0,0 +1,139 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+ "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd"; [
+ <!ENTITY % general-entities SYSTEM "../../general.ent">
+ %general-entities;
+
+ <!ENTITY py2cairo-download-http
+
"http://cairographics.org/releases/py2cairo-&py2cairo-version;.tar.bz2";>
+ <!ENTITY py2cairo-download-ftp " ">
+ <!ENTITY py2cairo-md5sum "20337132c4ab06c1146ad384d55372c5">
+ <!ENTITY py2cairo-size "400 KB">
+ <!ENTITY py2cairo-buildsize "3.6 MB">
+ <!ENTITY py2cairo-time "less than 0.1 SBU">
+]>
+
+ <!-- Begin Py2cairo -->
+ <sect2 id="py2cairo" xreflabel="Py2cairo-&py2cairo-version;">
+
+ <title>Py2cairo-&py2cairo-version;</title>
+
+ <indexterm zone="py2cairo">
+ <primary sortas="a-Py2cairo">Py2cairo</primary>
+ </indexterm>
+
+ <sect3 role="package">
+ <title>Introduction to Py2cairo Module</title>
+
+ <para>
+ Py2cairo provides <application>Python 2</application> bindings to
+ <application>Cairo</application>.
+ </para>
+
+ &lfs80_checked;
+
+ <bridgehead renderas="sect4">Package Information</bridgehead>
+ <itemizedlist spacing="compact">
+ <listitem>
+ <para>
+ Download (HTTP): <ulink url="&py2cairo-download-http;"/>
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ Download (FTP): <ulink url="&py2cairo-download-ftp;"/>
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ Download MD5 sum: &py2cairo-md5sum;
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ Download size: &py2cairo-size;
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ Estimated disk space required: &py2cairo-buildsize;
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ Estimated build time: &py2cairo-time;
+ </para>
+ </listitem>
+ </itemizedlist>
+
+ <bridgehead renderas="sect4">Py2cairo Dependencies</bridgehead>
+
+ <bridgehead renderas="sect5">Required</bridgehead>
+ <para role="required">
+ <xref linkend="python2"/> and
+ <xref linkend="cairo"/>
+ </para>
+
+ <bridgehead renderas="sect5">Optional</bridgehead>
+ <para role="optional">
+ <ulink url="http://pytest.org";>pytest</ulink>
+ </para>
+
+ <para condition="html" role="usernotes">
+ User Notes: <ulink url="&blfs-wiki;/py2cairo"/>
+ </para>
+ </sect3>
+
+ <sect3 role="installation">
+ <title>Installation of Py2cairo</title>
+
+ <para>
+ Install <application>Py2cairo</application> by running the following
+ commands:
+ </para>
+
+<screen><userinput>./waf configure --prefix=/usr &&
+./waf build</userinput></screen>
+
+ <para>
+ The test suite must be run after the package is installed.
+ </para>
+
+ <para>
+ Now, as the <systemitem class="username">root</systemitem> user:
+ </para>
+
+<screen role="root"><userinput>./waf install</userinput></screen>
+
+ <para>
+ The test suite requires the optional <application>pytest</application>
+ package. If installed, it is run by changing to the
+ <filename class='directory'>test</filename> directory and running
+ <command>py.test</command> as an unprivileged user.
+ </para>
+ </sect3>
+
+ <sect3 role="content">
+ <title>Contents</title>
+
+ <segmentedlist>
+ <segtitle>Installed Programs</segtitle>
+ <segtitle>Installed Library</segtitle>
+ <segtitle>Installed Directory</segtitle>
+
+ <seglistitem>
+ <seg>
+ None
+ </seg>
+ <seg>
+ _cairo.so
+ </seg>
+ <seg>
+ /usr/include/pycairo and
+ /usr/lib/python&python2-majorver;/site-packages/cairo
+ </seg>
+ </seglistitem>
+ </segmentedlist>
+ </sect3>
+ </sect2>
+ <!-- End Py2cairo -->
Modified: trunk/BOOK/general/prog/pycairo.xml
==============================================================================
--- trunk/BOOK/general/prog/pycairo.xml Mon May 22 12:40:18 2017 (r18755)
+++ trunk/BOOK/general/prog/pycairo.xml Mon May 22 13:46:50 2017 (r18756)
@@ -4,12 +4,11 @@
<!ENTITY % general-entities SYSTEM "../../general.ent">
%general-entities;
- <!ENTITY pycairo-download-http
-
"http://cairographics.org/releases/pycairo-&pycairo-version;.tar.bz2";>
+ <!ENTITY pycairo-download-http
"https://github.com/pygobject/pycairo/releases/download/v&pycairo-version;/pycairo-&pycairo-version;.tar.gz";>
<!ENTITY pycairo-download-ftp " ">
- <!ENTITY pycairo-md5sum "e6fd3f2f1e6a72e0db0868c4985669c5">
- <!ENTITY pycairo-size "244 KB">
- <!ENTITY pycairo-buildsize "3.0 MB">
+ <!ENTITY pycairo-md5sum "e6e8407d3f51b0b89863872da0760616">
+ <!ENTITY pycairo-size "140 KB">
+ <!ENTITY pycairo-buildsize "3.2 MB">
<!ENTITY pycairo-time "less than 0.1 SBU">
]>
@@ -26,11 +25,12 @@
<title>Introduction to PyCairo Module</title>
<para>
- PyCairo provides <application>Python 3</application> bindings to
+ PyCairo provides <application>Python</application> bindings to
<application>Cairo</application>.
</para>
&lfs80_checked;
+ <!-- Does not use gcc -->
<bridgehead renderas="sect4">Package Information</bridgehead>
<itemizedlist spacing="compact">
@@ -66,27 +66,12 @@
</listitem>
</itemizedlist>
- <bridgehead renderas="sect4">Additional Downloads</bridgehead>
- <itemizedlist spacing="compact">
- <listitem>
- <para>
- Required patch:
- <ulink
url="&patch-root;/pycairo-&pycairo-version;-waf_unpack-1.patch"/>
- </para>
- </listitem>
- <listitem>
- <para>
- Required patch:
- <ulink
url="&patch-root;/pycairo-&pycairo-version;-waf_python_3_4-1.patch"/>
- </para>
- </listitem>
- </itemizedlist>
-
<bridgehead renderas="sect4">PyCairo Dependencies</bridgehead>
<bridgehead renderas="sect5">Required</bridgehead>
<para role="required">
- <xref linkend="cairo"/> and
+ <xref linkend="cairo"/>,
+ <xref linkend="python"/>, and/or
<xref linkend="python3"/>
</para>
@@ -99,18 +84,11 @@
<title>Installation of PyCairo</title>
<para>
- Install <application>PyCairo</application> by running the following
- commands:
+ Install <application>PyCairo</application> for Python2 by running
+ the following commands:
</para>
-<screen><userinput>patch -Np1 -i
../pycairo-&pycairo-version;-waf_unpack-1.patch &&
-wafdir=$(./waf unpack) &&
-pushd $wafdir &&
-patch -Np1 -i ../../pycairo-&pycairo-version;-waf_python_3_4-1.patch &&
-popd &&
-unset wafdir &&
-PYTHON=/usr/bin/python3 ./waf configure --prefix=/usr &&
-./waf build</userinput></screen>
+<screen><userinput>python2 setup.py build</userinput></screen>
<para>
This package does not come with a test suite.
@@ -120,7 +98,24 @@
Now, as the <systemitem class="username">root</systemitem> user:
</para>
-<screen role="root"><userinput>./waf install</userinput></screen>
+<screen role="root"><userinput>python2 setup.py install
--optimize=1</userinput></screen>
+
+ <para>
+ Install <application>PyCairo</application> for Python3 by running
+ the following commands:
+ </para>
+
+<screen><userinput>python3 setup.py build</userinput></screen>
+
+ <para>
+ This package does not come with a test suite.
+ </para>
+
+ <para>
+ Now, as the <systemitem class="username">root</systemitem> user:
+ </para>
+
+<screen role="root"><userinput>python3 setup.py install
--optimize=1</userinput></screen>
</sect3>
@@ -129,18 +124,19 @@
<segmentedlist>
<segtitle>Installed Programs</segtitle>
- <segtitle>Installed Library</segtitle>
- <segtitle>Installed Directory</segtitle>
+ <segtitle>Installed Libraries</segtitle>
+ <segtitle>Installed Directories</segtitle>
<seglistitem>
<seg>
None
</seg>
<seg>
- None
+ _cairo.so (python2) and
+ _cairo.cpython-36m-x86_64-linux-gnu.so (python3)
</seg>
<seg>
- /usr/include/pycairo and
+ /usr/lib/python&python2-majorver;/site-packages/cairo and
/usr/lib/python&python3-majorver;/site-packages/cairo
</seg>
</seglistitem>
Modified: trunk/BOOK/general/prog/pygobject2.xml
==============================================================================
--- trunk/BOOK/general/prog/pygobject2.xml Mon May 22 12:40:18 2017
(r18755)
+++ trunk/BOOK/general/prog/pygobject2.xml Mon May 22 13:46:50 2017
(r18756)
@@ -83,7 +83,7 @@
<bridgehead renderas="sect5">Required</bridgehead>
<para role="required">
<xref linkend="glib2"/> and
- <xref linkend="py2cairo"/>
+ <xref linkend="pycairo"/> (Python 2)
</para>
<bridgehead renderas="sect5">Optional</bridgehead>
Modified: trunk/BOOK/general/prog/pygobject3.xml
==============================================================================
--- trunk/BOOK/general/prog/pygobject3.xml Mon May 22 12:40:18 2017
(r18755)
+++ trunk/BOOK/general/prog/pygobject3.xml Mon May 22 13:46:50 2017
(r18756)
@@ -73,10 +73,9 @@
<bridgehead renderas="sect5">Required</bridgehead>
<para role="required">
<xref linkend="gobject-introspection"/> and
- <xref linkend="py2cairo"/>
- (for <application>Python 2</application> bindings) and/or
<xref linkend="pycairo"/>
- (for <application>Python 3</application> bindings)
+ (for <application>Python 2</application> and/or
+ <application>Python 3</application> bindings)
</para>
<bridgehead renderas="sect5">Optional (for the tests)</bridgehead>
Modified: trunk/BOOK/general/prog/pygtk.xml
==============================================================================
--- trunk/BOOK/general/prog/pygtk.xml Mon May 22 12:40:18 2017 (r18755)
+++ trunk/BOOK/general/prog/pygtk.xml Mon May 22 13:46:50 2017 (r18756)
@@ -86,19 +86,19 @@
<bridgehead renderas="sect5">Required (pangocairo module)</bridgehead>
<para role="required">
- <xref linkend="py2cairo"/> and
+ <xref linkend="pycairo"/> (Python 2) and
<xref linkend="pango"/>
</para>
<bridgehead renderas="sect5">Required (gtk and gtk.unixprint
modules)</bridgehead>
<para role="required">
- <xref linkend="py2cairo"/> and
+ <xref linkend="pycairo"/> (Python 2) and
<xref linkend="gtk2"/>.
</para>
<bridgehead renderas="sect5">Required (gtk.glade module)</bridgehead>
<para role="required">
- <xref linkend="py2cairo"/> and
+ <xref linkend="pycairo"/> (Python 2) and
<xref linkend="libglade"/>.
</para>
Modified: trunk/BOOK/general/prog/python-modules.xml
==============================================================================
--- trunk/BOOK/general/prog/python-modules.xml Mon May 22 12:40:18 2017
(r18755)
+++ trunk/BOOK/general/prog/python-modules.xml Mon May 22 13:46:50 2017
(r18756)
@@ -41,11 +41,13 @@
<xref linkend="pyatspi2"/>
</para>
</listitem>
+<!--
<listitem>
<para>
<xref linkend="py2cairo"/>
- </para>
+ </para>
</listitem>
+-->
<listitem>
<para>
<xref linkend="pycairo"/>
@@ -126,10 +128,10 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude";
href="pyatspi2.xml"/>
-
+<!--
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude";
href="py2cairo.xml"/>
-
+-->
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude";
href="pycairo.xml"/>
Modified: trunk/BOOK/introduction/welcome/changelog.xml
==============================================================================
--- trunk/BOOK/introduction/welcome/changelog.xml Mon May 22 12:40:18
2017 (r18755)
+++ trunk/BOOK/introduction/welcome/changelog.xml Mon May 22 13:46:50
2017 (r18756)
@@ -45,6 +45,12 @@
<para>May 22nd, 2017</para>
<itemizedlist>
<listitem>
+ <para>[bdubbs] - Update to pycairo-1.13.2. Combines
+ build for python2 and python3. Py2cairo archived.
+ Fixes
+ <ulink url="&blfs-ticket-root;9267">#9267</ulink>.</para>
+ </listitem>
+ <listitem>
<para>[bdubbs] - Update to gucharmap-9.0.4. Fixes
<ulink url="&blfs-ticket-root;9226">#9226</ulink>.</para>
</listitem>
Modified: trunk/BOOK/packages.ent
==============================================================================
--- trunk/BOOK/packages.ent Mon May 22 12:40:18 2017 (r18755)
+++ trunk/BOOK/packages.ent Mon May 22 13:46:50 2017 (r18756)
@@ -389,7 +389,7 @@
<!ENTITY lxml-version "3.7.3">
<!ENTITY MarkupSafe-version "1.0">
<!ENTITY pyatspi2-version "2.24.0">
-<!ENTITY py2cairo-version "1.10.0">
+<!--<!ENTITY py2cairo-version "1.10.0"> -->
<!ENTITY pycairo-version "1.10.0">
<!ENTITY pycrypto-version "2.6.1">
<!ENTITY pygobject2-version "2.28.6">
--
http://lists.linuxfromscratch.org/listinfo/blfs-book
FAQ: http://www.linuxfromscratch.org/blfs/faq.html
Unsubscribe: See the above information page
