diff --git a/general.ent b/general.ent index d77cc09046..91a682e581 100644 --- a/general.ent +++ b/general.ent @@ -564,7 +564,7 @@ export -f as_root - + diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml index 42802f472c..dc9eadc07d 100644 --- a/introduction/welcome/changelog.xml +++ b/introduction/welcome/changelog.xml @@ -46,6 +46,10 @@ October 24th, 2013 + + [fernando] - Update to webkitgtk-2.2.1. Fixes + #4218. + [fernando] - Update to qpdf-5.0.1. Fixes #4212. diff --git a/x/lib/webkitgtk2.xml b/x/lib/webkitgtk2.xml index 84fbffd8a3..dfffd14139 100644 --- a/x/lib/webkitgtk2.xml +++ b/x/lib/webkitgtk2.xml @@ -6,10 +6,10 @@ - + - - + + ]> @@ -160,11 +160,6 @@ make Command Explanations - - sed ... glslang.y: This command fixes a problem - when using bison-3.0 or later. - - : This switch enables support for Gobject Introspection and is required for a @@ -197,13 +192,17 @@ make jsc-3 - libjavascriptcoregtk-3.0.so, + libjavascriptcoregtk-3.0.so, + libwebkit2gtkinjectedbundle.so, libwebkit2gtk-3.0.so, and libwebkitgtk-3.0.so /usr/include/webkitgtk-3.0, - /usr/lib/webkitgtk3, and + /usr/lib/webkitgtk3, + /usr/lib/webkit2gtk-3.0, + /usr/share/gtk-doc/html/webkitgtk, + /usr/share/gtk-doc/html/webkit2gtk, and /usr/share/webkitgtk-3.0 @@ -241,6 +240,19 @@ make + + libwebkit2gtkinjectedbundle.so + + + contains the WebKitGTK+ API functions for + the Injected Bundle support. + + + libwebkit2gtkinjectedbundle.so + + + + libwebkitgtk-3.0.so