Changeset 7ebcf19

Timestamp:

08/18/2020 06:53:24 PM (4 years ago)

Author:

Douglas R. Reno <renodr@…>

Branches:

10.0, 10.1, 11.0, 11.1, 11.2, 11.3, 12.0, 12.1, 12.2, gimp3, kea, ken/TL2024, ken/inkscape-core-mods, ken/tuningfonts, lazarus, lxqt, plabs/newcss, plabs/python-mods, python3.11, qt5new, rahul/power-profiles-daemon, renodr/vulkan-addition, trunk, upgradedb, xry111/for-12.3, xry111/intltool, xry111/llvm18, xry111/soup3, xry111/spidermonkey128, xry111/test-20220226, xry111/xf86-video-removal

Children:

58387b50

Parents:

b4a94be

Message:

Fix FTBFS in Inkscape
Various tags

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@23563 af4574ff-66df-0310-9fd7-8a98e5e911e0

Files:

• general/graphlib/librsvg.xml (modified) (1 diff)
• general/graphlib/openjpeg2.xml (modified) (1 diff)
• general/graphlib/poppler.xml (modified) (1 diff)
• general/graphlib/potrace.xml (modified) (1 diff)
• general/prog/lxml.xml (modified) (1 diff)
• general/prog/scour.xml (modified) (1 diff)
• introduction/welcome/changelog.xml (modified) (1 diff)
• x/icons/adwaita-icon-theme.xml (modified) (1 diff)
• x/lib/atkmm.xml (modified) (1 diff)
• x/lib/cairomm.xml (modified) (1 diff)
• x/lib/gdl.xml (modified) (1 diff)
• x/lib/gtk-engines.xml (modified) (1 diff)
• x/lib/gtkmm2.xml (modified) (1 diff)
• x/lib/gtkmm3.xml (modified) (1 diff)
• x/lib/pangomm.xml (modified) (1 diff)
• xsoft/other/inkscape.xml (modified) (4 diffs)

general/graphlib/librsvg.xml

@@ -36 +36 @@
     </para>
 
-    &lfs91_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>

general/graphlib/openjpeg2.xml

@@ -38 +38 @@
     </para>
 
-    &lfs91_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>

general/graphlib/poppler.xml

@@ -44 +44 @@
     </para>
 
-    &lfs91_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>

general/graphlib/potrace.xml

@@ -36 +36 @@
     </para>
 
-    &lfs91_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>

general/prog/lxml.xml

@@ -31 +31 @@
       </para>
 
-      &lfs91_checked;
+      &lfs10_checked;
 
       <bridgehead renderas="sect4">Package Information</bridgehead>

general/prog/scour.xml

@@ -31 +31 @@
       </para>
 
-      &lfs91_checked;
+      &lfs10_checked;
 
       <bridgehead renderas="sect4">Package Information</bridgehead>

introduction/welcome/changelog.xml

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

x/icons/adwaita-icon-theme.xml

@@ -37 +37 @@
     </para>
 
-    &lfs91_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>

x/lib/atkmm.xml

@@ -35 +35 @@
     </para>
 
-    &lfs91_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>

x/lib/cairomm.xml

@@ -35 +35 @@
     </para>
 
-    &lfs91_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>

x/lib/gdl.xml

@@ -35 +35 @@
     </para>
 
-    &lfs91_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>

x/lib/gtk-engines.xml

@@ -38 +38 @@
     </para>
 
-    &lfs91_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>

x/lib/gtkmm2.xml

@@ -37 +37 @@
     </para>
 
-    &lfs91_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>

x/lib/gtkmm3.xml

@@ -35 +35 @@
     </para>
 
-    &lfs91_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>

x/lib/pangomm.xml

@@ -35 +35 @@
     </para>
 
-    &lfs91_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>

xsoft/other/inkscape.xml

@@ -35 +35 @@
     </para>
 
-    &lfs91_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -177 +177 @@
     <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>
@@ -196 +185 @@
 <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.
@@ -225 +198 @@
 <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>