Changeset 49d3336 for x/lib/webkitgtk.xml

Timestamp:

03/04/2014 01:30:09 PM (10 years ago)

Author:

Fernando de Oliveira <fernando@…>

Branches:

10.0, 10.1, 11.0, 11.1, 11.2, 11.3, 12.0, 12.1, 7.10, 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:

4f161b1

Parents:

7300611

Message:

Tweaks, reformats and fixes: setqt, Qt-5.2.1, Qt-4.8.5, LibreOffice-4.2.0, WebKitGTK+-1.10.2 and WebKitGTK+-2.2.4.

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

File:

• x/lib/webkitgtk.xml (modified) (2 diffs)

x/lib/webkitgtk.xml

@@ -149 +149 @@
     </para>
 
-<screen role="root"><userinput>make install</userinput></screen>
+<screen role="root"><userinput>make install                                    &amp;&amp;
+rm -rf /usr/share/gtk-doc/html/webkitgtk-1.0    &amp;&amp;
+mv -vi /usr/share/gtk-doc/html/webkitgtk{,-1.0}</userinput></screen>
   </sect2>
 
   <sect2 role="commands">
     <title>Command Explanations</title>
+
+    <para>
+      <command>mv -vi /usr/share/gtk-doc/html/webkitgtk{,-1.0}</command>:
+      There is a conflict with the directory installed with same name by
+      <xref linkend="webkitgtk2"/>.
+    </para>
 
     <para>
@@ -192 +200 @@
         </seg>
         <seg>
-          libjavascriptcoregtk-1.0.so and libwebkit-1.0.so
+          libjavascriptcoregtk-1.0.so and libwebkitgtk-1.0.so
         </seg>
         <seg>
-          /usr/include/webkit-1.0 and
+          /usr/include/webkit-1.0,
+          /usr/share/gtk-doc/html/webkitgtk-1.0 and
           /usr/share/webkit-1.0
         </seg>