From 7c9b1d62da310375ee23d3de7b346b40ab0d56a9 Mon Sep 17 00:00:00 2001
From: Xi Ruoyao <xry111@mengyan1223.wang>
Date: Thu, 11 Apr 2019 16:50:29 +0000
Subject: [PATCH] Update to pixman-0.38.4

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@21455 af4574ff-66df-0310-9fd7-8a98e5e911e0
---
 general/graphlib/pixman.xml        | 23 +++++++++--------------
 introduction/welcome/changelog.xml |  4 ++++
 packages.ent                       |  2 +-
 3 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/general/graphlib/pixman.xml b/general/graphlib/pixman.xml
index 18296a977b..170881e250 100644
--- a/general/graphlib/pixman.xml
+++ b/general/graphlib/pixman.xml
@@ -6,9 +6,9 @@
 
   <!ENTITY pixman-download-http "https://www.cairographics.org/releases/pixman-&pixman-version;.tar.gz">
   <!ENTITY pixman-download-ftp  " ">
-  <!ENTITY pixman-md5sum        "e216abae705641038ca782c6d6fd4204">
+  <!ENTITY pixman-md5sum        "267a7af290f93f643a1bc74490d9fdd1">
   <!ENTITY pixman-size          "880 KB">
-  <!ENTITY pixman-buildsize     "63 MB (with tests)">
+  <!ENTITY pixman-buildsize     "55 MB (with tests)">
   <!ENTITY pixman-time          "0.8 SBU (with tests)">
 ]>
 
@@ -90,26 +90,21 @@
     <para>Install <application>Pixman</application> by running the following
     commands:</para>
 
-<screen><userinput>./configure --prefix=/usr --disable-static &amp;&amp;
-make</userinput></screen>
+<screen><userinput>mkdir build &amp;&amp;
+cd build &amp;&amp;
+
+meson --prefix=/usr &amp;&amp;
+ninja</userinput></screen>
 
     <para>
-      To test the results, issue: <command>make check</command>.
+      To test the results, issue: <command>ninja test</command>.
     </para>
 
     <para>
       Now, as the <systemitem class="username">root</systemitem> user:
     </para>
 
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/static-libraries.xml"/>
+<screen role="root"><userinput>ninja install</userinput></screen>
 
   </sect2>
 
diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml
index 953082841b..930ce2c743 100644
--- a/introduction/welcome/changelog.xml
+++ b/introduction/welcome/changelog.xml
@@ -44,6 +44,10 @@
     <listitem>
       <para>April 11th, 2019</para>
       <itemizedlist>
+        <listitem>
+          <para>[xry111] - Update to pixman-0.38.4.  Fixes
+          <ulink url="&blfs-ticket-root;11933">#11933</ulink>.</para>
+        </listitem>
         <listitem>
           <para>[xry111] - Update to gtk+-3.24.8.  Fixes
           <ulink url="&blfs-ticket-root;11935">#11935</ulink>.</para>
diff --git a/packages.ent b/packages.ent
index 65fff30e86..4d25e536f2 100644
--- a/packages.ent
+++ b/packages.ent
@@ -222,7 +222,7 @@ to avoid building libxml2 twice, which is slow with all deps -->
 <!ENTITY opencv-contrib-version       "4.0.1">
 <!ENTITY openjpeg-version             "1.5.2">
 <!ENTITY openjpeg2-version            "2.3.1">
-<!ENTITY pixman-version               "0.38.2">   <!-- Even minors only -->
+<!ENTITY pixman-version               "0.38.4">   <!-- Even minors only -->
 <!ENTITY poppler-version              "0.75.0">
 <!ENTITY potrace-version              "1.15">
 <!ENTITY qpdf-version                 "8.4.0">