Index: archive/webkitgtk2.xml-again
===================================================================
--- archive/webkitgtk2.xml-again (revision 4af99317895dd0d68f221e2cbc101bd3b3610db0)
+++ archive/webkitgtk2.xml-again (revision 4af99317895dd0d68f221e2cbc101bd3b3610db0)
@@ -0,0 +1,400 @@
+
+
+ %general-entities;
+
+
+
+
+
+
+
+]>
+
+
+
+
+
+ $LastChangedBy$
+ $Date$
+
+
+ WebKitGTK+-&webkitgtk2-version;
+
+
+ WebKitGTK+
+
+
+
+ Introduction to WebKitGTK+
+
+
+ The WebKitGTK+ is the port of the portable
+ web rendering engine WebKit to the
+ GTK+ 3 and GTK+ 2
+ platforms.
+
+
+ &lfs7a_checked;
+
+ Package Information
+
+
+
+ Download (HTTP):
+
+
+
+
+ Download (FTP):
+
+
+
+
+ Download MD5 sum: &webkitgtk2-md5sum;
+
+
+
+
+ Download size: &webkitgtk2-size;
+
+
+
+
+ Estimated disk space required: &webkitgtk2-buildsize;
+
+
+
+
+ Estimated build time: &webkitgtk2-time;
+
+
+
+
+ Additional Downloads
+
+
+
+ Required patch if using gcc-6 or later
+
+
+
+
+
+ WebKitGTK+ Dependencies
+
+ Required
+
+ ,
+ or
+ or both,
+ ,
+ ,
+ ,
+ ,
+ ,
+ ,
+ ,
+ and
+
+
+
+
+
+ Note that WebKit2 links against GTK+ 2
+ (even if GTK+ 3 is being used) in order
+ to be able to use NPAPI plugins such as Adobe Flash.
+
+
+
+ Recommended
+
+ ,
+ or
+ ,
+ and
+
+
+
+ Optional
+
+ ,
+ and
+ MathML
+
+
+
+ User Notes:
+
+
+
+
+
+
+
+ Installation of WebKitGTK+
+
+
+ If you have not installed , fix a bug that will
+ cause make install to fail:
+
+
+sed -i '/generate-gtkdoc --rebase/s:^:# :' GNUmakefile.in
+
+
+ Fix a couple of compiler issues when built with GCC-6.1:
+
+
+patch -Np1 -i ../webkitgtk-&webkitgtk2-version;-gcc6-1.patch
+
+
+
+ Unless noted otherwise, the packages depending on this package
+ expect it to be built against GTK+ 3.
+
+
+
+
+ To build WebKitGTK+ against
+ GTK+ 3, run the following
+ commands:
+
+
+mkdir build3 &&
+pushd build3 &&
+CFLAGS="-fno-delete-null-pointer-checks" \
+CXXFLAGS="-fno-delete-null-pointer-checks" \
+../configure --prefix=/usr --enable-introspection &&
+make &&
+popd
+
+
+ To build WebKitGTK+ against
+ GTK+ 2, run the following
+ commands:
+
+
+mkdir build2 &&
+pushd build2 &&
+CFLAGS="-fno-delete-null-pointer-checks" \
+CXXFLAGS="-fno-delete-null-pointer-checks" \
+../configure --prefix=/usr --with-gtk=2.0 --disable-webkit2 &&
+make &&
+popd
+
+
+ This package does not have a working testsuite. However, there are two
+ useable basic graphical web browsers in the build directory,
+ Programs/GtkLauncher and
+ Programs/MiniBrowser. If launching any one
+ fails, there is a problem with the build.
+
+
+
+ If you have built the package against GTK+ 3,
+ install it by running the following commands as the root user:
+
+
+make -C build3 install &&
+rm -rf /usr/share/gtk-doc/html/webkit{,dom}gtk-3.0 &&
+if [ -e /usr/share/gtk-doc/html/webkitdomgtk ]; then
+ mv -v /usr/share/gtk-doc/html/webkitdomgtk{,-3.0}
+fi
+if [ -e /usr/share/gtk-doc/html/webkitgtk ]; then
+ mv -v /usr/share/gtk-doc/html/webkitgtk{,-3.0}
+fi
+
+
+ If you have built the package against GTK+ 2,
+ install it by running the following commands as the root user:
+
+
+make -C build2 install &&
+rm -rf /usr/share/gtk-doc/html/webkit{,dom}gtk-1.0 &&
+if [ -e /usr/share/gtk-doc/html/webkitdomgtk ]; then
+ mv -v /usr/share/gtk-doc/html/webkitdomgtk{,-1.0}
+fi
+if [ -e /usr/share/gtk-doc/html/webkitgtk ]; then
+ mv -v /usr/share/gtk-doc/html/webkitgtk{,-1.0}
+fi
+
+
+
+
+ Command Explanations
+
+
+ --enable-introspection: This switch enables
+ Gobject Introspection bindings and is
+ required if building GNOME Desktop.
+ Remove if you don't have Gobject
+ Introspection installed or you don't want to install
+ GNOME. It is not needed if building
+ against GTK+ 2, although it can be used
+ if desired.
+
+
+
+ --with-gtk=2.0 --disable-webkit2: These switches
+ force WebKitGTK+ to compile against
+ GTK+ 2, even if
+ GTK+ 3 is also installed.
+
+
+
+ : Use this switch if you don't
+ want to install or
+ .
+
+
+
+
+
+
+
+ Contents
+
+
+ Installed Programs
+ Installed Libraries
+ Installed Directories
+
+
+
+ jsc-3 or jsc-1
+
+
+ libjavascriptcoregtk-3.0.so,
+ libwebkit2gtk-3.0.so and
+ libwebkitgtk-3.0.so or
+ libjavascriptcoregtk-1.0.so and
+ libwebkitgtk-1.0.so
+
+
+ /usr/include/webkitgtk-3.0,
+ /usr/lib/webkit2gtk-3.0,
+ /usr/share/gtk-doc/html/webkitgtk-3.0,
+ /usr/share/gtk-doc/html/webkitdomgtk-3.0,
+ /usr/share/gtk-doc/html/webkit2gtk and
+ /usr/share/webkitgtk-3.0 or
+ /usr/include/webkit-1.0,
+ /usr/share/gtk-doc/html/webkitgtk-1.0,
+ /usr/share/gtk-doc/html/webkitdomgtk-1.0 and
+ /usr/share/webkit-1.0
+
+
+
+
+
+ Short Descriptions
+
+
+
+
+ jsc-3
+
+
+ is a command-line utility that allows you to run JavaScript programs
+ outside of the context of a web browser linked against
+ libjavascriptcoregtk-3.0.so.
+
+
+ jsc-3
+
+
+
+
+
+ jsc-1
+
+
+ is a command-line utility that allows you to run JavaScript programs
+ outside of the context of a web browser linked against
+ libjavascriptcoregtk-1.0.so.
+
+
+ jsc-1
+
+
+
+
+
+ libjavascriptcoregtk-3.0.so
+
+
+ contains core JavaScript API functions used by jsc-3
+ and libwebkitgtk-3.0.so.
+
+
+ libjavascriptcoregtk-3.0.so
+
+
+
+
+
+ libwebkitgtk-3.0.so
+
+
+ contains the WebKitGTK+ API functions for
+ GTK+ 3.
+
+
+ libwebkitgtk-3.0.so
+
+
+
+
+
+ libwebkit2gtk-3.0.so
+
+
+ contains the WebKit2 API functions.
+
+
+ libwebkit2gtk-3.0.so
+
+
+
+
+
+ libjavascriptcoregtk-1.0.so
+
+
+ contains core JavaScript API functions used by jsc-1
+ and libwebkitgtk-1.0.so.
+
+
+ libjavascriptcoregtk-1.0.so
+
+
+
+
+
+ libwebkitgtk-1.0.so
+
+
+ contains the WebKitGTK+ API functions for
+ GTK+ 2.
+
+
+ libwebkitgtk-1.0.so
+
+
+
+
+
+
+
+
+
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml (revision 266784c082a0a1aaa847f714dcc38cc26381e5aa)
+++ introduction/welcome/changelog.xml (revision 4af99317895dd0d68f221e2cbc101bd3b3610db0)
@@ -47,4 +47,7 @@
+ [bdubbs] - Update to shadow-4.4.
+
+ [dj] - Update to Chromium-56.0.2924.87. Fixes
#8845.
Index: packages.ent
===================================================================
--- packages.ent (revision 266784c082a0a1aaa847f714dcc38cc26381e5aa)
+++ packages.ent (revision 4af99317895dd0d68f221e2cbc101bd3b3610db0)
@@ -38,5 +38,5 @@
-
+
Index: postlfs/security/shadow.xml
===================================================================
--- postlfs/security/shadow.xml (revision 266784c082a0a1aaa847f714dcc38cc26381e5aa)
+++ postlfs/security/shadow.xml (revision 4af99317895dd0d68f221e2cbc101bd3b3610db0)
@@ -7,7 +7,7 @@
-
-
-
+
+
+
]>
@@ -121,5 +121,6 @@
sed -i 's/groups$(EXEEXT) //' src/Makefile.in &&
-find man -name Makefile.in -exec sed -i 's/groups\.1 / /' {} \; &&
+
+find man -name Makefile.in -exec sed -i 's/groups\.1 / /' {} \; &&
find man -name Makefile.in -exec sed -i 's/getspnam\.3 / /' {} \; &&
find man -name Makefile.in -exec sed -i 's/passwd\.5 / /' {} \; &&
@@ -128,5 +129,7 @@
-e 's@/var/spool/mail@/var/mail@' etc/login.defs &&
-sed -i 's/1000/999/' etc/useradd &&
+sed -i 's/1000/999/' etc/useradd &&
+sed -i -e '/snprintf/s@_msg,@_msg, 256,@' src/su.c &&
+sed -i -e '47 d' -e '60,65 d' libmisc/myname.c &&
./configure --sysconfdir=/etc --with-group-name-max-length=32 &&
@@ -176,4 +179,15 @@
sed -i 's/1000/999/' etc/useradd: Make a minor change
to make the default useradd consistent with the LFS groups file.
+
+
+
+ sed -i -e '/snprintf/s@_msg,@_msg, 256,@' src/su.c: Fix
+ a build error that only occurs if is detected
+ by configure.
+
+
+
+ sed -i '47 d' -e '60,65 d' libmisc/myname.c: Apply
+ a security fix from upstream.
Index: x/lib/lib.xml
===================================================================
--- x/lib/lib.xml (revision 266784c082a0a1aaa847f714dcc38cc26381e5aa)
+++ x/lib/lib.xml (revision 4af99317895dd0d68f221e2cbc101bd3b3610db0)
@@ -69,6 +69,6 @@
-
-
+
+
Index: lib/webkitgtk2.xml
===================================================================
--- x/lib/webkitgtk2.xml (revision 266784c082a0a1aaa847f714dcc38cc26381e5aa)
+++ (revision )
@@ -1,400 +1,0 @@
-
-
- %general-entities;
-
-
-
-
-
-
-
-]>
-
-
-
-
-
- $LastChangedBy$
- $Date$
-
-
- WebKitGTK+-&webkitgtk2-version;
-
-
- WebKitGTK+
-
-
-
- Introduction to WebKitGTK+
-
-
- The WebKitGTK+ is the port of the portable
- web rendering engine WebKit to the
- GTK+ 3 and GTK+ 2
- platforms.
-
-
- &lfs7a_checked;
-
- Package Information
-
-
-
- Download (HTTP):
-
-
-
-
- Download (FTP):
-
-
-
-
- Download MD5 sum: &webkitgtk2-md5sum;
-
-
-
-
- Download size: &webkitgtk2-size;
-
-
-
-
- Estimated disk space required: &webkitgtk2-buildsize;
-
-
-
-
- Estimated build time: &webkitgtk2-time;
-
-
-
-
- Additional Downloads
-
-
-
- Required patch if using gcc-6 or later
-
-
-
-
-
- WebKitGTK+ Dependencies
-
- Required
-
- ,
- or
- or both,
- ,
- ,
- ,
- ,
- ,
- ,
- ,
- and
-
-
-
-
-
- Note that WebKit2 links against GTK+ 2
- (even if GTK+ 3 is being used) in order
- to be able to use NPAPI plugins such as Adobe Flash.
-
-
-
- Recommended
-
- ,
- or
- ,
- and
-
-
-
- Optional
-
- ,
- and
- MathML
-
-
-
- User Notes:
-
-
-
-
-
-
-
- Installation of WebKitGTK+
-
-
- If you have not installed , fix a bug that will
- cause make install to fail:
-
-
-sed -i '/generate-gtkdoc --rebase/s:^:# :' GNUmakefile.in
-
-
- Fix a couple of compiler issues when built with GCC-6.1:
-
-
-patch -Np1 -i ../webkitgtk-&webkitgtk2-version;-gcc6-1.patch
-
-
-
- Unless noted otherwise, the packages depending on this package
- expect it to be built against GTK+ 3.
-
-
-
-
- To build WebKitGTK+ against
- GTK+ 3, run the following
- commands:
-
-
-mkdir build3 &&
-pushd build3 &&
-CFLAGS="-fno-delete-null-pointer-checks" \
-CXXFLAGS="-fno-delete-null-pointer-checks" \
-../configure --prefix=/usr --enable-introspection &&
-make &&
-popd
-
-
- To build WebKitGTK+ against
- GTK+ 2, run the following
- commands:
-
-
-mkdir build2 &&
-pushd build2 &&
-CFLAGS="-fno-delete-null-pointer-checks" \
-CXXFLAGS="-fno-delete-null-pointer-checks" \
-../configure --prefix=/usr --with-gtk=2.0 --disable-webkit2 &&
-make &&
-popd
-
-
- This package does not have a working testsuite. However, there are two
- useable basic graphical web browsers in the build directory,
- Programs/GtkLauncher and
- Programs/MiniBrowser. If launching any one
- fails, there is a problem with the build.
-
-
-
- If you have built the package against GTK+ 3,
- install it by running the following commands as the root user:
-
-
-make -C build3 install &&
-rm -rf /usr/share/gtk-doc/html/webkit{,dom}gtk-3.0 &&
-if [ -e /usr/share/gtk-doc/html/webkitdomgtk ]; then
- mv -v /usr/share/gtk-doc/html/webkitdomgtk{,-3.0}
-fi
-if [ -e /usr/share/gtk-doc/html/webkitgtk ]; then
- mv -v /usr/share/gtk-doc/html/webkitgtk{,-3.0}
-fi
-
-
- If you have built the package against GTK+ 2,
- install it by running the following commands as the root user:
-
-
-make -C build2 install &&
-rm -rf /usr/share/gtk-doc/html/webkit{,dom}gtk-1.0 &&
-if [ -e /usr/share/gtk-doc/html/webkitdomgtk ]; then
- mv -v /usr/share/gtk-doc/html/webkitdomgtk{,-1.0}
-fi
-if [ -e /usr/share/gtk-doc/html/webkitgtk ]; then
- mv -v /usr/share/gtk-doc/html/webkitgtk{,-1.0}
-fi
-
-
-
-
- Command Explanations
-
-
- --enable-introspection: This switch enables
- Gobject Introspection bindings and is
- required if building GNOME Desktop.
- Remove if you don't have Gobject
- Introspection installed or you don't want to install
- GNOME. It is not needed if building
- against GTK+ 2, although it can be used
- if desired.
-
-
-
- --with-gtk=2.0 --disable-webkit2: These switches
- force WebKitGTK+ to compile against
- GTK+ 2, even if
- GTK+ 3 is also installed.
-
-
-
- : Use this switch if you don't
- want to install or
- .
-
-
-
-
-
-
-
- Contents
-
-
- Installed Programs
- Installed Libraries
- Installed Directories
-
-
-
- jsc-3 or jsc-1
-
-
- libjavascriptcoregtk-3.0.so,
- libwebkit2gtk-3.0.so and
- libwebkitgtk-3.0.so or
- libjavascriptcoregtk-1.0.so and
- libwebkitgtk-1.0.so
-
-
- /usr/include/webkitgtk-3.0,
- /usr/lib/webkit2gtk-3.0,
- /usr/share/gtk-doc/html/webkitgtk-3.0,
- /usr/share/gtk-doc/html/webkitdomgtk-3.0,
- /usr/share/gtk-doc/html/webkit2gtk and
- /usr/share/webkitgtk-3.0 or
- /usr/include/webkit-1.0,
- /usr/share/gtk-doc/html/webkitgtk-1.0,
- /usr/share/gtk-doc/html/webkitdomgtk-1.0 and
- /usr/share/webkit-1.0
-
-
-
-
-
- Short Descriptions
-
-
-
-
- jsc-3
-
-
- is a command-line utility that allows you to run JavaScript programs
- outside of the context of a web browser linked against
- libjavascriptcoregtk-3.0.so.
-
-
- jsc-3
-
-
-
-
-
- jsc-1
-
-
- is a command-line utility that allows you to run JavaScript programs
- outside of the context of a web browser linked against
- libjavascriptcoregtk-1.0.so.
-
-
- jsc-1
-
-
-
-
-
- libjavascriptcoregtk-3.0.so
-
-
- contains core JavaScript API functions used by jsc-3
- and libwebkitgtk-3.0.so.
-
-
- libjavascriptcoregtk-3.0.so
-
-
-
-
-
- libwebkitgtk-3.0.so
-
-
- contains the WebKitGTK+ API functions for
- GTK+ 3.
-
-
- libwebkitgtk-3.0.so
-
-
-
-
-
- libwebkit2gtk-3.0.so
-
-
- contains the WebKit2 API functions.
-
-
- libwebkit2gtk-3.0.so
-
-
-
-
-
- libjavascriptcoregtk-1.0.so
-
-
- contains core JavaScript API functions used by jsc-1
- and libwebkitgtk-1.0.so.
-
-
- libjavascriptcoregtk-1.0.so
-
-
-
-
-
- libwebkitgtk-1.0.so
-
-
- contains the WebKitGTK+ API functions for
- GTK+ 2.
-
-
- libwebkitgtk-1.0.so
-
-
-
-
-
-
-
-
-
Index: xfce/apps/midori.xml
===================================================================
--- xfce/apps/midori.xml (revision 266784c082a0a1aaa847f714dcc38cc26381e5aa)
+++ xfce/apps/midori.xml (revision 4af99317895dd0d68f221e2cbc101bd3b3610db0)
@@ -92,5 +92,6 @@
,
- , and
+
+ WebKitGTK+-2.4.11 , and
Zeitgeist
@@ -146,9 +147,9 @@
-DHALF_BRO_INCOM_WEBKIT2=ON: Links to instead of WebKitGTK+-2.4.x.. Strictly
+ linkend="webkitgtk"/> instead of WebKitGTK+-2.4.x. Strictly
speaking, is not required and Midori could
- 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.
+ be linked to WebKitGTK+-2.4.x. The former used to be considered
+ experimental by upstream, but now is considered stable. However
+ the syntax has not yet been updated.
Index: xsoft/other/gimp.xml
===================================================================
--- xsoft/other/gimp.xml (revision 266784c082a0a1aaa847f714dcc38cc26381e5aa)
+++ xsoft/other/gimp.xml (revision 4af99317895dd0d68f221e2cbc101bd3b3610db0)
@@ -146,5 +146,6 @@
sendmail program),
,
- , and
+
+ webkitgtk-2.4.11, and
libwmf
@@ -303,10 +304,12 @@
- The GIMP uses either a plugin (if you have installed ) or a browser for its help system. 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.
+ The GIMP uses either a plugin (if you have installed the external
+ package webkitgtk-2.4.11) or a
+ browser for its help system. 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.