Changeset 5e11bc38


Ignore:
Timestamp:
08/28/2014 03:53:10 PM (7 years ago)
Author:
Fernando de Oliveira <fernando@…>
Branches:
10.0, 10.1, 11.0, 7.10, 7.6, 7.7, 7.8, 7.9, 8.0, 8.1, 8.2, 8.3, 8.4, 9.0, 9.1, basic, bdubbs/svn, elogind, ken/refactor-virt, krejzi/svn, lazarus, nosym, perl-modules, qt5new, trunk, xry111/git-date, xry111/git-date-for-trunk, xry111/git-date-test
Children:
e14ac42
Parents:
13b64e3
Message:

Update to webkitgtk-2.4.5.
Remove WebKitGTK+1.10.x, consequently, fix Midori-0.5.8 and Gimp-2.8.14 (remove broken ftp link from the latter).
Fix Tk-8.6.2 md5sum that changed overnight. Thanks Wayne B.
LibreOffice-4.3.0 - fix broken symbolic links. Thanks Wayne B.

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

Files:
8 edited
1 moved

Legend:

Unmodified
Added
Removed
  • general/prog/tk.xml

    r13b64e3 r5e11bc38  
    77  <!ENTITY tk-download-http "&sourceforge-repo;/tcl/tk&tk-version;-src.tar.gz">
    88  <!ENTITY tk-download-ftp  " ">
    9   <!ENTITY tk-md5sum        "39782d44cf924827019a2828d54a80e7">
     9  <!ENTITY tk-md5sum        "a719038d2df12ffd41dda4a255da5e09">
    1010  <!ENTITY tk-size          "4.1 MB">
    1111  <!ENTITY tk-buildsize     "24 MB">
  • introduction/welcome/changelog.xml

    r13b64e3 r5e11bc38  
    4848      <para>August 28th, 2014</para>
    4949      <itemizedlist>
     50        <listitem>
     51          <para>[fernando] - LibreOffice-4.3.0 - fix broken symbolic links.
     52          Thanks Wayne B.</para>
     53        </listitem>
     54        <listitem>
     55          <para>[fernando] - Fix Tk-8.6.2 md5sum that changed overnight.
     56          Thanks Wayne B.</para>
     57        </listitem>
     58        <listitem>
     59          <para>[fernando] - Remove WebKitGTK+1.10.x, consequently, fix
     60          Midori-0.5.8 and Gimp-2.8.14 (remove broken ftp link from the latter).
     61          Fixes <ulink url="&blfs-ticket-root;5434">#5434</ulink>.</para>
     62        </listitem>
     63        <listitem>
     64          <para>[fernando] - Update to webkitgtk-2.4.5. Fixes
     65          <ulink url="&blfs-ticket-root;5426">#5426</ulink>.</para>
     66        </listitem>
    5067        <listitem>
    5168          <para>[ken] - Added libpaper-1.1.24+nmu3. Fixes
  • packages.ent

    r13b64e3 r5e11bc38  
    449449<!ENTITY shared-mime-info-version     "1.3">
    450450<!ENTITY startup-notification-version "0.12">
    451 <!ENTITY webkitgtk-version            "1.10.2">   <!-- Even minors only -->
    452 <!ENTITY webkitgtk2-version           "2.4.4">    <!-- Even minors only -->
     451<!ENTITY webkitgtk2-version           "2.4.5">    <!-- Even minors only -->
    453452<!ENTITY xulrunner-version            "31.0">
    454453
  • x/lib/lib.xml

    r13b64e3 r5e11bc38  
    5757  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="qt5.xml"/>
    5858  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="startup-notification.xml"/>
    59   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="webkitgtk.xml"/>
    6059  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="webkitgtk2.xml"/>
    6160
  • x/lib/webkitgtk2.xml

    r13b64e3 r5e11bc38  
    77  <!ENTITY webkitgtk2-download-http "http://webkitgtk.org/releases/webkitgtk-&webkitgtk2-version;.tar.xz">
    88  <!ENTITY webkitgtk2-download-ftp  " ">
    9   <!ENTITY webkitgtk2-md5sum        "79edd28d32172abc17a8861622cc274f">
     9  <!ENTITY webkitgtk2-md5sum        "c2e1687bb0314a0948fbf78e2d1e931f">
    1010  <!ENTITY webkitgtk2-size          "9.4 MB">
    11   <!ENTITY webkitgtk2-buildsize     "938 MB">
    12   <!ENTITY webkitgtk2-time          "77 SBU">
     11  <!ENTITY webkitgtk2-buildsize     "1.5 GB (both built)">
     12  <!ENTITY webkitgtk2-time          "138 SBU (both built, webkitgtk-3.0 takes a little longer than webkitgtk-1.0)">
    1313]>
    1414
     
    3131
    3232    <para>
    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.
     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/or <application>GTK+
     36      2</application> platforms.
    3637    </para>
    3738
     
    7778    <para role="required">
    7879      <xref linkend="gst10-plugins-base"/>,
     80      <xref linkend="gtk2"/> or
    7981      <xref linkend="gtk3"/>,
    8082      <xref linkend="icu"/>,
     
    8991    </para>
    9092
     93    <note><para>
     94      WebKit2 links against GTK+ 2 (even if GTK+ 3 is being used), in order to
     95      be able to use NPAPI plugins such as Adobe Flash.
     96    </para></note>
     97
     98
    9199    <bridgehead renderas="sect4">Recommended</bridgehead>
    92100    <para role="recommended">
     
    94102      <xref linkend="geoclue"/>,
    95103      <xref linkend="gobject-introspection"/>,
    96       <xref linkend="gtk2"/> and
    97104      <xref linkend="hicolor-icon-theme"/>
    98105    </para>
     
    115122    <title>Installation of WebKitGTK+</title>
    116123
    117     <warning>
    118       <para>
    119         If you are building <application>WebKitGTK+</application>
    120         with <command>make</command> 3.82, make sure that you have built
    121         it with the following
    122         <ulink url="&patch-downloads;/make/make-3.82-upstream_fixes-3.patch">
    123         patch</ulink> applied or <application>WebKitGTK+</application>
    124         build may fail.
    125       </para>
    126     </warning>
    127 
    128124    <para>
    129125      If you have not installed <xref linkend="gtk-doc"/>, fix a bug that will
     
    131127    </para>
    132128
    133 <screen><userinput>sed -i '/generate-gtkdoc --rebase/s:^:# :' GNUmakefile.in</userinput></screen>
     129<screen><userinput>sed -i '/generate-gtkdoc --rebase/s:^:# :' \
     130                           GNUmakefile.in</userinput></screen>
     131
     132    <para>
     133      Upstream standard now is to link this package against GTK+ 3. However,
     134      for backward compatibility, manu users need also another instance, linked
     135      to GTK+ 2. Both can be installed in the same system, without problem.
     136      However, some packages can alternatively be linked to either one. Here,
     137      both build methods are presented and recommended to be built, but if you
     138      know which one you need, just jump to the respective part.
     139    </para>
     140
     141<!-- ==== WebKitGTK+ against GTK+ 3 ====== -->
     142    <bridgehead renderas="sect3">Build and install WebKitGTK+ against
     143      GTK+ 3</bridgehead>
    134144
    135145    <para>
     
    138148    </para>
    139149
    140 <screen><userinput>./configure --prefix=/usr          \
    141             --enable-introspection &amp;&amp;
     150<screen><userinput>mkdir -vp build-3           &amp;&amp;
     151cp -a Documentation build-3 &amp;&amp;
     152cd build-3                  &amp;&amp;
     153
     154
     155../configure --prefix=/usr --enable-introspection &amp;&amp;
    142156make</userinput></screen>
    143157
    144158    <para>
    145159      This package does not have a working testsuite. However, there are two
    146       useable basic graphical web browsers in the source directory,
     160      useable basic graphical web browsers in the build directory,
    147161      <application>Programs/GtkLauncher</application> and
    148162      <application>Programs/MiniBrowser</application>. If launching any one
     
    162176    </para>
    163177
    164 <screen role="root"><userinput>make install                                    &amp;&amp;
    165 rm -rf /usr/share/gtk-doc/html/webkitgtk-2.0    &amp;&amp;
    166 mv -vi /usr/share/gtk-doc/html/webkitgtk{,-2.0}</userinput></screen>
     178<screen role="root"><userinput>make install</userinput></screen>
     179
     180    <para>
     181      Finally, leave the buid directory:
     182    </para>
     183
     184<screen><userinput>cd ..</userinput></screen>
     185
     186<!-- ==== WebKitGTK+ against GTK+ 2 ====== -->
     187    <bridgehead renderas="sect3">Build and install WebKitGTK+ against
     188      GTK+ 2</bridgehead>
     189
     190    <para>
     191      Install <application>WebKitGTK+</application> by running the
     192      following commands:
     193    </para>
     194
     195<screen><userinput>mkdir -vp build-1</userinput></screen>
     196
     197    <para>
     198      If you have built and installed the package against GTK+ 3, skip the
     199      following command, because the previous docummentation also applies here:
     200    </para>
     201
     202<screen><userinput>cp -a Documentation build-1</userinput></screen>
     203
     204    <para>
     205      Now, change into the build directory and effectively start the build and
     206      install:
     207    </para>
     208
     209<screen><userinput>cd build-1 &amp;&amp;
     210
     211
     212../configure --prefix=/usr --with-gtk=2.0 --disable-webkit2 &amp;&amp;
     213make</userinput></screen>
     214
     215    <para>
     216      This package does not have a working testsuite. However, there is one
     217      useable basic graphical web browser in the build directory,
     218      <application>Programs/GtkLauncher</application>. If launching it
     219      fails, there is a problem with the build.
     220    </para>
     221
     222    <note><para>
     223      When installing, the Makefile does some additional compiling and linking.
     224      If you do not have Xorg in /usr, the LIBRARY_PATH and PKG_CONFIG_PATH
     225      variables need to be defined for the root user.  If using sudo to assume
     226      root, use the -E option to pass your current environment variables for the
     227      install process.
     228    </para></note>
     229
     230    <para>
     231      Now, as the <systemitem class="username">root</systemitem> user:
     232    </para>
     233
     234<screen role="root"><userinput>make install</userinput></screen>
     235
     236    <para>
     237      Finally, leave the buid directory:
     238    </para>
     239
     240<screen><userinput>cd ..</userinput></screen>
     241
    167242  </sect2>
    168243
    169244  <sect2 role="commands">
    170245    <title>Command Explanations</title>
    171 
    172     <para>
    173       <command>mv -vi /usr/share/gtk-doc/html/webkitgtk{,-2.0}</command>:
    174       There is a conflict with the directory installed with same name by
    175       <xref linkend="webkitgtk"/>.
    176     </para>
    177246
    178247    <para>
     
    193262      href="../../xincludes/gtk-doc-rebuild.xml"/>
    194263
    195     <para><option>--libexecdir=/usr/lib/webkitgtk3</option>: This option
    196     puts the package's private programs into
    197     <filename class="directory">/usr/lib/webkitgtk3</filename> instead of
    198     <filename class="directory">/usr/libexec</filename> in accordance with
    199     the old version of the FHS used before LFS-7.5.</para>
    200 
    201264  </sect2>
    202265
     
    205268
    206269    <segmentedlist>
    207       <segtitle>Installed Program</segtitle>
     270      <segtitle>Installed Programs</segtitle>
    208271      <segtitle>Installed Libraries</segtitle>
    209272      <segtitle>Installed Directories</segtitle>
     
    211274      <seglistitem>
    212275        <seg>
    213           jsc-3
     276          jsc-1, and jsc-3
    214277        </seg>
    215278        <seg>
     279          libjavascriptcoregtk-1.0.so,
    216280          libjavascriptcoregtk-3.0.so,
    217281          libwebkit2gtk-3.0.so,
    218           libwebkitgtk-3.0.so and
    219           /usr/lib/webkit2gtk-3.0/injected-bundle/libwebkit2gtkinjectedbundle.so
     282          libwebkitgtk-1.0.so,
     283          libwebkitgtk-3.0.so, and
     284          webkit2gtk-3.0/injected-bundle/libwebkit2gtkinjectedbundle.so
    220285        </seg>
    221286        <seg>
     287          /usr/include/webkitgtk-1.0,
    222288          /usr/include/webkitgtk-3.0,
    223289          /usr/lib/webkit2gtk-3.0,
    224           /usr/share/gtk-doc/html/webkitgtk-2.0,
     290          /usr/share/gtk-doc/html/webkit2gtk,
    225291          /usr/share/gtk-doc/html/webkitdomgtk,
    226           /usr/share/gtk-doc/html/webkit2gtk, and
     292          /usr/share/gtk-doc/html/webkitgtk,
     293          /usr/share/webkitgtk-1.0, and
    227294          /usr/share/webkitgtk-3.0
    228295        </seg>
     
    235302      <?dbhtml list-presentation="table"?>
    236303
     304      <varlistentry id="jsc-1">
     305        <term><command>jsc-1</command></term>
     306        <listitem>
     307          <para>
     308            is a command-line utility that allows you to run JavaScript programs
     309            outside of the context of a web browser.
     310          </para>
     311          <indexterm zone="webkitgtk2 jsc-1">
     312            <primary sortas="b-jsc-1">jsc-1</primary>
     313          </indexterm>
     314        </listitem>
     315      </varlistentry>
     316
    237317      <varlistentry id="jsc-3">
    238318        <term><command>jsc-3</command></term>
     
    244324          <indexterm zone="webkitgtk2 jsc-3">
    245325            <primary sortas="b-jsc-3">jsc-3</primary>
     326          </indexterm>
     327        </listitem>
     328      </varlistentry>
     329
     330      <varlistentry id="libjavascriptcoregtk-1">
     331        <term><filename
     332        class="libraryfile">libjavascriptcoregtk-1.0.so</filename></term>
     333        <listitem>
     334          <para>
     335            contains core JavaScript API functions used by <command>jsc-1</command>
     336            and <filename class="libraryfile">libwebkitgtk-1.0.so</filename>.
     337          </para>
     338          <indexterm zone="webkitgtk2 libjavascriptcoregtk-1">
     339            <primary sortas="c-libjavascriptcoregtk-1">libjavascriptcoregtk-1.0.so</primary>
    246340          </indexterm>
    247341        </listitem>
     
    256350            and <filename class="libraryfile">libwebkitgtk-3.0.so</filename>.
    257351          </para>
    258           <indexterm zone="webkitgtk libjavascriptcoregtk-3">
     352          <indexterm zone="webkitgtk2 libjavascriptcoregtk-3">
    259353            <primary sortas="c-libjavascriptcoregtk-3">libjavascriptcoregtk-3.0.so</primary>
    260354          </indexterm>
    261355        </listitem>
    262356      </varlistentry>
    263 <!--
    264       <varlistentry id="libwebkit2gtkinjectedbundle">
    265         <term><filename class="libraryfile">libwebkit2gtkinjectedbundle.so</filename></term>
     357
     358      <varlistentry id="libwebkitgtk-1">
     359        <term><filename class="libraryfile">libwebkitgtk-1.0.so</filename></term>
    266360        <listitem>
    267361          <para>
    268362            contains the <application>WebKitGTK+</application> API functions for
    269             the Injected Bundle support.
    270           </para>
    271           <indexterm zone="webkitgtk libwebkit2gtkinjectedbundle">
    272             <primary sortas="c-libwebkit2gtkinjectedbundle">libwebkit2gtkinjectedbundle.so</primary>
    273           </indexterm>
    274         </listitem>
    275       </varlistentry>
    276 -->
     363            <application>GTK+ 2</application>.
     364          </para>
     365          <indexterm zone="webkitgtk2 libwebkitgtk-1">
     366            <primary sortas="c-libwebkitgtk-1">libwebkitgtk-1.0.so</primary>
     367          </indexterm>
     368        </listitem>
     369      </varlistentry>
    277370
    278371      <varlistentry id="libwebkitgtk-3">
     
    283376            <application>GTK+ 3</application>.
    284377          </para>
    285           <indexterm zone="webkitgtk libwebkitgtk-3">
     378          <indexterm zone="webkitgtk2 libwebkitgtk-3">
    286379            <primary sortas="c-libwebkitgtk-3">libwebkitgtk-3.0.so</primary>
    287380          </indexterm>
     
    295388            contains the <application>WebKit2</application> API functions.
    296389          </para>
    297           <indexterm zone="webkitgtk libwebkit2gtk-3">
     390          <indexterm zone="webkitgtk2 libwebkit2gtk-3">
    298391            <primary sortas="c-libwebkit2gtk-3">libwebkit2gtk-3.0.so</primary>
    299392          </indexterm>
  • xfce/apps/midori.xml

    r13b64e3 r5e11bc38  
    7979      <xref linkend="cmake"/>,
    8080      <xref linkend="libnotify"/>,
    81       <xref linkend="webkitgtk"/> or
    8281      <xref linkend="webkitgtk2"/> (see "Command Explanations"), and
    8382      <xref linkend="vala"/>
     
    138137
    139138    <para>
    140       <option>--enable-gtk3</option>: Use this switch if you want
    141       to build <application>Midori</application> with
    142       <application>WebKitGTK+ 2</application> dependencies.
     139      <option>--enable-gtk3</option>: Use this switch if you want to build
     140      <application>Midori</application> with
     141      <application>WebKitGTK+</application> built against <application>GTK+
     142      3</application>, because by default it chooses
     143      <application>WebKitGTK+</application> built against <application>GTK+
     144      2</application>.
    143145    </para>
    144146
  • xsoft/office/libreoffice.xml

    r13b64e3 r5e11bc38  
    289289tar -xf ../libreoffice-help-&libreoffice-dlversion;.tar.xz -\-no-overwrite-dir -\-strip-components=1 &amp;&amp;
    290290-->
    291 ln -sv ../../libreoffice-dictionaries-&libreoffice-dlversion;.tar.xz external/tarballs/ &amp;&amp;
    292 ln -sv ../../libreoffice-help-&libreoffice-dlversion;.tar.xz external/tarballs/</userinput></screen>
     291
     292ln -sv ../../../libreoffice-dictionaries-&libreoffice-dlversion;.tar.xz \
     293       external/tarballs/ &amp;&amp;
     294ln -sv ../../../libreoffice-help-&libreoffice-dlversion;.tar.xz \
     295       external/tarballs/</userinput></screen>
    293296
    294297<!-- Not necessary for this version
  • xsoft/other/gimp.xml

    r13b64e3 r5e11bc38  
    66
    77  <!ENTITY gimp-download-http "http://download.gimp.org/pub/gimp/v2.8/gimp-&gimp-version;.tar.bz2">
    8   <!ENTITY gimp-download-ftp  "ftp://mirrors.xmission.com/gimp/gimp/v2.8/gimp-&gimp-version;.tar.bz2">
     8  <!ENTITY gimp-download-ftp  " ">
     9<!--  <!ENTITY gimp-download-ftp  "ftp://mirrors.xmission.com/gimp/gimp/v2.8/gimp-&gimp-version;.tar.bz2">-->
    910  <!ENTITY gimp-md5sum        "233c948203383fa078434cc3f8f925cb">
    1011  <!ENTITY gimp-size          "20 MB">
     
    150151      <command>sendmail</command> program),
    151152      <xref linkend="udev-extras"/> (for GUdev),
    152       <xref linkend="webkitgtk"/> (required for the help-plugin) and
     153      <xref linkend="webkitgtk2"/> (required for the help-plugin) and
    153154      <xref linkend="gtk-doc"/>
    154155    </para>
Note: See TracChangeset for help on using the changeset viewer.