linux-from-scratch/glfs
1
0
Fork 0
mirror of https://github.com/Zeckmathederg/glfs.git synced 2025-01-24 06:52:14 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

rchive WebKitGTK+-2.4. Add comment to GIMP to provide

Browse Source 
help via a web browser.


git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@17226 af4574ff-66df-0310-9fd7-8a98e5e911e0
This commit is contained in:
Bruce Dubbs 2016-04-05 22:38:29 +00:00
parent a5fc81ec1c
commit 7551c54272
5 changed files with 20 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
x/lib/webkitgtk2.xml → archive/webkitgtk2.xml
View File

5
introduction/welcome/changelog.xml
View File

@ -47,6 +47,11 @@
<listitem>
<para>April 5th, 2016</para>
<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>

2
x/lib/lib.xml
View File

@ -58,7 +58,7 @@ $Date$
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="qt5.xml"/>
<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"/>
</chapter>

16
xfce/apps/midori.xml
View File

@ -91,7 +91,8 @@
<bridgehead renderas="sect4">Optional</bridgehead>
<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>
@ -102,15 +103,6 @@
<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>
Install <application>Midori</application> by running the following
@ -153,9 +145,9 @@ make</userinput></screen>
<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.
</para>

58
xsoft/other/gimp.xml
View File

@ -112,22 +112,6 @@
Estimated build time: &gimp-help-time;
</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>
<bridgehead renderas="sect3">Gimp Dependencies</bridgehead>
@ -161,8 +145,9 @@
<xref linkend="poppler"/>,
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>
@ -232,21 +217,6 @@ make</userinput></screen>
<envar>ALL_LINGUAS</envar>, if you wish to build all languages.
</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:
</para>
@ -286,21 +256,6 @@ chown -R root:root /usr/share/gimp/2.0/help</userinput></screen>
<para><option>--disable-python</option>: This option is necessary if
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"/>
@ -335,6 +290,13 @@ chown -R root:root /usr/share/gimp/2.0/help</userinput></screen>
for each user upon their initial use of the program.
</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>
</sect2>