[blfs-book] r24458 - in trunk/BOOK: . introduction/welcome xsoft/other

[ken--- via blfs-book]

Author: ken
Date: Sat Apr 10 20:37:23 2021
New Revision: 24458

Log:
Let inkscape build with glib-2.68.

Modified:
   trunk/BOOK/general.ent
   trunk/BOOK/introduction/welcome/changelog.xml
   trunk/BOOK/xsoft/other/inkscape.xml

Modified: trunk/BOOK/general.ent
==============================================================================
--- trunk/BOOK/general.ent      Fri Apr  9 16:06:48 2021        (r24457)
+++ trunk/BOOK/general.ent      Sat Apr 10 20:37:23 2021        (r24458)
@@ -1,12 +1,12 @@
 <!-- $LastChangedBy$ $Date$ -->
 
-<!ENTITY day          "09">                   <!-- Always 2 digits -->
+<!ENTITY day          "11">                   <!-- Always 2 digits -->
 <!ENTITY month        "04">                   <!-- Always 2 digits -->
 <!ENTITY year         "2021">
 <!ENTITY copyrightdate "2001-&year;">
 <!ENTITY copyholder   "The BLFS Development Team">
 <!ENTITY version      "&year;-&month;-&day;">
-<!ENTITY releasedate  "April 9th, &year;">
+<!ENTITY releasedate  "April 11th, &year;">
 <!ENTITY pubdate      "&year;-&month;-&day;"> <!-- metadata req. by TLDP -->
 <!ENTITY blfs-version "svn">                  <!-- svn|[release #] -->
 <!ENTITY lfs-version  "development">          <!-- x.y|development -->

Modified: trunk/BOOK/introduction/welcome/changelog.xml
==============================================================================
--- trunk/BOOK/introduction/welcome/changelog.xml       Fri Apr  9 16:06:48 
2021        (r24457)
+++ trunk/BOOK/introduction/welcome/changelog.xml       Sat Apr 10 20:37:23 
2021        (r24458)
@@ -42,6 +42,16 @@
     </listitem>
     -->
     <listitem>
+      <para>April 11th, 2021</para>
+      <itemizedlist>
+        <listitem>
+          <para>[ken] - Patch inkscape to build with glib-2.68. Fixes
+          <ulink url="&blfs-ticket-root;14889">#14889</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>April 9th, 2021</para>
       <itemizedlist>
         <listitem>

Modified: trunk/BOOK/xsoft/other/inkscape.xml
==============================================================================
--- trunk/BOOK/xsoft/other/inkscape.xml Fri Apr  9 16:06:48 2021        (r24457)
+++ trunk/BOOK/xsoft/other/inkscape.xml Sat Apr 10 20:37:23 2021        (r24458)
@@ -70,17 +70,15 @@
       </listitem>
     </itemizedlist>
 
-    <!-- With 1.0.0, there is now a dependency on IM7 instead of IM6.
-         It's explicitly searched for in CMakeLists.txt.
     <bridgehead renderas="sect3">Additional Downloads</bridgehead>
     <itemizedlist spacing="compact">
       <listitem>
         <para>
           Required patch: <ulink
-          
url="&patch-root;/inkscape-&inkscape-version;-use_versioned_ImageMagick6-1.patch"/>
+          url="&patch-root;/inkscape-&inkscape-version;-glib_2.68-1.patch"/>
         </para>
       </listitem>
-      -->
+    </itemizedlist>
       <!-- These are not needed right now. Inkscape builds/runs fine with the
            latest poppler as of this update (0.87.0). However, history says
            that almost every poppler version has broke inkscape, and history
@@ -210,13 +208,13 @@
       Install <application>Inkscape</application> by running the following
       commands:
     </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
+<screen><userinput remap="pre">patch -Np1 -i 
../inkscape-&inkscape-version;-glib_2.68-1.patch &amp;&amp;
+mkdir build                                       &amp;&amp;
+cd    build                                       &amp;&amp;
 
 cmake -DCMAKE_INSTALL_PREFIX=/usr \
       -DCMAKE_BUILD_TYPE=Release  \
-      ..                          &amp;&amp;
+      ..                                          &amp;&amp;
 make</userinput></screen>
 
 <!--
-- 
http://lists.linuxfromscratch.org/listinfo/blfs-book
FAQ: http://www.linuxfromscratch.org/blfs/faq.html
Unsubscribe: See the above information page