diff --git a/x/lib/webkitgtk2.xml b/archive/webkitgtk2.xml similarity index 100% rename from x/lib/webkitgtk2.xml rename to archive/webkitgtk2.xml diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml index 7b5ba49c15..b6cfc7208c 100644 --- a/introduction/welcome/changelog.xml +++ b/introduction/welcome/changelog.xml @@ -47,6 +47,11 @@ April 5th, 2016 + + [bdubbs] - Archive WebKitGTK+-2.4. Add comment to + GIMP to provide help via a web browser. Fixes + #7684. + [bdubbs] - Update to gegl-0.3.6. Fixes #7692. diff --git a/x/lib/lib.xml b/x/lib/lib.xml index 2ce6362ebe..5dc3ab5ec8 100644 --- a/x/lib/lib.xml +++ b/x/lib/lib.xml @@ -58,7 +58,7 @@ $Date$ - + diff --git a/xfce/apps/midori.xml b/xfce/apps/midori.xml index 8c3ee6d5cf..d020eae7b8 100644 --- a/xfce/apps/midori.xml +++ b/xfce/apps/midori.xml @@ -91,7 +91,8 @@ Optional , - , and + + WebKitGTK+-2.4.x, and Zeitgeist @@ -102,15 +103,6 @@ Installation of Midori - Install Midori by running the following @@ -153,9 +145,9 @@ make -DHALF_BRO_INCOM_WEBKIT2=ON: Links to instead of . Strictly + linkend="webkitgtk"/> instead of WebKitGTK+-2.4.x.. Strictly speaking, is not required and Midori could - be linked to . The former is deemed + be linked to WebKitGTK+-2.4.x. The former is deemed experimental by upstream, but seems to work well. The latter is an older API and less secure. diff --git a/xsoft/other/gimp.xml b/xsoft/other/gimp.xml index 9b5395159b..2a3f8e3bf3 100644 --- a/xsoft/other/gimp.xml +++ b/xsoft/other/gimp.xml @@ -112,22 +112,6 @@ Estimated build time: &gimp-help-time; - - Gimp Dependencies @@ -161,8 +145,9 @@ , an (that provides a sendmail program), - (required for the help-plugin) and - , and + , + + WebKitGTK+-2.4.x (required for the help-plugin), and libwmf @@ -232,21 +217,6 @@ make ALL_LINGUAS, if you wish to build all languages. - Now build the help files: @@ -286,21 +256,6 @@ chown -R root:root /usr/share/gimp/2.0/help : This option is necessary if you have not installed PyGTK. - @@ -335,6 +290,13 @@ chown -R root:root /usr/share/gimp/2.0/help for each user upon their initial use of the program. + + 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. +