From 4a8fc81f593d8fd5842ca8291c5384965aa6456b Mon Sep 17 00:00:00 2001
From: Fernando de Oliveira <fernando@linuxfromscratch.org>
Date: Fri, 28 Mar 2014 10:10:16 +0000
Subject: [PATCH] Update to pygobject-3.12.0. Archive PyAtSpi2-2.10.0.

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@12902 af4574ff-66df-0310-9fd7-8a98e5e911e0
---
 {general/prog => archive}/pyatspi2.xml |  0
 general.ent                            |  7 +++----
 general/prog/pygobject3.xml            | 17 +++++++++--------
 general/prog/python-modules.xml        |  8 --------
 introduction/welcome/changelog.xml     | 14 ++++++++++++++
 5 files changed, 26 insertions(+), 20 deletions(-)
 rename {general/prog => archive}/pyatspi2.xml (100%)

diff --git a/general/prog/pyatspi2.xml b/archive/pyatspi2.xml
similarity index 100%
rename from general/prog/pyatspi2.xml
rename to archive/pyatspi2.xml
diff --git a/general.ent b/general.ent
index 59b9b6febe..5074367945 100644
--- a/general.ent
+++ b/general.ent
@@ -1,12 +1,12 @@
 <!-- $LastChangedBy$ $Date$ -->
 
-<!ENTITY day          "27">                   <!-- Always 2 digits -->
+<!ENTITY day          "28">                   <!-- Always 2 digits -->
 <!ENTITY month        "03">                   <!-- Always 2 digits -->
 <!ENTITY year         "2014">
 <!ENTITY copyrightdate "2001-&year;">
 <!ENTITY copyholder   "The BLFS Development Team">
 <!ENTITY version      "&year;-&month;-&day;">
-<!ENTITY releasedate  "March 27nd, &year;">
+<!ENTITY releasedate  "March 28nd, &year;">
 <!ENTITY pubdate      "&year;-&month;-&day;"> <!-- metadata req. by TLDP -->
 <!ENTITY blfs-version "svn">                  <!-- svn|[release #] -->
 <!ENTITY lfs-version  "development">          <!-- x.y|development] -->
@@ -426,9 +426,8 @@ export -f as_root</userinput></screen>
 <!ENTITY py2cairo-version             "1.10.0">
 <!ENTITY pycairo-version              "1.10.0">
 <!ENTITY pygobject2-version           "2.28.6">
-<!ENTITY pygobject3-version           "3.10.2">
+<!ENTITY pygobject3-version           "3.12.0">
 <!ENTITY pygtk-version                "2.24.0">
-<!ENTITY pyatspi2-version             "2.10.0">
 <!ENTITY pyxdg-version                "0.25">
 
 <!-- Part IV -->
diff --git a/general/prog/pygobject3.xml b/general/prog/pygobject3.xml
index 30762cf33d..9f7f02b116 100644
--- a/general/prog/pygobject3.xml
+++ b/general/prog/pygobject3.xml
@@ -5,13 +5,13 @@
   %general-entities;
 
   <!ENTITY pygobject3-download-http
-           "&gnome-download-http;/pygobject/3.10/pygobject-&pygobject3-version;.tar.xz">
+           "&gnome-download-http;/pygobject/3.12/pygobject-&pygobject3-version;.tar.xz">
   <!ENTITY pygobject3-download-ftp
-           "&gnome-download-ftp;/pygobject/3.10/pygobject-&pygobject3-version;.tar.xz">
-  <!ENTITY pygobject3-md5sum        "f311155be8510df6ad8e4edf1cb463d4">
-  <!ENTITY pygobject3-size          "660 KB">
-  <!ENTITY pygobject3-buildsize     "27 MB">
-  <!ENTITY pygobject3-time          "0.5 SBU">
+           "&gnome-download-ftp;/pygobject/3.12/pygobject-&pygobject3-version;.tar.xz">
+  <!ENTITY pygobject3-md5sum        "f62700cdd7919b5afbc1de54569df648">
+  <!ENTITY pygobject3-size          "688 KB">
+  <!ENTITY pygobject3-buildsize     "16 MB">
+  <!ENTITY pygobject3-time          "0.3 SBU">
 ]>
 
  <!-- Begin PyGObject3 -->
@@ -162,8 +162,9 @@ popd</userinput></screen>
             None
            </seg>
           <seg>
-            libpyglib-gi-2.0-python.so and/or
-            libpyglib-gi-2.0-python3.so
+            /usr/lib/python&python2-majorver;/site-packages/gi/{_gi.so,_gi_cairo.so}
+ and/or
+            /usr/lib/python&python3-majorver;/site-packages/gi/{_gi_cairo.cpython-34m.so,_gi.cpython-34m.so}
            </seg>
           <seg>
             /usr/include/pygobject-3.0 and
diff --git a/general/prog/python-modules.xml b/general/prog/python-modules.xml
index a7a8ef08ef..5cf2aa7c62 100644
--- a/general/prog/python-modules.xml
+++ b/general/prog/python-modules.xml
@@ -61,11 +61,6 @@
           <xref linkend="pygtk"/>
         </para>
       </listitem>
-      <listitem>
-        <para>
-          <xref linkend="pyatspi2"/>
-        </para>
-      </listitem>
       <listitem>
         <para>
           <xref linkend="pyxdg"/>
@@ -92,9 +87,6 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="pygtk.xml"/>
 
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="pyatspi2.xml"/>
-
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="pyxdg.xml"/>
 
diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml
index e63748cbf8..a6fbcdfefd 100644
--- a/introduction/welcome/changelog.xml
+++ b/introduction/welcome/changelog.xml
@@ -44,6 +44,20 @@
 
 -->
 
+    <listitem>
+      <para>March 28nd, 2014</para>
+      <itemizedlist>
+        <listitem>
+          <para>[fernando] - Archive PyAtSpi2-2.10.0. Fixes
+          <ulink url="&blfs-ticket-root;4853">#4853</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[fernando] - Update to pygobject-3.12.0. Fixes
+          <ulink url="&blfs-ticket-root;4852">#4852</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
     <listitem>
       <para>March 27nd, 2014</para>
       <itemizedlist>