Changeset d356833


Ignore:
Timestamp:
09/26/2012 07:37:55 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:
35e84dce
Parents:
983fc68
Message:

GNOME 3.6 Part 6.

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

Location:
x/lib
Files:
1 deleted
9 edited

Legend:

Unmodified
Added
Removed

  • x/lib/gdk-pixbuf.xml

    r983fc68 rd356833  
    99  <!ENTITY gdk-pixbuf-download-ftp 
    1010           "&gnome-download-ftp;/gdk-pixbuf/2.26/gdk-pixbuf-&gdk-pixbuf-version;.tar.xz">
    11   <!ENTITY gdk-pixbuf-md5sum        "350fb5dcaded7810bb77d424896f0b4e">
     11  <!ENTITY gdk-pixbuf-md5sum        "e634924654bedfdbe58fab059f38ffed">
    1212  <!ENTITY gdk-pixbuf-size          "1.2 MB">
    1313  <!ENTITY gdk-pixbuf-buildsize     "25 MB">
    14   <!ENTITY gdk-pixbuf-time          "0.3 SBU">
     14  <!ENTITY gdk-pixbuf-time          "0.2 SBU">
    1515]>
    1616
    … …  
    7777    </itemizedlist>
    7878
    79     <bridgehead renderas="sect3">Gdk-Pixbuf Dependencies</bridgehead>
     79    <bridgehead renderas="sect3">Gdk Pixbuf Dependencies</bridgehead>
    8080
    8181    <bridgehead renderas="sect4">Required</bridgehead>
    … …  
    156156      <xref linkend="jasper"/> and you want
    157157      <application>Gdk Pixbuf</application> to use it to compile a
    158       JPEG2000 image loader, pass this option to configure.
     158      JPEG2000 image loader, pass this switch to configure.
    159159    </para>
    160160
    … …  
    219219      </varlistentry>
    220220
    221       <varlistentry id="libgdk_pixbuf-2.0">
     221      <varlistentry id="libgdk_pixbuf-2">
    222222        <term><filename class="libraryfile">libgdk_pixbuf-2.0.so</filename></term>
    223223        <listitem>
    … …  
    225225            contains functions used to load and render images.
    226226          </para>
    227           <indexterm zone="gdk-pixbuf libgdk_pixbuf-2.0">
    228             <primary sortas="c-libgdk_pixbuf-2.0">libgdk_pixbuf-2.0.so</primary>
    229           </indexterm>
    230         </listitem>
    231       </varlistentry>
    232 
    233       <varlistentry id="libgdk_pixbuf_xlib-2.0">
     227          <indexterm zone="gdk-pixbuf libgdk_pixbuf-2">
     228            <primary sortas="c-libgdk_pixbuf-2">libgdk_pixbuf-2.0.so</primary>
     229          </indexterm>
     230        </listitem>
     231      </varlistentry>
     232
     233      <varlistentry id="libgdk_pixbuf_xlib-2">
    234234        <term><filename class="libraryfile">libgdk_pixbuf_xlib-2.0.so</filename></term>
    235235        <listitem>
    … …  
    238238            <application>Xlib</application>.
    239239          </para>
    240           <indexterm zone="gdk-pixbuf libgdk_pixbuf_xlib-2.0">
    241             <primary sortas="c-libgdk_pixbuf_xlib-2.0">libgdk_pixbuf_xlib-2.0.so</primary>
     240          <indexterm zone="gdk-pixbuf libgdk_pixbuf_xlib-2">
     241            <primary sortas="c-libgdk_pixbuf_xlib-2">libgdk_pixbuf_xlib-2.0.so</primary>
    242242          </indexterm>
    243243        </listitem>

  • x/lib/gtk+2.xml

    r983fc68 rd356833  
    77  <!ENTITY gtk2-download-http "&gnome-download-http;/gtk+/2.24/gtk+-&gtk2-version;.tar.xz">
    88  <!ENTITY gtk2-download-ftp  "&gnome-download-ftp;/gtk+/2.24/gtk+-&gtk2-version;.tar.xz">
    9   <!ENTITY gtk2-md5sum        "af16f167ac870bf4b0804e06f8b5cbbf">
     9  <!ENTITY gtk2-md5sum        "e949406751df51e1e40e85628005a069">
    1010  <!ENTITY gtk2-size          "13 MB">
    1111  <!ENTITY gtk2-buildsize     "340 MB">
    12   <!ENTITY gtk2-time          "3.5 SBU">
     12  <!ENTITY gtk2-time          "2.7 SBU">
    1313]>
    1414
    … …  
    2424
    2525  <indexterm zone="gtk2">
    26     <primary sortas="a-gtk2">gtk2</primary>
     26    <primary sortas="a-GTK+2">GTK+2</primary>
    2727  </indexterm>
    2828

  • x/lib/gtk+3.xml

    r983fc68 rd356833  
    55  %general-entities;
    66
    7   <!ENTITY gtk3-download-http "&gnome-download-http;/gtk+/3.4/gtk+-&gtk3-version;.tar.xz">
    8   <!ENTITY gtk3-download-ftp  "&gnome-download-ftp;/gtk+/3.4/gtk+-&gtk3-version;.tar.xz">
    9   <!ENTITY gtk3-md5sum        "1b2cf29502a6394e8d4b30f7f5bb9131">
     7  <!ENTITY gtk3-download-http "&gnome-download-http;/gtk+/3.6/gtk+-&gtk3-version;.tar.xz">
     8  <!ENTITY gtk3-download-ftp  "&gnome-download-ftp;/gtk+/3.6/gtk+-&gtk3-version;.tar.xz">
     9  <!ENTITY gtk3-md5sum        "6f7ef4679f7e3622894c3f57045a1188">
    1010  <!ENTITY gtk3-size          "13 MB">
    11   <!ENTITY gtk3-buildsize     "350 MB">
    12   <!ENTITY gtk3-time          "3.5 SBU">
     11  <!ENTITY gtk3-buildsize     "330 MB">
     12  <!ENTITY gtk3-time          "2.7 SBU">
    1313]>
    1414
    … …  
    2424
    2525  <indexterm zone="gtk3">
    26     <primary sortas="a-gtk3">gtk3</primary>
     26    <primary sortas="a-GTK+3">GTK+3</primary>
    2727  </indexterm>
    2828
    … …  
    3636    </para>
    3737
    38     &lfs71_checked;
     38    &lfs72_checked;
    3939
    4040    <bridgehead renderas="sect3">Package Information</bridgehead>
    … …  
    7676    <bridgehead renderas="sect4">Required</bridgehead>
    7777    <para role="required">
    78       <xref linkend="atk"/>,
    79       <xref linkend="cairo"/>,
     78      <xref linkend="at-spi2-atk"/>,
    8079      <xref linkend="gdk-pixbuf"/> and
    8180      <xref linkend="pango"/>
    … …  
    9291      <xref linkend="cups"/>,
    9392      <xref linkend="docbook-utils"/> and
    94       <xref linkend="gtk-doc"/>.
     93      <xref linkend="gtk-doc"/>
    9594    </para>
    9695
    … …  
    129128    </para>
    130129
    131 <screen><userinput>rm tests/css/parser/selector.css &amp;&amp;
    132 rm tests/a11y/pickers.ui &amp;&amp;
     130<screen><userinput>rm tests/a11y/pickers.ui &amp;&amp;
    133131make check</userinput></screen>
    134132
    … …  
    155153
    156154    <para>
    157       <option>--disable-packagekit</option>: This parameter disables use
     155      <option>--disable-packagekit</option>: switch disables use
    158156      of PackageKit which isn't needed for BLFS.
    159157    </para>
    160158
    161159    <para>
    162       <command>rm tests/css/parser/selector.css</command> and
    163       <command>rm tests/a11y/pickers.ui</command>: This prevents two tests
    164       being run as they are known to fail.
     160      <command>rm tests/a11y/pickers.ui</command>: This prevents test
     161      being run as it is known to fail.
    165162    </para>
    166163
    … …  
    234231      <seglistitem>
    235232        <seg>
    236           gtk3-demo, gtk-query-immodules-3.0 and gtk-update-icon-cache
     233          gtk3-demo, gtk3-demo-application, gtk-launch,
     234          gtk-query-immodules-3.0 and gtk-update-icon-cache
    237235        </seg>
    238236        <seg>
    … …  
    241239        <seg>
    242240          /etc/gtk-3.0,
    243           /usr/include/{gail-3.0,gtk-3.0},
     241          /usr/include/gail-3.0,
     242          /usr/include/gtk-3.0,
    244243          /usr/lib/gtk-3.0,
    245           /usr/share/gtk-3.0 and
    246           /usr/share/gtk-doc/html/{gail-libgail-util3,gdk3,gtk3}
     244          /usr/share/gtk-3.0,
     245          /usr/share/gtk-doc/html/gail-libgail-util3,
     246          /usr/share/gtk-doc/html/gdk3 and
     247          /usr/share/gtk-doc/html/gtk3
    247248        </seg>
    248249      </seglistitem>
    … …  
    267268      </varlistentry>
    268269
     270      <varlistentry id="gtk-launch">
     271        <term><command>gtk-launch</command></term>
     272        <listitem>
     273          <para>
     274            launches an application using the given name. The name should match
     275            application desktop file name, as residing in
     276            <filename class="directory">/usr/share/application</filename>, with
     277            or without the '.desktop' suffix.
     278          </para>
     279          <indexterm zone="gtk3 gtk-launch">
     280            <primary sortas="b-gtk-launch">gtk-launch</primary>
     281          </indexterm>
     282        </listitem>
     283      </varlistentry>
     284
    269285      <varlistentry id="gtk-query-immodules-3.0">
    270286        <term><command>gtk-query-immodules-3.0</command></term>
    … …  
    294310      </varlistentry>
    295311
    296       <varlistentry id="libgailutil">
    297         <term><filename class='libraryfile'>libgailutil.so</filename></term>
     312      <varlistentry id="libgailutil-3">
     313        <term><filename class="libraryfile">libgailutil-3.so</filename></term>
    298314        <listitem>
    299315          <para>
    300316            contains functions that implements the accessibility interfaces
    301             defined by the GNOME Accessibility Toolkit.
    302           </para>
    303           <indexterm zone="gtk3 libgailutil">
    304             <primary sortas="c-libgailutil">libgailutil.so</primary>
     317            defined by the <application>GNOME</application> Accessibility
     318            Toolkit.
     319          </para>
     320          <indexterm zone="gtk3 libgailutil-3">
     321            <primary sortas="c-libgailutil-3">libgailutil-3.so</primary>
    305322          </indexterm>
    306323        </listitem>
    … …  
    308325
    309326      <varlistentry id="libgdk-3">
    310         <term><filename class='libraryfile'>libgdk-3.so</filename></term>
     327        <term><filename class="libraryfile">libgdk-3.so</filename></term>
    311328        <listitem>
    312329          <para>
    … …  
    322339
    323340      <varlistentry id="libgtk-3">
    324         <term><filename class='libraryfile'>libgtk-3.so</filename></term>
     341        <term><filename class="libraryfile">libgtk-3.so</filename></term>
    325342        <listitem>
    326343          <para>

  • x/lib/gtkmm3.xml

    r983fc68 rd356833  
    55  %general-entities;
    66
    7   <!ENTITY gtkmm3-download-http "&gnome-download-http;/gtkmm/3.4/gtkmm-&gtkmm3-version;.tar.xz">
    8   <!ENTITY gtkmm3-download-ftp  "&gnome-download-ftp;/gtkmm/3.4/gtkmm-&gtkmm3-version;.tar.xz">
    9   <!ENTITY gtkmm3-md5sum        "cae0fa7143ad8d9df678859bf8bdc1cb">
    10   <!ENTITY gtkmm3-size          "8.8 MB">
    11   <!ENTITY gtkmm3-buildsize     "240 MB">
     7  <!ENTITY gtkmm3-download-http "&gnome-download-http;/gtkmm/3.5/gtkmm-&gtkmm3-version;.tar.xz">
     8  <!ENTITY gtkmm3-download-ftp  "&gnome-download-ftp;/gtkmm/3.5/gtkmm-&gtkmm3-version;.tar.xz">
     9  <!ENTITY gtkmm3-md5sum        "816853d7e7a657b7fafc651b89e81b01">
     10  <!ENTITY gtkmm3-size          "1.7 MB">
     11  <!ENTITY gtkmm3-buildsize     "155 MB">
    1212  <!ENTITY gtkmm3-time          "3.0 SBU">
    1313]>
    … …  
    3535    </para>
    3636
    37     &lfs70_checked;
     37    &lfs72_checked;
    3838
    3939    <bridgehead renderas="sect3">Package Information</bridgehead>
    … …  
    8080    </para>
    8181
     82    <bridgehead renderas="sect4">Optional</bridgehead>
     83    <para role="optional">
     84      <xref linkend="doxygen"/>
     85    </para>
     86
    8287    <para condition="html" role="usernotes">
    8388      User Notes: <ulink url="&blfs-wiki;/gtkmm3"/>
    … …  
    9398    </para>
    9499
    95 <screen><userinput>./configure --prefix=/usr &amp;&amp;
     100<screen><userinput>./configure --prefix=/usr --disable-documentation &amp;&amp;
    96101make</userinput></screen>
    97102
    … …  
    105110
    106111<screen role="root"><userinput>make install</userinput></screen>
     112  </sect2>
     113
     114  <sect2 role="commands">
     115    <title>Command Explanations</title>
     116
     117    <para>
     118      <option>--disable-documentation</option>: This switch disables building
     119      and installing of <application>Gtkmm</application> documentation.
     120      Remove if you have installed <xref linkend="doxygen"/>.
     121    </para>
     122
    107123  </sect2>
    108124
    … …  
    119135        </seg>
    120136        <seg>
    121           /usr/include/{gdkmm-3.0,gtkmm-3.0},
    122           /usr/lib/{gdkmm-3.0,gtkmm-3.0},
     137          /usr/include/gdkmm-3.0,
     138          /usr/include/gtkmm-3.0,
     139          /usr/lib/gdkmm-3.0,
     140          /usr/lib/gtkmm-3.0,
    123141          /usr/share/devhelp/books/gtkmm-3.0 and
    124142          /usr/share/doc/gtkmm-3.0
    … …  
    132150      <?dbhtml list-presentation="table"?>
    133151
    134       <varlistentry id="libgdkmm-3.0">
    135         <term><filename class='libraryfile'>libgdkmm-3.0.so</filename></term>
     152      <varlistentry id="libgdkmm-3">
     153        <term><filename class="libraryfile">libgdkmm-3.0.so</filename></term>
    136154        <listitem>
    137155        <para>
    138156          contains the GDK API classes.
    139157        </para>
    140           <indexterm zone="gtkmm3 libgdkmm-3.0">
    141             <primary sortas="c-libgdkmm-3.0">libgdkmm-3.0.so</primary>
     158          <indexterm zone="gtkmm3 libgdkmm-3">
     159            <primary sortas="c-libgdkmm-3">libgdkmm-3.0.so</primary>
    142160          </indexterm>
    143161        </listitem>
    144162      </varlistentry>
    145163
    146       <varlistentry id="libgtkmm-3.0">
    147         <term><filename class='libraryfile'>libgtkmm-3.0.so</filename></term>
     164      <varlistentry id="libgtkmm-3">
     165        <term><filename class="libraryfile">libgtkmm-3.0.so</filename></term>
    148166        <listitem>
    149167        <para>
    150168          contains the <application>GTK+ 3</application> API classes.
    151169        </para>
    152           <indexterm zone="gtkmm3 libgtkmm-3.0">
    153             <primary sortas="c-libgtkmm-3.0">libgtkmm-3.0.so</primary>
     170          <indexterm zone="gtkmm3 libgtkmm-3">
     171            <primary sortas="c-libgtkmm-3">libgtkmm-3.0.so</primary>
    154172          </indexterm>
    155173        </listitem>

  • x/lib/lib.xml

    r983fc68 rd356833  
    3434  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="cogl.xml"/>
    3535  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="clutter.xml"/>
    36   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="clutter-gst.xml"/>
    37 <!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="clutter-gst2.xml"/> -->
     36  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="clutter-gst2.xml"/>
    3837  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="clutter-gtk.xml"/>
     38  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="colord-gtk.xml"/>
    3939  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="freeglut.xml"/>
    4040  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gdk-pixbuf.xml"/>

  • x/lib/libxklavier.xml

    r983fc68 rd356833  
    66
    77  <!ENTITY libxklavier-download-http
    8            "&gnome-download-http;/libxklavier/5.2/libxklavier-&libxklavier-version;.tar.xz">
     8           "&gnome-download-http;/libxklavier/5.3/libxklavier-&libxklavier-version;.tar.xz">
    99  <!ENTITY libxklavier-download-ftp 
    10            "&gnome-download-ftp;/libxklavier/5.2/libxklavier-&libxklavier-version;.tar.xz">
    11   <!ENTITY libxklavier-md5sum        "b3e718ee156d0d8883dfc3ff3bb86779">
    12   <!ENTITY libxklavier-size          "308 KB">
    13   <!ENTITY libxklavier-buildsize     "8.0 MB">
     10           "&gnome-download-ftp;/libxklavier/5.3/libxklavier-&libxklavier-version;.tar.xz">
     11  <!ENTITY libxklavier-md5sum        "290ea2a8abc40f78a3a16bdae6f02808">
     12  <!ENTITY libxklavier-size          "312 KB">
     13  <!ENTITY libxklavier-buildsize     "5.5 MB">
    1414  <!ENTITY libxklavier-time          "less than 0.1 SBU">
    1515]>
    … …  
    2626
    2727  <indexterm zone="libxklavier">
    28     <primary sortas="a-Libxklavier">Libxklavier</primary>
     28    <primary sortas="a-libxklavier">libxklavier</primary>
    2929  </indexterm>
    3030
    … …  
    7979      <xref linkend="glib2"/>,
    8080      <xref linkend="iso-codes"/>,
    81       <xref linkend="libxml2"/>, and
     81      <xref linkend="libxml2"/> and
    8282      <xref linkend="xorg7-lib"/>
    8383    </para>
    … …  
    126126    <para>
    127127      <parameter>--with-xkb-base=$XORG_PREFIX/share/X11/xkb</parameter>:
    128       Use this parameter if the $XORG_PREFIX is anything other than
     128      Use this swithc if the $XORG_PREFIX is anything other than
    129129      <filename class="directory">/usr</filename>.
    130130    </para>
    … …  
    162162
    163163      <varlistentry id="libxklavier-lib">
    164         <term><filename class='libraryfile'>libxklavier.so</filename></term>
     164        <term><filename class="libraryfile">libxklavier.so</filename></term>
    165165        <listitem>
    166166          <para>

  • x/lib/notification-daemon.xml

    r983fc68 rd356833  
    99  <!ENTITY notification-daemon-download-ftp 
    1010           "&gnome-download-ftp;/notification-daemon/0.7/notification-daemon-&notification-daemon-version;.tar.xz">
    11   <!ENTITY notification-daemon-md5sum        "ff92ed27e3117235d6800cef3e510a1b">
     11  <!ENTITY notification-daemon-md5sum        "08c9a6d18ead0aa62d933fc5a4135d38">
    1212  <!ENTITY notification-daemon-size          "276 KB">
    13   <!ENTITY notification-daemon-buildsize     "4.7 MB">
     13  <!ENTITY notification-daemon-buildsize     "4.8 MB">
    1414  <!ENTITY notification-daemon-time          "less than 0.1 SBU">
    1515]>
    … …  
    113113  </sect2>
    114114
    115   <sect2 role="commands">
    116     <title>Command Explanations</title>
    117 
    118     <para>
    119       <parameter>--libexecdir=/usr/lib/notification-daemon</parameter>: This
    120       parameter is used so that the <application>notification-daemon</application>
    121       program is installed in the preferred location of
    122       <filename class="directory">/usr/lib/notification-daemon</filename> instead
    123       of <filename class="directory">/usr/libexec</filename>.
    124     </para>
    125 
    126   </sect2>
    127 
    128115  <sect2 role="content">
    129116    <title>Contents</title>

  • x/lib/pango.xml

    r983fc68 rd356833  
    55  %general-entities;
    66
    7   <!ENTITY pango-download-http "&gnome-download-http;/pango/1.30/pango-&pango-version;.tar.xz">
    8   <!ENTITY pango-download-ftp  "&gnome-download-ftp;/pango/1.30/pango-&pango-version;.tar.xz">
    9   <!ENTITY pango-md5sum        "ec3c1f236ee9bd4a982a5f46fcaff7b9">
    10   <!ENTITY pango-size          "1.2 MB">
    11   <!ENTITY pango-buildsize     "40 MB">
    12   <!ENTITY pango-time          "0.5 SBU">
     7  <!ENTITY pango-download-http "&gnome-download-http;/pango/1.31/pango-&pango-version;.tar.xz">
     8  <!ENTITY pango-download-ftp  "&gnome-download-ftp;/pango/1.31/pango-&pango-version;.tar.xz">
     9  <!ENTITY pango-md5sum        "12ce3955a099d91c8cafddcc9f8815a6">
     10  <!ENTITY pango-size          "1.0 MB">
     11  <!ENTITY pango-buildsize     "24 MB">
     12  <!ENTITY pango-time          "0.2 SBU">
    1313]>
    1414
    … …  
    3333      <application>Pango</application> is a library for laying out and rendering
    3434      of text, with an emphasis on internationalization. It can be used anywhere
    35       that text layout is needed, though most of the work on Pango so far has
    36       been done in the context of the GTK+ widget toolkit.
     35      that text layout is needed, though most of the work on
     36      <application>Pango</application> so far has been done in the context of
     37      the <application>GTK+</application> widget toolkit.
    3738    </para>
    3839
    … …  
    7576    <bridgehead renderas="sect3">Pango Dependencies</bridgehead>
    7677
    77     <!-- FreeType2 and Fontconfig pulled by Xorg Libraries -->
    7878    <bridgehead renderas="sect4">Required</bridgehead>
    7979    <para role="required">
    80       <xref linkend="cairo"/> and
     80      <xref linkend="cairo"/>,
     81      <xref linkend="harfbuzz"/> and
    8182      <xref linkend="xorg7-lib"/>
    8283    </para>
    … …  
    8990    <bridgehead renderas="sect4">Optional</bridgehead>
    9091    <para role="optional">
    91       <xref linkend="gtk-doc"/> and
    92       <ulink url="http://linux.thai.net/libthai">LibThai</ulink>
     92      <xref linkend="gtk-doc"/>
    9393    </para>
    9494
    … …  
    110110
    111111    <para>
    112       To test the results, issue: <command>make check</command>. You can install
    113       <xref linkend="gtk-doc"/> if you wish to test the documentation section of
    114       the test suite. Also, the <quote>testboundries</quote> test could fail if
    115       you have <application>LibThai</application> installed.
     112      To test the results, issue: <command>make check</command>.
    116113    </para>
    117114
    … …  
    130127      </para>
    131128
    132 <screen role="root"><userinput>pango-querymodules > /etc/pango/pango.modules</userinput></screen>
     129<screen role="root"><userinput>pango-querymodules --update-cache</userinput></screen>
    133130    </note>
    134131  </sect2>
    … …  
    172169        config files listed above.
    173170      </para>
     171
    174172    </sect3>
     173
    175174  </sect2>
    176175
    … …  
    188187        </seg>
    189188        <seg>
    190           libpango-1.0.so, libpangocairo-1.0.so, libpangoft2-1.0.so,
    191           libpangox-1.0.so and libpangoxft-1.0.so
     189          libpango-1.0.so, libpangocairo-1.0.so, libpangoft2-1.0.so and
     190          libpangoxft-1.0.so
    192191        </seg>
    193192        <seg>
    … …  
    231230      </varlistentry>
    232231
    233       <varlistentry id="Pango-libraries">
    234         <term><filename class="libraryfile">libpango*-1.0.so</filename></term>
     232      <varlistentry id="libpango-1">
     233        <term><filename class="libraryfile">libpango-1.0.so</filename></term>
    235234        <listitem>
    236235          <para>
    … …  
    239238            internationalized text.
    240239          </para>
    241           <indexterm zone="pango Pango-libraries">
    242             <primary sortas="c-Pango-libraries">libpango*-1.0.so</primary>
     240          <indexterm zone="pango libpango-1">
     241            <primary sortas="c-libpango-1">libpango-1.0.so</primary>
    243242          </indexterm>
    244243        </listitem>

  • x/lib/webkitgtk.xml

    r983fc68 rd356833  
    55  %general-entities;
    66
    7   <!ENTITY webkitgtk-download-http "http://webkitgtk.org/releases/webkit-&webkitgtk-version;.tar.xz">
     7  <!ENTITY webkitgtk-download-http "http://webkitgtk.org/releases/webkitgtk-&webkitgtk-version;.tar.xz">
    88  <!ENTITY webkitgtk-download-ftp  " ">
    9   <!ENTITY webkitgtk-md5sum        "f7bd0bd4f323039f15e19c82a9a8313c">
    10   <!ENTITY webkitgtk-size          "7.7 MB">
    11   <!ENTITY webkitgtk-buildsize     "700 MB">
    12   <!ENTITY webkitgtk-time          "30 SBU">
     9  <!ENTITY webkitgtk-md5sum        "6da450ec7793c0a7873d8c8c2cae4eb8">
     10  <!ENTITY webkitgtk-size          "8.2 MB">
     11  <!ENTITY webkitgtk-buildsize     "800 MB">
     12  <!ENTITY webkitgtk-time          "40 SBU">
    1313]>
    1414
    … …  
    7272    </itemizedlist>
    7373
    74     <bridgehead renderas="sect3">Additional Downloads</bridgehead>
    75     <itemizedlist spacing="compact">
    76       <listitem>
    77         <para>
    78           Required patch:
    79           <ulink url="&patch-root;/webkit-&webkitgtk-version;-bison-1.patch"/>
    80         </para>
    81       </listitem>
    82     </itemizedlist>
    83 
    8474    <bridgehead renderas="sect3">WebKitGTK+ Dependencies</bridgehead>
    8575
    8676    <bridgehead renderas="sect4">Required</bridgehead>
    8777    <para role="required">
    88       <xref linkend="geoclue"/>,
    8978      <xref linkend="gperf"/>,
     79      <xref linkend="gst10-plugins-base"/> or
    9080      <xref linkend="gst-plugins-base"/>,
    91       <xref linkend="gtk3"/> or <xref linkend="gtk2"/>,
     81      <xref linkend="gtk3"/> or
     82      <xref linkend="gtk2"/>,
    9283      <xref linkend="icu"/>,
    9384      <xref linkend="libxslt"/>,
    9485      <xref linkend="libsoup"/>,
     86      <xref linkend="mesalib"/>,
     87      <xref linkend="ruby"/>,
    9588      <xref linkend="sqlite"/> and
    9689      <xref linkend="which"/>
    … …  
    9992    <bridgehead renderas="sect4">Recommended</bridgehead>
    10093    <para role="recommended">
     94      <xref linkend="geoclue"/> and
    10195      <xref linkend="gobject-introspection"/>
    10296    </para>
    … …  
    118112    <title>Installation of WebKitGTK+</title>
    119113
    120     <para>
    121       If you have <application>pkg-config 0.23</application> or older installed
    122       fix a bug in the configure script that will stop it detecting
    123       <application>Gstreamer</application> correctly:
    124     </para>
    125 
    126 <screen><userinput>sed -i 's#=GST#=$GST#' configure</userinput></screen>
     114    <warning>
     115      <para>
     116        If you are building <application>WebKitGTK+</application>
     117        with <command>make</command> 3.82, make sure that you have built
     118        it with the following
     119        <ulink url="&patch-downloads;/make/make-3.82-upstream_fixes-3.patch">
     120        patch</ulink> applied or <application>WebKitGTK+</application>
     121        build will fail.
     122      </para>
     123    </warning>
    127124
    128125    <para>
    … …  
    134131
    135132    <para>
    136       <application>WebKitGTK+</application> takes a long time to compile, so if you
    137       have a multicore CPU it can be useful to speed up the build by running
    138       make with multiple jobs.
    139     </para>
    140 
    141     <para>
    142       If you want to run make with just one core, install
    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 \
     133      Install <application>WebKitGTK+</application> by running the
     134      following commands:
     135    </para>
     136
     137<screen><userinput>./configure --prefix=/usr \
     138            --libexecdir=/usr/lib/WebKitGTK \
     139            --with-gstreamer=1.0 \
    149140            --enable-introspection &amp;&amp;
    150141make</userinput></screen>
    151142
    152143    <para>
    153       If you have a multicore CPU and want to run make with multiple jobs
    154       running in parallel, install <application>WebKitGTK+</application> with the
    155       following commands:
    156     </para>
    157 
    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;
    162 error_count=0
    163 until make -j$(getconf _NPROCESSORS_ONLN)
    164 do
    165   if (( $((error_count++)) &gt; 4 ))
    166   then
    167     echo Too Many Errors
    168     break
    169   fi
    170 done
    171 unset error_count</userinput></screen>
    172 
    173     <para>
    174144      This package does not have a working testsuite.
    175145    </para>
    … …  
    186156
    187157    <para>
    188       <option>--enable-introspection</option>: This option enables support for
    189       <application>GObject Introspection</application> and is required for a
    190       <application>GNOME</application> Desktop. If you don't have
    191       <application>Gobject Introspection</application> installed and don't want
    192       to install <application>GNOME</application> remove this option.
    193     </para>
    194 
    195     <para>
    196       <command>error_count=0; until make ...</command>: Sadly
    197       there are race conditions in the makefiles that will cause the build to
    198       fail if you run make with multiple jobs. This simple hack works around
    199       that problem by using <command>until</command> to keep running
    200       <command>make</command> until it succeeds. The variable
    201       <envar>error_count</envar> is incremented each time an error occurs and is
    202       checked to ensure that no more than 5 errors occur. This is so that if an
    203       error occurs that is <emphasis>not</emphasis> due to a race condition then
    204       it will not keep repeating <command>make</command> forever.
    205       <command>$(getconf _NPROCESSORS_ONLN)</command> prints the number of cores
    206       your computer seems to have. If you would prefer, you can use any positive
    207       integer such as 4.
    208     </para>
    209 
    210     <para>
    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
     158      <option>--enable-introspection</option>: This switch enables support for
     159      <application>Gobject Introspection</application> and is required for a
     160      <application>GNOME</application> Desktop. Remove if you don't have
     161      <application>Gobject Introspection</application> installed or you don't
     162      want to install <application>GNOME</application>.
     163    </para>
     164   
     165    <para>
     166      <parameter>--with-gstreamer=1.0</parameter>: This switch forces use of
     167      <application>GStreamer</application> 1.0 series which
     168      <application>GNOME</application> 3.6 uses. Remove if you don't want
     169      to install <application>GStreamer</application> 1.0 or you don't
     170      want to install <application>GNOME</application>.
     171    </para>
     172
     173    <para>
     174      <option>--disable-geolocation</option>: Use this option if you did not
     175      install <xref linkend="geoclue"/> or <command>configure</command> will
     176      fail.
     177    </para>
     178
     179    <para>
     180      <parameter>--with-gtk=2.0 --disable-webkit2</parameter>: These parameters
     181      force <application>WebKitGTK+</application> to compile against
    220182      <application>GTK+ 2</application>, even if
    221183      <application>GTK+ 3</application> is also installed. With
    … …  
    246208        <seg>
    247209          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
     210          libjavascriptcoregtk-3.0.so, libwebkit2gtk-3.0.so and
     211          libwebkit-3.0.so
    250212        </seg>
    251213        <seg>
    252214          /usr/include/webkit-1.0 and /usr/share/webkit-1.0 or
    253           /usr/include/webkit-3.0 and /usr/share/webkit-3.0 and
    254           optionaly /usr/lib/WebKit
     215          /usr/include/webkit-3.0, /usr/lib/WebKit and
     216          /usr/share/webkit-3.0
    255217        </seg>
    256218      </seglistitem>
    … …  
    275237      </varlistentry>
    276238
    277       <varlistentry id="libjavascriptcoregtk-1.0">
     239      <varlistentry id="libjavascriptcoregtk-1">
    278240        <term><filename
    279241        class="libraryfile">libjavascriptcoregtk-1.0.so</filename></term>
    … …  
    283245            and <filename class="libraryfile">libwebkitgtk-1.0.so</filename>.
    284246          </para>
    285           <indexterm zone="webkitgtk libjavascriptcoregtk-1.0">
    286             <primary sortas="c-libjavascriptcoregtk-1.0">libjavascriptcoregtk-1.0.so</primary>
    287           </indexterm>
    288         </listitem>
    289       </varlistentry>
    290 
    291       <varlistentry id="libwebkitgtk-1.0">
     247          <indexterm zone="webkitgtk libjavascriptcoregtk-1">
     248            <primary sortas="c-libjavascriptcoregtk-1">libjavascriptcoregtk-1.0.so</primary>
     249          </indexterm>
     250        </listitem>
     251      </varlistentry>
     252
     253      <varlistentry id="libwebkitgtk-1">
    292254        <term><filename class="libraryfile">libwebkitgtk-1.0.so</filename></term>
    293255        <listitem>
    … …  
    296258            <application>GTK+ 2</application>.
    297259          </para>
    298           <indexterm zone="webkitgtk libwebkitgtk-1.0">
    299             <primary sortas="c-libwebkitgtk-1.0">libwebkitgtk-1.0.so</primary>
    300           </indexterm>
    301         </listitem>
    302       </varlistentry>
    303 
    304       <varlistentry id="libjavascriptcoregtk-3.0">
     260          <indexterm zone="webkitgtk libwebkitgtk-1">
     261            <primary sortas="c-libwebkitgtk-1">libwebkitgtk-1.0.so</primary>
     262          </indexterm>
     263        </listitem>
     264      </varlistentry>
     265
     266      <varlistentry id="libjavascriptcoregtk-3">
    305267        <term><filename
    306268        class="libraryfile">libjavascriptcoregtk-3.0.so</filename></term>
    … …  
    310272            and <filename class="libraryfile">libwebkitgtk-3.0.so</filename>.
    311273          </para>
    312           <indexterm zone="webkitgtk libjavascriptcoregtk-3.0">
    313             <primary sortas="c-libjavascriptcoregtk-3.0">libjavascriptcoregtk-3.0.so</primary>
    314           </indexterm>
    315         </listitem>
    316       </varlistentry>
    317 
    318       <varlistentry id="libwebkitgtk-3.0">
     274          <indexterm zone="webkitgtk libjavascriptcoregtk-3">
     275            <primary sortas="c-libjavascriptcoregtk-3">libjavascriptcoregtk-3.0.so</primary>
     276          </indexterm>
     277        </listitem>
     278      </varlistentry>
     279
     280      <varlistentry id="libwebkitgtk-3">
    319281        <term><filename class="libraryfile">libwebkitgtk-3.0.so</filename></term>
    320282        <listitem>
    … …  
    323285            <application>GTK+ 3</application>.
    324286          </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">
     287          <indexterm zone="webkitgtk libwebkitgtk-3">
     288            <primary sortas="c-libwebkitgtk-3">libwebkitgtk-3.0.so</primary>
     289          </indexterm>
     290        </listitem>
     291      </varlistentry>
     292
     293      <varlistentry id="libwebkit2gtk-3">
    332294        <term><filename class="libraryfile">libwebkit2gtk-3.0.so</filename></term>
    333295        <listitem>
    … …  
    335297            contains the <application>WebKit2</application> API functions.
    336298          </para>
    337           <indexterm zone="webkitgtk libwebkit2gtk-3.0">
    338             <primary sortas="c-libwebkit2gtk-3.0">libwebkit2gtk-3.0.so</primary>
     299          <indexterm zone="webkitgtk libwebkit2gtk-3">
     300            <primary sortas="c-libwebkit2gtk-3">libwebkit2gtk-3.0.so</primary>
    339301          </indexterm>
    340302        </listitem>
Note: See TracChangeset for help on using the changeset viewer.