linux-from-scratch/glfs
1
0
Fork 0
mirror of https://github.com/Zeckmathederg/glfs.git synced 2025-01-24 15:12:11 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

• cmake-3.4.0: Minor re-reword of the tests explanations.

Browse Source 
• Update to nano-2.4.3.
• Update to poppler-0.38.0. Good simplification of instructions.
• Update to dbus-1.10.4.
• Update to gtk+-3.18.5 (gtk+3.18.5).


git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@16673 af4574ff-66df-0310-9fd7-8a98e5e911e0
This commit is contained in:
Fernando de Oliveira 2015-11-18 22:27:48 +00:00
parent 7ed0e9d202
commit 2cd6717d55
8 changed files with 71 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
general.ent
View File

@ -1,12 +1,12 @@
<!-- $LastChangedBy$ $Date$ --> <!-- $LastChangedBy$ $Date$ -->
<!ENTITY day "17"> <!-- Always 2 digits --> <!ENTITY day "18"> <!-- Always 2 digits -->
<!ENTITY month "11"> <!-- Always 2 digits --> <!ENTITY month "11"> <!-- Always 2 digits -->
<!ENTITY year "2015"> <!ENTITY year "2015">
<!ENTITY copyrightdate "2001-&year;"> <!ENTITY copyrightdate "2001-&year;">
<!ENTITY copyholder "The BLFS Development Team"> <!ENTITY copyholder "The BLFS Development Team">
<!ENTITY version "&year;-&month;-&day;"> <!ENTITY version "&year;-&month;-&day;">
<!ENTITY releasedate "November 17th &year;"> <!ENTITY releasedate "November 18th &year;">
<!ENTITY pubdate "&year;-&month;-&day;"> <!-- metadata req. by TLDP --> <!ENTITY pubdate "&year;-&month;-&day;"> <!-- metadata req. by TLDP -->
<!ENTITY blfs-version "svn"> <!-- svn|[release #] --> <!ENTITY blfs-version "svn"> <!-- svn|[release #] -->
<!ENTITY lfs-version "development"> <!-- x.y|development] --> <!ENTITY lfs-version "development"> <!-- x.y|development] -->

52
general/graphlib/poppler.xml
View File

@ -6,10 +6,10 @@
<!ENTITY poppler-download-http "http://poppler.freedesktop.org/poppler-&poppler-version;.tar.xz"> <!ENTITY poppler-download-http "http://poppler.freedesktop.org/poppler-&poppler-version;.tar.xz">
<!ENTITY poppler-download-ftp " "> <!ENTITY poppler-download-ftp " ">
<!ENTITY poppler-md5sum "c635e1742202cbbd9182cb0255d95652"> <!ENTITY poppler-md5sum "850f0725e5b263c504f0cb0910d1fadc">
<!ENTITY poppler-size "1.6 MB (additional 9 MB for the test suite)"> <!ENTITY poppler-size "1.6 MB (additional 9 MB for the test suite)">
<!ENTITY poppler-buildsize "293 MB (with Qt4 and Qt5 libraries, and tests)"> <!ENTITY poppler-buildsize "65 MB (with Qt4 and Qt5 libraries, and tests)">
<!ENTITY poppler-time "2.0 SBU (with Qt4 and Qt5 libraries, and tests)"> <!ENTITY poppler-time "1.6 SBU (with Qt4 and Qt5 libraries, and tests)">
<!ENTITY poppler-data-version "0.4.7"> <!ENTITY poppler-data-version "0.4.7">
@ -165,29 +165,20 @@
<screen><userinput>rm -rf testfiles &amp;&amp; <screen><userinput>rm -rf testfiles &amp;&amp;
git clone git://git.freedesktop.org/git/poppler/test testfiles</userinput></screen> git clone git://git.freedesktop.org/git/poppler/test testfiles</userinput></screen>
<note><para> <note>
<para>
This package can be optionally built with support for only one version of This package can be optionally built with support for only one version
Qt4 or Qt5. If you have only one, no modification is necessary. If both of Qt4 or Qt5 or without any Qt support. You can selectively disable
are installed, and you wish support for only one, before executing the support for one or both, see "Command Explanations" section, below.
<command>configure</command> command given below, use this command to </para>
select Qt4: </note>
<screen><userinput>source /usr/bin/setqt4</userinput></screen>
or this to select Qt5:
<screen><userinput>source /usr/bin/setqt5</userinput></screen>
</para></note>
<para> <para>
Install <application>Poppler</application> by running the following Install <application>Poppler</application> by running the following
commands: commands:
</para> </para>
<screen><userinput>MOCQT4=$QT4DIR/bin/moc \ <screen><userinput>./configure --prefix=/usr \
MOCQT5=$QT5DIR/bin/moc \
./configure --prefix=/usr \
--sysconfdir=/etc \ --sysconfdir=/etc \
--disable-static \ --disable-static \
--enable-build-type=release \ --enable-build-type=release \
@ -238,15 +229,6 @@ cd poppler-data-&poppler-data-version;</userinput></screen>
<sect2 role="commands"> <sect2 role="commands">
<title>Command Explanations</title> <title>Command Explanations</title>
<para>
<envar>MOCQT4=$QT4DIR/bin/moc</envar> and
<envar>MOCQT5=$QT5DIR/bin/moc</envar>:
These environment variables are necessary, for linking with the two Qt
versions, if both are installed. If only one Qt version is installed or
you wish to link to only one version, you can remove them, although this
is not necessary.
</para>
<para> <para>
<parameter>--enable-build-type=release</parameter>: This switch is used <parameter>--enable-build-type=release</parameter>: This switch is used
to apply a higher level of compiler optimizations. Other options are: to apply a higher level of compiler optimizations. Other options are:
@ -280,6 +262,14 @@ cd poppler-data-&poppler-data-version;</userinput></screen>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../../xincludes/gtk-doc-rebuild.xml"/> href="../../xincludes/gtk-doc-rebuild.xml"/>
<para>
<option>--disable-poppler-qt4</option>: Don't compile poppler Qt4 wrapper.
</para>
<para>
<option>--disable-poppler-qt5</option>: Don't compile poppler Qt5 wrapper.
</para>
<para> <para>
<command>LC_ALL=en_US.UTF-8 make check</command>: Run the test suite. <command>LC_ALL=en_US.UTF-8 make check</command>: Run the test suite.
The environment variable LC_ALL=en_US.UTF-8 is only needed if the The environment variable LC_ALL=en_US.UTF-8 is only needed if the
@ -310,9 +300,7 @@ cd poppler-data-&poppler-data-version;</userinput></screen>
libpoppler-qt5.so libpoppler-qt5.so
</seg> </seg>
<seg> <seg>
/usr/include/poppler, /usr/{include,share,share/gtk-doc/html}/poppler and
/usr/share/poppler,
/usr/share/gtk-doc/html/poppler, and
/usr/share/doc/poppler-&poppler-version; /usr/share/doc/poppler-&poppler-version;
</seg> </seg>
</seglistitem> </seglistitem>

13
general/prog/cmake.xml
View File

@ -122,14 +122,15 @@ make</userinput></screen>
-j<replaceable>&lt;N&gt;</replaceable> -O -j<replaceable>&lt;N&gt;</replaceable> -O
cmake-&cmake-version;-test.log</command>, where cmake-&cmake-version;-test.log</command>, where
<replaceable>&lt;N&gt;</replaceable> is an integer between 1 and the <replaceable>&lt;N&gt;</replaceable> is an integer between 1 and the
number of system cores. For some systems, it may be necessary to run number of system cores. For some systems, it may be necessary to run the
the tests only for Qt4 using <command>source setq4</command>, then tests only for Qt4 using <command>source setq4</command>, then
<command>export CXXFLAGS="-std=c++11"</command> before the <command>export CXXFLAGS="-std=c++11"</command> before the
<command>./bootstrap ...</command>) command. If used, be sure to <command>./bootstrap ...</command>) command. If used, be sure to
<command>unset CXXFLAGS</command> after the tests. All the <command>unset CXXFLAGS</command> after the tests. One of the problematic
problematic tests relate to the test procedures finding the correct tests relates to the test procedures finding the correct Qt files. Eight
Qt files. Five of 447 test are known to fail under some circumstances. of 447 tests are known to fail under some circumstances related to Gtk+2
and c++ standards.
<!-- Please, don't remove this comment, needed if tests start to fail <!-- Please, don't remove this comment, needed if tests start to fail
again. If you want to investigate a problem with a given "problem1-test", again. If you want to investigate a problem with a given "problem1-test",
use <command>bin/ctest -R "problem1-test"</command> and, to omit it, use use <command>bin/ctest -R "problem1-test"</command> and, to omit it, use

12
general/sysutils/dbus.xml
View File

@ -6,9 +6,9 @@
<!ENTITY dbus-download-http "http://dbus.freedesktop.org/releases/dbus/dbus-&dbus-version;.tar.gz"> <!ENTITY dbus-download-http "http://dbus.freedesktop.org/releases/dbus/dbus-&dbus-version;.tar.gz">
<!ENTITY dbus-download-ftp " "> <!ENTITY dbus-download-ftp " ">
<!ENTITY dbus-md5sum "2428919cc77b8d0028d65ee4d5dbef31"> <!ENTITY dbus-md5sum "27b8e99ffad603b8acfa25201c6e3d5c">
<!ENTITY dbus-size "1.9 MB"> <!ENTITY dbus-size "1.9 MB">
<!ENTITY dbus-buildsize "109 MB, with doxygen and xml documents (40 MB for the tests)"> <!ENTITY dbus-buildsize "109 MB, with doxygen and xml documents (37 MB for the tests)">
<!ENTITY dbus-time "0.4 SBU, with doxygen and xml documents (0.4 SBU for the tests)"> <!ENTITY dbus-time "0.4 SBU, with doxygen and xml documents (0.4 SBU for the tests)">
]> ]>
@ -202,15 +202,15 @@ make check</userinput></screen>
obtained in a build using the switches disabling documents generation. obtained in a build using the switches disabling documents generation.
This and the use of the <command>make distclean</command> command implies This and the use of the <command>make distclean</command> command implies
that the build directory size is smaller than the one for a full build that the build directory size is smaller than the one for a full build
with documents generated. with documents generated. There are two errors, for unknown reasons.
</para> </para>
<!--
<para> <para>
If <command>run-test.sh</command> fails, it can be disabled with the If <command>run-test.sh</command> fails, it can be disabled with the
following sed, before running the commands for the tests: following sed, before running the commands for the tests:
</para> </para>
<screen><userinput>sed -i -e 's:run-test.sh:$(NULL):g' test/name-test/Makefile.in</userinput></screen> <screen><userinput>sed -i -e 's:run-test.sh:$(NULL):g' test/name-test/Makefile.in</userinput></screen>-->
<para> <para>
There has been a report that the tests may fail if running inside a There has been a report that the tests may fail if running inside a
@ -441,7 +441,7 @@ kill $DBUS_SESSION_BUS_PID</literal></userinput></screen>
<seg> <seg>
dbus-cleanup-sockets, dbus-daemon, dbus-launch, dbus-monitor, dbus-cleanup-sockets, dbus-daemon, dbus-launch, dbus-monitor,
dbus-run-session, dbus-send, dbus-test-tool, dbus-run-session, dbus-send, dbus-test-tool,
dbus-update-activation-environment, and dbus-uuidgenn dbus-update-activation-environment, and dbus-uuidgen
</seg> </seg>
<seg> <seg>
libdbus-1.so libdbus-1.so

28
introduction/welcome/changelog.xml
View File

@ -43,6 +43,34 @@
</listitem> </listitem>
--> -->
<listitem>
<para>November 18th, 2015</para>
<itemizedlist>
<listitem>
<para>[fernando] - Update to gtk+-3.18.5 (gtk+3.18.5). Fixes
<ulink url="&blfs-ticket-root;7142">#7142</ulink>.</para>
</listitem>
<listitem>
<para>[fernando] - Update to dbus-1.10.4. Fixes
<ulink url="&blfs-ticket-root;7141">#7141</ulink>.</para>
</listitem>
<listitem>
<para>[fernando] - Update to poppler-0.38.0. Good simplification of
instructions. Fixes
<ulink url="&blfs-ticket-root;7140">#7140</ulink>.</para>
</listitem>
<listitem>
<para>[fernando] - Update to nano-2.4.3. Fixes
<ulink url="&blfs-ticket-root;7139">#7139</ulink>.</para>
</listitem>
<listitem>
<para>[fernando] - cmake-3.4.0: Minor re-reword of the tests
explanations.</para>
</listitem>
</itemizedlist>
</listitem>
<listitem> <listitem>
<para>November 17th, 2015</para> <para>November 17th, 2015</para>
<itemizedlist> <itemizedlist>

8
packages.ent
View File

@ -58,7 +58,7 @@
<!ENTITY ed-version "1.12"> <!ENTITY ed-version "1.12">
<!ENTITY emacs-version "24.5"> <!ENTITY emacs-version "24.5">
<!ENTITY joe-version "4.1"> <!ENTITY joe-version "4.1">
<!ENTITY nano-version "2.4.2"> <!ENTITY nano-version "2.4.3">
<!ENTITY vim-version "7.4"> <!ENTITY vim-version "7.4">
<!-- Chapter 7 --> <!-- Chapter 7 -->
@ -185,7 +185,7 @@
<!ENTITY openjpeg-version "1.5.2"> <!ENTITY openjpeg-version "1.5.2">
<!ENTITY openjpeg2-version "2.1.0"> <!ENTITY openjpeg2-version "2.1.0">
<!ENTITY pixman-version "0.32.8"> <!-- Even minors only --> <!ENTITY pixman-version "0.32.8"> <!-- Even minors only -->
<!ENTITY poppler-version "0.37.0"> <!ENTITY poppler-version "0.38.0">
<!ENTITY qpdf-version "6.0.0"> <!ENTITY qpdf-version "6.0.0">
<!-- Chapter 11 --> <!-- Chapter 11 -->
@ -219,7 +219,7 @@
<!ENTITY bluez-version "5.36"> <!ENTITY bluez-version "5.36">
<!ENTITY colord-version "1.2.12"> <!-- Even minors only --> <!ENTITY colord-version "1.2.12"> <!-- Even minors only -->
<!ENTITY cpio-version "2.12"> <!ENTITY cpio-version "2.12">
<!ENTITY dbus-version "1.10.2"> <!-- Even minors only --> <!ENTITY dbus-version "1.10.4"> <!-- Even minors only -->
<!ENTITY eudev-version "1.7"> <!ENTITY eudev-version "1.7">
<!ENTITY fcron-version "3.2.0"> <!ENTITY fcron-version "3.2.0">
<!ENTITY gpm-version "1.20.7"> <!ENTITY gpm-version "1.20.7">
@ -480,7 +480,7 @@
<!ENTITY glu-version "9.0.0"> <!ENTITY glu-version "9.0.0">
<!ENTITY goffice010-version "0.10.24"> <!ENTITY goffice010-version "0.10.24">
<!ENTITY gtk2-version "2.24.28"> <!ENTITY gtk2-version "2.24.28">
<!ENTITY gtk3-version "3.18.4"> <!ENTITY gtk3-version "3.18.5">
<!ENTITY gtk-engines-version "2.20.2"> <!ENTITY gtk-engines-version "2.20.2">
<!ENTITY gtkmm2-version "2.24.4"> <!ENTITY gtkmm2-version "2.24.4">
<!ENTITY gtkmm3-version "3.18.0"> <!ENTITY gtkmm3-version "3.18.0">

4
postlfs/editors/nano.xml
View File

@ -6,9 +6,9 @@
<!ENTITY nano-download-http "http://ftp.gnu.org/gnu/nano/nano-&nano-version;.tar.gz"> <!ENTITY nano-download-http "http://ftp.gnu.org/gnu/nano/nano-&nano-version;.tar.gz">
<!ENTITY nano-download-ftp "ftp://ftp.gnu.org/gnu/nano/nano-&nano-version;.tar.gz"> <!ENTITY nano-download-ftp "ftp://ftp.gnu.org/gnu/nano/nano-&nano-version;.tar.gz">
<!ENTITY nano-md5sum "ce6968992fec4283c17984b53554168b"> <!ENTITY nano-md5sum "0acc0ca68eee68ef38f899532a4873c6">
<!ENTITY nano-size "1.8 MB"> <!ENTITY nano-size "1.8 MB">
<!ENTITY nano-buildsize "9.4 MB"> <!ENTITY nano-buildsize "13 MB">
<!ENTITY nano-time "less than 0.1 SBU"> <!ENTITY nano-time "less than 0.1 SBU">
]> ]>

4
x/lib/gtk+3.xml
View File

@ -6,10 +6,10 @@
<!ENTITY gtk3-download-http "&gnome-download-http;/gtk+/&gnome-minor-18;/gtk+-&gtk3-version;.tar.xz"> <!ENTITY gtk3-download-http "&gnome-download-http;/gtk+/&gnome-minor-18;/gtk+-&gtk3-version;.tar.xz">
<!ENTITY gtk3-download-ftp "&gnome-download-ftp;/gtk+/&gnome-minor-18;/gtk+-&gtk3-version;.tar.xz"> <!ENTITY gtk3-download-ftp "&gnome-download-ftp;/gtk+/&gnome-minor-18;/gtk+-&gtk3-version;.tar.xz">
<!ENTITY gtk3-md5sum "2becb7e8bcf2adf5cf39e6c463dab02c"> <!ENTITY gtk3-md5sum "6cf1478025accbee2cd31a0b093d7efa">
<!ENTITY gtk3-size "19 MB"> <!ENTITY gtk3-size "19 MB">
<!ENTITY gtk3-buildsize "513 MB (with tests)"> <!ENTITY gtk3-buildsize "513 MB (with tests)">
<!ENTITY gtk3-time "6.5 SBU (with tests)"> <!ENTITY gtk3-time "6.6 SBU (with tests)">
]> ]>
<sect1 id="gtk3" xreflabel="GTK+-&gtk3-version;"> <sect1 id="gtk3" xreflabel="GTK+-&gtk3-version;">