Author: krejzi Date: 2012-08-12 11:02:37 -0600 (Sun, 12 Aug 2012) New Revision: 10500
Modified: trunk/BOOK/general.ent trunk/BOOK/general/sysutils/udisks2.xml trunk/BOOK/general/sysutils/upower.xml trunk/BOOK/introduction/welcome/changelog.xml trunk/BOOK/x/lib/webkitgtk.xml Log: UDisks2 1.99.0, UPower 0.9.18 and WebKitGTK+ 1.8.2. Modified: trunk/BOOK/general/sysutils/udisks2.xml =================================================================== --- trunk/BOOK/general/sysutils/udisks2.xml 2012-08-12 14:22:45 UTC (rev 10499) +++ trunk/BOOK/general/sysutils/udisks2.xml 2012-08-12 17:02:37 UTC (rev 10500) @@ -6,8 +6,8 @@ <!ENTITY udisks2-download-http "http://udisks.freedesktop.org/releases/udisks-&udisks2-version;.tar.bz2";> <!ENTITY udisks2-download-ftp " "> - <!ENTITY udisks2-md5sum "51346a6cf9183bb7bf5771b7166dfac1"> - <!ENTITY udisks2-size "632 KB"> + <!ENTITY udisks2-md5sum "b42f1d36ad4606622a9989e166fbae20"> + <!ENTITY udisks2-size "761 KB"> <!ENTITY udisks2-buildsize "32 MB"> <!ENTITY udisks2-time "0.4 SBU"> ]> @@ -78,7 +78,7 @@ <xref linkend="libatasmart"/>, <xref linkend="libxslt"/>, <xref linkend="polkit"/>, and - <xref linkend="udev"/> or <xref linkend="udev-extras"/> (for gudev) + <xref linkend="udev"/> or <xref linkend="udev-extras"/> (for GUdev) </para> <bridgehead renderas="sect4">Optional (Required if building GNOME)</bridgehead> @@ -148,6 +148,7 @@ libudisks2.so </seg> <seg> + /etc/udisks2, /usr/include/udisks2, /usr/lib/udisks2, /usr/share/gtk-doc/html/udisks2 and Modified: trunk/BOOK/general/sysutils/upower.xml =================================================================== --- trunk/BOOK/general/sysutils/upower.xml 2012-08-12 14:22:45 UTC (rev 10499) +++ trunk/BOOK/general/sysutils/upower.xml 2012-08-12 17:02:37 UTC (rev 10500) @@ -6,7 +6,7 @@ <!ENTITY upower-download-http "http://upower.freedesktop.org/releases/upower-&upower-version;.tar.xz";> <!ENTITY upower-download-ftp " "> - <!ENTITY upower-md5sum "9ef7fc8ec438542f014f3a34552822aa"> + <!ENTITY upower-md5sum "bfaaa1e7f8479fca5594406b3c36dff9"> <!ENTITY upower-size "393 KB"> <!ENTITY upower-buildsize "9.3 MB"> <!ENTITY upower-time "0.2 SBU"> @@ -79,7 +79,7 @@ <xref linkend="dbus-glib"/>, <xref linkend="intltool"/>, <xref linkend="polkit"/>, and - <xref linkend="udev"/> or <xref linkend="udev-extras"/> (for gudev) + <xref linkend="udev"/> or <xref linkend="udev-extras"/> (for GUdev) </para> <bridgehead renderas="sect4">Optional (Required if building GNOME)</bridgehead> Modified: trunk/BOOK/general.ent =================================================================== --- trunk/BOOK/general.ent 2012-08-12 14:22:45 UTC (rev 10499) +++ trunk/BOOK/general.ent 2012-08-12 17:02:37 UTC (rev 10500) @@ -398,10 +398,10 @@ <!ENTITY sysstat-version "10.0.2"> <!ENTITY udev-version "Installed LFS Version"> <!ENTITY udisks-version "1.0.4"> -<!ENTITY udisks2-version "1.98.0"> +<!ENTITY udisks2-version "1.99.0"> <!ENTITY unrar-version "4.2.4"> <!ENTITY unzip-version "6.0"> -<!ENTITY upower-version "0.9.17"> +<!ENTITY upower-version "0.9.18"> <!ENTITY usbutils-version "006"> <!ENTITY which-version "2.20"> <!ENTITY zip-version "3.0"> @@ -722,7 +722,7 @@ <!ENTITY qt-version "4.8.2"> <!ENTITY shared-mime-info-version "1.0"> <!ENTITY startup-notification-version "0.12"> -<!ENTITY webkitgtk-version "1.8.1"> +<!ENTITY webkitgtk-version "1.8.2"> <!ENTITY xulrunner-version "14.0.1"> <!ENTITY gtk2-libdir "2.0/2.10.0"> Modified: trunk/BOOK/introduction/welcome/changelog.xml =================================================================== --- trunk/BOOK/introduction/welcome/changelog.xml 2012-08-12 14:22:45 UTC (rev 10499) +++ trunk/BOOK/introduction/welcome/changelog.xml 2012-08-12 17:02:37 UTC (rev 10500) @@ -52,6 +52,15 @@ <listitem> <para>[krejzi] - Updated CUPS instructions.</para> </listitem> + <listitem> + <para>[krejzi] - UDisks2 1.99.0.</para> + </listitem> + <listitem> + <para>[krejzi] - UPower 0.9.18.</para> + </listitem> + <listitem> + <para>[krejzi] - WebKitGTK+ 1.8.2.</para> + </listitem> </itemizedlist> </listitem> Modified: trunk/BOOK/x/lib/webkitgtk.xml =================================================================== --- trunk/BOOK/x/lib/webkitgtk.xml 2012-08-12 14:22:45 UTC (rev 10499) +++ trunk/BOOK/x/lib/webkitgtk.xml 2012-08-12 17:02:37 UTC (rev 10500) @@ -4,13 +4,12 @@ <!ENTITY % general-entities SYSTEM "../../general.ent"> %general-entities; - <!ENTITY webkitgtk-download-http - "http://webkitgtk.org/releases/webkit-&webkitgtk-version;.tar.xz";> + <!ENTITY webkitgtk-download-http "http://webkitgtk.org/releases/webkit-&webkitgtk-version;.tar.xz";> <!ENTITY webkitgtk-download-ftp " "> - <!ENTITY webkitgtk-md5sum "f2f01b1fdc7262a2eede81ebed0970b2"> - <!ENTITY webkitgtk-size "7.6 MB"> - <!ENTITY webkitgtk-buildsize "566 MB (43 MB installed)"> - <!ENTITY webkitgtk-time "28 SBU"> + <!ENTITY webkitgtk-md5sum "f7bd0bd4f323039f15e19c82a9a8313c"> + <!ENTITY webkitgtk-size "7.7 MB"> + <!ENTITY webkitgtk-buildsize "700 MB"> + <!ENTITY webkitgtk-time "30 SBU"> ]> <sect1 id="webkitgtk" xreflabel="WebKitGTK+-&webkitgtk-version;"> @@ -72,24 +71,33 @@ </listitem> </itemizedlist> + <bridgehead renderas="sect3">Additional Downloads</bridgehead> + <itemizedlist spacing="compact"> + <listitem> + <para> + Required patch: + <ulink url="&patch-root;/webkitgtk-&webkitgtk-version;-bison-1.patch"/> + </para> + </listitem> + </itemizedlist> + <bridgehead renderas="sect3">WebKitGTK+ Dependencies</bridgehead> <bridgehead renderas="sect4">Required</bridgehead> <para role="required"> + <xref linkend="geoclue"/>, <xref linkend="gperf"/>, + <xref linkend="gst-plugins-base"/>, + <xref linkend="gtk3"/> or <xref linkend="gtk2"/>, <xref linkend="icu"/>, <xref linkend="libxslt"/>, - <xref linkend="gtk2"/> or <xref linkend="gtk3"/> - (<command>configure</command> defaults to using gtk+-3), <xref linkend="libsoup"/>, - <xref linkend="gst-plugins-base"/>, - <xref linkend="geoclue"/>, - <xref linkend="which"/> and - <xref linkend="sqlite"/> + <xref linkend="sqlite"/> and + <xref linkend="which"/> </para> - <bridgehead renderas="sect4">Optional (Required if building GNOME)</bridgehead> - <para role="optional"> + <bridgehead renderas="sect4">Recommended</bridgehead> + <para role="recommended"> <xref linkend="gobject-introspection"/> </para> @@ -125,26 +133,32 @@ <screen><userinput>sed -i '/generate-gtkdoc --rebase/s:^:# :' GNUmakefile.in</userinput></screen> <para> - <application>WebKit</application> takes a long time to compile, so if you + <application>WebKitGTK+</application> takes a long time to compile, so if you have a multicore CPU it can be useful to speed up the build by running make with multiple jobs. </para> <para> If you want to run make with just one core, install - <application>WebKit</application> by running the following commands: + <application>WebKitGTK+</application> by running the following commands: </para> -<screen><userinput>./configure --prefix=/usr --enable-introspection && +<screen><userinput>patch -Np1 -i ../webkitgtk-&webkitgtk-version;-bison-1.patch && +./configure --prefix=/usr \ + --libexecdir=/usr/lib/WebKit \ + --enable-introspection && make</userinput></screen> <para> If you have a multicore CPU and want to run make with multiple jobs - running in parallel, install <application>WebKit</application> with the + running in parallel, install <application>WebKitGTK+</application> with the following commands: </para> -<screen><userinput>./configure --prefix=/usr --enable-introspection && +<screen><userinput>patch -Np1 -i ../webkitgtk-&webkitgtk-version;-bison-1.patch && +./configure --prefix=/usr \ + --libexecdir=/usr/lib/WebKit \ + --enable-introspection && error_count=0 until make -j$(getconf _NPROCESSORS_ONLN) do @@ -172,7 +186,7 @@ <para> <option>--enable-introspection</option>: This option enables support for - <application>Gobject Introspection</application> and is required for a + <application>GObject Introspection</application> and is required for a <application>GNOME</application> Desktop. If you don't have <application>Gobject Introspection</application> installed and don't want to install <application>GNOME</application> remove this option. @@ -194,19 +208,27 @@ </para> <para> - <option>--with-gtk=2.0</option>: This option forces - <application>WebKit</application> to compile against + <option>--enable-webkit2</option>: This switch enables building of + <application>WebKit2</application> libraries which some applications + like <application>DevHelp</application> can use and which will probably + be used in future releases of <application>GNOME</application> Desktop. + </para> + + <para> + <parameter>--with-gtk=2.0</parameter>: This option forces + <application>WebKitGTK+</application> to compile against <application>GTK+ 2</application>, even if <application>GTK+ 3</application> is also installed. With <application>GTK+ 2</application>, everything - <application>Webkit</application> installs is suffixed with 1.0. When it + <application>WebKitGTK+</application> installs is suffixed with 1.0. When it is compiled against <application>GTK+ 3</application> everything it installs is suffixed with 3.0. Both versions can be installed alongside one another with no namespace conflicts. </para> <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; - href="../../xincludes/gtk-doc-rebuild.xml"/> + href="../../xincludes/gtk-doc-rebuild.xml"/> + </sect2> <sect2 role="content"> @@ -219,23 +241,17 @@ <seglistitem> <seg> - jsc-1 or jsc-3 (depending on whether you installed the - <application>Gtk+-2</application> or <application>Gtk+-3</application> - version of <application>WebKit</application>). + jsc-1 or jsc-3 </seg> <seg> - libwebkit-1.0.so and libjavascriptcoregtk-1.0.so or libwebkit-3.0.so - and libjavascriptcoregtk-3.0.so (depending on whether you installed - the <application>GTK+ 2</application> or - <application>GTK+ 3</application> version of - <application>WebKit</application>). + libjavascriptcoregtk-1.0.so and libwebkit-1.0.so or + libjavascriptcoregtk-3.0.so and libwebkit-3.0.so and + optionaly libwebkit2gtk-3.0.so </seg> <seg> /usr/include/webkit-1.0 and /usr/share/webkit-1.0 or - /usr/include/webkit-3.0 and /usr/share/webkit-3.0 (depending on - whether you installed the <application>GTK+ 2</application> or - <application>GTK+ 3</application> version of - <application>WebKit</application>). + /usr/include/webkit-3.0 and /usr/share/webkit-3.0 and + optionaly /usr/lib/WebKit </seg> </seglistitem> </segmentedlist> @@ -258,58 +274,72 @@ </listitem> </varlistentry> - <varlistentry id="libwebkit-1.0"> - <term><filename class="libraryfile">libwebkit-1.0.so</filename></term> + <varlistentry id="libjavascriptcoregtk-1.0"> + <term><filename + class="libraryfile">libjavascriptcoregtk-1.0.so</filename></term> <listitem> <para> - contains the <application>WebKit</application> API functions for - <application>GTK+ 2</application>. + contains core JavaScript API functions used by <command>jsc-1</command> + and <filename class="libraryfile">libwebkitgtk-1.0.so</filename>. </para> - <indexterm zone="webkitgtk libwebkit-1.0"> - <primary sortas="c-libwebkit-1.0">libwebkit-1.0.so</primary> + <indexterm zone="webkitgtk libjavascriptcoregtk-1.0"> + <primary sortas="c-libjavascriptcoregtk-1.0">libjavascriptcoregtk-1.0.so</primary> </indexterm> </listitem> </varlistentry> - <varlistentry id="libwebkit-3.0"> - <term><filename class="libraryfile">libwebkit-3.0.so</filename></term> + <varlistentry id="libwebkitgtk-1.0"> + <term><filename class="libraryfile">libwebkitgtk-1.0.so</filename></term> <listitem> <para> - contains the <application>WebKit</application> API functions for - <application>GTK+ 3</application>. + contains the <application>WebKitGTK+</application> API functions for + <application>GTK+ 2</application>. </para> - <indexterm zone="webkitgtk libwebkit-3.0"> - <primary sortas="c-libwebkit-3.0">libwebkit-3.0.so</primary> + <indexterm zone="webkitgtk libwebkitgtk-1.0"> + <primary sortas="c-libwebkitgtk-1.0">libwebkitgtk-1.0.so</primary> </indexterm> </listitem> </varlistentry> - <varlistentry id="libjavascriptcoregtk-1.0"> + <varlistentry id="libjavascriptcoregtk-3.0"> <term><filename - class="libraryfile">libjavascriptcoregtk-1.0.so</filename></term> + class="libraryfile">libjavascriptcoregtk-3.0.so</filename></term> <listitem> <para> - contains functions that are used by <command>jsc-1</command>. + contains core JavaScript API functions used by <command>jsc-3</command> + and <filename class="libraryfile">libwebkitgtk-3.0.so</filename>. </para> - <indexterm zone="webkitgtk libjavascriptcoregtk-1.0"> - <primary sortas="c-libjavascriptcoregtk-1.0">libjavascriptcoregtk-1.0.so</primary> + <indexterm zone="webkitgtk libjavascriptcoregtk-3.0"> + <primary sortas="c-libjavascriptcoregtk-3.0">libjavascriptcoregtk-3.0.so</primary> </indexterm> </listitem> </varlistentry> - <varlistentry id="libjavascriptcoregtk-3.0"> - <term><filename - class="libraryfile">libjavascriptcoregtk-3.0.so</filename></term> + <varlistentry id="libwebkitgtk-3.0"> + <term><filename class="libraryfile">libwebkitgtk-3.0.so</filename></term> <listitem> <para> - contains functions that are used by <command>jsc-3</command>. + contains the <application>WebKitGTK+</application> API functions for + <application>GTK+ 3</application>. </para> - <indexterm zone="webkitgtk libjavascriptcoregtk-3.0"> - <primary sortas="c-libjavascriptcoregtk-3.0">libjavascriptcoregtk-3.0.so</primary> + <indexterm zone="webkitgtk libwebkitgtk-3.0"> + <primary sortas="c-libwebkitgtk-3.0">libwebkitgtk-3.0.so</primary> </indexterm> </listitem> </varlistentry> + <varlistentry id="libwebkit2gtk-3.0"> + <term><filename class="libraryfile">libwebkit2gtk-3.0.so</filename></term> + <listitem> + <para> + contains the <application>WebKit2</application> API functions. + </para> + <indexterm zone="webkitgtk libwebkit2gtk-3.0"> + <primary sortas="c-libwebkit2gtk-3.0">libwebkit2gtk-3.0.so</primary> + </indexterm> + </listitem> + </varlistentry> + </variablelist> </sect2> -- http://linuxfromscratch.org/mailman/listinfo/blfs-book FAQ: http://www.linuxfromscratch.org/blfs/faq.html Unsubscribe: See the above information page
