Changeset 0a003b3

Timestamp:

06/30/2017 04:21:54 AM (6 years ago)

Author:

DJ Lucas <dj@…>

Branches:

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

Children:

46b0d7c

Parents:

0d4cd97

Message:

Use gtk+3.x for Chromium.
Remove unneeded libevent argument to find in chromium loop.
Put back guard for icu in chromium delete loop.
Fix freetype tarball name in chromium.

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

Files:

• general.ent (modified) (2 diffs)
• introduction/welcome/changelog.xml (modified) (1 diff)
• xsoft/graphweb/chromium.xml (modified) (9 diffs)

general.ent

@@ -1 +1 @@
 <!-- $LastChangedBy$ $Date$ -->
 
-<!ENTITY day          "29">                   <!-- Always 2 digits -->
+<!ENTITY day          "30">                   <!-- Always 2 digits -->
 <!ENTITY month        "06">                   <!-- Always 2 digits -->
 <!ENTITY year         "2017">
@@ -7 +7 @@
 <!ENTITY copyholder   "The BLFS Development Team">
 <!ENTITY version      "&year;-&month;-&day;">
-<!ENTITY releasedate  "June 29th &year;">
+<!ENTITY releasedate  "June 30th &year;">
 <!ENTITY pubdate      "&year;-&month;-&day;"> <!-- metadata req. by TLDP -->
 <!ENTITY blfs-version "svn">                  <!-- svn|[release #] -->

introduction/welcome/changelog.xml

@@ -44 +44 @@
 
    <listitem>
+     <para>June 30th, 2017</para>
+     <itemizedlist>
+       <listitem>
+         <para>[dj] - Use gtk+3.x for Chromium.</para>
+       </listitem>
+     </itemizedlist>
+   </listitem>
+
+   <listitem>
       <para>June 29th, 2017</para>
       <itemizedlist>

xsoft/graphweb/chromium.xml

@@ -66 +66 @@
         <para>Download (HTTP):</para>
         <para>
-          <ulink url="&sources-anduin-http;/other/chromium-freetype2.tar.xz"/>
+          <ulink url="&sources-anduin-http;/other/chromium-freetype.tar.xz"/>
         </para>
       </listitem>
@@ -157 +157 @@
       <xref linkend="dbus"/>,
       <xref linkend="perl-file-basedir"/>,
-      <xref linkend="gtk2"/>,
+      <xref linkend="gtk3"/>,
       <xref linkend="hicolor-icon-theme"/>,
       <xref linkend="mitkrb"/>,
@@ -175 +175 @@
       <xref linkend="git"/>,
 <!--      <xref linkend="icu"/>, -->
-      <xref linkend="libevent"/>,
+<!--      <xref linkend="libevent"/>, -->
       <xref linkend="libexif"/>,
       <xref linkend="libjpeg"/>,
@@ -193 +193 @@
       <xref linkend="icu"/> (currently broken),
       <xref linkend="gnome-keyring"/>,
+      <xref linkend="libevent"/> (currently broken),
       <xref linkend="libvpx"/> (currently broken),
       <xref linkend="libxml2"/> (currently broken),
@@ -250 +251 @@
         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, libvpx, libxml2, and zlib
-        are known to break the build at this time.
+        &chromium-version;, system versions of icu, libevent, libvpx, libxml2,
+        and zlib are known to break the build at this time.
         <!-- icu: Not at 59 internally -->
+        <!-- libevent: needs internal headers -->
         <!-- libvpx: breaks build in gfx -->
         <!-- libxml2: breaks build with ui -->
@@ -261 +263 @@
 <!-- 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 \
-           libjpeg_turbo libpng libvpx libwebp libxslt yasm; do
+<screen><userinput>for LIB in ffmpeg flac harfbuzz-ng<!-- icu libevent--> libjpeg \
+           libjpeg_turbo libpng libwebp<!-- libxml libvpx--> libxslt yasm; do
     find -type f -path "*third_party/$LIB/*"     \
         \! -path "*third_party/$LIB/chromium/*"  \
@@ -270 +272 @@
         \! -regex '.*\.\(gn\|gni\|isolate\|py\)' \
         -delete
-done &amp;&amp; -->
-<screen><userinput>for LIB in ffmpeg flac harfbuzz-ng libevent libjpeg \
-           libjpeg_turbo libpng libwebp<!-- libxml libvpx--> 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\)' \
-        -delete
 done &amp;&amp;
 
 python build/linux/unbundle/replace_gn_files.py \
-    --system-libraries ffmpeg flac harfbuzz-ng<!-- icu--> libevent libjpeg \
+    --system-libraries ffmpeg flac harfbuzz-ng<!-- icu libevent--> libjpeg \
                        libpng libwebp<!-- libxml libvpx--> libxslt yasm &amp;&amp;
 python third_party/libaddressinput/chromium/tools/update-strings.py</userinput></screen>
@@ -331 +324 @@
 'use_gnome_keyring=false'
 'use_gold=false'
-'use_gtk3=false'
+'use_gtk3=true'
 'use_kerberos=true'
 'use_pulseaudio=true'
@@ -412 +405 @@
 EOF</userinput></screen>
 
+    <note>
+      <para>If upgrading from a previous build of chromium using gtk+-2.x, you
+      may need to remove the <filename
+      class="directory">~/.config/chromium</filename> directory.</para>
+    </note>
+
     <bridgehead renderas="sect3">Extracting the WideVine plugin from Chrome</bridgehead>