Author: ken
Date: 2011-12-10 16:25:12 -0700 (Sat, 10 Dec 2011)
New Revision: 9090
Modified:
trunk/BOOK/general.ent
trunk/BOOK/introduction/welcome/changelog.xml
trunk/BOOK/xsoft/office/gimp.xml
Log:
Update to gimp-2.6.11
Modified: trunk/BOOK/general.ent
===================================================================
--- trunk/BOOK/general.ent 2011-12-10 22:45:12 UTC (rev 9089)
+++ trunk/BOOK/general.ent 2011-12-10 23:25:12 UTC (rev 9090)
@@ -775,7 +775,7 @@
<!ENTITY AbiWord-version "2.8.6">
<!ENTITY gnumeric-version "1.10.11">
<!ENTITY gnucash-version "2.2.4">
-<!ENTITY gimp-version "2.6.8">
+<!ENTITY gimp-version "2.6.11">
<!ENTITY evolution-version "2.30.2">
<!ENTITY icedtea-web-version "1.0.1">
Modified: trunk/BOOK/introduction/welcome/changelog.xml
===================================================================
--- trunk/BOOK/introduction/welcome/changelog.xml 2011-12-10 22:45:12 UTC
(rev 9089)
+++ trunk/BOOK/introduction/welcome/changelog.xml 2011-12-10 23:25:12 UTC
(rev 9090)
@@ -50,6 +50,9 @@
<listitem>
<para>[ken] - Updated to gegl-0.1.8.</para>
</listitem>
+ <listitem>
+ <para>[ken] - Updated to gimp-2.6.11.</para>
+ </listitem>
</itemizedlist>
</listitem>
Modified: trunk/BOOK/xsoft/office/gimp.xml
===================================================================
--- trunk/BOOK/xsoft/office/gimp.xml 2011-12-10 22:45:12 UTC (rev 9089)
+++ trunk/BOOK/xsoft/office/gimp.xml 2011-12-10 23:25:12 UTC (rev 9090)
@@ -4,12 +4,12 @@
<!ENTITY % general-entities SYSTEM "../../general.ent">
%general-entities;
- <!ENTITY gimp-download-http
"http://ftp.gtk.org/pub/gimp/v2.6/gimp-&gimp-version;.tar.bz2";>
+ <!ENTITY gimp-download-http
"http://gd.tuwien.ac.at/graphics/gimp/gimp/v2.6/gimp-&gimp-version;.tar.bz2";>
<!ENTITY gimp-download-ftp
"ftp://ftp.gimp.org/pub/gimp/v2.6/gimp-&gimp-version;.tar.bz2";>
- <!ENTITY gimp-md5sum "a4d9462c9420954824a80c9b1963f9d">
+ <!ENTITY gimp-md5sum "bb2939fe13e54fc7255cef5d097bb5dd">
<!ENTITY gimp-size "16 MB">
- <!ENTITY gimp-buildsize "330 MB to 430 MB (additional 78 MB to install
help files)">
- <!ENTITY gimp-time "5.5 to 5.7 SBU (additional 0.7 SBU to run the
test suite)">
+ <!ENTITY gimp-buildsize "349 MB to 530 MB (additional 78 MB to install
help files)">
+ <!ENTITY gimp-time "5.3 to 6.1 SBU (additional 0.8 SBU to run the
test suite)">
<!ENTITY gimp-help-version "2.6.0-html-en">
<!ENTITY gimp-help-download
"ftp://gimp.org/pub/gimp/help/gimp-help-&gimp-help-version;.tar.bz2";>
@@ -38,7 +38,7 @@
the GNU Image Manipulation Program. This is useful for
photo retouching, image composition and image authoring.</para>
- &lfs67_checked;
+ &lfs70_checked;
<bridgehead renderas="sect3">Package Information</bridgehead>
<itemizedlist spacing="compact">
@@ -63,9 +63,17 @@
</itemizedlist>
<bridgehead renderas="sect3">Additional Downloads</bridgehead>
- <itemizedlist spacing='compact'>
- <title>Help System</title>
+ <itemizedlist spacing="compact">
+ <title>Patches and Help System</title>
<listitem>
+ <para>Required patches: <ulink
+ url="&patch-root;/gimp-&gimp-version;-security_fix-1.patch"/>
+ and <ulink
+ url="&patch-root;/gimp-&gimp-version;-libpng_fix-1.patch"/>
+ </para>
+ </listitem>
+
+ <listitem>
<para>Optional help files: <ulink url="&gimp-help-download;"/> and/or
one or more of the other available languages - see <ulink
url="http://www.gimp.org/docs";>gimp.org</ulink> for details.</para>
@@ -76,7 +84,7 @@
<listitem>
<para>Download size: &gimp-help-size;</para>
</listitem>
- </itemizedlist>
+ </itemizedlist>
<bridgehead renderas="sect3">GIMP Dependencies</bridgehead>
@@ -114,6 +122,8 @@
<xref linkend="pygtk"/> (including the gtk and pango modules),
an <xref linkend="server-mail"/> (that provides a
<command>sendmail</command> program),
+ <!-- webkit-gtk is deliberately ignored because once we move to -1.6
+ it will only provide webkit-3.0.pc and gimp-2.6.11 needs the old -1.0.pc
-->
<xref linkend="x-window-system"/>,
and <xref linkend="gtk-doc"/></para>
@@ -128,11 +138,13 @@
<para>Install <application>GIMP</application> by running
the following commands:</para>
-<screen><userinput>./configure --prefix=/usr \
+<screen><userinput>patch -Np1 -i ../gimp-&gimp-version;-security_fixes-1.patch
&&
+patch -Np1 -i ../gimp-&gimp-version;-libpng_fixes-1.patch &&
+./configure --prefix=/usr \
--sysconfdir=/etc &&
make</userinput></screen>
- <para>To test the results, issue: <command>make check</command>.</para>
+ <para>To test the results, issue: <command>make -k check</command>.</para>
<para>Now, as the <systemitem class="username">root</systemitem>
user:</para>
@@ -161,6 +173,10 @@
<envar>datarootdir</envar> variable. Fortunately, passing
<parameter>-datadir=</parameter> works around the problem.</para> -->
+ <para><command>make -k check</command>: 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.</para>
+
<para><option>--without-libjpeg</option>: This option is necessary if
<application>libjpeg</application> is not installed.</para>
--
http://linuxfromscratch.org/mailman/listinfo/blfs-book
FAQ: http://www.linuxfromscratch.org/blfs/faq.html
Unsubscribe: See the above information page
