Changeset 7ebcf19


Ignore:
Timestamp:
08/18/2020 06:53:24 PM (13 months ago)
Author:
Douglas R. Reno <renodr@…>
Branches:
10.0, 10.1, 11.0, qt5new, trunk, xry111/git-date, xry111/git-date-for-trunk, xry111/git-date-test
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:
16 edited

Legend:

Unmodified
Added
Removed
  • general/graphlib/librsvg.xml

    rb4a94be r7ebcf19  
    3636    </para>
    3737
    38     &lfs91_checked;
     38    &lfs10_checked;
    3939
    4040    <bridgehead renderas="sect3">Package Information</bridgehead>
  • general/graphlib/openjpeg2.xml

    rb4a94be r7ebcf19  
    3838    </para>
    3939
    40     &lfs91_checked;
     40    &lfs10_checked;
    4141
    4242    <bridgehead renderas="sect3">Package Information</bridgehead>
  • general/graphlib/poppler.xml

    rb4a94be r7ebcf19  
    4444    </para>
    4545
    46     &lfs91_checked;
     46    &lfs10_checked;
    4747
    4848    <bridgehead renderas="sect3">Package Information</bridgehead>
  • general/graphlib/potrace.xml

    rb4a94be r7ebcf19  
    3636    </para>
    3737
    38     &lfs91_checked;
     38    &lfs10_checked;
    3939
    4040    <bridgehead renderas="sect3">Package Information</bridgehead>
  • general/prog/lxml.xml

    rb4a94be r7ebcf19  
    3131      </para>
    3232
    33       &lfs91_checked;
     33      &lfs10_checked;
    3434
    3535      <bridgehead renderas="sect4">Package Information</bridgehead>
  • general/prog/scour.xml

    rb4a94be r7ebcf19  
    3131      </para>
    3232
    33       &lfs91_checked;
     33      &lfs10_checked;
    3434
    3535      <bridgehead renderas="sect4">Package Information</bridgehead>
  • introduction/welcome/changelog.xml

    rb4a94be r7ebcf19  
    4646      <itemizedlist>
    4747        <listitem>
     48          <para>[renodr] - Fix building Inkscape with glibc-2.32.</para>
     49        </listitem>
     50        <listitem>
    4851          <para>[pierre] - Update to blocaled-0.3. Fixes
    4952          <ulink url="&blfs-ticket-root;13938">#13938</ulink>.</para>
  • x/icons/adwaita-icon-theme.xml

    rb4a94be r7ebcf19  
    3737    </para>
    3838
    39     &lfs91_checked;
     39    &lfs10_checked;
    4040
    4141    <bridgehead renderas="sect3">Package Information</bridgehead>
  • x/lib/atkmm.xml

    rb4a94be r7ebcf19  
    3535    </para>
    3636
    37     &lfs91_checked;
     37    &lfs10_checked;
    3838
    3939    <bridgehead renderas="sect3">Package Information</bridgehead>
  • x/lib/cairomm.xml

    rb4a94be r7ebcf19  
    3535    </para>
    3636
    37     &lfs91_checked;
     37    &lfs10_checked;
    3838
    3939    <bridgehead renderas="sect3">Package Information</bridgehead>
  • x/lib/gdl.xml

    rb4a94be r7ebcf19  
    3535    </para>
    3636
    37     &lfs91_checked;
     37    &lfs10_checked;
    3838
    3939    <bridgehead renderas="sect3">Package Information</bridgehead>
  • x/lib/gtk-engines.xml

    rb4a94be r7ebcf19  
    3838    </para>
    3939
    40     &lfs91_checked;
     40    &lfs10_checked;
    4141
    4242    <bridgehead renderas="sect3">Package Information</bridgehead>
  • x/lib/gtkmm2.xml

    rb4a94be r7ebcf19  
    3737    </para>
    3838
    39     &lfs91_checked;
     39    &lfs10_checked;
    4040
    4141    <bridgehead renderas="sect3">Package Information</bridgehead>
  • x/lib/gtkmm3.xml

    rb4a94be r7ebcf19  
    3535    </para>
    3636
    37     &lfs91_checked;
     37    &lfs10_checked;
    3838
    3939    <bridgehead renderas="sect3">Package Information</bridgehead>
  • x/lib/pangomm.xml

    rb4a94be r7ebcf19  
    3535    </para>
    3636
    37     &lfs91_checked;
     37    &lfs10_checked;
    3838
    3939    <bridgehead renderas="sect3">Package Information</bridgehead>
  • xsoft/other/inkscape.xml

    rb4a94be r7ebcf19  
    3535    </para>
    3636
    37     &lfs91_checked;
     37    &lfs10_checked;
    3838
    3939    <bridgehead renderas="sect3">Package Information</bridgehead>
     
    177177    <title>Installation of Inkscape</title>
    178178
    179     <!-- Not needed with 0.92.5, but let's keep the template instead.
    180     <para>
    181       First, fix a problem introduced by Poppler-0.76.1.
    182     </para>
    183 
    184 <screen><userinput remap="pre">sed -e 's|new Lexer(xref, obj)|obj|g' -i src/extension/internal/pdfinput/pdf-parser.cpp</userinput></screen>
    185 
    186     <para>
    187       Next, fix Inkscape to be able to build with poppler-0.82.0 and higher:
    188     </para>
    189 
    190 <screen><userinput remap="pre">sed -e 's|Unicode \*u|Unicode const *u|g' -i src/extension/internal/pdfinput/*</userinput></screen>
     179    <!-- Not needed with 1.0, but let's keep the template.
    191180
    192181    <para>
     
    196185<screen><userinput remap="pre">patch -Np1 -i ../inkscape-&inkscape-version;-poppler_0_83_0_fixes-1.patch</userinput></screen>
    197186    -->
    198 
    199     <!-- Inkscape now has a hard dependency on IM7.
    200     <para>
    201       Ensure that the libraries from <xref linkend="imagemagick6"/> can be used:
    202     </para>
    203 
    204 <screen><userinput>patch -Np1 -i ../inkscape-&inkscape-version;-use_versioned_ImageMagick6-1.patch</userinput></screen>
    205     -->
    206 <!--
    207     <para>
    208       Apply a patch to prevent out-of-bounds writes in the text and fill-bucket
    209       tools:
    210     </para>
    211 
    212 <screen><userinput>patch -Np1 -i ../inkscape-&inkscape-version;-upstream_fixes-1.patch</userinput></screen>
    213 -->
    214187
    215188<!-- If there is no test suite, then this is not needed.
     
    225198<screen remap="test"><userinput>bash download-gtest.sh</userinput></screen>
    226199    -->
     200
     201    <para>
     202      First, fix build failure with glibc-2.32:
     203    </para>
     204
     205<screen><userinput remap="pre">sed -i '/#include &lt;iostream&gt;/a #include &lt;atomic&gt;' src/ui/tool/node.cpp</userinput></screen>
    227206
    228207    <para>
Note: See TracChangeset for help on using the changeset viewer.