From 9980d0a165f4e03573ec3d4b4c72dd0f5e43c842 Mon Sep 17 00:00:00 2001 From: Ken Moffat Date: Tue, 12 Oct 2010 20:48:06 +0000 Subject: [PATCH] Update wilbur, also add missing commas in gegl. git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@8627 af4574ff-66df-0310-9fd7-8a98e5e911e0 --- general.ent | 4 +- general/graphlib/gegl.xml | 24 ++--- introduction/welcome/changelog.xml | 10 ++ xsoft/office/gimp.xml | 158 ++++++++++++++--------------- 4 files changed, 101 insertions(+), 95 deletions(-) diff --git a/general.ent b/general.ent index dc7165a6d1..5eff5a3036 100644 --- a/general.ent +++ b/general.ent @@ -3,7 +3,7 @@ $LastChangedBy$ $Date$ --> - + @@ -723,7 +723,7 @@ $Date$ - + diff --git a/general/graphlib/gegl.xml b/general/graphlib/gegl.xml index 837fdabeed..f3349e668b 100644 --- a/general/graphlib/gegl.xml +++ b/general/graphlib/gegl.xml @@ -65,18 +65,18 @@ Optional AsciiDoc - enscript - - - - libopenraw - - - libspiro - Lua - OpenEXR - + url="http://www.methods.co.nz/asciidoc/">AsciiDoc, + enscript, + , + , + , + libopenraw, + , + , + libspiro, + Lua, + OpenEXR, + , and diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml index ae19640c94..1a7531f5a5 100644 --- a/introduction/welcome/changelog.xml +++ b/introduction/welcome/changelog.xml @@ -41,6 +41,16 @@ --> + + October 12th + + + [ken] - Updated to Gimp-2.6.8. Fixes ticket + #2619 + + + + October 10th diff --git a/xsoft/office/gimp.xml b/xsoft/office/gimp.xml index 4bc3f9e516..92eb59b93d 100644 --- a/xsoft/office/gimp.xml +++ b/xsoft/office/gimp.xml @@ -4,18 +4,17 @@ %general-entities; - - - - - - + + + + + + - - - - + + + + ]> @@ -65,7 +64,9 @@ Help System - Optional help files: + Optional help files: and/or + one or more of the other available languages - see gimp.org for details. Download MD5 sum: &gimp-help-md5sum; @@ -78,16 +79,14 @@ GIMP Dependencies Required - , - , and + , + , + , Recommended and - If the recommended dependencies are not installed, the @@ -96,26 +95,25 @@ Optional - , - , - , + , + , + , + , + , + , + , , , + , + , - , - (required to build the help system browser plugin), libwmf, + , (including the gtk and pango modules), - Gimp-Print version 4.2.7, an (that provides a - sendmail program), and - - - Optional (for Building Documentation from - the Help Tarball) - , - , and - + sendmail program), + , + and User Notes: @@ -128,35 +126,24 @@ Install GIMP by running the following commands: -./configure --prefix=/usr \ - --sysconfdir=/etc \ - --disable-print && +./configure --prefix=/usr + --sysconfdir=/etc && make To test the results, issue: make check. Now, as the root user: -make install && -install -v -m755 -d /usr/share/doc/gimp-&gimp-version; && -install -v -m644 docs/{Wilber*,keybindings.txt,quick_reference.ps} \ - /usr/share/doc/gimp-&gimp-version; +make install - The gimp-help tarball contains a help system - designed for use with external web browsers, the internal - GIMP help browser, and HTML renderers. - The tarball only contains the XML sources, so you will need - the xsltproc program from - to build the HTML files. + The gimp-help tarball contains preformatted HTML + for use with external web browsers, the internal + GIMP help browser, and HTML renderers. If you downloaded the gimp-help tarball, unpack - it and change into the root of the newly created source tree (as an - unprivileged user). Issue the following commands to install the help files: - -./configure && -make - - Now, as the root user: + it and change into the root of the newly created source tree. Issue the + following commands as the root + user to install the help files: make install @@ -172,18 +159,16 @@ make datarootdir variable. Fortunately, passing -datadir= works around the problem. --> - : This option disables print support - and is required if the obsolete Gimp-Print - package is not installed. Print support for the - Gimp can be provided later by installing - the package. - : This option is necessary if libjpeg is not installed. : This option is necessary if libtiff is not installed. + : This option is necessary if + you installed python but have not installed + pygtk. + @@ -196,7 +181,7 @@ make Config Files /etc/gimp/2.0/* and - ~/.gimp-2.0/gimprc + ~/.gimp-2.6/gimprc ~/.gimp-2.0/gimprc @@ -215,8 +200,8 @@ make for each user upon their initial use of the program. GIMP executes the - mozilla web browser by default to view the help - files. If you do not have Mozilla, or + firefox web browser by default to view the help + files. If you do not have firefox, or prefer a different web browser, you can set a new system value in /etc/gimp/2.0/gimprc. Execute the following command as the root user, @@ -238,15 +223,15 @@ make Installed Directories - gimp, gimp-2.2, gimp-remote, gimp-remote-2.2, + gimp, gimp-2.6, gimp-console, gimp-console-2.6, and gimptool-2.0 libgimp-2.0.so, libgimpbase-2.0.so, libgimpcolor-2.0.so, - libgimpmath-2.0.so, libgimpmodule-2.0.so, libgimpthumb-2.0.so, + libgimpconfig-2.0.so, libgimpmath-2.0.so, libgimpmodule-2.0.so, libgimpthumb-2.0.so, libgimpui-2.0.so, libgimpwidgets-2.0.so, and many other modules and plugin libraries /etc/gimp, /usr/include/gimp-2.0, /usr/lib/gimp, - /usr/share/doc/gimp-&gimp-version;, /usr/share/gimp and - /usr/share/gtk-doc/html/libgimp{,base,color,math,module,thumb,widgets} + /usr/share/gimp and + /usr/share/gtk-doc/html/libgimp{,base,color,config,math,module,thumb,widgets} @@ -258,42 +243,42 @@ make gimp - is a symbolic link to gimp-2.2. + is a symbolic link to gimp-2.6. gimp - - gimp-2.2 + + gimp-2.6 is an image manipulation program. It works with a variety of image formats and provides a large selection of tools. - - gimp-2.2 + + gimp-2.6 - - gimp-remote + + gimp-console - is a symbolic link to gimp-remote-2.2. - - gimp-remote + is a symbolic link to gimp-console-2.6. + + gimp-console - - gimp-remote-2.2 + + gimp-console-2.6 - is a small utility that tells a running - GIMP to open a local or remote - image file. - - gimp-remote-2.2 + is a console program that behaves as if + GIMP was called with the + command-line option. + + gimp-console-2.6 @@ -350,6 +335,17 @@ make + + libgimpconfig-2.0.so + + contains C functions for reading and writing config information. + + + libgimpconfig-2.0.so + + + + libgimpmath-2.0.so