Author: dj
Date: Tue Feb  5 05:57:49 2019
New Revision: 21085

Log:
Merge to HEAD 21084.

Modified:
   branches/BOOK-elogind/general/genlib/nodejs.xml
   branches/BOOK-elogind/introduction/welcome/changelog.xml
   branches/BOOK-elogind/packages.ent
   branches/BOOK-elogind/postlfs/security/nss.xml
   branches/BOOK-elogind/x/installing/x7driver-libinput.xml
   branches/BOOK-elogind/xsoft/graphweb/firefox.xml

Modified: branches/BOOK-elogind/general/genlib/nodejs.xml
==============================================================================
--- branches/BOOK-elogind/general/genlib/nodejs.xml     Sun Feb  3 21:50:28 
2019        (r21084)
+++ branches/BOOK-elogind/general/genlib/nodejs.xml     Tue Feb  5 05:57:49 
2019        (r21085)
@@ -6,10 +6,10 @@
 
   <!ENTITY nodejs-download-http 
"https://nodejs.org/dist/v&nodejs-version;/node-v&nodejs-version;.tar.xz";>
   <!ENTITY nodejs-download-ftp  " ">
-  <!ENTITY nodejs-md5sum        "50d546a5653e35e30859d8d904e020e3">
+  <!ENTITY nodejs-md5sum        "1cad7963255de53509bfa560221bdc88">
   <!ENTITY nodejs-size          "19 MB">
-  <!ENTITY nodejs-buildsize     "375 MB (add 33 MB for tests)">
-  <!ENTITY nodejs-time          "5.2 SBU (using parallelism=4; add 1.5 SBU for 
tests)">
+  <!ENTITY nodejs-buildsize     "426 MB (add 51 MB for tests)">
+  <!ENTITY nodejs-time          "5.2 SBU (using parallelism=4; add 1.2 SBU for 
tests)">
 ]>
 
 <sect1 id="nodejs" xreflabel="nodejs-&nodejs-version;">
@@ -91,8 +91,9 @@
     <bridgehead renderas="sect4">Recommended</bridgehead>
     <para role="recommended">
       <xref linkend="c-ares"/>,
-      <xref linkend="icu"/> and
-      <xref linkend="libuv"/>
+      <xref linkend="icu"/>,
+      <xref linkend="libuv"/>, and
+      <xref linkend="nghttp2"/>
     </para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
@@ -119,6 +120,7 @@
 <screen><userinput>./configure --prefix=/usr                  \
             --shared-cares                 \
             --shared-libuv                 \
+            --shared-nghttp2               \
             --shared-openssl               \
             --shared-zlib                  \
             --with-intl=system-icu         &amp;&amp;
@@ -143,8 +145,8 @@
     <application>icu</application> library) and <option>small-icu</option> (to
     to build a local, minimal <application>icu</application> library).</para>
 
-    <para><parameter>--shared-{cares,libuv,openssl,zlib}</parameter>: use the
-    system installed libraries instead of local copies.</para>
+    <para><parameter>--shared-{cares,libuv,nghttp2,openssl,zlib}</parameter>:
+    use the system installed libraries instead of local copies.</para>
 
     <para><option>--without-npm</option>: do not build
     <application>npm</application> (use if you'd like to build a separate

Modified: branches/BOOK-elogind/introduction/welcome/changelog.xml
==============================================================================
--- branches/BOOK-elogind/introduction/welcome/changelog.xml    Sun Feb  3 
21:50:28 2019        (r21084)
+++ branches/BOOK-elogind/introduction/welcome/changelog.xml    Tue Feb  5 
05:57:49 2019        (r21085)
@@ -46,6 +46,24 @@
       <para>February 3rd, 2019</para>
       <itemizedlist>
         <listitem>
+          <para>[bdubbs] - Update to xf86-input-libinput-0.28.2. Fixes
+          <ulink url="&blfs-ticket-root;11625">#11625</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[ken] - firefox-65.0 includes its own version of libwebp
+          unless told to use the system version. Also, no need to specify
+          --enable-optimize=-O2 now we are using clang. Thanks to Brandan
+          L. for noticing both of these.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to NSS-3.42.1. Fixes
+          <ulink url="&blfs-ticket-root;11615">#11615</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to node.js-10.15.1. Fixes
+          <ulink url="&blfs-ticket-root;11607">#11607</ulink>.</para>
+        </listitem>
+        <listitem>
           <para>[bdubbs] - Update to qpdf-8.4.0. Fixes
           <ulink url="&blfs-ticket-root;11623">#11623</ulink>.</para>
         </listitem>

Modified: branches/BOOK-elogind/packages.ent
==============================================================================
--- branches/BOOK-elogind/packages.ent  Sun Feb  3 21:50:28 2019        (r21084)
+++ branches/BOOK-elogind/packages.ent  Tue Feb  5 05:57:49 2019        (r21085)
@@ -30,9 +30,9 @@
 <!ENTITY nettle-version               "3.4.1">
 
 <!ENTITY nss-minor-version            "42">
-<!--<!ENTITY nss-micro-version            "1">-->
-<!--<!ENTITY nss-version                  
"3.&nss-minor-version;.&nss-micro-version;">-->
-<!ENTITY nss-version                  "3.&nss-minor-version;">
+<!ENTITY nss-micro-version            "1">
+<!ENTITY nss-version                  
"3.&nss-minor-version;.&nss-micro-version;">
+<!--<!ENTITY nss-version                  "3.&nss-minor-version;">-->
 
 <!ENTITY openssh-version              "7.9p1">
 <!-- <!ENTITY openssl-version              "1.1.0g"> -->
@@ -172,7 +172,7 @@
 <!ENTITY libwacom-version             "0.29">
 <!ENTITY lzo-version                  "2.10">
 <!ENTITY mtdev-version                "1.1.5">
-<!ENTITY nodejs-version               "10.15.0">
+<!ENTITY nodejs-version               "10.15.1">
 <!ENTITY npth-version                 "1.6">
 <!ENTITY nspr-version                 "4.20">
 <!ENTITY openobex-version             "1.7.2">

Modified: branches/BOOK-elogind/postlfs/security/nss.xml
==============================================================================
--- branches/BOOK-elogind/postlfs/security/nss.xml      Sun Feb  3 21:50:28 
2019        (r21084)
+++ branches/BOOK-elogind/postlfs/security/nss.xml      Tue Feb  5 05:57:49 
2019        (r21085)
@@ -8,16 +8,16 @@
   <!ENTITY nss-url "archive.mozilla.org/pub/security/nss/releases"> 
 
 <!-- micro versions -->
-<!--<!ENTITY nss-download-http 
"https://&nss-url;/NSS_3_&nss-minor-version;_&nss-micro-version;_RTM/src/nss-&nss-version;.tar.gz";>-->
+<!ENTITY nss-download-http 
"https://&nss-url;/NSS_3_&nss-minor-version;_&nss-micro-version;_RTM/src/nss-&nss-version;.tar.gz";>
 
 <!-- no micro versions -->
-  <!ENTITY nss-download-http 
"https://&nss-url;/NSS_3_&nss-minor-version;_RTM/src/nss-&nss-version;.tar.gz";>
+<!--  <!ENTITY nss-download-http 
"https://&nss-url;/NSS_3_&nss-minor-version;_RTM/src/nss-&nss-version;.tar.gz";>-->
 
   <!ENTITY nss-download-ftp " ">
-  <!ENTITY nss-md5sum        "2a9bc43d35d16ebbe243f1de43b509ea">
+  <!ENTITY nss-md5sum        "1f6cc6c702379478a3a72298caaef0a7">
   <!ENTITY nss-size          "22 MB">
   <!ENTITY nss-buildsize     "143 MB">
-  <!ENTITY nss-time          "2.3 SBU">
+  <!ENTITY nss-time          "2.2 SBU">
 ]>
 
 <sect1 id="nss" xreflabel="NSS-&nss-version;">

Modified: branches/BOOK-elogind/x/installing/x7driver-libinput.xml
==============================================================================
--- branches/BOOK-elogind/x/installing/x7driver-libinput.xml    Sun Feb  3 
21:50:28 2019        (r21084)
+++ branches/BOOK-elogind/x/installing/x7driver-libinput.xml    Tue Feb  5 
05:57:49 2019        (r21085)
@@ -4,12 +4,12 @@
   <!ENTITY % general-entities SYSTEM "../../general.ent">
   %general-entities;
 
-  <!ENTITY xorg-libinput-driver-version "0.28.1">
+  <!ENTITY xorg-libinput-driver-version "0.28.2">
 
   <!ENTITY xorg-libinput-driver-download-http 
"&xorg-download-http;/driver/xf86-input-libinput-&xorg-libinput-driver-version;.tar.bz2">
   <!ENTITY xorg-libinput-driver-download-ftp  
"&xorg-download-ftp;/driver/xf86-input-libinput-&xorg-libinput-driver-version;.tar.bz2">
-  <!ENTITY xorg-libinput-driver-md5sum        
"9d2fb3d6b452d568a275908b856de0e2">
-  <!ENTITY xorg-libinput-driver-size          "368 KB">
+  <!ENTITY xorg-libinput-driver-md5sum        
"b7548bc1d7e82d189205794ff86307af">
+  <!ENTITY xorg-libinput-driver-size          "372 KB">
   <!ENTITY xorg-libinput-driver-buildsize     "3.6 MB (with tests)">
   <!ENTITY xorg-libinput-driver-time          "less than 0.1 SBU (with tests)">
 ]>

Modified: branches/BOOK-elogind/xsoft/graphweb/firefox.xml
==============================================================================
--- branches/BOOK-elogind/xsoft/graphweb/firefox.xml    Sun Feb  3 21:50:28 
2019        (r21084)
+++ branches/BOOK-elogind/xsoft/graphweb/firefox.xml    Tue Feb  5 05:57:49 
2019        (r21085)
@@ -10,11 +10,11 @@
   <!ENTITY firefox-size          "266 MB">
   <!-- NB with stylo, much of the build uses rust, and therefore cargo files.
     But the extra cached cargo files, if any, seem to be minimal -->
-  <!ENTITY firefox-buildsize     "9.4 GB (147 MB installed) without tests">
+  <!ENTITY firefox-buildsize     "9.4 GB (146 MB installed) without tests">
   <!-- editors: with ff63 and rust-1.29, ./mach build -j4 is probably the
    most practical way to get a timing on a machine with more cores, if taking
    cores offline is not practical. If in doubt, round up -->
-  <!ENTITY firefox-time          "31 SBU (with parallelism=4) without tests">
+  <!ENTITY firefox-time          "29 SBU (with parallelism=4) without tests">
 ]>
 
 <sect1 id="firefox" xreflabel="Firefox-&firefox-version;">
@@ -248,6 +248,8 @@
 ac_add_options --enable-system-sqlite
 ac_add_options --with-system-libevent
 ac_add_options --with-system-libvpx
+# firefox-65 understands webp and ships with an included copy
+ac_add_options --with-system-webp
 ac_add_options --with-system-nspr
 ac_add_options --with-system-nss
 ac_add_options --with-system-icu
@@ -278,8 +280,9 @@
 # increase the build time, for no obvious benefit.
 ac_add_options --disable-tests
 
-# Optimization for size is broken with gcc7 and later
-ac_add_options --enable-optimize="-O2"
+# With clang, unlike gcc-7 and later, the default level
+# of optimization produces a working build.
+ac_add_options --enable-optimize
 
 # From firefox-61 system cairo is not supported
 
-- 
http://lists.linuxfromscratch.org/listinfo/blfs-book
FAQ: http://www.linuxfromscratch.org/blfs/faq.html
Unsubscribe: See the above information page

Reply via email to