Changeset 2315c0bc for xsoft/graphweb

Timestamp:

04/23/2017 05:32:31 PM (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:

8484ef6

Parents:

e4ca0af7

Message:

Update to Chromium-58.0.3029.81. Fixes #9154.

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

File:

• xsoft/graphweb/chromium.xml (modified) (12 diffs)

xsoft/graphweb/chromium.xml

@@ -7 +7 @@
   <!ENTITY chromium-download-http "https://commondatastorage.googleapis.com/chromium-browser-official/chromium-&chromium-version;.tar.xz">
   <!ENTITY chromium-download-ftp  " ">
-  <!ENTITY chromium-md5sum        "23f8692653858bff32e60fac702abe05">
-  <!ENTITY chromium-size          "501 MB">
-  <!ENTITY chromium-buildsize     "5.2 GB">
-  <!ENTITY chromium-time          "94 SBU">
+  <!ENTITY chromium-md5sum        "fe28227f5f4aa05709b9cbd47a5cf426">
+  <!ENTITY chromium-size          "483 MB">
+  <!ENTITY chromium-buildsize     "5.3 GB">
+  <!ENTITY chromium-time          "94 SBU (with 4 threads)">
   <!-- Ninja defaults to parallel build unless supplying -j1, SBU measured on
   dual core, hyperthreaded CPU (4 threads).                               -->
@@ -81 +81 @@
       </listitem>
       <listitem>
-        <para>Download MD5 sum: 52a4341475511d3627a86a344c0831ce</para>
-      </listitem>
-      <listitem>
-        <para>Download size: 46 MB</para>
+        <para>Download MD5 sum: 65b7afdac7796e9a1ec21008fa82e403</para>
+      </listitem>
+      <listitem>
+        <para>Download size: 55 MB</para>
       </listitem>
     </itemizedlist>
@@ -116 +116 @@
       <xref linkend="mesa"/>,
       <xref linkend="ninja"/>,
+      <xref linkend="nodejs"/>,
       <xref linkend="nss"/>,
       <xref linkend="python2"/>,
@@ -127 +128 @@
       <xref linkend="flac"/>,
       <xref linkend="git"/>,
-      <!-- <xref linkend="icu"/>, -->
+<!--      <xref linkend="icu"/>, -->
       <xref linkend="libevent"/>,
       <xref linkend="libexif"/>,
@@ -133 +134 @@
       <xref linkend="libpng"/>,
       <xref linkend="libsecret"/>,
-      <xref linkend="libvpx"/>,
+<!--      <xref linkend="libvpx"/>, -->
       <xref linkend="libwebp"/>,
       <xref linkend="pciutils"/>,
@@ -144 +145 @@
     <para role="optional">
       <xref linkend="GConf"/>,
+      <xref linkend="icu"/> (currently broken),
       <xref linkend="gnome-keyring"/>,
+      <xref linkend="libvpx"/> (currently broken),
       <xref linkend="libxml2"/>,
-      <!-- <xref linkend="libvpx"/>, -->
-      <xref linkend="icu"/>,
       <ulink url="https://devel.freebsoft.org/speechd">speech-dispatcher</ulink>
       (for the screen reader), and
@@ -186 +187 @@
         Chromium uses many external projects, the selections below are not set
         in stone, however they have been tested thoroughly. With Chromium
-        &chromium-version;, system versions of icu, libxml2, and zlib
+        &chromium-version;, system versions of icu, libvpx, libxml2, and zlib
         are known to break the build at this time.
-        <!-- icu59 introduces /uchar16/&_t/, should be fixed in c58 -->
         <!-- libxml2: https://bugs.archlinux.org/task/29939 -->
+        <!-- libvpx: https://bugs.gentoo.org/show_bug.cgi?id=611394 -->
         <!-- zlib requires libminizip -->
       </para>
@@ -196 +197 @@
 <!-- Again, thanks to Arch, this is much better than listing all the needed
 shipped libs required to use the remove_bundled_files.py script -->
-<screen><userinput>for LIB in ffmpeg flac harfbuzz-ng <!-- icu --> libevent libjpeg \
+<!--<screen><userinput>for LIB in ffmpeg flac harfbuzz-ng icu libevent libjpeg \
            libjpeg_turbo libpng libvpx libwebp libxslt yasm; do
     find -type f -path "*third_party/$LIB/*"     \
         \! -path "*third_party/$LIB/chromium/*"  \
         \! -path "*third_party/$LIB/google/*"    \
-        <!-- \! -path "*base/third_party/icu/*"       \ -->
+        \! -path "*base/third_party/icu/*"       \
+        \! -path "*base/third_party/libevent/*"  \
+        \! -regex '.*\.\(gn\|gni\|isolate\|py\)' \
+        -delete
+done &amp;&amp; -->
+<screen><userinput>for LIB in ffmpeg flac harfbuzz-ng libevent libjpeg \
+           libjpeg_turbo libpng libwebp libxslt yasm; do
+    find -type f -path "*third_party/$LIB/*"     \
+        \! -path "*third_party/$LIB/chromium/*"  \
+        \! -path "*third_party/$LIB/google/*"    \
         \! -path "*base/third_party/libevent/*"  \
         \! -regex '.*\.\(gn\|gni\|isolate\|py\)' \
@@ -208 +218 @@
 
 python build/linux/unbundle/replace_gn_files.py \
-    --system-libraries ffmpeg flac harfbuzz-ng <!-- icu --> libevent libjpeg \
-                       libpng libwebp libvpx libxslt yasm &amp;&amp;
+    --system-libraries ffmpeg flac harfbuzz-ng<!--icu--> libevent libjpeg \
+                       libpng libwebp libxslt yasm &amp;&amp;
 python third_party/libaddressinput/chromium/tools/update-strings.py</userinput></screen>
 
@@ -264 +274 @@
     <application>Ninja</application> build files:</para>
 
-<screen><userinput>python tools/gn/bootstrap/bootstrap.py --gn-gen-args "${GN_CONFIG[*]}" &amp;&amp;
+<screen><userinput>sed "/internal\.cc',/a\      'base/callback_helpers.cc'," \
+    -i tools/gn/bootstrap/bootstrap.py &amp;&amp;
+python tools/gn/bootstrap/bootstrap.py --gn-gen-args "${GN_CONFIG[*]}" &amp;&amp;
 out/Release/gn gen out/Release --args="${GN_CONFIG[*]}"</userinput></screen>
 
     <para>Build <application>Chromium</application> using the following
-    command:</para>
-
-<screen><userinput>ninja -C out/Release chrome chrome_sandbox chromedriver widevinecdmadapter</userinput></screen>
+    commands:</para>
+
+<screen><userinput>mkdir -p third_party/node/linux/node-linux-x64/bin &amp;&amp;
+ln -s /usr/bin/node third_party/node/linux/node-linux-x64/bin/ &amp;&amp;
+ninja -C out/Release chrome chrome_sandbox chromedriver widevinecdmadapter</userinput></screen>
 
     <para>This package was already tested as part of the build.</para>
@@ -356 +370 @@
     all of the defines used in the build.</para>
 
+    <para><command>sed...tools/gn/bootstrap/bootstrap.py</command>: Fix a
+    build issue with <application>gn</application>.</para>
+
     <para><command>python tools/gn/bootstrap/bootstrap.py --gn-gen-args "${GN_CONFIG[*]}"</command>:
     this command replaces defines in the gn files with the values contained in 
@@ -365 +382 @@
     a <application>Ninja</application> configuration suitable for the build
     machine.</para>
+
+    <para><command>mkdir...ln -s /usr/bin/node
+    third_party/node/linux/node-linux-x64/bin/</command>: these commands
+    replaced the local <application>Node.js</application> (no longer available)
+    with the system installed <application>Node.js</application>.</para>
 
     <para><command>ar -x ../../google-chrome-stable*.deb</command>: