Changeset 45ada554


Ignore:
Timestamp:
08/12/2012 05:02:37 PM (12 years ago)
Author:
Krejzi <krejzi@…>
Branches:
10.0, 10.1, 11.0, 11.1, 11.2, 11.3, 12.0, 12.1, 7.10, 7.4, 7.5, 7.6, 7.6-blfs, 7.6-systemd, 7.7, 7.8, 7.9, 8.0, 8.1, 8.2, 8.3, 8.4, 9.0, 9.1, basic, bdubbs/svn, elogind, gnome, kde5-13430, kde5-14269, kde5-14686, kea, ken/TL2024, ken/inkscape-core-mods, ken/tuningfonts, krejzi/svn, lazarus, lxqt, nosym, perl-modules, plabs/newcss, plabs/python-mods, python3.11, qt5new, rahul/power-profiles-daemon, renodr/vulkan-addition, systemd-11177, systemd-13485, trunk, upgradedb, xry111/intltool, xry111/llvm18, xry111/soup3, xry111/test-20220226, xry111/xf86-video-removal
Children:
8617f6dd
Parents:
dcbd2c6
Message:

UDisks2 1.99.0, UPower 0.9.18 and WebKitGTK+ 1.8.2.

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@10500 af4574ff-66df-0310-9fd7-8a98e5e911e0

Files:
5 edited

Legend:

Unmodified
Added
Removed

  • general.ent

    rdcbd2c6 r45ada554  
    399399<!ENTITY udev-version                 "Installed LFS Version">
    400400<!ENTITY udisks-version               "1.0.4">
    401 <!ENTITY udisks2-version              "1.98.0">
     401<!ENTITY udisks2-version              "1.99.0">
    402402<!ENTITY unrar-version                "4.2.4">
    403403<!ENTITY unzip-version                "6.0">
    404 <!ENTITY upower-version               "0.9.17">
     404<!ENTITY upower-version               "0.9.18">
    405405<!ENTITY usbutils-version             "006">
    406406<!ENTITY which-version                "2.20">
    … …  
    723723<!ENTITY shared-mime-info-version     "1.0">
    724724<!ENTITY startup-notification-version "0.12">
    725 <!ENTITY webkitgtk-version            "1.8.1">
     725<!ENTITY webkitgtk-version            "1.8.2">
    726726<!ENTITY xulrunner-version            "14.0.1">
    727727

  • general/sysutils/udisks2.xml

    rdcbd2c6 r45ada554  
    77  <!ENTITY udisks2-download-http "http://udisks.freedesktop.org/releases/udisks-&udisks2-version;.tar.bz2">
    88  <!ENTITY udisks2-download-ftp  " ">
    9   <!ENTITY udisks2-md5sum        "51346a6cf9183bb7bf5771b7166dfac1">
    10   <!ENTITY udisks2-size          "632 KB">
     9  <!ENTITY udisks2-md5sum        "b42f1d36ad4606622a9989e166fbae20">
     10  <!ENTITY udisks2-size          "761 KB">
    1111  <!ENTITY udisks2-buildsize     "32 MB">
    1212  <!ENTITY udisks2-time          "0.4 SBU">
    … …  
    7979      <xref linkend="libxslt"/>,
    8080      <xref linkend="polkit"/>,  and
    81       <xref linkend="udev"/> or <xref linkend="udev-extras"/> (for gudev)
     81      <xref linkend="udev"/> or <xref linkend="udev-extras"/> (for GUdev)
    8282    </para>
    8383
    … …  
    149149        </seg>
    150150        <seg>
     151          /etc/udisks2,
    151152          /usr/include/udisks2,
    152153          /usr/lib/udisks2,

  • general/sysutils/upower.xml

    rdcbd2c6 r45ada554  
    77  <!ENTITY upower-download-http "http://upower.freedesktop.org/releases/upower-&upower-version;.tar.xz">
    88  <!ENTITY upower-download-ftp  " ">
    9   <!ENTITY upower-md5sum        "9ef7fc8ec438542f014f3a34552822aa">
     9  <!ENTITY upower-md5sum        "bfaaa1e7f8479fca5594406b3c36dff9">
    1010  <!ENTITY upower-size          "393 KB">
    1111  <!ENTITY upower-buildsize     "9.3 MB">
    … …  
    8080      <xref linkend="intltool"/>,
    8181      <xref linkend="polkit"/>, and
    82       <xref linkend="udev"/> or  <xref linkend="udev-extras"/> (for gudev)
     82      <xref linkend="udev"/> or  <xref linkend="udev-extras"/> (for GUdev)
    8383    </para>
    8484

  • introduction/welcome/changelog.xml

    rdcbd2c6 r45ada554  
    5353          <para>[krejzi] - Updated CUPS instructions.</para>
    5454        </listitem>
     55        <listitem>
     56          <para>[krejzi] - UDisks2 1.99.0.</para>
     57        </listitem>
     58        <listitem>
     59          <para>[krejzi] - UPower 0.9.18.</para>
     60        </listitem>
     61        <listitem>
     62          <para>[krejzi] - WebKitGTK+ 1.8.2.</para>
     63        </listitem>
    5564      </itemizedlist>
    5665    </listitem>

  • x/lib/webkitgtk.xml

    rdcbd2c6 r45ada554  
    55  %general-entities;
    66
    7   <!ENTITY webkitgtk-download-http
    8     "http://webkitgtk.org/releases/webkit-&webkitgtk-version;.tar.xz">
     7  <!ENTITY webkitgtk-download-http "http://webkitgtk.org/releases/webkit-&webkitgtk-version;.tar.xz">
    98  <!ENTITY webkitgtk-download-ftp  " ">
    10   <!ENTITY webkitgtk-md5sum        "f2f01b1fdc7262a2eede81ebed0970b2">
    11   <!ENTITY webkitgtk-size          "7.6 MB">
    12   <!ENTITY webkitgtk-buildsize     "566 MB (43 MB installed)">
    13   <!ENTITY webkitgtk-time          "28 SBU">
     9  <!ENTITY webkitgtk-md5sum        "f7bd0bd4f323039f15e19c82a9a8313c">
     10  <!ENTITY webkitgtk-size          "7.7 MB">
     11  <!ENTITY webkitgtk-buildsize     "700 MB">
     12  <!ENTITY webkitgtk-time          "30 SBU">
    1413]>
    1514
    … …  
    7372    </itemizedlist>
    7473
     74    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
     75    <itemizedlist spacing="compact">
     76      <listitem>
     77        <para>
     78          Required patch:
     79          <ulink url="&patch-root;/webkitgtk-&webkitgtk-version;-bison-1.patch"/>
     80        </para>
     81      </listitem>
     82    </itemizedlist>
     83
    7584    <bridgehead renderas="sect3">WebKitGTK+ Dependencies</bridgehead>
    7685
    7786    <bridgehead renderas="sect4">Required</bridgehead>
    7887    <para role="required">
     88      <xref linkend="geoclue"/>,
    7989      <xref linkend="gperf"/>,
     90      <xref linkend="gst-plugins-base"/>,
     91      <xref linkend="gtk3"/> or <xref linkend="gtk2"/>,
    8092      <xref linkend="icu"/>,
    8193      <xref linkend="libxslt"/>,
    82       <xref linkend="gtk2"/> or <xref linkend="gtk3"/>
    83       (<command>configure</command> defaults to using gtk+-3),
    8494      <xref linkend="libsoup"/>,
    85       <xref linkend="gst-plugins-base"/>,
    86       <xref linkend="geoclue"/>,
    87       <xref linkend="which"/> and
    88       <xref linkend="sqlite"/>
    89     </para>
    90 
    91     <bridgehead renderas="sect4">Optional (Required if building GNOME)</bridgehead>
    92     <para role="optional">
     95      <xref linkend="sqlite"/> and
     96      <xref linkend="which"/>
     97    </para>
     98
     99    <bridgehead renderas="sect4">Recommended</bridgehead>
     100    <para role="recommended">
    93101      <xref linkend="gobject-introspection"/>
    94102    </para>
    … …  
    126134
    127135    <para>
    128       <application>WebKit</application> takes a long time to compile, so if you
     136      <application>WebKitGTK+</application> takes a long time to compile, so if you
    129137      have a multicore CPU it can be useful to speed up the build by running
    130138      make with multiple jobs.
    … …  
    133141    <para>
    134142      If you want to run make with just one core, install
    135       <application>WebKit</application> by running the following commands:
    136     </para>
    137 
    138 <screen><userinput>./configure --prefix=/usr --enable-introspection &amp;&amp;
     143      <application>WebKitGTK+</application> by running the following commands:
     144    </para>
     145
     146<screen><userinput>patch -Np1 -i ../webkitgtk-&webkitgtk-version;-bison-1.patch &amp;&amp;
     147./configure --prefix=/usr \
     148            --libexecdir=/usr/lib/WebKit \
     149            --enable-introspection &amp;&amp;
    139150make</userinput></screen>
    140151
    141152    <para>
    142153      If you have a multicore CPU and want to run make with multiple jobs
    143       running in parallel, install <application>WebKit</application> with the
     154      running in parallel, install <application>WebKitGTK+</application> with the
    144155      following commands:
    145156    </para>
    146157
    147 <screen><userinput>./configure --prefix=/usr --enable-introspection &amp;&amp;
     158<screen><userinput>patch -Np1 -i ../webkitgtk-&webkitgtk-version;-bison-1.patch &amp;&amp;
     159./configure --prefix=/usr \
     160            --libexecdir=/usr/lib/WebKit \
     161            --enable-introspection &amp;&amp;
    148162error_count=0
    149163until make -j$(getconf _NPROCESSORS_ONLN)
    … …  
    173187    <para>
    174188      <option>--enable-introspection</option>: This option enables support for
    175       <application>Gobject Introspection</application> and is required for a
     189      <application>GObject Introspection</application> and is required for a
    176190      <application>GNOME</application> Desktop. If you don't have
    177191      <application>Gobject Introspection</application> installed and don't want
    … …  
    195209
    196210    <para>
    197       <option>--with-gtk=2.0</option>: This option forces
    198       <application>WebKit</application> to compile against
     211      <option>--enable-webkit2</option>: This switch enables building of
     212      <application>WebKit2</application> libraries which some applications
     213      like <application>DevHelp</application> can use and which will probably
     214      be used in future releases of <application>GNOME</application> Desktop.
     215    </para>
     216
     217    <para>
     218      <parameter>--with-gtk=2.0</parameter>: This option forces
     219      <application>WebKitGTK+</application> to compile against
    199220      <application>GTK+ 2</application>, even if
    200221      <application>GTK+ 3</application> is also installed. With
    201222      <application>GTK+ 2</application>, everything
    202       <application>Webkit</application> installs is suffixed with 1.0. When it
     223      <application>WebKitGTK+</application> installs is suffixed with 1.0. When it
    203224      is compiled against <application>GTK+ 3</application> everything it
    204225      installs is suffixed with 3.0. Both versions can be installed alongside
    … …  
    207228
    208229    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    209     href="../../xincludes/gtk-doc-rebuild.xml"/>
     230      href="../../xincludes/gtk-doc-rebuild.xml"/>
     231
    210232  </sect2>
    211233
    … …  
    220242      <seglistitem>
    221243        <seg>
    222           jsc-1 or jsc-3 (depending on whether you installed the
    223           <application>Gtk+-2</application> or <application>Gtk+-3</application>
    224           version of <application>WebKit</application>).
     244          jsc-1 or jsc-3
    225245        </seg>
    226246        <seg>
    227           libwebkit-1.0.so and libjavascriptcoregtk-1.0.so or libwebkit-3.0.so
    228           and libjavascriptcoregtk-3.0.so (depending on whether you installed
    229           the <application>GTK+ 2</application> or
    230           <application>GTK+ 3</application> version of
    231           <application>WebKit</application>).
     247          libjavascriptcoregtk-1.0.so and libwebkit-1.0.so or
     248          libjavascriptcoregtk-3.0.so and libwebkit-3.0.so and
     249          optionaly libwebkit2gtk-3.0.so
    232250        </seg>
    233251        <seg>
    234252          /usr/include/webkit-1.0 and /usr/share/webkit-1.0 or
    235           /usr/include/webkit-3.0 and /usr/share/webkit-3.0 (depending on
    236           whether you installed the <application>GTK+ 2</application> or
    237           <application>GTK+ 3</application> version of
    238           <application>WebKit</application>).
     253          /usr/include/webkit-3.0 and /usr/share/webkit-3.0 and
     254          optionaly /usr/lib/WebKit
    239255        </seg>
    240256      </seglistitem>
    … …  
    259275      </varlistentry>
    260276
    261       <varlistentry id="libwebkit-1.0">
    262         <term><filename class="libraryfile">libwebkit-1.0.so</filename></term>
    263         <listitem>
    264           <para>
    265             contains the <application>WebKit</application> API functions for
    266             <application>GTK+ 2</application>.
    267           </para>
    268           <indexterm zone="webkitgtk libwebkit-1.0">
    269             <primary sortas="c-libwebkit-1.0">libwebkit-1.0.so</primary>
    270           </indexterm>
    271         </listitem>
    272       </varlistentry>
    273 
    274       <varlistentry id="libwebkit-3.0">
    275         <term><filename class="libraryfile">libwebkit-3.0.so</filename></term>
    276         <listitem>
    277           <para>
    278             contains the <application>WebKit</application> API functions for
    279             <application>GTK+ 3</application>.
    280           </para>
    281           <indexterm zone="webkitgtk libwebkit-3.0">
    282             <primary sortas="c-libwebkit-3.0">libwebkit-3.0.so</primary>
    283           </indexterm>
    284         </listitem>
    285       </varlistentry>
    286 
    287277      <varlistentry id="libjavascriptcoregtk-1.0">
    288278        <term><filename
    … …  
    290280        <listitem>
    291281          <para>
    292             contains functions that are used by <command>jsc-1</command>.
     282            contains core JavaScript API functions used by <command>jsc-1</command>
     283            and <filename class="libraryfile">libwebkitgtk-1.0.so</filename>.
    293284          </para>
    294285          <indexterm zone="webkitgtk libjavascriptcoregtk-1.0">
    295286            <primary sortas="c-libjavascriptcoregtk-1.0">libjavascriptcoregtk-1.0.so</primary>
     287          </indexterm>
     288        </listitem>
     289      </varlistentry>
     290
     291      <varlistentry id="libwebkitgtk-1.0">
     292        <term><filename class="libraryfile">libwebkitgtk-1.0.so</filename></term>
     293        <listitem>
     294          <para>
     295            contains the <application>WebKitGTK+</application> API functions for
     296            <application>GTK+ 2</application>.
     297          </para>
     298          <indexterm zone="webkitgtk libwebkitgtk-1.0">
     299            <primary sortas="c-libwebkitgtk-1.0">libwebkitgtk-1.0.so</primary>
    296300          </indexterm>
    297301        </listitem>
    … …  
    303307        <listitem>
    304308          <para>
    305             contains functions that are used by <command>jsc-3</command>.
     309            contains core JavaScript API functions used by <command>jsc-3</command>
     310            and <filename class="libraryfile">libwebkitgtk-3.0.so</filename>.
    306311          </para>
    307312          <indexterm zone="webkitgtk libjavascriptcoregtk-3.0">
    … …  
    311316      </varlistentry>
    312317
     318      <varlistentry id="libwebkitgtk-3.0">
     319        <term><filename class="libraryfile">libwebkitgtk-3.0.so</filename></term>
     320        <listitem>
     321          <para>
     322            contains the <application>WebKitGTK+</application> API functions for
     323            <application>GTK+ 3</application>.
     324          </para>
     325          <indexterm zone="webkitgtk libwebkitgtk-3.0">
     326            <primary sortas="c-libwebkitgtk-3.0">libwebkitgtk-3.0.so</primary>
     327          </indexterm>
     328        </listitem>
     329      </varlistentry>
     330
     331      <varlistentry id="libwebkit2gtk-3.0">
     332        <term><filename class="libraryfile">libwebkit2gtk-3.0.so</filename></term>
     333        <listitem>
     334          <para>
     335            contains the <application>WebKit2</application> API functions.
     336          </para>
     337          <indexterm zone="webkitgtk libwebkit2gtk-3.0">
     338            <primary sortas="c-libwebkit2gtk-3.0">libwebkit2gtk-3.0.so</primary>
     339          </indexterm>
     340        </listitem>
     341      </varlistentry>
     342
    313343    </variablelist>
    314344
Note: See TracChangeset for help on using the changeset viewer.