From 7ebcf19f932bd88847b33e74ebfd13a8ec9b5134 Mon Sep 17 00:00:00 2001
From: "Douglas R. Reno" <renodr@linuxfromscratch.org>
Date: Tue, 18 Aug 2020 18:53:24 +0000
Subject: [PATCH] Fix FTBFS in Inkscape Various tags

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@23563 af4574ff-66df-0310-9fd7-8a98e5e911e0
---
 general/graphlib/librsvg.xml       |  2 +-
 general/graphlib/openjpeg2.xml     |  2 +-
 general/graphlib/poppler.xml       |  2 +-
 general/graphlib/potrace.xml       |  2 +-
 general/prog/lxml.xml              |  2 +-
 general/prog/scour.xml             |  2 +-
 introduction/welcome/changelog.xml |  3 +++
 x/icons/adwaita-icon-theme.xml     |  2 +-
 x/lib/atkmm.xml                    |  2 +-
 x/lib/cairomm.xml                  |  2 +-
 x/lib/gdl.xml                      |  2 +-
 x/lib/gtk-engines.xml              |  2 +-
 x/lib/gtkmm2.xml                   |  2 +-
 x/lib/gtkmm3.xml                   |  2 +-
 x/lib/pangomm.xml                  |  2 +-
 xsoft/other/inkscape.xml           | 37 +++++++-----------------------
 16 files changed, 25 insertions(+), 43 deletions(-)

diff --git a/general/graphlib/librsvg.xml b/general/graphlib/librsvg.xml
index a372e51a20..1e852cd285 100644
--- a/general/graphlib/librsvg.xml
+++ b/general/graphlib/librsvg.xml
@@ -35,7 +35,7 @@
       Scalable Vector Graphic (SVG) images.
     </para>
 
-    &lfs91_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing="compact">
diff --git a/general/graphlib/openjpeg2.xml b/general/graphlib/openjpeg2.xml
index e8700a3c09..4c604c500a 100644
--- a/general/graphlib/openjpeg2.xml
+++ b/general/graphlib/openjpeg2.xml
@@ -37,7 +37,7 @@
       specifications and can compress/decompress lossless 16-bit images.
     </para>
 
-    &lfs91_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing="compact">
diff --git a/general/graphlib/poppler.xml b/general/graphlib/poppler.xml
index f7e9b505bb..197ae00bfa 100644
--- a/general/graphlib/poppler.xml
+++ b/general/graphlib/poppler.xml
@@ -43,7 +43,7 @@
       useful for providing PDF rendering functionality as a shared library.
     </para>
 
-    &lfs91_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing="compact">
diff --git a/general/graphlib/potrace.xml b/general/graphlib/potrace.xml
index 660ab2b5d4..68bab87381 100644
--- a/general/graphlib/potrace.xml
+++ b/general/graphlib/potrace.xml
@@ -35,7 +35,7 @@
       (PBM, PGM, PPM, or BMP format) into one of several vector file formats.
     </para>
 
-    &lfs91_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing="compact">
diff --git a/general/prog/lxml.xml b/general/prog/lxml.xml
index b2fd45d1c2..60f2698ca8 100644
--- a/general/prog/lxml.xml
+++ b/general/prog/lxml.xml
@@ -30,7 +30,7 @@
         <xref linkend="libxslt"/> and <xref linkend="libxml2"/>.
       </para>
 
-      &lfs91_checked;
+      &lfs10_checked;
 
       <bridgehead renderas="sect4">Package Information</bridgehead>
       <itemizedlist spacing="compact">
diff --git a/general/prog/scour.xml b/general/prog/scour.xml
index 83e9b74f74..dff2a87b89 100644
--- a/general/prog/scour.xml
+++ b/general/prog/scour.xml
@@ -30,7 +30,7 @@
         removing unnecessary data.
       </para>
 
-      &lfs91_checked;
+      &lfs10_checked;
 
       <bridgehead renderas="sect4">Package Information</bridgehead>
       <itemizedlist spacing="compact">
diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml
index 0e43357267..8245c25d74 100644
--- a/introduction/welcome/changelog.xml
+++ b/introduction/welcome/changelog.xml
@@ -44,6 +44,9 @@
     <listitem>
       <para>August 18th, 2020</para>
       <itemizedlist>
+        <listitem>
+          <para>[renodr] - Fix building Inkscape with glibc-2.32.</para>
+        </listitem>
         <listitem>
           <para>[pierre] - Update to blocaled-0.3. Fixes
           <ulink url="&blfs-ticket-root;13938">#13938</ulink>.</para>
diff --git a/x/icons/adwaita-icon-theme.xml b/x/icons/adwaita-icon-theme.xml
index 0907b616d8..f5e31b0222 100644
--- a/x/icons/adwaita-icon-theme.xml
+++ b/x/icons/adwaita-icon-theme.xml
@@ -36,7 +36,7 @@
       icon theme for <application>Gtk+ 3</application> applications.
     </para>
 
-    &lfs91_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing="compact">
diff --git a/x/lib/atkmm.xml b/x/lib/atkmm.xml
index 9d4f3317c9..3768856654 100644
--- a/x/lib/atkmm.xml
+++ b/x/lib/atkmm.xml
@@ -34,7 +34,7 @@
       ATK accessibility toolkit library.
     </para>
 
-    &lfs91_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing="compact">
diff --git a/x/lib/cairomm.xml b/x/lib/cairomm.xml
index ac5fefc976..feec5ef7c5 100644
--- a/x/lib/cairomm.xml
+++ b/x/lib/cairomm.xml
@@ -34,7 +34,7 @@
       interface to <application>Cairo</application>.
     </para>
 
-    &lfs91_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing="compact">
diff --git a/x/lib/gdl.xml b/x/lib/gdl.xml
index b1b0174dc7..c400bb3ae9 100644
--- a/x/lib/gdl.xml
+++ b/x/lib/gdl.xml
@@ -34,7 +34,7 @@
       GTK+ applications.
     </para>
 
-    &lfs91_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing="compact">
diff --git a/x/lib/gtk-engines.xml b/x/lib/gtk-engines.xml
index 6b3b688a33..f55f3dc180 100644
--- a/x/lib/gtk-engines.xml
+++ b/x/lib/gtk-engines.xml
@@ -37,7 +37,7 @@
       <application>GTK2</application>.
     </para>
 
-    &lfs91_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing="compact">
diff --git a/x/lib/gtkmm2.xml b/x/lib/gtkmm2.xml
index 644dbacabd..cff6ba4b24 100644
--- a/x/lib/gtkmm2.xml
+++ b/x/lib/gtkmm2.xml
@@ -36,7 +36,7 @@
       with no namespace conflicts.
     </para>
 
-    &lfs91_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing="compact">
diff --git a/x/lib/gtkmm3.xml b/x/lib/gtkmm3.xml
index 385cadb2c0..13c58b2d9f 100644
--- a/x/lib/gtkmm3.xml
+++ b/x/lib/gtkmm3.xml
@@ -34,7 +34,7 @@
       <application>GTK+ 3</application>.
     </para>
 
-    &lfs91_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing="compact">
diff --git a/x/lib/pangomm.xml b/x/lib/pangomm.xml
index e84403585e..afcc053d86 100644
--- a/x/lib/pangomm.xml
+++ b/x/lib/pangomm.xml
@@ -34,7 +34,7 @@
       interface to <application>Pango</application>.
     </para>
 
-    &lfs91_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing="compact">
diff --git a/xsoft/other/inkscape.xml b/xsoft/other/inkscape.xml
index 0bbd957b26..fcd3071ac8 100644
--- a/xsoft/other/inkscape.xml
+++ b/xsoft/other/inkscape.xml
@@ -34,7 +34,7 @@
       changing SVG images.
     </para>
 
-    &lfs91_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing="compact">
@@ -176,18 +176,7 @@
   <sect2 role="installation">
     <title>Installation of Inkscape</title>
 
-    <!-- Not needed with 0.92.5, but let's keep the template instead.
-    <para>
-      First, fix a problem introduced by Poppler-0.76.1.
-    </para>
-
-<screen><userinput remap="pre">sed -e 's|new Lexer(xref, obj)|obj|g' -i src/extension/internal/pdfinput/pdf-parser.cpp</userinput></screen>
-
-    <para>
-      Next, fix Inkscape to be able to build with poppler-0.82.0 and higher:
-    </para>
-
-<screen><userinput remap="pre">sed -e 's|Unicode \*u|Unicode const *u|g' -i src/extension/internal/pdfinput/*</userinput></screen>
+    <!-- Not needed with 1.0, but let's keep the template.
 
     <para>
       Now fix Inkscape to build with poppler-0.83.0:
@@ -196,22 +185,6 @@
 <screen><userinput remap="pre">patch -Np1 -i ../inkscape-&inkscape-version;-poppler_0_83_0_fixes-1.patch</userinput></screen>
     -->
 
-    <!-- Inkscape now has a hard dependency on IM7.
-    <para>
-      Ensure that the libraries from <xref linkend="imagemagick6"/> can be used:
-    </para>
-
-<screen><userinput>patch -Np1 -i ../inkscape-&inkscape-version;-use_versioned_ImageMagick6-1.patch</userinput></screen>
-    -->
-<!--
-    <para>
-      Apply a patch to prevent out-of-bounds writes in the text and fill-bucket
-      tools:
-    </para>
-
-<screen><userinput>patch -Np1 -i ../inkscape-&inkscape-version;-upstream_fixes-1.patch</userinput></screen>
--->
-
 <!-- If there is no test suite, then this is not needed.
      There is none if the command below is not run.
      With 1.0, this support is broken, so let's comment it out for now to
@@ -225,6 +198,12 @@
 <screen remap="test"><userinput>bash download-gtest.sh</userinput></screen>
     -->
 
+    <para>
+      First, fix build failure with glibc-2.32:
+    </para>
+
+<screen><userinput remap="pre">sed -i '/#include &lt;iostream&gt;/a #include &lt;atomic&gt;' src/ui/tool/node.cpp</userinput></screen>
+
     <para>
       Install <application>Inkscape</application> by running the following
       commands: