Author: renodr
Date: Thu May 5 18:04:13 2016
New Revision: 17323
Log:
Sync to trunk r17130
Fix FAAC compilation under GCC-6
Modified:
branches/systemd/general/prog/git.xml
branches/systemd/general/prog/nasm.xml
branches/systemd/introduction/welcome/changelog.xml
branches/systemd/multimedia/libdriv/faac.xml
branches/systemd/packages.ent
branches/systemd/x/lib/webkitgtk.xml
branches/systemd/xfce/core/xfce4-session.xml
branches/systemd/xsoft/office/libreoffice.xml
Modified: branches/systemd/general/prog/git.xml
==============================================================================
--- branches/systemd/general/prog/git.xml Thu May 5 17:11:37 2016
(r17322)
+++ branches/systemd/general/prog/git.xml Thu May 5 18:04:13 2016
(r17323)
@@ -124,11 +124,16 @@
<xref linkend="valgrind"/>
</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>
<para condition="html" role="usernotes">User Notes:
@@ -171,10 +176,13 @@
<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>
<para>
@@ -228,7 +236,8 @@
<bridgehead renderas="sect3">Reorganize man pages and/or html docs (both
methods)</bridgehead>
<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>
Modified: branches/systemd/general/prog/nasm.xml
==============================================================================
--- branches/systemd/general/prog/nasm.xml Thu May 5 17:11:37 2016
(r17322)
+++ branches/systemd/general/prog/nasm.xml Thu May 5 18:04:13 2016
(r17323)
@@ -6,8 +6,8 @@
<!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">
]>
Modified: branches/systemd/introduction/welcome/changelog.xml
==============================================================================
--- branches/systemd/introduction/welcome/changelog.xml Thu May 5 17:11:37
2016 (r17322)
+++ branches/systemd/introduction/welcome/changelog.xml Thu May 5 18:04:13
2016 (r17323)
@@ -47,6 +47,33 @@
<para>May 6th, 2016</para>
<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>
<listitem>
Modified: branches/systemd/multimedia/libdriv/faac.xml
==============================================================================
--- branches/systemd/multimedia/libdriv/faac.xml Thu May 5 17:11:37
2016 (r17322)
+++ branches/systemd/multimedia/libdriv/faac.xml Thu May 5 18:04:13
2016 (r17323)
@@ -91,6 +91,8 @@
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>
Modified: branches/systemd/packages.ent
==============================================================================
--- branches/systemd/packages.ent Thu May 5 17:11:37 2016 (r17322)
+++ branches/systemd/packages.ent Thu May 5 18:04:13 2016 (r17323)
@@ -291,7 +291,7 @@
<!ENTITY llvm-version "3.8.0">
<!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">
<!ENTITY pyatspi2-version "2.16.0">
@@ -531,7 +531,7 @@
<!ENTITY shared-mime-info-version "1.4">
<!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">
<!ENTITY qt4-dir "$QT4DIR">
Modified: branches/systemd/x/lib/webkitgtk.xml
==============================================================================
--- branches/systemd/x/lib/webkitgtk.xml Thu May 5 17:11:37 2016
(r17322)
+++ branches/systemd/x/lib/webkitgtk.xml Thu May 5 18:04:13 2016
(r17323)
@@ -6,10 +6,10 @@
<!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)">
]>
<sect1 id="webkitgtk" xreflabel="WebKitGTK+-&webkitgtk-version;">
Modified: branches/systemd/xfce/core/xfce4-session.xml
==============================================================================
--- branches/systemd/xfce/core/xfce4-session.xml Thu May 5 17:11:37
2016 (r17322)
+++ branches/systemd/xfce/core/xfce4-session.xml Thu May 5 18:04:13
2016 (r17323)
@@ -168,7 +168,7 @@
</para>
<screen role="root"><userinput>update-desktop-database &&
-update-mime-database</userinput></screen>
+update-mime-database /usr/share/mime</userinput></screen>
</sect2>
<sect2 role="content">
Modified: branches/systemd/xsoft/office/libreoffice.xml
==============================================================================
--- branches/systemd/xsoft/office/libreoffice.xml Thu May 5 17:11:37
2016 (r17322)
+++ branches/systemd/xsoft/office/libreoffice.xml Thu May 5 18:04:13
2016 (r17323)
@@ -473,7 +473,7 @@
# 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 &&
@@ -660,12 +660,9 @@
<para>
<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>
<para>
@@ -797,7 +794,7 @@
<listitem>
<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">
<primary sortas="b-unopkg">unopkg</primary>
--
http://lists.linuxfromscratch.org/listinfo/blfs-book
FAQ: http://www.linuxfromscratch.org/blfs/faq.html
Unsubscribe: See the above information page
