Changeset b01309e7

Timestamp:

05/06/2021 03:36:33 PM (3 years ago)

Author:

Douglas R. Reno <renodr@…>

Branches:

11.0, 11.1, 11.2, 11.3, 12.0, 12.1, 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/intltool, xry111/llvm18, xry111/soup3, xry111/test-20220226, xry111/xf86-video-removal

Children:

70896c42

Parents:

9d6b3e6

Message:

Update to ICU-69.1
Fix building WebKitGTK+ with ICU-69.1 (patch from Xi Ruoyao)
Fix building Node.JS with ICU-69.1 (patch from Ken Moffat)

Files:

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

general/genlib/icu.xml

@@ -8 +8 @@
            "https://github.com/unicode-org/icu/releases/download/release-&icu-major;-&icu-minor;/icu4c-&icu-major;_&icu-minor;-src.tgz">
   <!ENTITY icu-download-ftp  " ">
-  <!ENTITY icu-md5sum        "c21cbdfe31a1e325afe765a16f907d20">
+  <!ENTITY icu-md5sum        "9403db682507369d0f60a25ea67014c4">
   <!ENTITY icu-size          "24 MB">
-  <!ENTITY icu-buildsize     "312 MB (add 37 MB for tests)">
-  <!ENTITY icu-time          "0.7 SBU (Using parallelism=4; add 2.2 SBU for tests)">
+  <!ENTITY icu-buildsize     "354 MB (add 36 MB for tests)">
+  <!ENTITY icu-time          "0.9 SBU (Using parallelism=4; add 2.0 SBU for tests)">
 ]>
 

general/genlib/nodejs.xml

@@ -72 +72 @@
     </itemizedlist>
 
+    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Required patch:
+          <ulink url="&patch-root;/node-v&nodejs-version;-icu_69-1.patch"/>
+        </para>
+      </listitem>
+    </itemizedlist>
+
 <!--<note>
       <para>
@@ -111 +121 @@
   <sect2 role="installation">
     <title>Installation of Node.js</title>
+
+    <!-- needed for ICU-69.1 -->
+    <para>
+      First, fix the build with system ICU:
+    </para>
+
+<screen><userinput remap="pre">patch -Np1 -i ../node-v&nodejs-version;-icu_69-1.patch</userinput></screen>
 
     <para>

introduction/welcome/changelog.xml

@@ -41 +41 @@
     </listitem>
     -->
-    <listitem>
+   <listitem>
      <para>May 6th, 2021</para>
      <itemizedlist>
-         <listitem>
-           <para>[timtas] - Upgrade to xfce4-panel-4.16.3. Fixes
-           <ulink url="&blfs-ticket-root;15002">#15002</ulink>.</para>
-         </listitem>
+       <listitem>
+         <para>[renodr] - Update to ICU-69.1. Fixes
+         <ulink url="&blfs-ticket-root;14884">#14884</ulink>.</para>
+       </listitem>
+       <listitem>
+         <para>[renodr] - Fix building WebKitGTK+ with ICU-69.1. Patch by Xi
+         Ruoyao.</para>
+       </listitem>
+       <listitem>
+         <para>[renodr] - Fix building Node.JS with ICU-69.1. Patch by Ken
+         Moffat.</para>
+       </listitem>
+       <listitem>
+         <para>[timtas] - Upgrade to xfce4-panel-4.16.3. Fixes
+         <ulink url="&blfs-ticket-root;15002">#15002</ulink>.</para>
+       </listitem>
      </itemizedlist>
    </listitem>
@@ -54 +66 @@
      <para>May 5th, 2021</para>
      <itemizedlist>
-         <listitem>
-           <para>[timtas] - Upgrade to thunderbird-78.10.1. Fixes
-           <ulink url="&blfs-ticket-root;14998">#14998</ulink>.</para>
-         </listitem>
+       <listitem>
+         <para>[timtas] - Upgrade to thunderbird-78.10.1. Fixes
+         <ulink url="&blfs-ticket-root;14998">#14998</ulink>.</para>
+       </listitem>
        <listitem>
          <para>[thomas] - Upgrade libxkbcommon-1.3.0. Fixes

packages.ent

@@ -108 +108 @@
 <!ENTITY gspell-version               "1.8.4">
 
-<!ENTITY icu-major                    "68">
-<!ENTITY icu-minor                    "2">
+<!ENTITY icu-major                    "69">
+<!ENTITY icu-minor                    "1">
 <!ENTITY icu-patch                    "0">
 <!ENTITY icu-version                  "&icu-major;.&icu-minor;"><!-- .&icu-patch;-->

x/lib/webkitgtk.xml

@@ -68 +68 @@
         <para>
           Estimated build time: &webkitgtk-time;
+        </para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Required patch:
+          <ulink url="&patch-root;/webkitgtk-&webkitgtk-version;-icu_69-1.patch"/>
         </para>
       </listitem>
@@ -136 +146 @@
 <screen><userinput>echo 'add_compile_definitions("U_DEFINE_FALSE_AND_TRUE=1")' &gt;&gt; Source/WTF/wtf/CMakeLists.txt</userinput></screen>
 -->
+
+    <!-- Needed for ICU-69.1 -->
+    <para>
+      First, fix building with ICU-69.1:
+    </para>
+
+<screen><userinput remap="pre">patch -Np1 -i ../webkitgtk-&webkitgtk-version;-icu_69-1.patch</userinput></screen>
 
     <para>