mirror of
https://github.com/Zeckmathederg/glfs.git
synced 2025-01-25 07:42:13 +08:00
Update to midori_0.5.9.
Tried to improve D-Bus-1.8.10 configure format in the page. git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@14887 af4574ff-66df-0310-9fd7-8a98e5e911e0
This commit is contained in:
parent
d4bae4c9d0
commit
4532b2faf5
@ -132,12 +132,12 @@ useradd -c "D-Bus Message Daemon User" -d /var/run/dbus \
|
|||||||
<screen><userinput>./configure --prefix=/usr \
|
<screen><userinput>./configure --prefix=/usr \
|
||||||
--sysconfdir=/etc \
|
--sysconfdir=/etc \
|
||||||
--localstatedir=/var \
|
--localstatedir=/var \
|
||||||
--with-console-auth-dir=/run/console/ \
|
|
||||||
--without-systemdsystemunitdir \
|
|
||||||
--disable-doxygen-docs \
|
--disable-doxygen-docs \
|
||||||
--disable-systemd \
|
|
||||||
--disable-static \
|
--disable-static \
|
||||||
--docdir=/usr/share/doc/dbus-&dbus-version; &&
|
--disable-systemd \
|
||||||
|
--without-systemdsystemunitdir \
|
||||||
|
--with-console-auth-dir=/run/console/ \
|
||||||
|
--docdir=/usr/share/doc/dbus-&dbus-version; &&
|
||||||
make</userinput></screen>
|
make</userinput></screen>
|
||||||
|
|
||||||
<para>
|
<para>
|
||||||
@ -200,9 +200,19 @@ make check</userinput></screen>
|
|||||||
<title>Command Explanations</title>
|
<title>Command Explanations</title>
|
||||||
|
|
||||||
<para>
|
<para>
|
||||||
<parameter>--with-console-auth-dir=/run/console/</parameter>: This
|
<parameter>--disable-doxygen-docs</parameter>: This switch disables
|
||||||
parameter specifies location of the
|
development documentation build and install, if you have
|
||||||
<application>ConsoleKit</application> auth dir.
|
<application>doxygen</application> installed. Delete, if
|
||||||
|
<application>doxygen</application> is installed and you wish to build and
|
||||||
|
install them.
|
||||||
|
</para>
|
||||||
|
|
||||||
|
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
|
||||||
|
href="../../xincludes/static-libraries.xml"/>
|
||||||
|
|
||||||
|
<para>
|
||||||
|
<parameter>--disable-systemd</parameter>: This switch disables systemd
|
||||||
|
support in <application>D-Bus</application>.
|
||||||
</para>
|
</para>
|
||||||
|
|
||||||
<para>
|
<para>
|
||||||
@ -211,21 +221,11 @@ make check</userinput></screen>
|
|||||||
</para>
|
</para>
|
||||||
|
|
||||||
<para>
|
<para>
|
||||||
<parameter>--disable-doxygen-docs</parameter>: This switch disables
|
<parameter>--with-console-auth-dir=/run/console/</parameter>: This
|
||||||
development documentation build and install, if you have
|
parameter specifies location of the
|
||||||
<application>doxygen</application> installed. Delete, if
|
<application>ConsoleKit</application> auth dir.
|
||||||
<application>doxygen</application> is installed and you wish to build and
|
|
||||||
install them.
|
|
||||||
</para>
|
</para>
|
||||||
|
|
||||||
<para>
|
|
||||||
<parameter>--disable-systemd</parameter>: This switch disables systemd
|
|
||||||
support in <application>D-Bus</application>.
|
|
||||||
</para>
|
|
||||||
|
|
||||||
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
|
|
||||||
href="../../xincludes/static-libraries.xml"/>
|
|
||||||
|
|
||||||
<para>
|
<para>
|
||||||
<parameter>--enable-tests</parameter>: Build extra parts of the code to
|
<parameter>--enable-tests</parameter>: Build extra parts of the code to
|
||||||
support all tests. Configure will end with a NOTE warning about increased
|
support all tests. Configure will end with a NOTE warning about increased
|
||||||
|
@ -47,6 +47,10 @@
|
|||||||
<listitem>
|
<listitem>
|
||||||
<para>November 12th, 2014</para>
|
<para>November 12th, 2014</para>
|
||||||
<itemizedlist>
|
<itemizedlist>
|
||||||
|
<listitem>
|
||||||
|
<para>[fernando] - Update to midori_0.5.9. Fixes
|
||||||
|
<ulink url="&blfs-ticket-root;5805">#5805</ulink>.</para>
|
||||||
|
</listitem>
|
||||||
<listitem>
|
<listitem>
|
||||||
<para>[igor] - Added mupdf-1.6. Fixes
|
<para>[igor] - Added mupdf-1.6. Fixes
|
||||||
<ulink url="&blfs-ticket-root;5779">#5779</ulink>.</para>
|
<ulink url="&blfs-ticket-root;5779">#5779</ulink>.</para>
|
||||||
|
@ -538,7 +538,7 @@
|
|||||||
<!ENTITY xfce4-session-version "4.10.1">
|
<!ENTITY xfce4-session-version "4.10.1">
|
||||||
|
|
||||||
<!-- Chapter 33 -->
|
<!-- Chapter 33 -->
|
||||||
<!ENTITY midori-version "0.5.8">
|
<!ENTITY midori-version "0.5.9">
|
||||||
<!ENTITY parole-version "0.5.4">
|
<!ENTITY parole-version "0.5.4">
|
||||||
<!ENTITY gtksourceview2-version "2.10.5">
|
<!ENTITY gtksourceview2-version "2.10.5">
|
||||||
<!ENTITY mousepad-version "0.3.0">
|
<!ENTITY mousepad-version "0.3.0">
|
||||||
|
@ -7,11 +7,10 @@
|
|||||||
<!ENTITY midori-download-http
|
<!ENTITY midori-download-http
|
||||||
"http://www.midori-browser.org/downloads/midori_&midori-version;_all_.tar.bz2">
|
"http://www.midori-browser.org/downloads/midori_&midori-version;_all_.tar.bz2">
|
||||||
<!ENTITY midori-download-ftp " ">
|
<!ENTITY midori-download-ftp " ">
|
||||||
<!ENTITY midori-md5sum "b89e25e74199d705e74767499a415976">
|
<!ENTITY midori-md5sum "a0af659e0f1d6edb2c97aefdc8c0f097">
|
||||||
<!ENTITY midori-size "1.3 MB">
|
<!ENTITY midori-size "1.3 MB">
|
||||||
<!ENTITY midori-buildsize "63 MB (additional 1 MB for the tests)">
|
<!ENTITY midori-buildsize "71 MB (additional 2 MB for the tests)">
|
||||||
<!ENTITY midori-time "0.5 SBU (additional less than 0.1 SBU
|
<!ENTITY midori-time "0.7 SBU (additional less than 0.1 SBU for the tests)">
|
||||||
for the tests)">
|
|
||||||
]>
|
]>
|
||||||
|
|
||||||
<sect1 id="midori" xreflabel="Midori-&midori-version;">
|
<sect1 id="midori" xreflabel="Midori-&midori-version;">
|
||||||
@ -89,6 +88,7 @@
|
|||||||
|
|
||||||
<bridgehead renderas="sect4">Optional</bridgehead>
|
<bridgehead renderas="sect4">Optional</bridgehead>
|
||||||
<para role="optional">
|
<para role="optional">
|
||||||
|
<xref linkend="gcr"/>,
|
||||||
<xref linkend="gtk-doc"/> and
|
<xref linkend="gtk-doc"/> and
|
||||||
<xref linkend="libzeitgeist"/>
|
<xref linkend="libzeitgeist"/>
|
||||||
</para>
|
</para>
|
||||||
@ -101,15 +101,6 @@
|
|||||||
<sect2 role="installation">
|
<sect2 role="installation">
|
||||||
<title>Installation of Midori</title>
|
<title>Installation of Midori</title>
|
||||||
|
|
||||||
<para>
|
|
||||||
The tarball is not compressed from a directory, thus it is better to
|
|
||||||
create a directory to uncompress it:
|
|
||||||
</para>
|
|
||||||
|
|
||||||
<screen><userinput>mkdir -v midori-&midori-version; &&
|
|
||||||
tar xf midori_&midori-version;_all_.tar.bz2 -C midori-&midori-version; &&
|
|
||||||
cd midori-&midori-version;</userinput></screen>
|
|
||||||
|
|
||||||
<para>
|
<para>
|
||||||
Install <application>Midori</application> by running the following
|
Install <application>Midori</application> by running the following
|
||||||
commands:
|
commands:
|
||||||
@ -117,15 +108,19 @@ cd midori-&midori-version;</userinput></screen>
|
|||||||
|
|
||||||
<screen><userinput>mkdir -v build &&
|
<screen><userinput>mkdir -v build &&
|
||||||
cd build &&
|
cd build &&
|
||||||
cmake -DCMAKE_INSTALL_PREFIX=/usr \
|
cmake -DCMAKE_INSTALL_PREFIX=/usr \
|
||||||
|
-DCMAKE_BUILD_TYPE=Release \
|
||||||
|
-DUSE_ZEITGEIST=OFF \
|
||||||
-DCMAKE_INSTALL_DOCDIR=/usr/share/doc/midori-&midori-version; \
|
-DCMAKE_INSTALL_DOCDIR=/usr/share/doc/midori-&midori-version; \
|
||||||
-DUSE_ZEITGEIST=OFF \
|
|
||||||
.. &&
|
.. &&
|
||||||
make</userinput></screen>
|
make</userinput></screen>
|
||||||
|
|
||||||
<para>
|
<para>
|
||||||
To test the results, issue: <command>make check</command> from an X
|
To test the results, issue: <command>make check</command> from an X
|
||||||
terminal emulator.
|
terminal emulator. Test suite performance is poor: almost 1/3 fails.
|
||||||
|
Another simple test is to run <command>midori/midori</command> from the
|
||||||
|
<filename class="directory">build</filename> directory,
|
||||||
|
before installing.
|
||||||
</para>
|
</para>
|
||||||
|
|
||||||
<para>
|
<para>
|
||||||
@ -138,6 +133,9 @@ make</userinput></screen>
|
|||||||
<sect2 role="commands">
|
<sect2 role="commands">
|
||||||
<title>Command Explanations</title>
|
<title>Command Explanations</title>
|
||||||
|
|
||||||
|
<para><parameter>-DCMAKE_BUILD_TYPE=Release</parameter>: This switch is
|
||||||
|
used to force building with Qt4 even if Qt5 is found.</para>
|
||||||
|
|
||||||
<para>
|
<para>
|
||||||
<parameter>-DUSE_ZEITGEIST=OFF</parameter>: Remove this switch if
|
<parameter>-DUSE_ZEITGEIST=OFF</parameter>: Remove this switch if
|
||||||
<xref linkend="libzeitgeist"/> is installed.
|
<xref linkend="libzeitgeist"/> is installed.
|
||||||
@ -173,12 +171,12 @@ make</userinput></screen>
|
|||||||
midori
|
midori
|
||||||
</seg>
|
</seg>
|
||||||
<seg>
|
<seg>
|
||||||
libmidori-core.so and several libraries under /usr/lib/midori
|
libmidori-core.so
|
||||||
</seg>
|
</seg>
|
||||||
<seg>
|
<seg>
|
||||||
/etc/xdg/midori,
|
/etc/xdg/midori,
|
||||||
/usr/lib/midori,
|
/usr/lib/midori,
|
||||||
/usr/share/doc/midori and
|
/usr/share/doc/midori-&midori-version; and
|
||||||
/usr/share/midori
|
/usr/share/midori
|
||||||
</seg>
|
</seg>
|
||||||
</seglistitem>
|
</seglistitem>
|
||||||
|
Loading…
Reference in New Issue
Block a user