Changeset 419681d6

Timestamp:

05/06/2016 01:04:13 AM (8 years ago)

Author:

Douglas R. Reno <renodr@…>

Branches:

systemd-13485

Children:

2432970

Parents:

cf4247e

Message:

Sync to trunk r17130
Fix FAAC compilation under GCC-6

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/branches/systemd@17323 af4574ff-66df-0310-9fd7-8a98e5e911e0

Files:

• general/prog/git.xml (modified) (3 diffs)
• general/prog/nasm.xml (modified) (1 diff)
• introduction/welcome/changelog.xml (modified) (1 diff)
• multimedia/libdriv/faac.xml (modified) (1 diff)
• packages.ent (modified) (2 diffs)
• x/lib/webkitgtk.xml (modified) (1 diff)
• xfce/core/xfce4-session.xml (modified) (1 diff)
• xsoft/office/libreoffice.xml (modified) (3 diffs)

general/prog/git.xml

@@ -125 +125 @@
     </para>
 
-    <bridgehead renderas="sect4">Optional (to create the man pages and html docs)</bridgehead>
+    <bridgehead renderas="sect4">Optional (to create the man pages, html docs,
+    and other docs)</bridgehead>
     <para>
       <xref linkend="xmlto"/> and
       <ulink url="http://www.methods.co.nz/asciidoc/">AsciiDoc</ulink> or
-      <ulink url="http://asciidoctor.org/">AsciiDoctor</ulink>
+      <ulink url="http://asciidoctor.org/">AsciiDoctor</ulink>, and also
+      <ulink url="http://dblatex.sourceforge.net/">dblatex</ulink>
+      (for the PDF version of the user manual), and
+      <ulink url="http://docbook2x.sourceforge.net/">docbook2x</ulink> to
+      create info pages
     </para>
 
@@ -172 +177 @@
     <para>
 <!--  The test suite can be run in parallel mode. To run the test suite, issue: -->
-      The test suite fails early, in 'blame respects encoding', because grep-2.23
+<!--      The test suite fails early, in 'blame respects encoding', because grep-2.23
       treats data in the locale tests as binary.  To run the tests up to that
       point issue:
       <command>make test</command>. -->
+      The test suite can be run in parallel mode. To run the test suite, issue:
+      <command>make test</command>. If run as a normal user, 0 test should be
+      reported as failed in the final summary.
     </para>
 
@@ -229 +237 @@
 
     <para>
-      For both methods, reorganize the files, as
+      For both methods, the html-docs include a lot of plain text files.
+      Reorganize the files as the
       <systemitem class="username">root</systemitem> user:
     </para>

general/prog/nasm.xml

@@ -7 +7 @@
   <!ENTITY nasm-download-http "http://www.nasm.us/pub/nasm/releasebuilds/&nasm-version;/nasm-&nasm-version;.tar.xz">
   <!ENTITY nasm-download-ftp  " ">
-  <!ENTITY nasm-md5sum        "cf17c2dc0993f94aa8a3a9e15589f6f3">
-  <!ENTITY nasm-size          "760 KB">
+  <!ENTITY nasm-md5sum        "d53e1b2678231be9ec48f75ba0cc7475">
+  <!ENTITY nasm-size          "762 KB">
   <!ENTITY nasm-buildsize     "31 MB" >
   <!ENTITY nasm-time          "0.1 SBU">

introduction/welcome/changelog.xml

@@ -48 +48 @@
       <itemizedlist>
         <listitem>
+          <para>[renodr] - Fixed FAAC compilation with GCC-6.x.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Merged to trunk r17130.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update-mime-database needs to be given a directory
+          in Xfce4-session. Merged from trunk r17130.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Fixed some typos and reworded command explanations
+          in Libreoffice. Merged from trunk r17129.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Revamped test suite instructions for Git. Merged
+          from trunk r17128.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to NASM-2.12.01. Merged from trunk
+          r17127.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to WebkitGTK+-2.10.9. Note that I have to
+          merge a later version when GNOME is updated. Merged from trunk
+          r17126.</para>
+        </listitem>
+        <listitem>
           <para>[renodr] - Sync to trunk r17126.</para>
         </listitem>

multimedia/libdriv/faac.xml

@@ -92 +92 @@
 sed -i -e '/obj-type/d' -e '/Long Term/d' frontend/main.c &&
 
+CFLAGS=-std=c99                            \
+CXXFLAGS=-std=c++98                        \
 ./configure --prefix=/usr --disable-static &&
 make</userinput></screen>

packages.ent

@@ -292 +292 @@
 <!ENTITY lua-version                  "5.3.2">
 <!ENTITY mercurial-version            "3.7.1">
-<!ENTITY nasm-version                 "2.12">
+<!ENTITY nasm-version                 "2.12.01">
 <!ENTITY npapi-sdk-version            "0.27.2">
 <!ENTITY php-version                  "7.0.3">
@@ -532 +532 @@
 <!ENTITY startup-notification-version "0.12">
 <!ENTITY webkitgtk2-version           "2.4.9">    <!-- Even minors only -->
-<!ENTITY webkitgtk-version            "2.10.7">    <!-- Even minors only -->
+<!ENTITY webkitgtk-version            "2.10.9">    <!-- Even minors only -->
 
 <!ENTITY gtk2-libdir                  "2.0/2.10.0">

x/lib/webkitgtk.xml

@@ -7 +7 @@
   <!ENTITY webkitgtk-download-http "http://webkitgtk.org/releases/webkitgtk-&webkitgtk-version;.tar.xz">
   <!ENTITY webkitgtk-download-ftp  " ">
-  <!ENTITY webkitgtk-md5sum        "84832b9d8329413b4f1d87df5f7e8efe">
+  <!ENTITY webkitgtk-md5sum        "910749295bd177738469ae19ec9dded24">
   <!ENTITY webkitgtk-size          "10 MB">
-  <!ENTITY webkitgtk-buildsize     "910 MB (100 MB installed)">
-  <!ENTITY webkitgtk-time          "157 SBU (with -j1. We recommend building with parallel jobs).">
+  <!ENTITY webkitgtk-buildsize     "0.98 GB (105 MB installed)">
+  <!ENTITY webkitgtk-time          "35 SBU (with parallelism=4, estimated 88+ SBU using one core)">
 ]>
 

xfce/core/xfce4-session.xml

@@ -169 +169 @@
 
 <screen role="root"><userinput>update-desktop-database &amp;&amp;
-update-mime-database</userinput></screen>
+update-mime-database /usr/share/mime</userinput></screen>
   </sect2>
 

xsoft/office/libreoffice.xml

@@ -474 +474 @@
   # Icons
   mkdir -vp /usr/share/pixmaps
-  for i in $LO_PREFIX/share/icons/hicolor/32x32/application/*; do
+  for i in $LO_PREFIX/share/icons/hicolor/32x32/apps/*; do
     ln -svf $i /usr/share/pixmaps
   done &&
@@ -661 +661 @@
       <option>--disable-postgresql-sdbc</option>: This switch disables compiling
       <application>LibreOffice</application> with the ability to connect to a
-      <application>PostgreSQL</application> database. Remove it if you would
-      like <application>LibreOffice</application> to be able to connect to a
-      <application>PostgreSQL</application> database. If you have installed
-      <application>PostgreSQL</application> on your system and would like
-      <application>LibreOffice</application> to use that rather than compile its
-      own copy, use the <option>--with-system-postgresql</option> switch.
+      <application>PostgreSQL</application> database. Use it if you have not
+      installed <application>PostgreSQL</application> and you do not want
+      <application>Libreoffice</application> to compile its bundled copy.
     </para>
 
@@ -798 +795 @@
           <para>
             is a tool to manage <application>LibreOffice</application>
-            extensions from the command line shell starting script.
+            extensions from the command line.
           </para>
           <indexterm zone="libreoffice unopkg">