From 5e11bc38e7cbc0f25936f0a0d9e35ee4eb7bf288 Mon Sep 17 00:00:00 2001 From: Fernando de Oliveira Date: Thu, 28 Aug 2014 15:53:10 +0000 Subject: [PATCH] Update to webkitgtk-2.4.5. Remove WebKitGTK+1.10.x, consequently, fix Midori-0.5.8 and Gimp-2.8.14 (remove broken ftp link from the latter). Fix Tk-8.6.2 md5sum that changed overnight. Thanks Wayne B. LibreOffice-4.3.0 - fix broken symbolic links. Thanks Wayne B. git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@14111 af4574ff-66df-0310-9fd7-8a98e5e911e0 --- {x/lib => archive}/webkitgtk.xml | 0 general/prog/tk.xml | 2 +- introduction/welcome/changelog.xml | 17 +++ packages.ent | 3 +- x/lib/lib.xml | 1 - x/lib/webkitgtk2.xml | 199 +++++++++++++++++++++-------- xfce/apps/midori.xml | 10 +- xsoft/office/libreoffice.xml | 7 +- xsoft/other/gimp.xml | 5 +- 9 files changed, 179 insertions(+), 65 deletions(-) rename {x/lib => archive}/webkitgtk.xml (100%) diff --git a/x/lib/webkitgtk.xml b/archive/webkitgtk.xml similarity index 100% rename from x/lib/webkitgtk.xml rename to archive/webkitgtk.xml diff --git a/general/prog/tk.xml b/general/prog/tk.xml index 12c439a77b..8a015d672f 100644 --- a/general/prog/tk.xml +++ b/general/prog/tk.xml @@ -6,7 +6,7 @@ - + diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml index 7062715d18..149763ce7f 100644 --- a/introduction/welcome/changelog.xml +++ b/introduction/welcome/changelog.xml @@ -47,6 +47,23 @@ August 28th, 2014 + + [fernando] - LibreOffice-4.3.0 - fix broken symbolic links. + Thanks Wayne B. + + + [fernando] - Fix Tk-8.6.2 md5sum that changed overnight. + Thanks Wayne B. + + + [fernando] - Remove WebKitGTK+1.10.x, consequently, fix + Midori-0.5.8 and Gimp-2.8.14 (remove broken ftp link from the latter). + Fixes #5434. + + + [fernando] - Update to webkitgtk-2.4.5. Fixes + #5426. + [ken] - Added libpaper-1.1.24+nmu3. Fixes #5440. diff --git a/packages.ent b/packages.ent index 1b525a6182..0fef287944 100644 --- a/packages.ent +++ b/packages.ent @@ -448,8 +448,7 @@ - - + diff --git a/x/lib/lib.xml b/x/lib/lib.xml index 221e17217c..edb917d488 100644 --- a/x/lib/lib.xml +++ b/x/lib/lib.xml @@ -56,7 +56,6 @@ $Date$ - diff --git a/x/lib/webkitgtk2.xml b/x/lib/webkitgtk2.xml index 832b2303d9..85d3c1b404 100644 --- a/x/lib/webkitgtk2.xml +++ b/x/lib/webkitgtk2.xml @@ -6,10 +6,10 @@ - + - - + + ]> @@ -30,9 +30,10 @@ Introduction to WebKitGTK+ - The WebKitGTK+ is the port of the portable - web rendering engine WebKit to the - GTK+ 3 platform. + The WebKitGTK+ is the port of the portable web + rendering engine WebKit to the + GTK+ 3 and/or GTK+ + 2 platforms. &lfs75_checked; @@ -76,6 +77,7 @@ Required , + or , , , @@ -88,12 +90,17 @@ + + 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 , , , - and @@ -114,36 +121,43 @@ Installation of WebKitGTK+ - - - If you are building WebKitGTK+ - with make 3.82, make sure that you have built - it with the following - - patch applied or WebKitGTK+ - build may fail. - - - If you have not installed , fix a bug that will cause make install to fail: -sed -i '/generate-gtkdoc --rebase/s:^:# :' GNUmakefile.in +sed -i '/generate-gtkdoc --rebase/s:^:# :' \ + GNUmakefile.in + + + Upstream standard now is to link this package against GTK+ 3. However, + for backward compatibility, manu users need also another instance, linked + to GTK+ 2. Both can be installed in the same system, without problem. + However, some packages can alternatively be linked to either one. Here, + both build methods are presented and recommended to be built, but if you + know which one you need, just jump to the respective part. + + + + Build and install WebKitGTK+ against + GTK+ 3 Install WebKitGTK+ by running the following commands: -./configure --prefix=/usr \ - --enable-introspection && +mkdir -vp build-3 && +cp -a Documentation build-3 && +cd build-3 && + + +../configure --prefix=/usr --enable-introspection && make This package does not have a working testsuite. However, there are two - useable basic graphical web browsers in the source directory, + 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. @@ -161,20 +175,75 @@ make Now, as the root user: -make install && -rm -rf /usr/share/gtk-doc/html/webkitgtk-2.0 && -mv -vi /usr/share/gtk-doc/html/webkitgtk{,-2.0} +make install + + + Finally, leave the buid directory: + + +cd .. + + + Build and install WebKitGTK+ against + GTK+ 2 + + + Install WebKitGTK+ by running the + following commands: + + +mkdir -vp build-1 + + + If you have built and installed the package against GTK+ 3, skip the + following command, because the previous docummentation also applies here: + + +cp -a Documentation build-1 + + + Now, change into the build directory and effectively start the build and + install: + + +cd build-1 && + + +../configure --prefix=/usr --with-gtk=2.0 --disable-webkit2 && +make + + + This package does not have a working testsuite. However, there is one + useable basic graphical web browser in the build directory, + Programs/GtkLauncher. If launching it + fails, there is a problem with the build. + + + + When installing, the Makefile does some additional compiling and linking. + If you do not have Xorg in /usr, the LIBRARY_PATH and PKG_CONFIG_PATH + variables need to be defined for the root user. If using sudo to assume + root, use the -E option to pass your current environment variables for the + install process. + + + + Now, as the root user: + + +make install + + + Finally, leave the buid directory: + + +cd .. + Command Explanations - - mv -vi /usr/share/gtk-doc/html/webkitgtk{,-2.0}: - There is a conflict with the directory installed with same name by - . - - : This switch enables support for Gobject Introspection and is required for a @@ -192,38 +261,36 @@ mv -vi /usr/share/gtk-doc/html/webkitgtk{,-2.0} - : This option - puts the package's private programs into - /usr/lib/webkitgtk3 instead of - /usr/libexec in accordance with - the old version of the FHS used before LFS-7.5. - Contents - Installed Program + Installed Programs Installed Libraries Installed Directories - jsc-3 + jsc-1, and jsc-3 + libjavascriptcoregtk-1.0.so, libjavascriptcoregtk-3.0.so, libwebkit2gtk-3.0.so, - libwebkitgtk-3.0.so and - /usr/lib/webkit2gtk-3.0/injected-bundle/libwebkit2gtkinjectedbundle.so + libwebkitgtk-1.0.so, + libwebkitgtk-3.0.so, and + webkit2gtk-3.0/injected-bundle/libwebkit2gtkinjectedbundle.so + /usr/include/webkitgtk-1.0, /usr/include/webkitgtk-3.0, /usr/lib/webkit2gtk-3.0, - /usr/share/gtk-doc/html/webkitgtk-2.0, + /usr/share/gtk-doc/html/webkit2gtk, /usr/share/gtk-doc/html/webkitdomgtk, - /usr/share/gtk-doc/html/webkit2gtk, and + /usr/share/gtk-doc/html/webkitgtk, + /usr/share/webkitgtk-1.0, and /usr/share/webkitgtk-3.0 @@ -234,6 +301,19 @@ mv -vi /usr/share/gtk-doc/html/webkitgtk{,-2.0} + + jsc-1 + + + is a command-line utility that allows you to run JavaScript programs + outside of the context of a web browser. + + + jsc-1 + + + + jsc-3 @@ -247,6 +327,20 @@ mv -vi /usr/share/gtk-doc/html/webkitgtk{,-2.0} + + libjavascriptcoregtk-1.0.so + + + contains core JavaScript API functions used by jsc-1 + and libwebkitgtk-1.0.so. + + + libjavascriptcoregtk-1.0.so + + + + libjavascriptcoregtk-3.0.so @@ -255,25 +349,24 @@ mv -vi /usr/share/gtk-doc/html/webkitgtk{,-2.0} contains core JavaScript API functions used by jsc-3 and libwebkitgtk-3.0.so. - + libjavascriptcoregtk-3.0.so - libwebkitgtk-3.0.so @@ -282,7 +375,7 @@ mv -vi /usr/share/gtk-doc/html/webkitgtk{,-2.0} contains the WebKitGTK+ API functions for GTK+ 3. - + libwebkitgtk-3.0.so @@ -294,7 +387,7 @@ mv -vi /usr/share/gtk-doc/html/webkitgtk{,-2.0} contains the WebKit2 API functions. - + libwebkit2gtk-3.0.so diff --git a/xfce/apps/midori.xml b/xfce/apps/midori.xml index 2432140de5..fa4e76ebea 100644 --- a/xfce/apps/midori.xml +++ b/xfce/apps/midori.xml @@ -78,7 +78,6 @@ , , - or (see "Command Explanations"), and @@ -137,9 +136,12 @@ make Command Explanations - : Use this switch if you want - to build Midori with - WebKitGTK+ 2 dependencies. + : Use this switch if you want to build + Midori with + WebKitGTK+ built against GTK+ + 3, because by default it chooses + WebKitGTK+ built against GTK+ + 2. diff --git a/xsoft/office/libreoffice.xml b/xsoft/office/libreoffice.xml index 0d2dc4dffc..14f9772605 100644 --- a/xsoft/office/libreoffice.xml +++ b/xsoft/office/libreoffice.xml @@ -288,8 +288,11 @@ tar -xf ../libreoffice-dictionaries-&libreoffice-dlversion;.tar.xz --no-overwrit -ln -sv ../../libreoffice-dictionaries-&libreoffice-dlversion;.tar.xz external/tarballs/ && -ln -sv ../../libreoffice-help-&libreoffice-dlversion;.tar.xz external/tarballs/ + +ln -sv ../../../libreoffice-dictionaries-&libreoffice-dlversion;.tar.xz \ + external/tarballs/ && +ln -sv ../../../libreoffice-help-&libreoffice-dlversion;.tar.xz \ + external/tarballs/ (that provides a sendmail program), (for GUdev), - (required for the help-plugin) and + (required for the help-plugin) and