diff --git a/general.ent b/general.ent index 9b5dfd0235..d40c442675 100644 --- a/general.ent +++ b/general.ent @@ -3,13 +3,13 @@ $LastChangedBy$ $Date$ --> - + - + @@ -207,7 +207,7 @@ $Date$ - + @@ -228,11 +228,11 @@ $Date$ - + - + @@ -243,11 +243,11 @@ $Date$ - + - - + + - + - + @@ -330,8 +330,7 @@ $Date$ - - + @@ -572,7 +571,7 @@ $Date$ - + @@ -775,7 +774,7 @@ $Date$ - + diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml index 0be355be61..51b6addf07 100644 --- a/introduction/welcome/changelog.xml +++ b/introduction/welcome/changelog.xml @@ -41,6 +41,15 @@ --> + + December 12th, 2011 + + + [abenton] - Updated Webkitgtk to 1.6.1. + + + + December 11th, 2011 diff --git a/x/lib/webkitgtk.xml b/x/lib/webkitgtk.xml index 44bade3a58..1402e0d853 100644 --- a/x/lib/webkitgtk.xml +++ b/x/lib/webkitgtk.xml @@ -6,10 +6,10 @@ - - - - + + + + ]> @@ -33,7 +33,7 @@ portable web rendering engine WebKit to the GTK+ platform. - &lfs67_checked; + &lfs70_checked; Package Information @@ -60,29 +60,20 @@ WebKitGTK+ Dependencies Required - , - , - , - , - , - , - , - , - , - , and - - - Recommended - (Required - if building epiphany) - - + , , + , , , + or (if both are installed + configure defaults to using gtk+-3), , + , + and Optional - , - GeoClue, - MathML, and - + , , + GeoClue, + (required if building + epiphany), and + MathML. User Notes: @@ -92,16 +83,17 @@ Installation of WebKitGTK+ - Install WebKitGTK+ by running the following - commands: + Install WebKitGTK+ by running the + following commands: -./configure --prefix=/usr --enable-introspection && +./configure --prefix=/usr --with-gtk=2.0 && make To test the results, issue: make check (you must be in an xterm or similar to do this, because it launches some windows). - Now, as the root user: + Now, as the root + user: make install @@ -110,24 +102,19 @@ make Command Explanations + : This option forces + Webkit to compile against + Gtk+-2, even if + Gtk+-3 is also installed. With + Gtk+-2, everything + Webkit installs is suffixed with 1.0. When it is + compiled against Gtk+-3 everything it installs + is suffixed with 3.0. Both versions can be installed alongside one another + with no namespace conflicts. + : This option enables support for gobject-introspection. - : This option enables support - for 3D transforms. - - : This option enables support for - geolocation. - - : This option enables support for - MathML. - - : This option enables support for - WML. - - : This option enables support for - Web Sockets. - @@ -142,10 +129,14 @@ make Installed Directories - jsc - libwebkit-1.0.so - /usr/{include/webkit-1.0/{JavaScriptCore,webkit}, - share/webkit-1.0/{images,resources,webinspector/Images}} + jsc-1 or jsc-3 (depending on whether you installed the gtk+-2 or + gtk+-3 version of webkit) + libwebkit-1.0.so and libjavascriptcoregtk-1.0.so or + libwebkit-3.0.so and libjavascriptcoregtk-3.0.so (depending on whether + you installed the gtk+-2 or gtk+-3 version of webkit) + /usr/include/webkit-1.0 and /usr/share/webkit-1.0 or + /usr/include/webkit-3.0 and /usr/share/webkit-3.0 (depending on whether + you installed the gtk+-2 or gtk+-3 version of webkit) @@ -155,7 +146,7 @@ make - jsc + jsc-1 or jsc-3 is a command-line utility that allows you to run JavaScript programs outside of the context of a web browser. @@ -166,16 +157,52 @@ make - libwebkit-1.0.so + libwebkit-1.0.so contains the WebKitGTK+ API - functions. + functions for gtk+-2. libwebkit-1.0.so + + libwebkit-3.0.so + + contains the WebKitGTK+ API + functions for gtk+-3. + + libwebkit-3.0.so + + + + + + libjavascriptcoregtk-1.0.so + + contains functions that are used by + jsc-1 + + libjavascriptcoregtk-1.0.so + + + + + + libjavascriptcoregtk-3.0.so + + contains functions that are used by + jsc-3 + + libjavascriptcoregtk-3.0.so + + +