Changeset 3ed1498c

Timestamp:

04/11/2021 03:37:23 AM (4 years ago)

Author:

Ken Moffat <ken@…>

Branches:

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:

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:

• general.ent (modified) (2 diffs)
• introduction/welcome/changelog.xml (modified) (1 diff)
• xsoft/other/inkscape.xml (modified) (3 diffs)

general.ent

@@ -1 +1 @@
 <!-- $LastChangedBy$ $Date$ -->
 
-<!ENTITY day          "09">                   <!-- Always 2 digits -->
+<!ENTITY day          "11">                   <!-- Always 2 digits -->
 <!ENTITY month        "04">                   <!-- Always 2 digits -->
 <!ENTITY year         "2021">
@@ -7 +7 @@
 <!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 #] -->

introduction/welcome/changelog.xml

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

xsoft/other/inkscape.xml

@@ -71 +71 @@
     </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">
@@ -78 +76 @@
         <para>
           Required patch: <ulink
-          url="&patch-root;/inkscape-&inkscape-version;-use_versioned_ImageMagick6-1.patch"/>
-        </para>
-      </listitem>
-      -->
+          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
@@ -211 +209 @@
       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>