linux-from-scratch/glfs
1
0
Fork 0
mirror of https://github.com/Zeckmathederg/glfs.git synced 2025-01-24 23:32:12 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix FTBFS in Inkscape

Browse Source 
Various tags

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@23563 af4574ff-66df-0310-9fd7-8a98e5e911e0
This commit is contained in:
Douglas R. Reno 2020-08-18 18:53:24 +00:00
parent b4a94beb9e
commit 7ebcf19f93
16 changed files with 25 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
general/graphlib/librsvg.xml
View File

@ -35,7 +35,7 @@
Scalable Vector Graphic (SVG) images.
</para>
&lfs91_checked;
&lfs10_checked;
<bridgehead renderas="sect3">Package Information</bridgehead>
<itemizedlist spacing="compact">

2
general/graphlib/openjpeg2.xml
View File

@ -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">

2
general/graphlib/poppler.xml
View File

@ -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">

2
general/graphlib/potrace.xml
View File

@ -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">

2
general/prog/lxml.xml
View File

@ -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">

2
general/prog/scour.xml
View File

@ -30,7 +30,7 @@
removing unnecessary data.
</para>
&lfs91_checked;
&lfs10_checked;
<bridgehead renderas="sect4">Package Information</bridgehead>
<itemizedlist spacing="compact">

3
introduction/welcome/changelog.xml
View File

@ -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>

2
x/icons/adwaita-icon-theme.xml
View File

@ -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">

2
x/lib/atkmm.xml
View File

@ -34,7 +34,7 @@
ATK accessibility toolkit library.
</para>
&lfs91_checked;
&lfs10_checked;
<bridgehead renderas="sect3">Package Information</bridgehead>
<itemizedlist spacing="compact">

2
x/lib/cairomm.xml
View File

@ -34,7 +34,7 @@
interface to <application>Cairo</application>.
</para>
&lfs91_checked;
&lfs10_checked;
<bridgehead renderas="sect3">Package Information</bridgehead>
<itemizedlist spacing="compact">

2
x/lib/gdl.xml
View File

@ -34,7 +34,7 @@
GTK+ applications.
</para>
&lfs91_checked;
&lfs10_checked;
<bridgehead renderas="sect3">Package Information</bridgehead>
<itemizedlist spacing="compact">

2
x/lib/gtk-engines.xml
View File

@ -37,7 +37,7 @@
<application>GTK2</application>.
</para>
&lfs91_checked;
&lfs10_checked;
<bridgehead renderas="sect3">Package Information</bridgehead>
<itemizedlist spacing="compact">

2
x/lib/gtkmm2.xml
View File

@ -36,7 +36,7 @@
with no namespace conflicts.
</para>
&lfs91_checked;
&lfs10_checked;
<bridgehead renderas="sect3">Package Information</bridgehead>
<itemizedlist spacing="compact">

2
x/lib/gtkmm3.xml
View File

@ -34,7 +34,7 @@
<application>GTK+ 3</application>.
</para>
&lfs91_checked;
&lfs10_checked;
<bridgehead renderas="sect3">Package Information</bridgehead>
<itemizedlist spacing="compact">

2
x/lib/pangomm.xml
View File

@ -34,7 +34,7 @@
interface to <application>Pango</application>.
</para>
&lfs91_checked;
&lfs10_checked;
<bridgehead renderas="sect3">Package Information</bridgehead>
<itemizedlist spacing="compact">

37
xsoft/other/inkscape.xml
View File

@ -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: