Changeset 7551c54

Timestamp:

04/05/2016 10:38:29 PM (7 years ago)

Author:

Bruce Dubbs <bdubbs@…>

Branches:

10.0, 10.1, 11.0, 11.1, 11.2, 11.3, 7.10, 8.0, 8.1, 8.2, 8.3, 8.4, 9.0, 9.1, basic, bdubbs/svn, elogind, ken/inkscape-core-mods, lazarus, nosym, perl-modules, plabs/python-mods, qt5new, trunk, upgradedb, xry111/intltool, xry111/soup3, xry111/test-20220226

Children:

939b7582

Parents:

a5fc81e

Message:

rchive WebKitGTK+-2.4. Add comment to GIMP to provide
help via a web browser.

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

Files:

• archive/webkitgtk2.xml (moved) (moved from x/lib/webkitgtk2.xml )
• introduction/welcome/changelog.xml (modified) (1 diff)
• x/lib/lib.xml (modified) (1 diff)
• xfce/apps/midori.xml (modified) (3 diffs)
• xsoft/other/gimp.xml (modified) (5 diffs)

introduction/welcome/changelog.xml

@@ -49 +49 @@
       <itemizedlist>
         <listitem>
+          <para>[bdubbs] - Archive WebKitGTK+-2.4. Add comment to 
+          GIMP to provide help via a web browser.  Fixes 
+          <ulink url="&blfs-ticket-root;7684">#7684</ulink>.</para>
+        </listitem>
+        <listitem>
           <para>[bdubbs] - Update to gegl-0.3.6. Fixes
           <ulink url="&blfs-ticket-root;7692">#7692</ulink>.</para>

x/lib/lib.xml

@@ -59 +59 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="qtwebkit5.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="startup-notification.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="webkitgtk2.xml"/>
+<!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="webkitgtk2.xml"/> -->
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="webkitgtk.xml"/>
 

xfce/apps/midori.xml

@@ -92 +92 @@
     <para role="optional">
       <xref linkend="gtk-doc"/>,
-      <xref linkend="webkitgtk2"/>, and
+      <!--<xref linkend="webkitgtk2"/>, and -->
+      <ulink url="http://webkitgtk.org/releases/">WebKitGTK+-2.4.x</ulink>, and
       <ulink url="https://launchpad.net/zeitgeist/0.9/">Zeitgeist</ulink>
     </para>
@@ -103 +104 @@
   <sect2 role="installation">
     <title>Installation of Midori</title>
-<!--
-    <note>
-      <para>
-        The tarball was not created from a directory, thus it is better to create a directory to uncompress it:
-      </para>
-<screen><userinput>mkdir -v midori-&midori-version; &amp;&amp;
-tar -xf midori_&midori-version;_all_.tar.bz2 -C midori-&midori-version; &amp;&amp;
-cd midori-&midori-version;</userinput></screen>
-    </note>-->
 
     <para>
@@ -154 +146 @@
     <para>
       <parameter>-DHALF_BRO_INCOM_WEBKIT2=ON</parameter>: Links to <xref
-      linkend="webkitgtk"/> instead of <xref linkend="webkitgtk2"/>. Strictly
+      linkend="webkitgtk"/> instead of WebKitGTK+-2.4.x.. Strictly
       speaking, <xref linkend="webkitgtk"/> is not required and Midori could
-      be linked to <xref linkend="webkitgtk2"/>. The former is deemed <quote>
+      be linked to WebKitGTK+-2.4.x. The former is deemed <quote>
       experimental</quote> by upstream, but seems to work well. The latter is
       an older API and less secure.

xsoft/other/gimp.xml

@@ -113 +113 @@
         </para>
       </listitem>
-<!--      <listitem>
-        <para>
-          Optional patch:
-          <ulink url="&patch-root;/gimp-&gimp-version;-device_info-1.patch"/>
-        </para>
-      </listitem>-->
-<!--      <listitem>
-        <para>
-          Compressed Patch MD5 sum: 5312793a67132131a6e3360e76f392e4
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-         Compressed Patch size: 486 KB
-        </para>
-      </listitem> -->
     </itemizedlist>
 
@@ -162 +146 @@
       an <xref linkend="server-mail"/> (that provides a
       <command>sendmail</command> program),
-      <xref linkend="webkitgtk2"/> (required for the help-plugin) and
-      <xref linkend="gtk-doc"/>, and
+      <xref linkend="gtk-doc"/>, 
+      <!--xref linkend="webkitgtk2"/> (required for the help-plugin) and-->
+      <ulink url="http://webkitgtk.org/releases/">WebKitGTK+-2.4.x</ulink> (required for the help-plugin), and
       <ulink url="http://wvware.sourceforge.net/libwmf.html">libwmf</ulink>
     </para>
@@ -233 +218 @@
     </para>
 
-<!--    <para>
-      Alternatively, if you wish to build languages including Catalan,
-      apply the patch:
-    </para>
-
-<screen role="nodump"><userinput>xzcat ../gimp-help-2.8.0-build_fixes-1.patch.xz \
- | patch -p1 &amp;&amp;
-./autogen.sh -prefix=/usr &amp;&amp;</userinput></screen>
-
-    <para>
-      Again, you can specify a subset of languages by specifying
-      <envar>ALL_LINGUAS</envar> in front of <command>./autogen.sh</command>, but
-      this time including &quot;ca&quot;.
-    </para>
- -->
     <para>
       Now build the help files:
@@ -287 +257 @@
     you have not installed <application>PyGTK</application>.</para>
 
-<!--<para>
-      <command>./autogen.sh</command> <parameter>-prefix=/usr</parameter>: In this case, using
-      <command>autoreconf</command> to regenerate <filename>configure</filename>
-      does not work, because of how the gimp-help developers chose to address
-      problems with the autotools.
-    </para>
-
-    <para>
-      <command>xzcat ../gimp-help-2.8.0-build_fixes-1.patch.xz</command>:
-      this patch is large, so it has been compressed with
-      <application>xz</application>. You are encouraged to be suspicious of
-      all patches until you have looked at them. Use <command>view</command>
-      to read the compressed patch before you apply it.
-    </para>
--->
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
       href="../../xincludes/gtk-doc-rebuild.xml"/>
@@ -336 +291 @@
       </para>
 
+      <para>
+        The GIMP uses either a plugin or a browser for its help system.  The
+        depedency to build the plugin, WebKitGTK+-2.4.x, has been deprecated
+        and is no longer in BLFS.  To set up the help system to work with the
+        default browser, use Edit -> Preferences -> Help System and select 'Web
+        Browser' for the 'Help Browser to use' setting.
+      </para>
     </sect3>