Changeset 2acb826

Timestamp:

04/18/2017 03:59:42 AM (7 years ago)

Author:

DJ Lucas <dj@…>

Branches:

10.0, 10.1, 11.0, 11.1, 11.2, 11.3, 12.0, 12.1, 8.1, 8.2, 8.3, 8.4, 9.0, 9.1, basic, bdubbs/svn, elogind, kea, ken/TL2024, ken/inkscape-core-mods, ken/tuningfonts, lazarus, lxqt, perl-modules, plabs/newcss, plabs/python-mods, python3.11, qt5new, rahul/power-profiles-daemon, renodr/vulkan-addition, trunk, upgradedb, xry111/intltool, xry111/llvm18, xry111/soup3, xry111/test-20220226, xry111/xf86-video-removal

Children:

298fc093

Parents:

5b92407

Message:

Fix WebKitGTK+ build issues with ICU-59.

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

Files:

• general.ent (modified) (2 diffs)
• introduction/welcome/changelog.xml (modified) (1 diff)
• x/lib/webkitgtk.xml (modified) (1 diff)

general.ent

@@ -1 +1 @@
 <!-- $LastChangedBy$ $Date$ -->
 
-<!ENTITY day          "16">                   <!-- Always 2 digits -->
+<!ENTITY day          "18">                   <!-- Always 2 digits -->
 <!ENTITY month        "04">                   <!-- Always 2 digits -->
 <!ENTITY year         "2017">
@@ -7 +7 @@
 <!ENTITY copyholder   "The BLFS Development Team">
 <!ENTITY version      "&year;-&month;-&day;">
-<!ENTITY releasedate  "April 16th &year;">
+<!ENTITY releasedate  "April 18th &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 18th, 2017</para>
+      <itemizedlist>
+        <listitem>
+          <para>[dj] - Fix WebKitGTK+ build issues with ICU-59.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>April 16th, 2017</para>
       <itemizedlist>

x/lib/webkitgtk.xml

@@ -147 +147 @@
 
     <para>
+      First, fix a build issue with <application>ICU</application> &gt;= 59:
+    </para>
+
+<screen><userinput>sed -i 's@unsigned short@char16_t@' \
+       Source/JavaScriptCore/API/JSStringRef.h \
+       Source/WebKit2/Shared/API/c/WKString.h &amp;&amp;
+sed -i 's@cmakeconfig\.h\"@cmakeconfig.h\"\n#include &lt;uchar.h&gt;@' \
+       Tools/MiniBrowser/gtk/main.c</userinput></screen>
+
+    <para>
       Install <application>WebKitGTK+</application> by running the
       following commands: