From 45439b981ca39aa41418d0cf4b76312d57d12271 Mon Sep 17 00:00:00 2001 From: Ken Moffat Date: Sat, 5 May 2012 20:42:19 +0000 Subject: [PATCH] gimp-2.8.0 with babl-0.1.10 and gegl-0.2.0. git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@10086 af4574ff-66df-0310-9fd7-8a98e5e911e0 --- general.ent | 6 +-- general/graphlib/babl.xml | 16 ++------ general/graphlib/gegl.xml | 41 ++++--------------- introduction/welcome/changelog.xml | 6 +++ xsoft/other/gimp.xml | 63 +++++++++++++++++------------- 5 files changed, 56 insertions(+), 76 deletions(-) diff --git a/general.ent b/general.ent index 92b1af2389..5affbd5e40 100644 --- a/general.ent +++ b/general.ent @@ -277,8 +277,8 @@ $Date$ - - + + @@ -937,7 +937,7 @@ $Date$ - + diff --git a/general/graphlib/babl.xml b/general/graphlib/babl.xml index 4573ca571a..cda11892ed 100644 --- a/general/graphlib/babl.xml +++ b/general/graphlib/babl.xml @@ -8,9 +8,9 @@ "http://gd.tuwien.ac.at/graphics/gimp/babl/0.1//babl-&babl-version;.tar.bz2"> - - - + + + ]> @@ -97,8 +97,7 @@ Install Babl by running the following commands: -sed -i 's#DBABL_IS_BEING_COMPILED#& -lgmodule-2.0#' babl/Makefile.in && -./configure --prefix=/usr && +./configure --prefix=/usr && make @@ -119,13 +118,6 @@ install -v -m644 docs/graphics/*.{html,png,svg} /usr/share/gtk-doc/html/babl/gra Command Explanations - - sed -i 's#DBABL_IS_BEING_COMPILED#& -lgmodule-2.0#' - babl/Makefile.in: This sed fixes compiling when both - Glib-2.32 and - are installed. - - install -v -m755 -d /usr/share/gtk-doc/html/babl/graphics: This and the subsequent diff --git a/general/graphlib/gegl.xml b/general/graphlib/gegl.xml index c2b41d8819..e592bcdb11 100644 --- a/general/graphlib/gegl.xml +++ b/general/graphlib/gegl.xml @@ -5,13 +5,13 @@ %general-entities; + "http://gd.tuwien.ac.at/graphics/gimp/gegl/0.2/gegl-&gegl-version;.tar.bz2"> - - - - + "ftp://ftp.gimp.org/pub/gegl/0.2/gegl-&gegl-version;.tar.bz2"> + + + + ]> @@ -119,9 +119,7 @@ Install gegl by running the following commands: -echo 'Babl-0.1' > gegl/gegl-0.1.deps && -sed -i '/INTROSPECTION_SCANNER_ARGS/s#$# -lgmodule-2.0#' gegl/Makefile.in && -./configure --prefix=/usr && +./configure --prefix=/usr && make @@ -132,36 +130,13 @@ make Now, as the root user: -make install && -install -v -m644 docs/*.{css,html} /usr/share/gtk-doc/html/gegl +make install Command Explanations - - echo 'Babl-0.1' > gegl/gegl-0.1.deps: This command - fixes compiling Gegl if you have - installed. - - - - sed -i '/INTROSPECTION_SCANNER_ARGS/s#$# -lgmodule-2.0#' - gegl/Makefile.in: This sed fixes compiling - Gegl if you have - Glib-2.32 and - installed. - - - - install -v -m644 docs/*.{css,html} - /usr/share/gtk-doc/html/gegl: The command 'make - install' only installs operations.html, - omitting the stylesheet and index.html. This extra - command ensures all the links in the html work. - - : Do not create a vala API - use this if diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml index c0b887ac10..da5a66239d 100644 --- a/introduction/welcome/changelog.xml +++ b/introduction/welcome/changelog.xml @@ -53,6 +53,12 @@ [abenton] - Updated Parted to 3.1. + + [ken] - Updated to babl-0.1.10, gegl-0.2.0, gimp-2.8.0. Fixes + #3353, + #3354 and + #3352. + diff --git a/xsoft/other/gimp.xml b/xsoft/other/gimp.xml index 0196633723..42c3e0558c 100644 --- a/xsoft/other/gimp.xml +++ b/xsoft/other/gimp.xml @@ -4,12 +4,12 @@ %general-entities; - - - - - - + + + + + + @@ -112,10 +112,9 @@ , an (that provides a sendmail program), - (this must be compiled with - gtk+-2 backend, The - Gimp uses Webkit to - create it's help browser) + (this must be compiled with the + gtk+-2 backend for the + Gimp to use it to create its help browser) and User Notes: @@ -128,10 +127,11 @@ Install The Gimp by running the following commands: -./configure --prefix=/usr --sysconfdir=/etc && +./configure --prefix=/usr --sysconfdir=/etc --without-gvfs && make - To test the results, issue: make check. + To test the results, from an xterm or similar, issue: + make check. Now, as the root user: @@ -140,7 +140,10 @@ make The gimp-help tarball contains preformatted HTML for use with external web browsers, the internal - Gimp help browser, and HTML renderers. + Gimp help browser, and HTML renderers. Some of + the details have changed in gimp-2.8, but much of + this is still relevant. Please also consult + . If you downloaded the gimp-help tarball, unpack it and change into the root of the newly created source tree. Issue the @@ -153,9 +156,13 @@ make Command Explanations - make check: Although all the tests themselves - are expected to pass, there is a bug in the i18n file validation which will - fail with a warning message for the maintainer. + --without-gvfs: the choice of the backend to + handle URI information, e.g. when dragging images from a browser into the + gimp, is made at compile time. This parameter will + ensure that curl is used at run-time, instead of + gvfs. You can omit this if you are installing + gvfs AND will be running gvfsd, + e.g. in a GNOME desktop. : This option is necessary if libpng is not installed. @@ -180,7 +187,7 @@ make Config Files /etc/gimp/2.0/* and - ~/.gimp-2.6/gimprc + ~/.gimp-2.8/gimprc ~/.gimp-2.0/gimprc @@ -219,7 +226,7 @@ make Installed Directories - gimp, gimp-2.6, gimp-console, gimp-console-2.6, + gimp, gimp-2.8, gimp-console, gimp-console-2.8, and gimptool-2.0 libgimp-2.0.so, libgimpbase-2.0.so, libgimpcolor-2.0.so, libgimpconfig-2.0.so, libgimpmath-2.0.so, libgimpmodule-2.0.so, @@ -239,20 +246,20 @@ make gimp - is a symbolic link to gimp-2.6. + is a symbolic link to gimp-2.8. gimp - - gimp-2.6 + + gimp-2.8 is the Gnu Image Manipulation Program. It works with a variety of image formats and provides a large selection of tools. - - gimp-2.6 + + gimp-2.8 @@ -260,21 +267,21 @@ make gimp-console - is a symbolic link to gimp-console-2.6. + is a symbolic link to gimp-console-2.8. gimp-console - - gimp-console-2.6 + + gimp-console-2.8 is a console program that behaves as if The Gimp was called with the command-line option. - - gimp-console-2.6 + + gimp-console-2.8