Author: renodr
Date: Tue Aug 18 11:53:24 2020
New Revision: 23563
Log:
Fix FTBFS in Inkscape
Various tags
Modified:
trunk/BOOK/general/graphlib/librsvg.xml
trunk/BOOK/general/graphlib/openjpeg2.xml
trunk/BOOK/general/graphlib/poppler.xml
trunk/BOOK/general/graphlib/potrace.xml
trunk/BOOK/general/prog/lxml.xml
trunk/BOOK/general/prog/scour.xml
trunk/BOOK/introduction/welcome/changelog.xml
trunk/BOOK/x/icons/adwaita-icon-theme.xml
trunk/BOOK/x/lib/atkmm.xml
trunk/BOOK/x/lib/cairomm.xml
trunk/BOOK/x/lib/gdl.xml
trunk/BOOK/x/lib/gtk-engines.xml
trunk/BOOK/x/lib/gtkmm2.xml
trunk/BOOK/x/lib/gtkmm3.xml
trunk/BOOK/x/lib/pangomm.xml
trunk/BOOK/xsoft/other/inkscape.xml
Modified: trunk/BOOK/general/graphlib/librsvg.xml
==============================================================================
--- trunk/BOOK/general/graphlib/librsvg.xml Tue Aug 18 10:54:09 2020
(r23562)
+++ trunk/BOOK/general/graphlib/librsvg.xml Tue Aug 18 11:53:24 2020
(r23563)
@@ -35,7 +35,7 @@
Scalable Vector Graphic (SVG) images.
</para>
- &lfs91_checked;
+ &lfs10_checked;
<bridgehead renderas="sect3">Package Information</bridgehead>
<itemizedlist spacing="compact">
Modified: trunk/BOOK/general/graphlib/openjpeg2.xml
==============================================================================
--- trunk/BOOK/general/graphlib/openjpeg2.xml Tue Aug 18 10:54:09 2020
(r23562)
+++ trunk/BOOK/general/graphlib/openjpeg2.xml Tue Aug 18 11:53:24 2020
(r23563)
@@ -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">
Modified: trunk/BOOK/general/graphlib/poppler.xml
==============================================================================
--- trunk/BOOK/general/graphlib/poppler.xml Tue Aug 18 10:54:09 2020
(r23562)
+++ trunk/BOOK/general/graphlib/poppler.xml Tue Aug 18 11:53:24 2020
(r23563)
@@ -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">
Modified: trunk/BOOK/general/graphlib/potrace.xml
==============================================================================
--- trunk/BOOK/general/graphlib/potrace.xml Tue Aug 18 10:54:09 2020
(r23562)
+++ trunk/BOOK/general/graphlib/potrace.xml Tue Aug 18 11:53:24 2020
(r23563)
@@ -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">
Modified: trunk/BOOK/general/prog/lxml.xml
==============================================================================
--- trunk/BOOK/general/prog/lxml.xml Tue Aug 18 10:54:09 2020 (r23562)
+++ trunk/BOOK/general/prog/lxml.xml Tue Aug 18 11:53:24 2020 (r23563)
@@ -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">
Modified: trunk/BOOK/general/prog/scour.xml
==============================================================================
--- trunk/BOOK/general/prog/scour.xml Tue Aug 18 10:54:09 2020 (r23562)
+++ trunk/BOOK/general/prog/scour.xml Tue Aug 18 11:53:24 2020 (r23563)
@@ -30,7 +30,7 @@
removing unnecessary data.
</para>
- &lfs91_checked;
+ &lfs10_checked;
<bridgehead renderas="sect4">Package Information</bridgehead>
<itemizedlist spacing="compact">
Modified: trunk/BOOK/introduction/welcome/changelog.xml
==============================================================================
--- trunk/BOOK/introduction/welcome/changelog.xml Tue Aug 18 10:54:09
2020 (r23562)
+++ trunk/BOOK/introduction/welcome/changelog.xml Tue Aug 18 11:53:24
2020 (r23563)
@@ -45,6 +45,9 @@
<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>
</listitem>
Modified: trunk/BOOK/x/icons/adwaita-icon-theme.xml
==============================================================================
--- trunk/BOOK/x/icons/adwaita-icon-theme.xml Tue Aug 18 10:54:09 2020
(r23562)
+++ trunk/BOOK/x/icons/adwaita-icon-theme.xml Tue Aug 18 11:53:24 2020
(r23563)
@@ -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">
Modified: trunk/BOOK/x/lib/atkmm.xml
==============================================================================
--- trunk/BOOK/x/lib/atkmm.xml Tue Aug 18 10:54:09 2020 (r23562)
+++ trunk/BOOK/x/lib/atkmm.xml Tue Aug 18 11:53:24 2020 (r23563)
@@ -34,7 +34,7 @@
ATK accessibility toolkit library.
</para>
- &lfs91_checked;
+ &lfs10_checked;
<bridgehead renderas="sect3">Package Information</bridgehead>
<itemizedlist spacing="compact">
Modified: trunk/BOOK/x/lib/cairomm.xml
==============================================================================
--- trunk/BOOK/x/lib/cairomm.xml Tue Aug 18 10:54:09 2020 (r23562)
+++ trunk/BOOK/x/lib/cairomm.xml Tue Aug 18 11:53:24 2020 (r23563)
@@ -34,7 +34,7 @@
interface to <application>Cairo</application>.
</para>
- &lfs91_checked;
+ &lfs10_checked;
<bridgehead renderas="sect3">Package Information</bridgehead>
<itemizedlist spacing="compact">
Modified: trunk/BOOK/x/lib/gdl.xml
==============================================================================
--- trunk/BOOK/x/lib/gdl.xml Tue Aug 18 10:54:09 2020 (r23562)
+++ trunk/BOOK/x/lib/gdl.xml Tue Aug 18 11:53:24 2020 (r23563)
@@ -34,7 +34,7 @@
GTK+ applications.
</para>
- &lfs91_checked;
+ &lfs10_checked;
<bridgehead renderas="sect3">Package Information</bridgehead>
<itemizedlist spacing="compact">
Modified: trunk/BOOK/x/lib/gtk-engines.xml
==============================================================================
--- trunk/BOOK/x/lib/gtk-engines.xml Tue Aug 18 10:54:09 2020 (r23562)
+++ trunk/BOOK/x/lib/gtk-engines.xml Tue Aug 18 11:53:24 2020 (r23563)
@@ -37,7 +37,7 @@
<application>GTK2</application>.
</para>
- &lfs91_checked;
+ &lfs10_checked;
<bridgehead renderas="sect3">Package Information</bridgehead>
<itemizedlist spacing="compact">
Modified: trunk/BOOK/x/lib/gtkmm2.xml
==============================================================================
--- trunk/BOOK/x/lib/gtkmm2.xml Tue Aug 18 10:54:09 2020 (r23562)
+++ trunk/BOOK/x/lib/gtkmm2.xml Tue Aug 18 11:53:24 2020 (r23563)
@@ -36,7 +36,7 @@
with no namespace conflicts.
</para>
- &lfs91_checked;
+ &lfs10_checked;
<bridgehead renderas="sect3">Package Information</bridgehead>
<itemizedlist spacing="compact">
Modified: trunk/BOOK/x/lib/gtkmm3.xml
==============================================================================
--- trunk/BOOK/x/lib/gtkmm3.xml Tue Aug 18 10:54:09 2020 (r23562)
+++ trunk/BOOK/x/lib/gtkmm3.xml Tue Aug 18 11:53:24 2020 (r23563)
@@ -34,7 +34,7 @@
<application>GTK+ 3</application>.
</para>
- &lfs91_checked;
+ &lfs10_checked;
<bridgehead renderas="sect3">Package Information</bridgehead>
<itemizedlist spacing="compact">
Modified: trunk/BOOK/x/lib/pangomm.xml
==============================================================================
--- trunk/BOOK/x/lib/pangomm.xml Tue Aug 18 10:54:09 2020 (r23562)
+++ trunk/BOOK/x/lib/pangomm.xml Tue Aug 18 11:53:24 2020 (r23563)
@@ -34,7 +34,7 @@
interface to <application>Pango</application>.
</para>
- &lfs91_checked;
+ &lfs10_checked;
<bridgehead renderas="sect3">Package Information</bridgehead>
<itemizedlist spacing="compact">
Modified: trunk/BOOK/xsoft/other/inkscape.xml
==============================================================================
--- trunk/BOOK/xsoft/other/inkscape.xml Tue Aug 18 10:54:09 2020 (r23562)
+++ trunk/BOOK/xsoft/other/inkscape.xml Tue Aug 18 11:53:24 2020 (r23563)
@@ -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
@@ -226,6 +199,12 @@
-->
<para>
+ First, fix build failure with glibc-2.32:
+ </para>
+
+<screen><userinput remap="pre">sed -i '/#include <iostream>/a #include
<atomic>' src/ui/tool/node.cpp</userinput></screen>
+
+ <para>
Install <application>Inkscape</application> by running the following
commands:
</para>
--
http://lists.linuxfromscratch.org/listinfo/blfs-book
FAQ: http://www.linuxfromscratch.org/blfs/faq.html
Unsubscribe: See the above information page
