Changeset 3ed1498


Ignore:
Timestamp:
04/11/2021 03:37:23 AM (4 months ago)
Author:
Ken Moffat <ken@…>
Branches:
trunk, xry111/git-date, xry111/git-date-for-trunk, xry111/git-date-test
Children:
e5c3d5c
Parents:
fb6d1550
Message:

Let inkscape build with glib-2.68.

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

Files:
3 edited

Legend:

Unmodified
Added
Removed
  • general.ent

    rfb6d1550 r3ed1498  
    11<!-- $LastChangedBy$ $Date$ -->
    22
    3 <!ENTITY day          "09">                   <!-- Always 2 digits -->
     3<!ENTITY day          "11">                   <!-- Always 2 digits -->
    44<!ENTITY month        "04">                   <!-- Always 2 digits -->
    55<!ENTITY year         "2021">
     
    77<!ENTITY copyholder   "The BLFS Development Team">
    88<!ENTITY version      "&year;-&month;-&day;">
    9 <!ENTITY releasedate  "April 9th, &year;">
     9<!ENTITY releasedate  "April 11th, &year;">
    1010<!ENTITY pubdate      "&year;-&month;-&day;"> <!-- metadata req. by TLDP -->
    1111<!ENTITY blfs-version "svn">                  <!-- svn|[release #] -->
  • introduction/welcome/changelog.xml

    rfb6d1550 r3ed1498  
    4343    -->
    4444    <listitem>
     45      <para>April 11th, 2021</para>
     46      <itemizedlist>
     47        <listitem>
     48          <para>[ken] - Patch inkscape to build with glib-2.68. Fixes
     49          <ulink url="&blfs-ticket-root;14889">#14889</ulink>.</para>
     50        </listitem>
     51      </itemizedlist>
     52    </listitem>
     53
     54    <listitem>
    4555      <para>April 9th, 2021</para>
    4656      <itemizedlist>
  • xsoft/other/inkscape.xml

    rfb6d1550 r3ed1498  
    7171    </itemizedlist>
    7272
    73     <!-- With 1.0.0, there is now a dependency on IM7 instead of IM6.
    74          It's explicitly searched for in CMakeLists.txt.
    7573    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
    7674    <itemizedlist spacing="compact">
     
    7876        <para>
    7977          Required patch: <ulink
    80           url="&patch-root;/inkscape-&inkscape-version;-use_versioned_ImageMagick6-1.patch"/>
    81         </para>
    82       </listitem>
    83       -->
     78          url="&patch-root;/inkscape-&inkscape-version;-glib_2.68-1.patch"/>
     79        </para>
     80      </listitem>
     81    </itemizedlist>
    8482      <!-- These are not needed right now. Inkscape builds/runs fine with the
    8583           latest poppler as of this update (0.87.0). However, history says
     
    211209      commands:
    212210    </para>
    213 
    214 <screen><userinput>mkdir build &amp;&amp;
    215 cd    build &amp;&amp;
     211<screen><userinput remap="pre">patch -Np1 -i ../inkscape-&inkscape-version;-glib_2.68-1.patch &amp;&amp;
     212mkdir build                                      &amp;&amp;
     213cd    build                                       &amp;&amp;
    216214
    217215cmake -DCMAKE_INSTALL_PREFIX=/usr \
    218216      -DCMAKE_BUILD_TYPE=Release  \
    219       ..                          &amp;&amp;
     217      ..                                          &amp;&amp;
    220218make</userinput></screen>
    221219
Note: See TracChangeset for help on using the changeset viewer.