Changeset b178376


Ignore:
Timestamp:
10/28/2014 05:37:22 PM (9 years ago)
Author:
Krejzi <krejzi@…>
Branches:
krejzi/svn
Children:
70eab9cd
Parents:
3e09737
Message:

Moar updates, finishing Xorg Libraries section.

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/branches/krejzi@14774 af4574ff-66df-0310-9fd7-8a98e5e911e0

Files:
7 edited
1 moved

Legend:

Unmodified
Added
Removed

  • general/genutils/xscreensaver.xml

    r3e09737 rb178376  
    9393    <bridgehead renderas="sect4">Optional</bridgehead>
    9494    <para role="optional">
    95       <xref linkend="gdm"/>,
     95<!-- UNCOMMENT     <xref linkend="gdm"/>, -->
    9696      <ulink url="http://linas.org/gle/">GLE</ulink> and
    9797      <xref linkend="linux-pam"/>

  • gnome/applications/epiphany.xml

    r3e09737 rb178376  
    8383      <xref linkend="libnotify"/>,
    8484      <xref linkend="libwnck"/>, and
    85       <xref linkend="webkitgtk26"/>
     85      <xref linkend="webkit2gtk"/>
    8686    </para>
    8787

  • introduction/welcome/changelog.xml

    r3e09737 rb178376  
    5151        </listitem>
    5252        <listitem>
     53          <para>[krejzi] - Internal refactoring of the WebKitGTK+-2.6.2 instructions.</para>
     54        </listitem>
     55      </itemizedlist>
     56    </listitem>
     57
     58    <listitem>
     59      <para>October 27th, 2014</para>
     60      <itemizedlist>
     61        <listitem>
    5362          <para>[krejzi] - Simplified WebKitGTK-2.4.7 instructions.</para>
    5463        </listitem>

  • systemd.ent

    r3e09737 rb178376  
    2424<!ENTITY upower1-version              "0.99.1">
    2525<!ENTITY wayland-version              "1.6.0">
     26<!ENTITY webkit2gtk-version           "2.6.2">
    2627<!ENTITY weston-version               "1.6.0">
    2728<!ENTITY yaml-version                 "0.1.6">

  • x/lib/gtk+3-systemd.xml

    r3e09737 rb178376  
    9999      <xref linkend="gtk-doc"/>,
    100100      <xref linkend="json-glib"/>, and
    101       <xref linkend="librest"/>
     101<!-- UNCOMMENT      <xref linkend="librest"/> -->
    102102    </para>
    103103

  • x/lib/lib.xml

    r3e09737 rb178376  
    6060  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="startup-notification.xml"/>
    6161  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="webkitgtk2-systemd.xml"/>
    62   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="webkitgtk26.xml"/>
     62  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="webkit2gtk-systemd.xml"/>
    6363
    6464</chapter>

  • x/lib/webkit2gtk-systemd.xml

    r3e09737 rb178376  
    55  %general-entities;
    66
    7   <!ENTITY webkitgtk26-download-http "http://webkitgtk.org/releases/webkitgtk-&webkitgtk26-version;.tar.xz">
    8   <!ENTITY webkitgtk26-download-ftp  " ">
    9   <!ENTITY webkitgtk26-md5sum        "92ee7b2b15cda9580b842834d4db118a">
    10   <!ENTITY webkitgtk26-size          "9.6 MB">
    11   <!ENTITY webkitgtk26-buildsize     "874 MB">
    12   <!ENTITY webkitgtk26-time          "23 SBU (using parallelism=8)">
     7  <!ENTITY webkit2gtk-download-http "http://webkitgtk.org/releases/webkitgtk-&webkit2gtk-version;.tar.xz">
     8  <!ENTITY webkit2gtk-download-ftp  " ">
     9  <!ENTITY webkit2gtk-md5sum        "92ee7b2b15cda9580b842834d4db118a">
     10  <!ENTITY webkit2gtk-size          "9.6 MB">
     11  <!ENTITY webkit2gtk-buildsize     "905 MB">
     12  <!ENTITY webkit2gtk-time          "95 SBU">
    1313]>
    1414
    15 <sect1 id="webkitgtk26" xreflabel="WebKitGTK+-&webkitgtk26-version;">
    16   <?dbhtml filename="webkitgtk26.html"?>
     15<sect1 id="webkit2gtk" xreflabel="WebKitGTK+-&webkit2gtk-version;">
     16  <?dbhtml filename="webkit2gtk.html"?>
    1717
    1818  <sect1info>
    … …  
    2121  </sect1info>
    2222
    23   <title>WebKitGTK+-&webkitgtk26-version;</title>
    24 
    25   <indexterm zone="webkitgtk26">
     23  <title>WebKitGTK+-&webkit2gtk-version;</title>
     24
     25  <indexterm zone="webkit2gtk">
    2626    <primary sortas="a-WebKitGTK+">WebKitGTK+</primary>
    2727  </indexterm>
    … …  
    3131
    3232    <para>
    33       The <application>WebKitGTK+</application> is the port of the portable web
    34       rendering engine <application>WebKit</application> to the
    35       <application>GTK+ 3</application> and <application>GTK+ 2</application>
    36       platforms.
     33      The <application>WebKitGTK+</application> is the port of the portable
     34      web rendering engine <application>WebKit</application> to the
     35      <application>GTK+ 3</application> platform.
    3736    </para>
    3837
    … …  
    4342      <listitem>
    4443        <para>
    45           Download (HTTP): <ulink url="&webkitgtk26-download-http;"/>
    46         </para>
    47       </listitem>
    48       <listitem>
    49         <para>
    50           Download (FTP): <ulink url="&webkitgtk26-download-ftp;"/>
    51         </para>
    52       </listitem>
    53       <listitem>
    54         <para>
    55           Download MD5 sum: &webkitgtk26-md5sum;
    56         </para>
    57       </listitem>
    58       <listitem>
    59         <para>
    60           Download size: &webkitgtk26-size;
    61         </para>
    62       </listitem>
    63       <listitem>
    64         <para>
    65           Estimated disk space required: &webkitgtk26-buildsize;
    66         </para>
    67       </listitem>
    68       <listitem>
    69         <para>
    70           Estimated build time: &webkitgtk26-time;
     44          Download (HTTP): <ulink url="&webkit2gtk-download-http;"/>
     45        </para>
     46      </listitem>
     47      <listitem>
     48        <para>
     49          Download (FTP): <ulink url="&webkit2gtk-download-ftp;"/>
     50        </para>
     51      </listitem>
     52      <listitem>
     53        <para>
     54          Download MD5 sum: &webkit2gtk-md5sum;
     55        </para>
     56      </listitem>
     57      <listitem>
     58        <para>
     59          Download size: &webkit2gtk-size;
     60        </para>
     61      </listitem>
     62      <listitem>
     63        <para>
     64          Estimated disk space required: &webkit2gtk-buildsize;
     65        </para>
     66      </listitem>
     67      <listitem>
     68        <para>
     69          Estimated build time: &webkit2gtk-time;
    7170        </para>
    7271      </listitem>
    … …  
    7978      <xref linkend="cmake"/>,
    8079      <xref linkend="gst10-plugins-base"/>,
    81       <xref linkend="gtk2"/>,
    8280      <xref linkend="gtk3"/>,
    8381      <xref linkend="icu"/>,
    … …  
    9593    <para role="recommended">
    9694      <xref linkend="enchant"/>,
     95      <xref linkend="geoclue2"/> or
    9796      <xref linkend="geoclue"/>,
    98       <xref linkend="gobject-introspection"/>,
    99       <xref linkend="hicolor-icon-theme"/>
     97      <xref linkend="gobject-introspection"/> and
     98      <xref linkend="gtk2"/>
    10099    </para>
    101100
    102101    <bridgehead renderas="sect4">Optional</bridgehead>
    103102    <para role="optional">
    104       <xref linkend="gtk-doc"/>,
    105       <xref linkend="harfbuzz"/>,
    106       <xref linkend="llvm"/>,
    107       <ulink url="http://gitorious.org/geoclue2/">GeoClue2</ulink>, and
     103      <xref linkend="gtk-doc"/> and
    108104      <ulink url="http://xsltml.sourceforge.net/">MathML</ulink>
    109105    </para>
     106
     107    <note>
     108      <para>
     109        Note that <application>WebKitGTK+</application> links against
     110        <application>GTK+ 2</application> in order to be able to use
     111        NPAPI plugins such as Adobe Flash.
     112      </para>
     113    </note>
    110114
    111115    <para condition="html" role="usernotes">
    … …  
    117121    <title>Installation of WebKitGTK+</title>
    118122
    119     <bridgehead renderas="sect3">Installation of
    120     <application>WebKitGTK+</application></bridgehead>
    121 
    122     <para>
    123       Install <application>WebKitGTK+</application> by running the
    124       following commands:
    125     </para>
    126 
    127 <screen><userinput>sed -i 's/”/\"/g' Source/WebCore/xml/XMLViewer.{css,js} &amp;&amp;
    128 
    129 mkdir -vp build &amp;&amp;
    130 cd build        &amp;&amp;
    131 
    132 cmake -DCMAKE_BUILD_TYPE=Release    \
    133       -DCMAKE_INSTALL_PREFIX=/usr   \
    134       -DCMAKE_SKIP_RPATH=ON         \
    135       -DPORT=GTK                    \
    136       -DLIB_INSTALL_DIR=/usr/lib .. &amp;&amp;
     123    <para>
     124      Install <application>WebKitGTK+</application> by running the following
     125      commands:
     126    </para>
     127
     128<screen><userinput>mkdir build &amp;&amp;
     129cd    build &amp;&amp;
     130
     131cmake -DCMAKE_BUILD_TYPE=Release  \
     132      -DCMAKE_INSTALL_PREFIX=/usr \
     133      -DCMAKE_SKIP_RPATH=ON       \
     134      -DPORT=GTK                  \
     135      -DLIB_INSTALL_DIR=/usr/lib  \
     136      -Wno-dev ..
    137137make</userinput></screen>
    138138
    139     <para>
    140       This package does not have a working testsuite.<!-- However, there are two
    141       useable basic graphical web browsers in the build directory,
    142       <application>Programs/GtkLauncher</application> and
    143       <application>Programs/MiniBrowser</application>. If launching any one
    144       fails, there is a problem with the build.-->
    145     </para>
    146 
    147     <note><para>
    148       When installing, the Makefile does some additional compiling and linking.
    149       If you do not have Xorg in /usr, the LIBRARY_PATH and PKG_CONFIG_PATH
    150       variables need to be defined for the root user.  If using sudo to assume
    151       root, use the -E option to pass your current environment variables for the
    152       install process.
    153     </para></note>
     139
     140    <para>
     141      This package does not have a working testsuite.
     142    </para>
    154143
    155144    <para>
    … …  
    157146    </para>
    158147
    159 <screen role="root"><userinput>make install &amp;&amp;
    160 
    161 install -vdm755 /usr/share/gtk-doc/html/webkit{2,dom}gtk-4.0, &amp;&amp;
    162 install -vm644  ../Documentation/webkit2gtk/html/* \
    163                 /usr/share/gtk-doc/html/webkit2gtk-4.0 &amp;&amp;
    164 install -vm644  ../Documentation/webkitdomgtk/html/* \
    165                 /usr/share/gtk-doc/html/webkitdomgtk-4.0</userinput></screen>
     148<screen role="root"><userinput>make install</userinput></screen>
    166149
    167150  </sect2>
    … …  
    171154
    172155    <para>
    173       <command>sed -i ...</command>: Fixes typos in two source code files.
    174     </para>
    175 
    176     <para>
    177       <option>-DUSE_SYSTEM_MALLOC=ON</option>: This switch enables building
    178       against the system installed <application>malloc</application>.
     156      <parameter>-DCMAKE_BUILD_TYPE=Release</parameter>: This switch is used
     157      to apply higher level of the compiler optimizations.
     158    </para>
     159
     160    <para>
     161      <parameter>-DCMAKE_SKIP_RPATH=ON</parameter>: This switch is used to
     162      prevent hardcoding a runtime path into the built executables.
     163    </para>
     164
     165    <para>
     166      <parameter>-DLIB_INSTALL_DIR=/usr/lib</parameter>: This switch is used
     167      to get libraries to install to <filename
     168      class="directory">$KF5_PREFIX/lib</filename> instead of <filename
     169      class="directory">$KF5_PREFIX/lib64</filename> on a 64 bit system.
     170    </para>
     171
     172    <para>
     173      <option>-DENABLE_SPELLCHECK=OFF</option>: Use this switch if you don't
     174      want to install <xref linkend="enchant"/> and don't need the spell
     175      checking feature.
    179176    </para>
    180177
    … …  
    182179      <option>-DENABLE_GEOLOCATION=OFF</option>: Use this switch if you don't
    183180      want to install <xref linkend="geoclue"/> or
    184       <ulink url="http://gitorious.org/geoclue2/">GeoClue2</ulink>.
    185     </para>
    186 
    187     <para>
    188       <option>-DENABLE_GTKDOC=ON</option>: Use this switch if <xref
    189       linkend="gtk-doc"/> is installed and you wish to rebuild and install the
    190       API documentation.
    191     </para>
     181      <xref linkend="geoclue2"/> and don't need the geolocation feature.
     182    </para>
     183
     184    <para>
     185      <option>-DENABLE_GTKDOC=ON</option>: Use this switch if you have
     186      installed <xref linkend="gtk-doc"/> and wish to build the API
     187      manuals.
     188    </para>
     189
    192190
    193191  </sect2>
    … …  
    197195
    198196    <segmentedlist>
    199       <segtitle>Installed Program</segtitle>
     197      <segtitle>Installed Programs</segtitle>
    200198      <segtitle>Installed Libraries</segtitle>
    201199      <segtitle>Installed Directories</segtitle>
    … …  
    213211          /usr/lib/webkit2gtk-4.0,
    214212          /usr/libexec/webkit2gtk-4.0,
    215           /usr/share/gtk-doc/html/webkit2gtk-4.0, and
     213          /usr/share/gtk-doc/html/webkit2gtk-4.0 and
    216214          /usr/share/gtk-doc/html/webkitdomgtk-4.0
    217215        </seg>
    … …  
    231229            outside of the context of a web browser.
    232230          </para>
    233           <indexterm zone="webkitgtk26 jsc">
     231          <indexterm zone="webkit2gtk jsc">
    234232            <primary sortas="b-jsc">jsc</primary>
    235233          </indexterm>
    … …  
    242240        <listitem>
    243241          <para>
    244             contains core JavaScript API functions used by
    245             <command>jsc</command> and <filename
    246             class="libraryfile">libwebkit2gtk-4.0</filename>.
     242            contains core JavaScript API functions used by <command>jsc</command>
     243            and <filename class="libraryfile">libwebkit2gtk-4.0.so</filename>.
    247244          </para>
    248           <indexterm zone="webkitgtk26 libjavascriptcoregtk-4.0">
    249             <primary sortas="c-libjavascriptcoregtk-4.0">libjavascriptcoregtk-4.0.0.so</primary>
     245          <indexterm zone="webkit2gtk libjavascriptcoregtk-4.0">
     246            <primary sortas="c-libjavascriptcoregtk-4.0">libjavascriptcoregtk-4.0.so</primary>
    250247          </indexterm>
    251248        </listitem>
    252249      </varlistentry>
    253250
    254       <varlistentry id="libwebkit2gtk-4">
     251      <varlistentry id="libwebkit2gtk-4.0">
    255252        <term><filename class="libraryfile">libwebkit2gtk-4.0.so</filename></term>
    256253        <listitem>
    … …  
    258255            contains the <application>WebKit2</application> API functions.
    259256          </para>
    260           <indexterm zone="webkitgtk26 libwebkit2gtk-4">
    261             <primary sortas="c-libwebkit2gtk-4">libwebkit2gtk-4.0.so</primary>
     257          <indexterm zone="webkit2gtk libwebkit2gtk-4.0">
     258            <primary sortas="c-libwebkit2gtk-4.0">libwebkit2gtk-4.0.so</primary>
    262259          </indexterm>
    263260        </listitem>

  • x/lib/webkitgtk2-systemd.xml

    r3e09737 rb178376  
    3333      The <application>WebKitGTK+</application> is the port of the portable
    3434      web rendering engine <application>WebKit</application> to the
    35       <application>GTK+ 3</application> platform.
     35      <application>GTK+ 3</application> and <application>GTK+ 2</application>
     36      platform.
    3637    </para>
    3738
Note: See TracChangeset for help on using the changeset viewer.