Author: dj
Date: Sat Dec 22 15:11:08 2018
New Revision: 20857

Log:
Merge to HEAD 20855

Modified:
   branches/BOOK-elogind/general.ent
   branches/BOOK-elogind/general/genlib/libuv.xml
   branches/BOOK-elogind/introduction/welcome/changelog.xml
   branches/BOOK-elogind/networking/netlibs/c-ares.xml
   branches/BOOK-elogind/packages.ent
   branches/BOOK-elogind/x/lib/gtk+3.xml

Modified: branches/BOOK-elogind/general.ent
==============================================================================
--- branches/BOOK-elogind/general.ent   Sat Dec 22 15:07:07 2018        (r20856)
+++ branches/BOOK-elogind/general.ent   Sat Dec 22 15:11:08 2018        (r20857)
@@ -1,12 +1,12 @@
 <!-- $LastChangedBy$ $Date$ -->
 
-<!ENTITY day          "21">                   <!-- Always 2 digits -->
+<!ENTITY day          "22">                   <!-- Always 2 digits -->
 <!ENTITY month        "12">                   <!-- Always 2 digits -->
 <!ENTITY year         "2018">
 <!ENTITY copyrightdate "2001-&year;">
 <!ENTITY copyholder   "The BLFS Development Team">
 <!ENTITY version      "&year;-&month;-&day;">
-<!ENTITY releasedate  "December 21st, &year;">
+<!ENTITY releasedate  "December 22nd, &year;">
 <!ENTITY pubdate      "&year;-&month;-&day;"> <!-- metadata req. by TLDP -->
 <!ENTITY blfs-version "svn">                  <!-- svn|[release #] -->
 <!ENTITY lfs-version  "development">          <!-- x.y|development -->

Modified: branches/BOOK-elogind/general/genlib/libuv.xml
==============================================================================
--- branches/BOOK-elogind/general/genlib/libuv.xml      Sat Dec 22 15:07:07 
2018        (r20856)
+++ branches/BOOK-elogind/general/genlib/libuv.xml      Sat Dec 22 15:11:08 
2018        (r20857)
@@ -6,10 +6,10 @@
 
   <!ENTITY libuv-download-http 
"https://dist.libuv.org/dist/v&libuv-version;/libuv-v&libuv-version;.tar.gz";>
   <!ENTITY libuv-download-ftp  " ">
-  <!ENTITY libuv-md5sum        "90320330757253b07404d2a97f59c66b">
+  <!ENTITY libuv-md5sum        "a06eb31fe41c446ace34dc1d1d335964">
   <!ENTITY libuv-size          "1.1 MB">
-  <!ENTITY libuv-buildsize     "12 MB (add 10 MB for tests)">
-  <!ENTITY libuv-time          "0.1 SBU (add 1.3 SBU for tests)">
+  <!ENTITY libuv-buildsize     "12 MB (add 11 MB for tests)">
+  <!ENTITY libuv-time          "0.1 SBU (add 0.6 SBU for tests)">
 ]>
 
 <sect1 id="libuv" xreflabel="libuv-&libuv-version;">
@@ -95,18 +95,18 @@
       commands:
     </para>
 
-<screen><userinput>sh autogen.sh                              &amp;&amp;
-./configure --prefix=/usr --disable-static &amp;&amp;
-make</userinput></screen>
-<!--
-Alternativly, if cmake is allready installed:
-$ mkdir build
-$ cd build
-$ sed -e "/TARGETS uv_a ARCHIVE/d" -i ../CMakeLists.txt   # mimic 
disable-static
-$ cmake -DCMAKE_INSTALL_PREFIX=/usr ..
--->
+<screen><userinput>sed -i "/TARGETS uv_a ARCHIVE/d" CMakeLists.txt &amp;&amp;
+
+mkdir build &amp;&amp;
+cd    build &amp;&amp;
+
+cmake -DCMAKE_INSTALL_PREFIX=/usr .. &amp;&amp;
+make </userinput></screen>
+
     <para>
-      To execute the test suite, run <command>make check</command>.  
+      If you want to run the tests, add -DBUILD_TESTING=true to
+      the cmake line above and after building run: 
+      <command>make test</command>.
     </para>
 
     <para>
@@ -117,18 +117,17 @@
 
   </sect2>
 
-<!--
+
   <sect2 role="commands">
     <title>Command Explanations</title>
 
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude";
-      href="../../xincludes/static-libraries.xml"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude";
-      href="../../xincludes/gtk-doc-rebuild.xml"/>
-
+    <para>
+      <command>sed ...</command>: This command disables installation
+      of the static library.
+    </para>
+    
   </sect2>
--->
+
   <sect2 role="content">
     <title>Contents</title>
 

Modified: branches/BOOK-elogind/introduction/welcome/changelog.xml
==============================================================================
--- branches/BOOK-elogind/introduction/welcome/changelog.xml    Sat Dec 22 
15:07:07 2018        (r20856)
+++ branches/BOOK-elogind/introduction/welcome/changelog.xml    Sat Dec 22 
15:11:08 2018        (r20857)
@@ -48,6 +48,18 @@
           <para>[dj] - Added elogind support to Pulseaudio.</para>
         </listitem>
         <listitem>
+          <para>[bdubbs] - Update to libuv-v1.24.1. Fixes
+          <ulink url="&blfs-ticket-root;11455">#11455</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to c-ares-1.15.0. Fixes
+          <ulink url="&blfs-ticket-root;11452">#11452</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to gtk+-3.24.2. Fixes
+          <ulink url="&blfs-ticket-root;11444">#11444</ulink>.</para>
+        </listitem>
+        <listitem>
           <para>[dj] - Complete integration of elogind fd passing in
           xtrans/xorg-server.</para>
         </listitem>

Modified: branches/BOOK-elogind/networking/netlibs/c-ares.xml
==============================================================================
--- branches/BOOK-elogind/networking/netlibs/c-ares.xml Sat Dec 22 15:07:07 
2018        (r20856)
+++ branches/BOOK-elogind/networking/netlibs/c-ares.xml Sat Dec 22 15:11:08 
2018        (r20857)
@@ -6,10 +6,10 @@
 
   <!ENTITY c-ares-download-http 
"https://c-ares.haxx.se/download/c-ares-&c-ares-version;.tar.gz";>
   <!ENTITY c-ares-download-ftp  " ">
-  <!ENTITY c-ares-md5sum        "e57b37a7c46283e83c21cde234df10c7">
+  <!ENTITY c-ares-md5sum        "d2391da274653f7643270623e822dff7">
   <!ENTITY c-ares-size          "1.3 MB">
-  <!ENTITY c-ares-buildsize     "14 MB">
-  <!ENTITY c-ares-time          "0.3 SBU">
+  <!ENTITY c-ares-buildsize     "8.5 MB">
+  <!ENTITY c-ares-time          "0.1 SBU">
 ]>
 
 <sect1 id="c-ares" xreflabel="c-ares-&c-ares-version;">
@@ -80,7 +80,10 @@
       commands:
     </para>
 
-<screen><userinput>./configure --prefix=/usr --disable-static &amp;&amp;
+<screen><userinput>mkdir build &amp;&amp;
+cd    build &amp;&amp;
+
+cmake  -DCMAKE_INSTALL_PREFIX=/usr .. &amp;&amp;
 make</userinput></screen>
 
     <para>

Modified: branches/BOOK-elogind/packages.ent
==============================================================================
--- branches/BOOK-elogind/packages.ent  Sat Dec 22 15:07:07 2018        (r20856)
+++ branches/BOOK-elogind/packages.ent  Sat Dec 22 15:11:08 2018        (r20857)
@@ -165,7 +165,7 @@
 <!ENTITY libunistring-version         "0.9.10">
 <!ENTITY libusb-version               "1.0.22">
 <!ENTITY libusb-compat-version        "0.1.5">
-<!ENTITY libuv-version                "1.24.0">
+<!ENTITY libuv-version                "1.24.1">
 <!ENTITY libxkbcommon-version         "0.8.2">
 <!-- the libxml2-version is also used for the python2 module,
 which is built separately after libxml2.so has been installed,
@@ -574,7 +574,7 @@
 <!ENTITY wicd-major-version           "1.7">
 
 <!-- Chapter 17 -->
-<!ENTITY c-ares-version               "1.14.0">
+<!ENTITY c-ares-version               "1.15.0">
 <!ENTITY curl-version                 "7.63.0">
 <!ENTITY geoclue2-version             "2.4.12">
 <!ENTITY glib-networking-version      "2.58.0">
@@ -690,7 +690,7 @@
 <!ENTITY glu-version                  "9.0.0">
 <!ENTITY goffice010-version           "0.10.43">
 <!ENTITY gtk2-version                 "2.24.32">
-<!ENTITY gtk3-version                 "3.24.1">
+<!ENTITY gtk3-version                 "3.24.2">
 <!ENTITY gtk-engines-version          "2.20.2">
 <!ENTITY gtkmm2-version               "2.24.5">
 <!ENTITY gtkmm3-version               "3.24.0">

Modified: branches/BOOK-elogind/x/lib/gtk+3.xml
==============================================================================
--- branches/BOOK-elogind/x/lib/gtk+3.xml       Sat Dec 22 15:07:07 2018        
(r20856)
+++ branches/BOOK-elogind/x/lib/gtk+3.xml       Sat Dec 22 15:11:08 2018        
(r20857)
@@ -6,10 +6,10 @@
 
   <!ENTITY gtk3-download-http 
"&gnome-download-http;/gtk+/&gnome-minor-24;/gtk+-&gtk3-version;.tar.xz">
   <!ENTITY gtk3-download-ftp  
"&gnome-download-ftp;/gtk+/&gnome-minor-24;/gtk+-&gtk3-version;.tar.xz">
-  <!ENTITY gtk3-md5sum        "9dfe16f486573815f242fa400763feb7">
-  <!ENTITY gtk3-size          "18 MB">
-  <!ENTITY gtk3-buildsize     "569 MB (add 9 MB for tests)">
-  <!ENTITY gtk3-time          "2.8 SBU (using parallelism=4, add 0.5 SBU for 
tests)">
+  <!ENTITY gtk3-md5sum        "f336c5ce0bc10f6ebdd9e34dcff65b15">
+  <!ENTITY gtk3-size          "21 MB">
+  <!ENTITY gtk3-buildsize     "459 MB (add 10 MB for tests)">
+  <!ENTITY gtk3-time          "2.5 SBU (using parallelism=4, add 1.0 SBU for 
tests)">
 ]>
 
 <sect1 id="gtk3" xreflabel="GTK+-&gtk3-version;">
@@ -144,7 +144,9 @@
       commands:
     </para>
 
-<screen><userinput>./configure --prefix=/usr             \
+<screen><userinput>sed -i 's/dfeault/default/' docs/tools/shooter.c &amp;&amp;
+
+./configure --prefix=/usr             \
             --sysconfdir=/etc         \
             --enable-broadway-backend \
             --enable-x11-backend      \
@@ -163,8 +165,9 @@
     <para>
       To test the results you need a graphical session, then issue
       <command>make -k check</command>. 
-      Some tests may fail, although "/Default Values/GdkPixbuf" is the only 
known
-      failure as of version 3.24.1.
+      The colorchooser.ui portion of the accessibility-dump test is 
+      known to fail.  Additioanlly many tests will fail if the current 
+      gtk theme (such as current XFCE themes) has deprecated elements.
     </para>
 
     <para>
-- 
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