Changeset 56aab2e

Timestamp:

12/10/2011 11:25:12 PM (13 years ago)

Author:

Ken Moffat <ken@…>

Branches:

10.0, 10.1, 11.0, 11.1, 11.2, 11.3, 12.0, 12.1, 12.2, 7.10, 7.4, 7.5, 7.6, 7.6-blfs, 7.6-systemd, 7.7, 7.8, 7.9, 8.0, 8.1, 8.2, 8.3, 8.4, 9.0, 9.1, basic, bdubbs/svn, elogind, gimp3, gnome, kde5-13430, kde5-14269, kde5-14686, kea, ken/TL2024, ken/inkscape-core-mods, ken/tuningfonts, krejzi/svn, lazarus, lxqt, nosym, perl-modules, plabs/newcss, plabs/python-mods, python3.11, qt5new, rahul/power-profiles-daemon, renodr/vulkan-addition, systemd-11177, systemd-13485, trunk, upgradedb, xry111/for-12.3, xry111/intltool, xry111/llvm18, xry111/soup3, xry111/spidermonkey128, xry111/test-20220226, xry111/xf86-video-removal

Children:

5cd2984

Parents:

8ddd2428

Message:

Update to gimp-2.6.11

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@9090 af4574ff-66df-0310-9fd7-8a98e5e911e0

Files:

• general.ent (modified) (1 diff)
• introduction/welcome/changelog.xml (modified) (1 diff)
• xsoft/office/gimp.xml (modified) (7 diffs)

general.ent

@@ -776 +776 @@
 <!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">

introduction/welcome/changelog.xml

@@ -51 +51 @@
           <para>[ken] - Updated to gegl-0.1.8.</para>
         </listitem>
+        <listitem>
+          <para>[ken] - Updated to gimp-2.6.11.</para>
+        </listitem>
       </itemizedlist>
     </listitem>

xsoft/office/gimp.xml

@@ -5 +5 @@
   %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">
@@ -39 +39 @@
     photo retouching, image composition and image authoring.</para>
 
-    &lfs67_checked;
+    &lfs70_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -64 +64 @@
 
     <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
@@ -77 +85 @@
         <para>Download size: &gimp-help-size;</para>
       </listitem>
-    </itemizedlist>
+      </itemizedlist>
 
     <bridgehead renderas="sect3">GIMP Dependencies</bridgehead>
@@ -115 +123 @@
     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>
@@ -129 +139 @@
     the following commands:</para>
 
-<screen><userinput>./configure --prefix=/usr \
+<screen><userinput>patch -Np1 -i ../gimp-&gimp-version;-security_fixes-1.patch &amp;&amp;
+patch -Np1 -i ../gimp-&gimp-version;-libpng_fixes-1.patch &amp;&amp;
+./configure --prefix=/usr \
             --sysconfdir=/etc &amp;&amp;
 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 +173 @@
     <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