LXQt 0.9.1: typos.

Xorg-Server-1.17.2: typo. PIN-Entry-0.9.5: attempt to clarify fixes when building pinentry-qt4. WebKitGTK+-2.8.4: include switch to build and install MiniBrowser, good test if there are build problems and can be useful for simple browsing. Update to NetworkManager-1.0.4. Update to network-manager-applet-1.0.4. Update to Samba-4.2.3. Update to libepoxy-1.3.1. git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@16254 af4574ff-66df-0310-9fd7-8a98e5e911e0
2025-01-23 22:42:14 +08:00 · 2015-07-17 00:43:56 +00:00 · 2015-07-17 00:43:56 +00:00 · 7c4f32b99b
commit 7c4f32b99b
parent 895c4b753f
16 changed files with 100 additions and 73 deletions
--- a/general.ent
+++ b/general.ent
@ -1,12 +1,12 @@
 <!-- $LastChangedBy$ $Date$ -->

-<!ENTITY day          "15">                   <!-- Always 2 digits -->
+<!ENTITY day          "16">                   <!-- Always 2 digits -->
 <!ENTITY month        "07">                   <!-- Always 2 digits -->
 <!ENTITY year         "2015">
 <!ENTITY copyrightdate "2001-&year;">
 <!ENTITY copyholder   "The BLFS Development Team">
 <!ENTITY version      "&year;-&month;-&day;">
-<!ENTITY releasedate  "July 15th &year;">
+<!ENTITY releasedate  "July 16th &year;">
 <!ENTITY pubdate      "&year;-&month;-&day;"> <!-- metadata req. by TLDP -->
 <!ENTITY blfs-version "svn">                  <!-- svn|[release #] -->
 <!ENTITY lfs-version  "development">          <!-- x.y|development] -->
--- a/general/genutils/pinentry.xml
+++ b/general/genutils/pinentry.xml
@ -86,7 +86,7 @@
    <para>Install <application>PIN-Entry</application> by running the following
    commands:</para>

-<screen><userinput>CXXFLAGS=-std=c++11 ./configure --prefix=/usr &amp;&amp;
+<screen><userinput>./configure --prefix=/usr &amp;&amp;
 make</userinput></screen><!-- &amp;&amp;

 makeinfo - -html - -no-split -o doc/pinentry_nochunks.html doc/pinentry.texi &amp;&amp;
@ -123,18 +123,22 @@ install -v -m644 doc/pinentry.{pdf,ps,dvi} \
    <title>Command Explanations</title>

    <para>
-      <envar>CXXFLAGS=-std=c++11</envar>: Fix a build problem with gcc-5.
+      <option>--enable-pinentry-qt4</option>: Use this switch if you wish to
+      install <command>pinentry-qt4</command>.
    </para>

    <para>
-      <option>--enable-pinentry-qt4</option>: Use this switch if ypu wish to
-      install <command>pinentry-qt4</command>. If both <xref linkend="qt4"/>
-      and <xref linkend="qt5"/> are installed, use <command>source
-      setqt4</command>, before starting. Also, you need to modify the
-      configuration step, using <command>CXX="g++ -std=c++11"
-      MOC="$QT4DIR/bin/moc" ./configure ...</command>, to fix building with
-      gcc-5 and for Qt4 <command>moc</command> (Qt4 meta object compiler)
-      detection.
+      <envar>CXXFLAGS=-std=c++11</envar>: If using
+      <option>--enable-pinentry-qt4</option> switch, add to the
+      <command>./configure ...</command> command line, to fix a build problem
+      with gcc-5.
+    </para>
+
+    <para>
+      <envar>MOC=$QT4DIR/bin/moc</envar>:  If using
+      <option>--enable-pinentry-qt4</option> switch, add to the
+      <command>./configure ...</command> command line, to help Qt4
+      <command>moc</command> (Qt4 meta object compiler) detection.
    </para>

  </sect2>
--- a/gnome.ent
+++ b/gnome.ent
@ -48,5 +48,5 @@
 <!ENTITY gnome-terminal-version       "3.16.2">
 <!ENTITY gucharmap-version            "3.16.2">
 <!ENTITY nautilus-version             "3.16.2">
-<!ENTITY network-manager-applet-version "1.0.2">
+<!ENTITY network-manager-applet-version "1.0.4">
 <!ENTITY seahorse-version             "3.16.0">
--- a/gnome/applications/network-manager-applet.xml
+++ b/gnome/applications/network-manager-applet.xml
@ -8,10 +8,10 @@
           "&gnome-download-http;/network-manager-applet/1.0/network-manager-applet-&network-manager-applet-version;.tar.xz">
  <!ENTITY network-manager-applet-download-ftp
           "&gnome-download-ftp;/network-manager-applet/1.0/network-manager-applet-&network-manager-applet-version;.tar.xz">
-  <!ENTITY network-manager-applet-md5sum        "5b2a8baa6b038b3e55e5444ff321e80d">
+  <!ENTITY network-manager-applet-md5sum        "7fc2ed3f0c46ed41ddabe99d51513b1c">
  <!ENTITY network-manager-applet-size          "1.3 MB">
-  <!ENTITY network-manager-applet-buildsize     "51 MB">
-  <!ENTITY network-manager-applet-time          "0.3 SBU">
+  <!ENTITY network-manager-applet-buildsize     "52 MB (with the tests)">
+  <!ENTITY network-manager-applet-time          "0.4 SBU (with the tests)">
 ]>

 <sect1 id="network-manager-applet" xreflabel="network-manager-applet-&network-manager-applet-version;">
@ -170,8 +170,7 @@ make</userinput></screen>
          libnm-gtk.so
        </seg>
        <seg>
-          /usr/include/libnm-gtk,
-          /usr/share/libnm-gtk, and
+          /usr/{include,share}/libnm-gtk and
          /usr/share/nm-applet
        </seg>
      </seglistitem>
--- a/introduction/welcome/changelog.xml
+++ b/introduction/welcome/changelog.xml
@ -44,6 +44,28 @@

 -->

+    <listitem>
+      <para>July 15th, 2015</para>
+      <itemizedlist>
+        <listitem>
+          <para>[fernando] - Update to libepoxy-1.3.1. Fixes
+          <ulink url="&blfs-ticket-root;6726">#6726</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[fernando] - Update to Samba-4.2.3. Fixes
+          <ulink url="&blfs-ticket-root;6721">#6721</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[fernando] - Update to network-manager-applet-1.0.4. Fixes
+          <ulink url="&blfs-ticket-root;6720">#6720</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[fernando] - Update to NetworkManager-1.0.4. Fixes
+          <ulink url="&blfs-ticket-root;6720">#6720</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
    <listitem>
      <para>July 15th, 2015</para>
      <itemizedlist>
--- a/lxqt/desktop/lxqt-common.xml
+++ b/lxqt/desktop/lxqt-common.xml
@ -75,18 +75,18 @@
    <para role="required">
      <xref linkend="liblxqt"/>,
      <xref linkend="openbox"/> (runtime - may be replaced by another WM, e.g.
-      <xref linkend="xfwm4"/>, but it was not tested for BLFS),
+      <xref linkend="xfwm4"/>, but this has not been tested for BLFS),
      <xref linkend="qt5"/> built with <xref linkend="librsvg"/>, and
      <xref linkend="xdg-utils"/>
    </para>

    <bridgehead renderas="sect4">Recommended</bridgehead>
    <para role="recommended">
-      <xref linkend="consolekit"/>, or
+      <xref linkend="consolekit"/> alone or with
      <xref linkend="lxdm"/> or another Display Manager, e.g.
-      <ulink url="https://github.com/sddm/sddm">sddm</ulink> (this is reported
-      as the <quote>recommended <application>LXQt</application> display
-      manager</quote>,
+      <ulink url="https://github.com/sddm/sddm">sddm</ulink> (this has been
+      reported as the <quote>recommended <application>LXQt</application>
+      display manager</quote>),
      <xref linkend="desktop-file-utils"/>,
      <xref linkend="hicolor-icon-theme"/>, and
      <xref linkend="shared-mime-info"/>
--- a/lxqt/desktop/lxqt-policykit.xml
+++ b/lxqt/desktop/lxqt-policykit.xml
@ -30,7 +30,7 @@
    <title>Introduction to lxqt-policykit</title>

    <para>
-      The <application>lxqt-policykit</application> package the
+      The <application>lxqt-policykit</application> package is the
      <application>LXQt</application> PolicyKit agent.
    </para>

--- a/lxqt/desktop/lxqt-runner.xml
+++ b/lxqt/desktop/lxqt-runner.xml
@ -74,7 +74,7 @@

    <bridgehead renderas="sect4">Required</bridgehead>
    <para role="required">
-      kwindowsystem, from <xref linkend="kf5-frameworks"/>
+      kwindowsystem, from <xref linkend="kf5-frameworks"/>,
      <xref linkend="lxqt-common"/>,
      <xref linkend="lxqt-globalkeys"/> and
      <xref linkend="menu-cache"/>
--- a/lxqt/desktop/post-install.xml
+++ b/lxqt/desktop/post-install.xml
@ -37,11 +37,11 @@

    <bridgehead renderas="sect4">Recommended</bridgehead>
    <para role="recommended">
-      <xref linkend="consolekit"/>, or
+      <xref linkend="consolekit"/> alone or with
      <xref linkend="lxdm"/> or another Display Manager, e.g.
-      <ulink url="https://github.com/sddm/sddm">sddm</ulink> (this is reported
-      as the <quote>recommended <application>LXQt</application> display
-      manager</quote>
+      <ulink url="https://github.com/sddm/sddm">sddm</ulink> (this has been
+      reported as the <quote>recommended <application>LXQt</application>
+      display manager</quote>)
    </para>

    <para condition="html" role="usernotes">
--- a/lxqt/desktop/pre-install.xml
+++ b/lxqt/desktop/pre-install.xml
@ -20,7 +20,7 @@

    <para>
      LXQt can be installed in /usr or /opt/lxqt.  The BLFS editors recommend
-      the latter in the BLFS environment. The former has not been tests in
+      the latter in the BLFS environment. The former has not been tested in
      BLFS.
    </para>

--- a/networking/netprogs/samba.xml
+++ b/networking/netprogs/samba.xml
@ -6,10 +6,10 @@

  <!ENTITY samba-download-http "https://download.samba.org/pub/samba/stable/samba-&samba-version;.tar.gz">
  <!ENTITY samba-download-ftp  " ">
-  <!ENTITY samba-md5sum        "77f138cc0736549b03872279364766e0">
+  <!ENTITY samba-md5sum        "aeaa6ccee87727b7d01df7b6d0864c74">
  <!ENTITY samba-size          "20 MB">
-  <!ENTITY samba-buildsize     "487 MB (additional 399 MB for the quicktest, reputedly up to 500 MB additional for all tests)">
-  <!ENTITY samba-time          "2.1 SBU, using parallelism=4 (additional 6.9 SBU for the quicktest, reputedly up to 110 SBU to run all tests)">
+  <!ENTITY samba-buildsize     "476 MB (additional 397 MB for the quicktest, reputedly up to 500 MB additional for all tests)">
+  <!ENTITY samba-time          "2.1 SBU, using parallelism=4 (additional 7.4 SBU for the quicktest, reputedly up to 110 SBU to run all tests)">
 ]>

 <sect1 id="samba" xreflabel="Samba-&samba-version;">
@ -114,16 +114,6 @@
      dependencies.</para>
    </note>

-    <para>Fix some code when building with gnutls-3.4 and later:</para>
-
-<screen><userinput>sed -e 's/.*set_priority.*/\tgnutls_priority_set_direct(tls->session, "NORMAL:+CTYPE-OPENPGP", NULL);/' \
-    -e '/cert_type_priority/d' \
-    -i source4/lib/tls/tls.c &amp;&amp;
-sed -e 's/.*set_priority.*/\tgnutls_priority_set_direct(tlss->tls_session, "NORMAL:+CTYPE-OPENPGP", NULL);/' \
-    -e '/t cert_type_priority/ s:^:/*:' \
-    -e '/t cert_type_priority/{n;N;N;N;s:$:*/:}' \
-    -i source4/lib/tls/tls_tstream.c</userinput></screen>
-
    <para>Install <application>Samba</application> by running the following
    commands:</para>

--- a/networking/netutils/networkmanager.xml
+++ b/networking/netutils/networkmanager.xml
@ -8,10 +8,10 @@
           "&gnome-download-http;/NetworkManager/1.0/NetworkManager-&NetworkManager-version;.tar.xz">
  <!ENTITY NetworkManager-download-ftp
           "&gnome-download-ftp;/NetworkManager/1.0/NetworkManager-&NetworkManager-version;.tar.xz">
-  <!ENTITY NetworkManager-md5sum        "5a4899f89edcbdd1ac46d2d947e8d6eb">
-  <!ENTITY NetworkManager-size          "3.1 MB">
-  <!ENTITY NetworkManager-buildsize     "319 MB (additional 1 MB for the tests)">
-  <!ENTITY NetworkManager-time          "1.6 SBU (additional 0.2 SBU for the tests)">
+  <!ENTITY NetworkManager-md5sum        "7eabef7bd3bbdd6dc0473dd32aeac924">
+  <!ENTITY NetworkManager-size          "3.3 MB">
+  <!ENTITY NetworkManager-buildsize     "358 MB (with the tests)">
+  <!ENTITY NetworkManager-time          "2.6 SBU (with the tests)">
 ]>

 <sect1 id="NetworkManager" xreflabel="NetworkManager-&NetworkManager-version;">
@ -121,11 +121,8 @@
    <title>Installation of NetworkManager</title>

    <para>
-      If <xref linkend="qt4"/> and  <xref linkend="qt5"/> are installed, you
-      need to choose <application>Qt4</application> with
-      <command>source setqt4</command>, before starting. Install
-      <application>NetworkManager</application> by running the following
-      commands:
+      Install <application>NetworkManager</application> by running the
+      following commands:
    </para>

 <screen><userinput>./configure --prefix=/usr        \
@ -263,11 +260,10 @@ EOF</userinput></screen>
        </seg>
        <seg>
          /etc/NetworkManager,
-          /usr/include/{libnm,libnm-glib,NetworkManager},
+          /usr/include/{libnm{,-glib},NetworkManager},
          /usr/lib/NetworkManager,
          /usr/share/doc/NetworkManager-&NetworkManager-version;,
-          /usr/share/gtk-doc/html/{libnm,libnm-glib,libnm-util,NetworkManager},
-          and
+          /usr/share/gtk-doc/html/{libnm{,-glib,-util},NetworkManager}, and
          /var/{lib,run}/NetworkManager
        </seg>
      </seglistitem>
--- a/packages.ent
+++ b/packages.ent
@ -109,7 +109,7 @@
 <!ENTITY libcroco-version             "0.6.8">
 <!ENTITY libdaemon-version            "0.14">
 <!ENTITY libdrm-version               "2.4.62">
-<!ENTITY libepoxy-version             "1.2">
+<!ENTITY libepoxy-version             "1.3.1">
 <!ENTITY libesmtp-version             "1.0.6">
 <!ENTITY libffi-version               "3.2.1">
 <!ENTITY libgcrypt-version            "1.6.3">
@ -356,7 +356,7 @@
 <!ENTITY ntp-version                  "4.2.8p3">
 <!ENTITY rpcbind-version              "0.2.3">
 <!ENTITY rsync-version                "3.1.1">
-<!ENTITY samba-version                "4.2.2">
+<!ENTITY samba-version                "4.2.3">
 <!ENTITY wget-version                 "1.16.3">
 <!ENTITY wireless-tools-version       "29">
 <!ENTITY wpa_supplicant-version       "2.4">
@ -365,7 +365,7 @@
 <!ENTITY avahi-version                "0.6.31">
 <!ENTITY bind-version                 "9.10.2-P2">
 <!ENTITY mod_dnssd-version            "0.6">
-<!ENTITY NetworkManager-version       "1.0.2">
+<!ENTITY NetworkManager-version       "1.0.4">
 <!ENTITY nmap-version                 "6.47">
 <!ENTITY traceroute-version           "2.0.21">
 <!ENTITY whois-version                "5.2.9">
--- a/x/installing/xorg-server.xml
+++ b/x/installing/xorg-server.xml
@ -95,7 +95,7 @@
    <bridgehead renderas="sect4">Recommended</bridgehead>
    <para role="recommended">
      <xref linkend="libepoxy"/> (required for glamor, see command
-      explanations below)
+      explanations below) and
      <xref linkend="xcb-util-keysyms"/> (used by Xnest)
    </para>

--- a/x/lib/libepoxy.xml
+++ b/x/lib/libepoxy.xml
@ -4,12 +4,12 @@
  <!ENTITY % general-entities SYSTEM "../../general.ent">
  %general-entities;

-  <!ENTITY libepoxy-download-http "http://crux.nu/files/libepoxy-&libepoxy-version;.tar.gz">
+  <!ENTITY libepoxy-download-http "https://github.com/anholt/libepoxy/releases/download/v&libepoxy-version;/libepoxy-&libepoxy-version;.tar.bz2">
  <!ENTITY libepoxy-download-ftp  " ">
-  <!ENTITY libepoxy-md5sum        "12d6b7621f086c0c928887c27d90bc30">
-  <!ENTITY libepoxy-size          "264 KB">
-  <!ENTITY libepoxy-buildsize     "21 MB">
-  <!ENTITY libepoxy-time          "0.2 SBU">
+  <!ENTITY libepoxy-md5sum        "96f6620a9b005a503e7b44b0b528287d">
+  <!ENTITY libepoxy-size          "804 KB">
+  <!ENTITY libepoxy-buildsize     "27 MB (with the tests)">
+  <!ENTITY libepoxy-time          "0.1 SBU (with the tests)">
 ]>

 <sect1 id="libepoxy" xreflabel="libepoxy-&libepoxy-version;">
@ -90,12 +90,11 @@
      commands:
    </para>

-<screen><userinput>./autogen.sh --prefix=/usr &amp;&amp;
+<screen><userinput>./configure --prefix=/usr &amp;&amp;
 make</userinput></screen>

    <para>
-      To test the results, issue: <command>make -k check</command>. Some
-      tests may fail for unknown reasons.
+      To test the results, issue: <command>make check</command>.
    </para>

    <para>
--- a/x/lib/webkitgtk.xml
+++ b/x/lib/webkitgtk.xml
@ -145,15 +145,15 @@ cmake -DCMAKE_BUILD_TYPE=Release  \
      -DCMAKE_SKIP_RPATH=ON       \
      -DPORT=GTK                  \
      -DLIB_INSTALL_DIR=/usr/lib  \
+      -DENABLE_MINIBROWSER=ON     \
      -Wno-dev .. &amp;&amp;
 make</userinput></screen>

    <para>
-      This package does not have a working testsuite.<!-- However, there are two
-      useable basic graphical web browsers in the build directory,
-      <application>Programs/GtkLauncher</application> and
-      <application>Programs/MiniBrowser</application>. If launching any one
-      fails, there is a problem with the build.-->
+      This package does not have a working testsuite. However, there is a
+      useable basic graphical web browser in the build directory,
+      <application>build/bin/MiniBrowser</application>. If launching it fails,
+      there is a problem with the build.
    </para>

    <note><para>
@ -185,6 +185,11 @@ install -vm644  ../Documentation/webkitdomgtk-4.0/html/* \
      <command>sed -i ...</command>: Fixes typos in two source code files.
    </para>

+    <para>
+      <parameter>-DENABLE_MINIBROWSER=ON</parameter>: This switch enables the
+      <application>Mini Browser</application> compilation and install.
+    </para>
+
    <para>
      <option>-DUSE_SYSTEM_MALLOC=ON</option>: This switch enables building
      against the system installed <application>malloc</application>.
@ -214,7 +219,7 @@ install -vm644  ../Documentation/webkitdomgtk-4.0/html/* \

      <seglistitem>
        <seg>
-          jsc
+          jsc and MiniBrowser
        </seg>
        <seg>
          libjavascriptcoregtk-4.0.so and
@ -247,6 +252,18 @@ install -vm644  ../Documentation/webkitdomgtk-4.0/html/* \
        </listitem>
      </varlistentry>

+      <varlistentry id="MiniBrowser">
+        <term><command>MiniBrowser</command></term>
+        <listitem>
+          <para>
+            is a very simple graphical browser.
+          </para>
+          <indexterm zone="webkitgtk MiniBrowser">
+            <primary sortas="b-MiniBrowser">MiniBrowser</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
      <varlistentry id="libjavascriptcoregtk-4.0">
        <term><filename
        class="libraryfile">libjavascriptcoregtk-4.0.so</filename></term>