Changeset 389246e

Timestamp:

04/12/2016 10:19:55 PM (7 years ago)

Author:

Bruce Dubbs <bdubbs@…>

Branches:

10.0, 10.1, 11.0, 11.1, 11.2, 11.3, 12.0, 7.10, 8.0, 8.1, 8.2, 8.3, 8.4, 9.0, 9.1, basic, bdubbs/svn, elogind, kea, ken/inkscape-core-mods, lazarus, lxqt, nosym, perl-modules, plabs/python-mods, qt5new, trunk, upgradedb, xry111/intltool, xry111/soup3, xry111/test-20220226, xry111/xf86-video-removal

Children:

145c21bc

Parents:

5ca14bdd

Message:

Update to apache-2.4.20.
Update to scons-2.5.0.
Change gimp instructions to allow building with gegl-0.3

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

Files:

• general/prog/scons.xml (modified) (1 diff)
• introduction/welcome/changelog.xml (modified) (1 diff)
• packages.ent (modified) (2 diffs)
• server/major/apache.xml (modified) (2 diffs)
• xsoft/other/gimp.xml (modified) (3 diffs)

general/prog/scons.xml

@@ -7 +7 @@
   <!ENTITY scons-download-http "&sourceforge-repo;/scons/scons-&scons-version;.tar.gz">
   <!ENTITY scons-download-ftp  " ">
-  <!ENTITY scons-md5sum        "9a0ddf33d9839f04380e0fae87cc4b40">
-  <!ENTITY scons-size          "628 KB">
-  <!ENTITY scons-buildsize     "13 MB">
+  <!ENTITY scons-md5sum        "9e00fa0df8f5ca5c5f5975b40e0ed354">
+  <!ENTITY scons-size          "608 KB">
+  <!ENTITY scons-buildsize     "5.2 MB">
   <!ENTITY scons-time          "less than 0.1 SBU">
 ]>

introduction/welcome/changelog.xml

@@ -49 +49 @@
       <itemizedlist>
         <listitem>
+          <para>[bdubbs] - Update to apache-2.4.20. Fixes
+          <ulink url="&blfs-ticket-root;7711">#7711</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to scons-2.5.0. Fixes
+          <ulink url="&blfs-ticket-root;7703">#7703</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Change gimp instructions to allow building
+          with gegl-0.3. Fixes
+          <ulink url="&blfs-ticket-root;7706">#7706</ulink>.</para>
+        </listitem>
+        <listitem>
           <para>[bdubbs] - Update to samba-4.4.0. Fixes
           <ulink url="&blfs-ticket-root;7533">#7533</ulink>.</para>

packages.ent

@@ -281 +281 @@
 <!ENTITY ruby-patch-version           "0">
 <!ENTITY ruby-version                 "&ruby-minor-version;.&ruby-patch-version;">
-<!ENTITY scons-version                "2.4.1">
+<!ENTITY scons-version                "2.5.0">
 <!ENTITY slang-version                "2.2.4">
 <!ENTITY subversion-version           "1.9.3">
@@ -417 +417 @@
 <!-- Part V -->
 <!-- Chapter 20 -->
-<!ENTITY apache-version               "2.4.18">
+<!ENTITY apache-version               "2.4.20">
 <!ENTITY proftpd-version              "1.3.5b">
 <!ENTITY vsftpd-version               "3.0.3">

server/major/apache.xml

@@ -8 +8 @@
            "https://archive.apache.org/dist/httpd/httpd-&apache-version;.tar.bz2">
   <!ENTITY apache-download-ftp  " ">
-  <!ENTITY apache-md5sum        "3690b3cc991b7dfd22aea9e1264a11b9">
-  <!ENTITY apache-size          "4.9 MB">
-  <!ENTITY apache-buildsize     "109 MB">
-  <!ENTITY apache-time          "0.6 SBU">
+  <!ENTITY apache-md5sum        "3ff4f00ee051cf5d5304b47b1bc418b8">
+  <!ENTITY apache-size          "6.0 MB">
+  <!ENTITY apache-buildsize     "78 MB">
+  <!ENTITY apache-time          "0.7 SBU">
 ]>
 
@@ -136 +136 @@
 <screen><userinput>patch -Np1 -i ../httpd-&apache-version;-blfs_layout-1.patch           &amp;&amp;
 
-sed '/dir.*CFG_PREFIX/s@^@#@'     -i support/apxs.in        &amp;&amp;
+sed '/dir.*CFG_PREFIX/s@^@#@' -i support/apxs.in            &amp;&amp;
 
 ./configure --enable-authnz-fcgi                            \

xsoft/other/gimp.xml

@@ -172 +172 @@
     </para>
 
-<screen><userinput>./configure --prefix=/usr \
+<screen><userinput>sed -i '/gegl/s/2/3/' configure.ac &amp;&amp;
+autoreconf -fiv                    &amp;&amp;
+
+./configure --prefix=/usr \
             --sysconfdir=/etc \
             --without-gvfs &amp;&amp;
@@ -199 +202 @@
     <para>
       The <filename>gimp-help</filename> tarball contains images and English
-      text help for help files, together with translations.<!-- It is
-      &quot;work in progress&quot;.-->
+      text help for help files, together with translations.
     </para>
 
@@ -237 +239 @@
   <sect2 role="commands" id="gimp-cmd-explanations">
     <title>Command Explanations</title>
+
+    <para>
+      <command> sed ... configure.ac</command>: This command allows
+      building with the current version of gegl.
+    </para>
 
     <para>